From d7ae15beea9ffaf06874c175103edb3516b7a598 Mon Sep 17 00:00:00 2001
From: prachi <prachi@cloud.com>
Date: Mon, 14 Nov 2011 17:39:09 -0800
Subject: [PATCH] - Fixed missing UUId in listNetworkServiceProviders API

- BroadcastDomainRange will be 'POD' for 'basic' zone and 'ZONE' for an advance zone.
---
 api/src/com/cloud/api/response/ProviderResponse.java |  2 +-
 .../configuration/ConfigurationManagerImpl.java      | 12 +++++++++---
 server/src/com/cloud/network/NetworkManagerImpl.java |  8 ++++++++
 server/src/com/cloud/network/PhysicalNetworkVO.java  |  2 +-
 setup/db/create-schema.sql                           |  2 +-
 5 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/api/src/com/cloud/api/response/ProviderResponse.java b/api/src/com/cloud/api/response/ProviderResponse.java
index 8dddf01cd1a..b94d9ab3971 100644
--- a/api/src/com/cloud/api/response/ProviderResponse.java
+++ b/api/src/com/cloud/api/response/ProviderResponse.java
@@ -81,7 +81,7 @@ public class ProviderResponse extends BaseResponse {
     }
 
     public void setId(String uuid) {
-        this.id = id;
+        this.id = uuid;
     }
     
     public String getId() {
diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
index e97dfcbeec2..1552046d8a5 100755
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -1388,7 +1388,7 @@ public class ConfigurationManagerImpl implements ConfigurationManager, Configura
             zone = _zoneDao.persist(zone);
 
             // Create default Physical Network
-            long physicalNetworkId = createDefaultPhysicalNetwork(zone.getId(), domainId);
+            long physicalNetworkId = createDefaultPhysicalNetwork(zone, domainId);
             
             //add VirtualRouter as the defualt network service provider 
             PhysicalNetworkServiceProvider nsp = _networkMgr.addDefaultVirtualRouterToPhysicalNetwork(physicalNetworkId);
@@ -1406,9 +1406,15 @@ public class ConfigurationManagerImpl implements ConfigurationManager, Configura
         }
     }
 
-    private long createDefaultPhysicalNetwork(long zoneId, Long domainId){
+    private long createDefaultPhysicalNetwork(DataCenter zone, Long domainId){
         //create entry
-        PhysicalNetwork defaultNetwork = _networkMgr.createPhysicalNetwork(zoneId, null, null, null, PhysicalNetwork.BroadcastDomainRange.ZONE.toString(), domainId, null);
+        String broadcastDomainRange = PhysicalNetwork.BroadcastDomainRange.POD.toString();
+        if(zone.getNetworkType() == NetworkType.Basic){
+            broadcastDomainRange = PhysicalNetwork.BroadcastDomainRange.POD.toString();
+        }else{
+            broadcastDomainRange = PhysicalNetwork.BroadcastDomainRange.ZONE.toString();
+        }
+        PhysicalNetwork defaultNetwork = _networkMgr.createPhysicalNetwork(zone.getId(), null, null, null, broadcastDomainRange, domainId, null);
         
         String defaultXenLabel = "cloud-private";
         
diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java
index 7aa35052281..c8077dcdef7 100755
--- a/server/src/com/cloud/network/NetworkManagerImpl.java
+++ b/server/src/com/cloud/network/NetworkManagerImpl.java
@@ -3759,6 +3759,14 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
             }
         }
         
+        if(broadcastDomainRange == null){
+            if(zone.getNetworkType() == NetworkType.Basic){
+                broadcastDomainRange = PhysicalNetwork.BroadcastDomainRange.POD;
+            }else{
+                broadcastDomainRange = PhysicalNetwork.BroadcastDomainRange.ZONE;
+            }
+        }
+        
         Transaction txn = Transaction.currentTxn();
         try {
             txn.start();
diff --git a/server/src/com/cloud/network/PhysicalNetworkVO.java b/server/src/com/cloud/network/PhysicalNetworkVO.java
index 6de6ffd33ea..85cf5f70a80 100644
--- a/server/src/com/cloud/network/PhysicalNetworkVO.java
+++ b/server/src/com/cloud/network/PhysicalNetworkVO.java
@@ -100,7 +100,7 @@ public class PhysicalNetworkVO implements PhysicalNetwork {
         if(broadcastDomainRange != null){
             this.broadcastDomainRange = broadcastDomainRange;
         }else{
-            this.broadcastDomainRange = BroadcastDomainRange.ZONE;
+            this.broadcastDomainRange = BroadcastDomainRange.POD;
         }
         this.state = State.Disabled;
         this.uuid = UUID.randomUUID().toString();
diff --git a/setup/db/create-schema.sql b/setup/db/create-schema.sql
index 5466fbbd742..16ec19720ed 100755
--- a/setup/db/create-schema.sql
+++ b/setup/db/create-schema.sql
@@ -1859,7 +1859,7 @@ CREATE TABLE `cloud`.`physical_network` (
   `vnet` varchar(255),
   `speed` varchar(32),  
   `domain_id` bigint unsigned COMMENT 'foreign key to domain id',
-  `broadcast_domain_range` varchar(32) NOT NULL DEFAULT 'ZONE' COMMENT 'range of broadcast domain : POD/ZONE', 
+  `broadcast_domain_range` varchar(32) NOT NULL DEFAULT 'POD' COMMENT 'range of broadcast domain : POD/ZONE', 
   `state` varchar(32) NOT NULL DEFAULT 'Disabled' COMMENT 'what state is this configuration in',
   `created` datetime COMMENT 'date created',
   `removed` datetime COMMENT 'date removed if not null',