Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2024-11-25 06:16:37 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

CP-14874: Enable XC SSH support for (more) Linux VMs

Browse Source 
VM.IsWindows flag is getting clever

As this property is used on the General tab and on the SSH Console, HVM Linux VMs with the viridian flag turned on will no longer be treated as Windows VMs (as long as they have the Linux Guest Agent running)

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
This commit is contained in:
Gabor Apati-Nagy 2015-12-08 14:57:24 +00:00
parent 6bcae1c984
commit 03308f0f40
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
XenModel/XenAPI-Extensions/VM.cs
View File

@ -1889,25 +1889,32 @@ namespace XenAPI
} }
} }
/// <summary>
/// List of distro values that we treat as Linux/Non-Windows (written by Linux Guest Agent, evaluating xe-linux-distribution)
/// </summary>
private readonly string[] linuxDistros = { "debian", "rhel", "fedora", "centos", "scientific", "oracle", "sles", "lsb", "boot2docker", "freebsd" };
/// <summary> /// <summary>
/// Returns true if this VM is Windows. /// Returns true if this VM is Windows.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// This really should be just a flag from XAPI, but we do not have such.
///
/// To get an acceptable result, this getter is trying to detect some specific cases before falling back to the viridian flag /// To get an acceptable result, this getter is trying to detect some specific cases before falling back to the viridian flag
/// that may not be correct at all times.</remarks> /// that may not be correct at all times. (Linux distro can be detected if the guest agent is running on a Linux VM.)</remarks>
public bool IsWindows public bool IsWindows
{ {
get get
{ {
//try to detect special cases when we are sure - having guest_metrics can help //try to detect special cases when the decision is easy - the presence of guest_metrics helps
var gm = Connection.Resolve(this.guest_metrics); var gm = Connection.Resolve(this.guest_metrics);
if (gm != null) if (gm != null && gm.os_version != null)
if (gm.os_version.ContainsKey("distro") && gm.os_version["distro"].ToLowerInvariant().Contains("freebsd") {
|| gm.os_version.ContainsKey("uname") && gm.os_version["uname"].ToLowerInvariant().Contains("netscaler")) if (gm.os_version.ContainsKey("distro") && !string.IsNullOrEmpty(gm.os_version["distro"]) && linuxDistros.Contains(gm.os_version["distro"].ToLowerInvariant()))
return false; return false;
if (gm.os_version.ContainsKey("uname") && gm.os_version["uname"].ToLowerInvariant().Contains("netscaler"))
return false;
}
//generic check //generic check
return return
this.IsHVM && BoolKey(this.platform, "viridian"); this.IsHVM && BoolKey(this.platform, "viridian");