Updated Branches: refs/heads/master 305f3cb8a -> 44f3f5eca
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/master Commit: 44f3f5eca529b5f9bfe08a984fed8ce23160b9c5 Parents: 305f3cb Author: Koushik Das <[email protected]> Authored: Wed May 8 17:52:02 2013 +0530 Committer: Koushik Das <[email protected]> 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 <Node Name> profile <Edge Security Profile Name in VNMC> + 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;
