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

CA-341423: Added a new filter value for VMs with only the management agent installed so they can be easier to find.

Browse Source 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
This commit is contained in:
Konstantina Chremmou 2020-07-03 13:17:23 +01:00
parent e30ea433c7
commit 2755f71dcf
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
XenModel/Messages.Designer.cs generated
View File

@ -38621,6 +38621,15 @@ namespace XenAdmin {
}
}
/// <summary>
/// Looks up a localized string similar to Management Agent installed only.
/// </summary>
public static string VIRTUALIZATION_STATE_VM_MANAGEMENT_AGENT_INSTALLED_ONLY {
get {
return ResourceManager.GetString("VIRTUALIZATION_STATE_VM_MANAGEMENT_AGENT_INSTALLED_ONLY", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Management Agent not installed.
/// </summary>

3
XenModel/Messages.resx
View File

@ -13324,6 +13324,9 @@ To start a [XenServer] trial, click the button below.</value>
<data name="VIRTUALIZATION_STATE_VM_MANAGEMENT_AGENT_INSTALLED" xml:space="preserve">
<value>Management Agent installed</value>
</data>
<data name="VIRTUALIZATION_STATE_VM_MANAGEMENT_AGENT_INSTALLED_ONLY" xml:space="preserve">
<value>Management Agent installed only</value>
</data>
<data name="VIRTUALIZATION_STATE_VM_MANAGEMENT_AGENT_NOT_INSTALLED" xml:space="preserve">
<value>Management Agent not installed</value>
</data>

18
XenModel/XenSearch/Common.cs
View File

@ -203,9 +203,9 @@ namespace XenAdmin.XenSearch
VirtualisationStatus_i18n[Messages.OUT_OF_DATE] = VM.VirtualisationStatus.PV_DRIVERS_OUT_OF_DATE;
VirtualisationStatus_i18n[Messages.UNKNOWN] = VM.VirtualisationStatus.UNKNOWN;
VirtualisationStatus_i18n[Messages.VIRTUALIZATION_STATE_VM_IO_OPTIMIZED_ONLY] = VM.VirtualisationStatus.IO_DRIVERS_INSTALLED;
VirtualisationStatus_i18n[Messages.VIRTUALIZATION_STATE_VM_MANAGEMENT_AGENT_INSTALLED_ONLY] = VM.VirtualisationStatus.MANAGEMENT_INSTALLED;
VirtualisationStatus_i18n[Messages.VIRTUALIZATION_STATE_VM_OPTIMIZED] = VM.VirtualisationStatus.IO_DRIVERS_INSTALLED | VM.VirtualisationStatus.MANAGEMENT_INSTALLED;
ObjectTypes_i18n[Messages.VMS] = ObjectTypes.VM;
ObjectTypes_i18n[Messages.XENSERVER_TEMPLATES] = ObjectTypes.DefaultTemplate;
ObjectTypes_i18n[Messages.CUSTOM_TEMPLATES] = ObjectTypes.UserTemplate;
@ -305,19 +305,9 @@ namespace XenAdmin.XenSearch
properties[PropertyNames.os_name] = o => o is VM vm && vm.is_a_real_vm() ? vm.GetOSName() : null;
properties[PropertyNames.power_state] = o => o is VM vm && vm.is_a_real_vm() ? (IComparable)vm.power_state : null;
properties[PropertyNames.vendor_device_state] = o => o is VM vm && vm.is_a_real_vm() ? (bool?)vm.WindowsUpdateCapable() : null;
properties[PropertyNames.virtualisation_status] = o =>
{
if (o is VM vm && vm.is_a_real_vm())
{
var status = vm.GetVirtualisationStatus(out _);
if (!status.HasFlag(VM.VirtualisationStatus.IO_DRIVERS_INSTALLED) && status.HasFlag(VM.VirtualisationStatus.MANAGEMENT_INSTALLED))
return null;
return status;
}
return null;
};
properties[PropertyNames.virtualisation_status] = o => o is VM vm && vm.is_a_real_vm() ? (IComparable)vm.GetVirtualisationStatus(out _) : null;
properties[PropertyNames.start_time] = o => o is VM vm && vm.is_a_real_vm() ? (DateTime?)vm.GetStartTime() : null;
properties[PropertyNames.read_caching_enabled] = o => o is VM vm && vm.is_a_real_vm() ? (bool?)vm.ReadCachingEnabled() : null;
properties[PropertyNames.label] = Helpers.GetName;
properties[PropertyNames.pool] = o => o == null ? null : Helpers.GetPool(o.Connection);
@ -384,8 +374,6 @@ namespace XenAdmin.XenSearch
return null;
};
properties[PropertyNames.read_caching_enabled] = o => o is VM vm && vm.is_a_real_vm() ? (bool?)vm.ReadCachingEnabled() : null;
properties[PropertyNames.connection_hostname] = ConnectionHostnameProperty;
properties[PropertyNames.cpuText] = CPUTextProperty;
properties[PropertyNames.cpuValue] = CPUValueProperty;