From 1c9196f9afaa2d59813f738c8b56a769f96b5a76 Mon Sep 17 00:00:00 2001
From: Kelven Yang <kelven@cloud.com>
Date: Wed, 23 Mar 2011 16:17:08 -0700
Subject: [PATCH] add vncPassword on hypervisor back

---
 api/src/com/cloud/agent/api/to/VirtualMachineTO.java | 12 +++++++++++-
 .../src/com/cloud/hypervisor/HypervisorGuruBase.java |  3 ++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/api/src/com/cloud/agent/api/to/VirtualMachineTO.java b/api/src/com/cloud/agent/api/to/VirtualMachineTO.java
index 07b4b6a8566..7694f7bb014 100644
--- a/api/src/com/cloud/agent/api/to/VirtualMachineTO.java
+++ b/api/src/com/cloud/agent/api/to/VirtualMachineTO.java
@@ -39,12 +39,13 @@ public class VirtualMachineTO {
     String[] bootupScripts;
     boolean rebootOnCrash;
     boolean enableHA;
+    String vncPassword;
     Map<String, String> params;
 
     VolumeTO[] disks;
     NicTO[] nics;
 
-    public VirtualMachineTO(long id, String instanceName, VirtualMachine.Type type, int cpus, Integer speed, long minRam, long maxRam, BootloaderType bootloader, String os, boolean enableHA) {
+    public VirtualMachineTO(long id, String instanceName, VirtualMachine.Type type, int cpus, Integer speed, long minRam, long maxRam, BootloaderType bootloader, String os, boolean enableHA, String vncPassword) {
         this.id = id;
         this.name = instanceName;
         this.type = type;
@@ -55,6 +56,7 @@ public class VirtualMachineTO {
         this.bootloader = bootloader;
         this.os = os;
         this.enableHA = enableHA;
+        this.vncPassword = vncPassword;
     }
 
     protected VirtualMachineTO() {
@@ -176,4 +178,12 @@ public class VirtualMachineTO {
     public void setNics(NicTO[] nics) {
         this.nics = nics;
     }
+    
+    public String getVncPassword() {
+    	return this.vncPassword;
+    }
+    
+    public void setVncPassword(String vncPassword) {
+    	this.vncPassword = vncPassword;
+    }
 }
diff --git a/server/src/com/cloud/hypervisor/HypervisorGuruBase.java b/server/src/com/cloud/hypervisor/HypervisorGuruBase.java
index 75b28a9665d..f44101199be 100644
--- a/server/src/com/cloud/hypervisor/HypervisorGuruBase.java
+++ b/server/src/com/cloud/hypervisor/HypervisorGuruBase.java
@@ -59,7 +59,8 @@ public abstract class HypervisorGuruBase extends AdapterBase implements Hypervis
         ServiceOffering offering = vmProfile.getServiceOffering();  
         VirtualMachine vm = vmProfile.getVirtualMachine();
         
-        VirtualMachineTO to = new VirtualMachineTO(vm.getId(), vm.getInstanceName(), vm.getType(), offering.getCpu(), offering.getSpeed(), offering.getRamSize() * 1024l * 1024l, offering.getRamSize() * 1024l * 1024l, null, null, vm.isHaEnabled());
+        VirtualMachineTO to = new VirtualMachineTO(vm.getId(), vm.getInstanceName(), vm.getType(), offering.getCpu(), offering.getSpeed(), 
+        	offering.getRamSize() * 1024l * 1024l, offering.getRamSize() * 1024l * 1024l, null, null, vm.isHaEnabled(), vm.getVncPassword());
         to.setBootArgs(vmProfile.getBootArgs());
         
         List<NicProfile> nicProfiles = vmProfile.getNics();