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

Merge pull request #1369 from MihaelaStoica/CA-237963

Browse Source 
CA-237963: On a partially upgraded pool (from Dundee to Ely) the host…
This commit is contained in:
Stephen Turner 2017-01-09 16:35:39 +00:00 committed by GitHub
commit 0f1c4fd690
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
XenModel/XenAPI-Extensions/Host.cs
View File

@ -1137,7 +1137,7 @@ namespace XenAPI
if (Connection == null)
return null;
if (Helpers.DundeePlusOrGreater(Connection))
if (!Helper.IsNullOrEmptyOpaqueRef(control_domain))
return Connection.Resolve(control_domain);
var vms = Connection.ResolveAll(resident_VMs);
@ -1166,7 +1166,7 @@ namespace XenAPI
var vms = Connection.ResolveAll(resident_VMs);
if (Helpers.DundeePlusOrGreater(Connection))
if (!Helper.IsNullOrEmptyOpaqueRef(control_domain))
return vms.Where(v => v.is_control_domain && v.opaque_ref != control_domain);
return vms.Where(v => v.is_control_domain && v.domid != 0);

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

@ -1490,7 +1490,7 @@ namespace XenAPI
if (host == null)
return false;
if (Helpers.DundeePlusOrGreater(Connection))
if (!Helper.IsNullOrEmptyOpaqueRef(host.control_domain))
return host.control_domain == opaque_ref;
var vms = Connection.ResolveAll(host.resident_VMs);