Updated Branches: refs/heads/master bec00cce4 -> 14f589702
CLOUDSTACK-660: Fixes traffic label configuration in Marvin Signed-off-by: Chip Childers <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/14f58970 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/14f58970 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/14f58970 Branch: refs/heads/master Commit: 14f589702a3a4a473d661677b02f254f5dca9016 Parents: bec00cc Author: John Burwell <[email protected]> Authored: Tue Dec 18 13:03:39 2012 -0500 Committer: Chip Childers <[email protected]> Committed: Tue Dec 18 13:25:24 2012 -0500 ---------------------------------------------------------------------- tools/marvin/marvin/deployDataCenter.py | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/14f58970/tools/marvin/marvin/deployDataCenter.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/deployDataCenter.py b/tools/marvin/marvin/deployDataCenter.py index 01235fe..7bdd975 100644 --- a/tools/marvin/marvin/deployDataCenter.py +++ b/tools/marvin/marvin/deployDataCenter.py @@ -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()
