You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ed...@apache.org on 2013/06/14 02:03:08 UTC
git commit: updated refs/heads/master to 793d549
Updated Branches:
refs/heads/master 5a8a2a259 -> 793d54907
fix unit test
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/793d5490
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/793d5490
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/793d5490
Branch: refs/heads/master
Commit: 793d5490721bf5d8fd4dbe83fa2a9dccca4ffbb1
Parents: 5a8a2a2
Author: Edison Su <su...@gmail.com>
Authored: Thu Jun 13 16:53:08 2013 -0700
Committer: Edison Su <su...@gmail.com>
Committed: Thu Jun 13 17:02:53 2013 -0700
----------------------------------------------------------------------
.../kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java | 2 +-
.../hypervisor/kvm/resource/LibvirtComputingResourceTest.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/793d5490/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java
----------------------------------------------------------------------
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 9cddb2e..e91e347 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
@@ -951,7 +951,7 @@ public class LibvirtVMDef {
if (_listenAddr != null) {
graphicBuilder.append(" listen='" + _listenAddr + "'");
} else {
- graphicBuilder.append(" listen='' ");
+ graphicBuilder.append(" listen=''");
}
if (_passwd != null) {
graphicBuilder.append(" passwd='" + _passwd + "'");
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/793d5490/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 0bafd07..c82c31f 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
@@ -80,7 +80,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 + "' passwd='" + vncPassword + "'/>\n";
vmStr += "<console type='pty'>\n";
vmStr += "<target port='0'/>\n";
vmStr += "</console>\n";
@@ -156,7 +156,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 + "' passwd='" + vncPassword + "'/>\n";
vmStr += "<console type='pty'>\n";
vmStr += "<target port='0'/>\n";
vmStr += "</console>\n";