Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 68D22FD4C for ; Wed, 8 May 2013 20:48:02 +0000 (UTC) Received: (qmail 72590 invoked by uid 500); 8 May 2013 20:47:35 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 71856 invoked by uid 500); 8 May 2013 20:47:31 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 70999 invoked by uid 99); 8 May 2013 20:47:30 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 08 May 2013 20:47:30 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 41567889FB5; Wed, 8 May 2013 20:47:30 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: alena1108@apache.org To: commits@cloudstack.apache.org Date: Wed, 08 May 2013 20:48:53 -0000 Message-Id: <221368a5a74946f68abf28a052718052@git.apache.org> In-Reply-To: <7a0950acb4dd4b0e93e0b027ce95ffe0@git.apache.org> References: <7a0950acb4dd4b0e93e0b027ce95ffe0@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [87/90] [abbrv] git commit: updated refs/heads/internallb to 1b8a698 CLOUDSTACK-2145 : Failed to create guest nexus port profile while deploying the First VM on Nexus VMWARE Cluster Additional stuff needs to be configured in guest port profile when Vnmc is present to provide firewall services. The xml command used to configure port profile had issues with special characters in the input value for 'org' parameter. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/44f3f5ec Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/44f3f5ec Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/44f3f5ec Branch: refs/heads/internallb Commit: 44f3f5eca529b5f9bfe08a984fed8ce23160b9c5 Parents: 305f3cb Author: Koushik Das Authored: Wed May 8 17:52:02 2013 +0530 Committer: Koushik Das Committed: Wed May 8 17:52:02 2013 +0530 ---------------------------------------------------------------------- .../com/cloud/utils/cisco/n1kv/vsm/VsmCommand.java | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/44f3f5ec/utils/src/com/cloud/utils/cisco/n1kv/vsm/VsmCommand.java ---------------------------------------------------------------------- diff --git a/utils/src/com/cloud/utils/cisco/n1kv/vsm/VsmCommand.java b/utils/src/com/cloud/utils/cisco/n1kv/vsm/VsmCommand.java index fdab390..d86b710 100644 --- a/utils/src/com/cloud/utils/cisco/n1kv/vsm/VsmCommand.java +++ b/utils/src/com/cloud/utils/cisco/n1kv/vsm/VsmCommand.java @@ -546,10 +546,15 @@ public class VsmCommand { vmware.appendChild(portgroup); portProf.appendChild(vmware); - // org root/%vdc% + // org %vdc% // vservice node profile + Element vdcValue = doc.createElement(s_paramvalue); + vdcValue.setAttribute("isKey", "true"); + vdcValue.setTextContent(vdc); + Element org = doc.createElement("org"); - org.appendChild(doc.createElement(vdc)); + org.appendChild(doc.createElement("orgname")) + .appendChild(vdcValue); portProf.appendChild(org); String asaNodeName = "ASA_" + vlanid;