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 #773 from GaborApatiNagy/CA-187681

Browse Source 
CA-187681: xs-tools ISO doesn't get mounted on dlvm xva(Centos 7 HVM)
This commit is contained in:
Mihaela Stoica 2016-01-20 12:27:29 +00:00
commit 9aee7a4f9b
3 changed files with 2 additions and 18 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); var gm = vm.Connection.Resolve(vm.guest_metrics);
bool isIoOptimized = gm != null && gm.network_paths_optimized && gm.storage_paths_optimized; bool isIoOptimized = gm != null && gm.network_paths_optimized && gm.storage_paths_optimized;
bool isManagementAgentInstalled = vm.GetVirtualisationStatus.HasFlag(VM.VirtualisationStatus.MANAGEMENT_INSTALLED);
//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 canInstallIoDriversAndManagementAgent = InstallToolsCommand.CanExecute(vm) && !isIoOptimized; bool canInstallIoDriversAndManagementAgent = InstallToolsCommand.CanExecute(vm) && !isIoOptimized;
bool canInstallManagementAgentOnly = InstallToolsCommand.CanExecute(vm) && isIoOptimized && !isManagementAgentInstalled; bool canInstallManagementAgentOnly = InstallToolsCommand.CanExecute(vm) && isIoOptimized && !isManagementAgentInstalled;
//canInstallIoDriversOnly is missing - management agent communicates with XS using the I/O drivers //canInstallIoDriversOnly is missing - management agent communicates with XS using the I/O drivers

2
XenModel/Actions/VM/InstallPVToolsAction.cs
View File

@ -92,7 +92,7 @@ namespace XenAdmin.Actions
// Check the version (if any) of the PV tools already on this host... // Check the version (if any) of the PV tools already on this host...
VM_guest_metrics guestMetrics = Connection.Resolve(VM.guest_metrics); VM_guest_metrics guestMetrics = Connection.Resolve(VM.guest_metrics);
if (guestMetrics != null && guestMetrics.PV_drivers_up_to_date) if (guestMetrics != null && !VM.HasNewVirtualisationStates && guestMetrics.PV_drivers_up_to_date)
{ {
this.Description = Messages.INSTALLTOOLS_EXIST; this.Description = Messages.INSTALLTOOLS_EXIST;
return; return;

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 /// <summary>Returns true if
/// 1) the guest is HVM and /// 1) the guest is HVM and
/// 2a) the allow-gpu-passthrough restriction is absent or /// 2a) the allow-gpu-passthrough restriction is absent or