cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alena1...@apache.org
Subject [6/50] [abbrv] git commit: From: jason.bausewein@tier3.com 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.
Date Wed, 04 Jul 2012 00:35:29 GMT
From: jason.bausewein@tier3.com
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.


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/217fdd24
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/217fdd24
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/217fdd24

Branch: refs/heads/vpc
Commit: 217fdd24973cf1eff478c7c19fa2b3020b2fa654
Parents: c8bbf04
Author: Edison Su <sudison@gmail.com>
Authored: Tue Jul 3 12:56:42 2012 -0700
Committer: Edison Su <sudison@gmail.com>
Committed: Tue Jul 3 12:56:42 2012 -0700

----------------------------------------------------------------------
 tools/marvin/marvin/configGenerator.py  |    1 +
 tools/marvin/marvin/deployDataCenter.py |   11 +++++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/217fdd24/tools/marvin/marvin/configGenerator.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/configGenerator.py b/tools/marvin/marvin/configGenerator.py
index 1e84f90..60526a8 100644
--- 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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/217fdd24/tools/marvin/marvin/deployDataCenter.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/deployDataCenter.py b/tools/marvin/marvin/deployDataCenter.py
index 5c7880e..d483807 100644
--- a/tools/marvin/marvin/deployDataCenter.py
+++ b/tools/marvin/marvin/deployDataCenter.py
@@ -257,8 +257,15 @@ class deployDataCenters():
                 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)


Mime
View raw message