From e393dcd069c2c2468fcca545b273392801623445 Mon Sep 17 00:00:00 2001
From: Sheng Yang <sheng.yang@cloud.com>
Date: Tue, 13 Dec 2011 18:30:49 -0800
Subject: [PATCH] server-setup.xml: Add physical network enabled by default

Also add uuid for physical networks and zones. And fix server-setup.xml example.
---
 server/src/com/cloud/test/PodZoneConfig.java | 7 +++++++
 setup/db/server-setup.xml                    | 7 ++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/server/src/com/cloud/test/PodZoneConfig.java b/server/src/com/cloud/test/PodZoneConfig.java
index f9dd08184f2..0c49fad3b60 100644
--- a/server/src/com/cloud/test/PodZoneConfig.java
+++ b/server/src/com/cloud/test/PodZoneConfig.java
@@ -306,6 +306,8 @@ public class PodZoneConfig {
 			values += ",'" + networkType + "'";
 		}
 		
+        columns += ", uuid";
+        values += ", UUID()";
 			
 		columns += ")";
 		values += ")";
@@ -335,6 +337,11 @@ public class PodZoneConfig {
         columns += ", vnet";
         values += ",'" + vnetStart + "-" + vnetEnd + "'";
             
+        columns += ", state";
+        values += ", 'Enabled'";
+        
+        columns += ", uuid";
+        values += ", UUID()";
             
         columns += ")";
         values += ")";
diff --git a/setup/db/server-setup.xml b/setup/db/server-setup.xml
index df00b52d4f2..4035902d327 100755
--- a/setup/db/server-setup.xml
+++ b/setup/db/server-setup.xml
@@ -13,14 +13,15 @@
     <zone>
       <id>1</id>
       <name>NM</name>
+      <physicalNetworkId>200</physicalNetworkId>
       <dns1>4.2.2.2</dns1>
       <dns2>10.10.10.14</dns2>
       <internalDns1>4.2.2.2</internalDns1>
       <internalDns2>4.2.2.2</internalDns2>
-	  <gateway>10.91.28.1</gateway>
-	  <netmask>255.255.255.0</netmask>
-	  <vnet>560-579</vnet>      
+      <netmask>255.255.255.0</netmask>
+      <vnet>560-579</vnet>      
       <guestNetworkCidr>10.1.1.0/24</guestNetworkCidr>
+      <networktype>Advanced</networktype>
     </zone>
   </zones>