etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

added entry for networktype to dbconfig for zone creation

This commit is contained in:
abhishek 2010-11-16 18:01:39 -08:00
parent 3dd4727060
commit 20262803fe
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/src/com/cloud/test/DatabaseConfig.java
View File

@ -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);
}

7
server/src/com/cloud/test/PodZoneConfig.java
View File

@ -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 += ")";