Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2025-01-20 07:19:18 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

CA-187681: xs-tools ISO doesn't get mounted on dlvm xva(Centos 7 HVM)

Browse Source 
There were times when "HasUpgradeSupportInManagementAgent" was needed, but not anymore, so this commit is changing code to use only VirtualisationStatus.MANAGEMENT_INSTALLED again.
This commit is contained in:
Gabor Apati-Nagy 2016-01-13 13:26:37 +00:00
parent a7fbea1ed8
commit 69cbb9445d
2 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
XenAdmin/TabPages/GeneralTabPage.cs
View File

@ -1304,11 +1304,7 @@ namespace XenAdmin.TabPages
var gm = vm.Connection.Resolve(vm.guest_metrics);
bool isIoOptimized = gm != null && gm.network_paths_optimized && gm.storage_paths_optimized;
//vmtype is not yet implemented (will likely have different name) in XAPI, but this is the type that refers to the windows update readyness/capability of the VM and is expected to have the following values: yes, no, dontknow, got_it
bool isManagementAgentInstalled = vm.HasUpgradeSupportInManagementAgent //&& vmtype != no"
|| vm.HasRDP; //&& vmtype == no;
bool isManagementAgentInstalled = vm.GetVirtualisationStatus.HasFlag(VM.VirtualisationStatus.MANAGEMENT_INSTALLED);
bool canInstallIoDriversAndManagementAgent = InstallToolsCommand.CanExecute(vm) && !isIoOptimized;
bool canInstallManagementAgentOnly = InstallToolsCommand.CanExecute(vm) && isIoOptimized && !isManagementAgentInstalled;
//canInstallIoDriversOnly is missing - management agent communicates with XS using the I/O drivers

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

@ -458,18 +458,6 @@ namespace XenAPI
}
}
public bool HasUpgradeSupportInManagementAgent
{
get
{
var metrics = Connection.Resolve(this.guest_metrics);
if (metrics == null)
return false;
return 0 != IntKey(metrics.other, "feature-supports-driver-update", 0);
}
}
/// <summary>Returns true if
/// 1) the guest is HVM and
/// 2a) the allow-gpu-passthrough restriction is absent or