You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by de...@apache.org on 2014/01/01 10:48:54 UTC
[2/3] git commit: updated refs/heads/4.3 to 0b643dd
CLOUDSTACK-5703: putting rdp server port value in host details
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e74889ac
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e74889ac
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e74889ac
Branch: refs/heads/4.3
Commit: e74889ac91c919ab26852da3d93133eaeae874c8
Parents: a4d4d4b
Author: Anshul Gangwar <an...@citrix.com>
Authored: Wed Jan 1 14:15:31 2014 +0530
Committer: Devdeep Singh <de...@gmail.com>
Committed: Wed Jan 1 15:05:09 2014 +0530
----------------------------------------------------------------------
.../HypervResource/HypervResourceController.cs | 1 +
server/src/com/cloud/servlet/ConsoleProxyServlet.java | 13 +++++--------
2 files changed, 6 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e74889ac/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs
index 6f8b786..1b2b6c5 100644
--- a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs
+++ b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs
@@ -1873,6 +1873,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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e74889ac/server/src/com/cloud/servlet/ConsoleProxyServlet.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/servlet/ConsoleProxyServlet.java b/server/src/com/cloud/servlet/ConsoleProxyServlet.java
index e0aaa6d..a587337 100644
--- a/server/src/com/cloud/servlet/ConsoleProxyServlet.java
+++ b/server/src/com/cloud/servlet/ConsoleProxyServlet.java
@@ -388,25 +388,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();
@@ -426,8 +423,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());