apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

From: jason.bausewein@tier3.com

Browse Source 
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.
This commit is contained in:
Edison Su 2012-07-03 12:56:42 -07:00
parent c8bbf04c81
commit 217fdd2497
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tools/marvin/marvin/configGenerator.py
View File

@ -164,6 +164,7 @@ def describe_setup_in_basic_mode():
z.internaldns2 = "192.168.110.253" z.internaldns2 = "192.168.110.253"
z.name = "test"+str(l) z.name = "test"+str(l)
z.networktype = 'Basic' z.networktype = 'Basic'
z.securitygroupenabled = 'True'
'''create 10 pods''' '''create 10 pods'''
for i in range(2): for i in range(2):

7
tools/marvin/marvin/deployDataCenter.py
View File

@ -257,8 +257,15 @@ class deployDataCenters():
listnetworkoffering = \ listnetworkoffering = \
listNetworkOfferings.listNetworkOfferingsCmd() listNetworkOfferings.listNetworkOfferingsCmd()
if zone.securitygroupenabled:
listnetworkoffering.name = \ listnetworkoffering.name = \
"DefaultSharedNetworkOfferingWithSGService" "DefaultSharedNetworkOfferingWithSGService"
else:
# need both name and display text for single result
listnetworkoffering.name = \
"DefaultSharedNetworkOffering"
listnetworkoffering.displaytext = \
"Offering for Shared networks"
listnetworkofferingresponse = \ listnetworkofferingresponse = \
self.apiClient.listNetworkOfferings(listnetworkoffering) self.apiClient.listNetworkOfferings(listnetworkoffering)