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

There can be only one physical network in basic zone 

reviewed-by: simulator run
This commit is contained in:
Prasanna Santhanam 2012-08-22 16:12:20 +05:30
parent deb3648c26
commit 1af59094b6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -284,7 +284,7 @@ class deployDataCenters():
listnetworkoffering = listNetworkOfferings.listNetworkOfferingsCmd() listnetworkoffering = listNetworkOfferings.listNetworkOfferingsCmd()
listnetworkoffering.name = "DefaultSharedNetscalerEIPandELBNetworkOffering" \ listnetworkoffering.name = "DefaultSharedNetscalerEIPandELBNetworkOffering" \
if len(filter(lambda x : x.typ == 'Public', zone.physical_networks.traffictypes)) > 0 \ if len(filter(lambda x : x.typ == 'Public', zone.physical_networks[0].traffictypes)) > 0 \
else "DefaultSharedNetworkOfferingWithSGService" else "DefaultSharedNetworkOfferingWithSGService"
listnetworkofferingresponse = \ listnetworkofferingresponse = \
@ -313,7 +313,7 @@ class deployDataCenters():
return return
def isEipElbZone(self, zone): def isEipElbZone(self, zone):
if zone.networktype == "Basic" and len(filter(lambda x : x.typ == 'Public', zone.physical_networks.traffictypes)) > 0: if zone.networktype == "Basic" and len(filter(lambda x : x.typ == 'Public', zone.physical_networks[0].traffictypes)) > 0:
return True return True
return False return False