From b2de225f54f80e48598c9327d19c276186682299 Mon Sep 17 00:00:00 2001
From: Anshul Gangwar <anshul.gangwar@citrix.com>
Date: Wed, 1 Jan 2014 14:15:31 +0530
Subject: [PATCH] CLOUDSTACK-5703: putting rdp server port value in host
 details

---
 .../HypervResource/HypervResourceController.cs      |  1 +
 .../src/com/cloud/servlet/ConsoleProxyServlet.java  | 13 +++++--------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs
index 6daadeefaac..76336e996cc 100644
--- a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs
+++ b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs
@@ -1921,6 +1921,7 @@ namespace HypervResource
                     string productVersion = System.Environment.OSVersion.Version.Major.ToString() + "." +
                         System.Environment.OSVersion.Version.Minor.ToString();
                     details.Add("product_version", productVersion);
+                    details.Add("rdp.server.port", 2179);
                 }
 
                 // Detect CPUs, speed, memory
diff --git a/server/src/com/cloud/servlet/ConsoleProxyServlet.java b/server/src/com/cloud/servlet/ConsoleProxyServlet.java
index 5edd95d8dbd..a6b179a6ddc 100644
--- a/server/src/com/cloud/servlet/ConsoleProxyServlet.java
+++ b/server/src/com/cloud/servlet/ConsoleProxyServlet.java
@@ -395,25 +395,22 @@ public class ConsoleProxyServlet extends HttpServlet {
     private String composeConsoleAccessUrl(String rootUrl, VirtualMachine vm, HostVO hostVo) {
         StringBuffer sb = new StringBuffer(rootUrl);
         String host = hostVo.getPrivateIpAddress();
-        String username = _ms.findDetail(hostVo.getId(), "username").getValue();
-        String password = _ms.findDetail(hostVo.getId(), "password").getValue();
 
         Pair<String, Integer> portInfo = _ms.getVncPort(vm);
         if (s_logger.isDebugEnabled())
             s_logger.debug("Port info " + portInfo.first());
 
         Ternary<String, String, String> parsedHostInfo = parseHostInfo(portInfo.first());
+
         int port = -1;
-        String sid;
-        
         if (portInfo.second() == -9) {
             //for hyperv
-            port = 2179;
+            port = Integer.parseInt(_ms.findDetail(hostVo.getId(), "rdp.server.port").getValue());
         } else {
             port = portInfo.second();
         }
 
-        sid = vm.getVncPassword();
+        String sid = vm.getVncPassword();
         UserVmDetailVO details = _userVmDetailsDao.findDetail(vm.getId(), "keyboard");
 
         String tag = vm.getUuid();
@@ -434,8 +431,8 @@ public class ConsoleProxyServlet extends HttpServlet {
         if (portInfo.second() == -9) {
             //For Hyperv Clinet Host Address will send Instance id
             param.setHypervHost(host);
-            param.setUsername(username);
-            param.setPassword(password);
+            param.setUsername(_ms.findDetail(hostVo.getId(), "username").getValue());
+            param.setPassword(_ms.findDetail(hostVo.getId(), "password").getValue());
         }
         if (parsedHostInfo.second() != null && parsedHostInfo.third() != null) {
             param.setClientTunnelUrl(parsedHostInfo.second());