From 20262803fe367a3fc620a3f1a335fab7464f1030 Mon Sep 17 00:00:00 2001
From: abhishek <abhishek@cloud.com>
Date: Tue, 16 Nov 2010 18:01:39 -0800
Subject: [PATCH] added entry for networktype to dbconfig for zone creation

---
 server/src/com/cloud/test/DatabaseConfig.java | 4 +++-
 server/src/com/cloud/test/PodZoneConfig.java  | 7 ++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/server/src/com/cloud/test/DatabaseConfig.java b/server/src/com/cloud/test/DatabaseConfig.java
index aed35560ab0..b4845430a33 100644
--- a/server/src/com/cloud/test/DatabaseConfig.java
+++ b/server/src/com/cloud/test/DatabaseConfig.java
@@ -154,6 +154,7 @@ public class DatabaseConfig {
     	fieldNames.add("storageType");
     	fieldNames.add("category");
     	fieldNames.add("tags");
+    	fieldNames.add("networktype");
     	
 
     	
@@ -602,6 +603,7 @@ public class DatabaseConfig {
         String internalDns2 = _currentObjectParams.get("internalDns2");
         String vnetRange = _currentObjectParams.get("vnet");
         String guestNetworkCidr = _currentObjectParams.get("guestNetworkCidr");
+        String networkType = _currentObjectParams.get("networktype");
         
         // Check that all IPs are valid
         String ipError = "Please enter a valid IP address for the field: ";
@@ -618,7 +620,7 @@ public class DatabaseConfig {
             vnetEnd = Integer.parseInt(tokens[1]);
         }
     	
-    	pzc.saveZone(false, id, name, dns1, dns2, internalDns1, internalDns2, vnetStart, vnetEnd, guestNetworkCidr);
+    	pzc.saveZone(false, id, name, dns1, dns2, internalDns1, internalDns2, vnetStart, vnetEnd, guestNetworkCidr, networkType);
         
     }
     
diff --git a/server/src/com/cloud/test/PodZoneConfig.java b/server/src/com/cloud/test/PodZoneConfig.java
index f917a573d6d..ea9a4589f63 100644
--- a/server/src/com/cloud/test/PodZoneConfig.java
+++ b/server/src/com/cloud/test/PodZoneConfig.java
@@ -254,7 +254,7 @@ public class PodZoneConfig {
     }
 	
 	@DB
-	public void saveZone(boolean printOutput, long id, String name, String dns1, String dns2, String dns3, String dns4, int vnetStart, int vnetEnd, String guestNetworkCidr) {
+	public void saveZone(boolean printOutput, long id, String name, String dns1, String dns2, String dns3, String dns4, int vnetStart, int vnetEnd, String guestNetworkCidr, String networkType) {
 		
 		if (printOutput) System.out.println("Saving zone, please wait...");
 		
@@ -294,6 +294,11 @@ public class PodZoneConfig {
 			values += ",'" + guestNetworkCidr + "'";
 		}
 		
+		if(networkType != null) {
+			columns += ", networktype";
+			values += ",'" + networkType + "'";
+		}
+		
 			
 			
 		columns += ")";