From: jason.bausewein@tier3.com

sudison · sudison · commit 217fdd24973c · 2012-07-03T12:56:42.000-07:00
Fixed deployDataCenter.py to select the correct network offering based on if security groups are enabled.  Also added default value to configGenerator.py for basic setup.
diff --git a/tools/marvin/marvin/configGenerator.py b/tools/marvin/marvin/configGenerator.py
@@ -164,6 +164,7 @@ def describe_setup_in_basic_mode():
         z.internaldns2 = "192.168.110.253"
         z.name = "test"+str(l)
         z.networktype = 'Basic'
+        z.securitygroupenabled = 'True'
     
         '''create 10 pods'''
         for i in range(2):
diff --git a/tools/marvin/marvin/deployDataCenter.py b/tools/marvin/marvin/deployDataCenter.py
@@ -257,8 +257,15 @@ def createZones(self, zones):
                 listnetworkoffering = \
                 listNetworkOfferings.listNetworkOfferingsCmd()
 
-                listnetworkoffering.name = \
-                "DefaultSharedNetworkOfferingWithSGService"
+                if zone.securitygroupenabled:
+                    listnetworkoffering.name = \
+                    "DefaultSharedNetworkOfferingWithSGService"
+                else:
+                    # need both name and display text for single result
+                    listnetworkoffering.name = \
+                    "DefaultSharedNetworkOffering"
+                    listnetworkoffering.displaytext = \
+                    "Offering for Shared networks"
 
                 listnetworkofferingresponse = \
                 self.apiClient.listNetworkOfferings(listnetworkoffering)
