This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch 4.11 in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/4.11 by this push: new dee5bb5 CLOUDSTACK-10261: Libvirt metadata create only one nuage-extension xml tag (#2441) dee5bb5 is described below commit dee5bb527e7aca4e72e2249b348cca6d688fbe5f Author: Frank Maximus <the.evergr...@gmail.com> AuthorDate: Mon Feb 12 12:06:44 2018 +0100 CLOUDSTACK-10261: Libvirt metadata create only one nuage-extension xml tag (#2441) --- .../com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java | 15 +++++++-------- .../cloud/hypervisor/kvm/resource/LibvirtVMDefTest.java | 17 +++++++++++++++++ 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java index 385fe79..90674eb 100644 --- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java +++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java @@ -1543,16 +1543,15 @@ public class LibvirtVMDef { @Override public String toString() { StringBuilder fsBuilder = new StringBuilder(); + fsBuilder.append("<nuage-extension xmlns='nuagenetworks.net/nuage/cna'>\n"); for (Map.Entry<String, String> address : addresses.entrySet()) { - fsBuilder.append("<nuage-extension xmlns='nuagenetworks.net/nuage/cna'>\n") - .append(" <interface mac='") - .append(address.getKey()) - .append("' vsp-vr-ip='") - .append(address.getValue()) - .append("'></interface>\n") - .append("</nuage-extension>\n"); + fsBuilder.append(" <interface mac='") + .append(address.getKey()) + .append("' vsp-vr-ip='") + .append(address.getValue()) + .append("'></interface>\n"); } - return fsBuilder.toString(); + return fsBuilder.append("</nuage-extension>\n").toString(); } } diff --git a/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtVMDefTest.java b/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtVMDefTest.java index 006562c..b391b94 100644 --- a/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtVMDefTest.java +++ b/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtVMDefTest.java @@ -209,4 +209,21 @@ public class LibvirtVMDefTest extends TestCase { assertEquals(str, expected); } + public void testMetadataDef() { + LibvirtVMDef.MetadataDef metadataDef = new LibvirtVMDef.MetadataDef(); + + metadataDef.getMetadataNode(LibvirtVMDef.NuageExtensionDef.class).addNuageExtension("mac1", "ip1"); + metadataDef.getMetadataNode(LibvirtVMDef.NuageExtensionDef.class).addNuageExtension("mac2", "ip2"); + + String xmlDef = metadataDef.toString(); + String expectedXml = "<metadata>\n" + + "<nuage-extension xmlns='nuagenetworks.net/nuage/cna'>\n" + + " <interface mac='mac2' vsp-vr-ip='ip2'></interface>\n" + + " <interface mac='mac1' vsp-vr-ip='ip1'></interface>\n" + + "</nuage-extension>\n" + + "</metadata>\n"; + + assertEquals(xmlDef, expectedXml); + } + } -- To stop receiving notification emails like this one, please contact ro...@apache.org.