incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t..@apache.org
Subject git commit: Marvin: physical network label not carried through in the API
Date Tue, 15 Jan 2013 14:02:54 GMT
Updated Branches:
  refs/heads/master 95222cdb6 -> 04b14ab03


Marvin: physical network label not carried through in the API

The label associated with the hypervisor nic to isolate traffic types by
Guest/Mgmt/Public/Storage was not passed in the marvin.traffictype
object and sent through to mgmt server resulting in traffic types not
being applied.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>


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

Branch: refs/heads/master
Commit: 04b14ab03f089f333f4dbf7058e951a23c12a28a
Parents: 95222cd
Author: Prasanna Santhanam <tsp@apache.org>
Authored: Tue Jan 15 19:27:24 2013 +0530
Committer: Prasanna Santhanam <tsp@apache.org>
Committed: Tue Jan 15 19:29:27 2013 +0530

----------------------------------------------------------------------
 tools/marvin/marvin/deployDataCenter.py |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/04b14ab0/tools/marvin/marvin/deployDataCenter.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/deployDataCenter.py b/tools/marvin/marvin/deployDataCenter.py
index 7f8c029..ff3b6e6 100644
--- a/tools/marvin/marvin/deployDataCenter.py
+++ b/tools/marvin/marvin/deployDataCenter.py
@@ -258,10 +258,10 @@ class deployDataCenters():
         traffic_type = addTrafficType.addTrafficTypeCmd()
         traffic_type.physicalnetworkid = physical_network_id
         traffic_type.traffictype = traffictype.typ
-        if traffictype.labeldict is not None:
-            traffic_type.kvmnetworklabel = traffictype.labeldict.kvm
-            traffic_type.xennetworklabel = traffictype.labeldict.xen
-            traffic_type.vmwarenetworklabel = traffictype.labeldict.vmware
+        traffic_type.kvmnetworklabel = traffictype.kvm if traffictype.kvm is not None else
None
+        traffic_type.xennetworklabel = traffictype.xen if traffictype.xen is not None else
None
+        traffictype.vmwarenetworklabel = traffictype.vmware if traffictype.vmware is not
None else None
+        traffictype.simulatorlabel = traffictype.simulator if traffictype.simulator is not
None else None
         return self.apiClient.addTrafficType(traffic_type)
 
     def enableZone(self, zoneid, allocation_state="Enabled"):


Mime
View raw message