Return-Path: X-Original-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 415F0E26F for ; Tue, 15 Jan 2013 14:03:00 +0000 (UTC) Received: (qmail 35675 invoked by uid 500); 15 Jan 2013 14:03:00 -0000 Delivered-To: apmail-incubator-cloudstack-commits-archive@incubator.apache.org Received: (qmail 35433 invoked by uid 500); 15 Jan 2013 14:02:56 -0000 Mailing-List: contact cloudstack-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cloudstack-dev@incubator.apache.org Delivered-To: mailing list cloudstack-commits@incubator.apache.org Received: (qmail 35402 invoked by uid 99); 15 Jan 2013 14:02:55 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 15 Jan 2013 14:02:55 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id BE9701DB95; Tue, 15 Jan 2013 14:02:54 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tsp@apache.org To: cloudstack-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: git commit: Marvin: physical network label not carried through in the API Message-Id: <20130115140254.BE9701DB95@tyr.zones.apache.org> Date: Tue, 15 Jan 2013 14:02:54 +0000 (UTC) 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 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 Authored: Tue Jan 15 19:27:24 2013 +0530 Committer: Prasanna Santhanam 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"):