Fix the kvm vncAddr test This test was broken because we reverted to the old listen on all interfaces for vnc.
Signed-off-by: Prasanna Santhanam <t...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4f091383 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4f091383 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4f091383 Branch: refs/heads/scaleupvm Commit: 4f091383642d76ef466d3487abce10f95bf8bd2c Parents: 057a6f5 Author: Prasanna Santhanam <t...@apache.org> Authored: Sat Mar 23 20:59:29 2013 +0530 Committer: Prasanna Santhanam <t...@apache.org> Committed: Sat Mar 23 20:59:29 2013 +0530 ---------------------------------------------------------------------- .../kvm/resource/LibvirtComputingResourceTest.java | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4f091383/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java b/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java index 018f2f5..39e36d6 100644 --- a/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java +++ b/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java @@ -19,13 +19,13 @@ package com.cloud.hypervisor.kvm.resource; -import org.junit.Test; import com.cloud.agent.api.to.VirtualMachineTO; -import com.cloud.hypervisor.kvm.resource.LibvirtVMDef; import com.cloud.template.VirtualMachineTemplate.BootloaderType; import com.cloud.vm.VirtualMachine; -import com.cloud.vm.VirtualMachine.Type; +import org.junit.Test; + import java.util.Random; + import static org.junit.Assert.assertEquals; public class LibvirtComputingResourceTest { @@ -54,7 +54,7 @@ public class LibvirtComputingResourceTest { boolean haEnabled = false; boolean limitCpuUse = false; - String vncAddr = "1.2.3.4"; + String vncAddr = ""; String vncPassword = "mySuperSecretPassword"; LibvirtComputingResource lcr = new LibvirtComputingResource(); @@ -79,7 +79,7 @@ public class LibvirtComputingResourceTest { vmStr += "<serial type='pty'>\n"; vmStr += "<target port='0'/>\n"; vmStr += "</serial>\n"; - vmStr += "<graphics type='vnc' autoport='yes' listen='" + vncAddr + "'/>\n"; + vmStr += "<graphics type='vnc' autoport='yes' listen='" + vncAddr + "' />\n"; vmStr += "<console type='pty'>\n"; vmStr += "<target port='0'/>\n"; vmStr += "</console>\n"; @@ -129,7 +129,7 @@ public class LibvirtComputingResourceTest { boolean haEnabled = false; boolean limitCpuUse = false; - String vncAddr = "1.2.3.4"; + String vncAddr = ""; String vncPassword = "mySuperSecretPassword"; LibvirtComputingResource lcr = new LibvirtComputingResource(); @@ -154,7 +154,7 @@ public class LibvirtComputingResourceTest { vmStr += "<serial type='pty'>\n"; vmStr += "<target port='0'/>\n"; vmStr += "</serial>\n"; - vmStr += "<graphics type='vnc' autoport='yes' listen='" + vncAddr + "'/>\n"; + vmStr += "<graphics type='vnc' autoport='yes' listen='" + vncAddr + "' />\n"; vmStr += "<console type='pty'>\n"; vmStr += "<target port='0'/>\n"; vmStr += "</console>\n";
