QuickCloud: allow specification of network offering name in datacenter config. The deployDatacenter python script will use this to pick the network offering during creation of the default network in a basic zone

chiradeep · chiradeep · commit a806ce43d32e · 2013-04-09T14:45:26.000-07:00
diff --git a/tools/devcloud/quickcloud.cfg b/tools/devcloud/quickcloud.cfg
@@ -54,6 +54,7 @@
             "securitygroupenabled": "true", 
             "localstorageenabled": "true",
             "networktype": "Basic", 
+            "networkofferingname": "QuickCloudNoServices", 
             "pods": [
                 {
                     "endip": "192.168.56.220", 
diff --git a/tools/marvin/marvin/deployDataCenter.py b/tools/marvin/marvin/deployDataCenter.py
@@ -299,10 +299,11 @@ def createZones(self, zones):
 
             if zone.networktype == "Basic":
                 listnetworkoffering = listNetworkOfferings.listNetworkOfferingsCmd()
-                
                 listnetworkoffering.name = "DefaultSharedNetscalerEIPandELBNetworkOffering" \
                         if len(filter(lambda x : x.typ == 'Public', zone.physical_networks[0].traffictypes)) > 0 \
                         else "DefaultSharedNetworkOfferingWithSGService"
+                if zone.networkofferingname  is not None:
+                   listnetworkoffering.name = zone.networkofferingname 
 
                 listnetworkofferingresponse = \
                 self.apiClient.listNetworkOfferings(listnetworkoffering)

Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,7 @@`
`54`	`54`	`"securitygroupenabled": "true",`
`55`	`55`	`"localstorageenabled": "true",`
`56`	`56`	`"networktype": "Basic",`
	`57`	`+ "networkofferingname": "QuickCloudNoServices",`
`57`	`58`	`"pods": [`
`58`	`59`	`{`
`59`	`60`	`"endip": "192.168.56.220",`