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

CLOUDSTACK-660: Fixes traffic label configuration in Marvin 

Signed-off-by: Chip Childers <chip.childers@gmail.com>
This commit is contained in:
John Burwell 2012-12-18 13:03:39 -05:00 committed by Chip Childers
parent bec00cce46
commit 14f589702a
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -258,9 +258,9 @@ class deployDataCenters():
traffic_type = addTrafficType.addTrafficTypeCmd()
traffic_type.physicalnetworkid = physical_network_id
traffic_type.traffictype = traffictype.typ
if traffictype.labeldict:
traffic_type.kvmnetworklabel = traffictype.labeldict.xen
traffic_type.xennetworklabel = traffictype.labeldict.kvm
if traffictype.labeldict is not None:
traffic_type.kvmnetworklabel = traffictype.labeldict.kvm
traffic_type.xennetworklabel = traffictype.labeldict.xen
traffic_type.vmwarenetworklabel = traffictype.labeldict.vmware
return self.apiClient.addTrafficType(traffic_type)
@ -419,7 +419,6 @@ class deployDataCenters():
self.createZones(self.config.zones)
self.updateConfiguration(self.config.globalConfig)
if __name__ == "__main__":
parser = OptionParser()