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

CP-30602: Add boot mode info to Naples XC

Browse Source 
Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
This commit is contained in:
Ji Jiang 2019-02-11 18:38:27 +00:00 committed by Mihaela Stoica
parent 5da6edaf7e
commit ba649634e5
7 changed files with 77 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
XenAdmin/SettingsPanels/GpuEditPage.cs
View File

@ -135,7 +135,7 @@ namespace XenAdmin.SettingsPanels
{
get
{
string txt = Messages.GPU_UNAVAILABLE;
string txt = Messages.UNAVAILABLE;
if (gpusAvailable)
{

11
XenAdmin/TabPages/GeneralTabPage.cs
View File

@ -968,6 +968,8 @@ namespace XenAdmin.TabPages
{
s.AddEntry(FriendlyName("VM.BootOrder"), HVMBootOrder(vm),
new PropertiesToolStripMenuItem(new VmEditStartupOptionsCommand(Program.MainWindow, vm)));
if (Helpers.NaplesOrGreater(vm.Connection))
s.AddEntry(FriendlyName("VM.BootMode"), HVMBootMode(vm));
}
else
{
@ -1691,6 +1693,15 @@ namespace XenAdmin.TabPages
return string.Join("\n", order.Select(c => new BootDevice(c).ToString()).ToArray());
}
private static string HVMBootMode(VM vm)
{
if (vm.IsSecureBootEnabled())
return Messages.UEFI_SECURE_BOOT;
if (vm.IsUEFIEnabled())
return Messages.UEFI_BOOT;
return Messages.BIOS_BOOT;
}
#endregion
#region Pool delegates

8
XenModel/Actions/VM/CreateVMAction.cs
View File

@ -56,13 +56,13 @@ namespace XenAdmin.Actions.VMActions
switch (x)
{
case BootMode.BIOS_BOOT:
return "BIOS Boot";
return Messages.BIOS_BOOT;
case BootMode.UEFI_BOOT:
return "UEFI Boot";
return Messages.UEFI_BOOT;
case BootMode.UEFI_SECURE_BOOT:
return "UEFI Secure Boot";
return Messages.UEFI_SECURE_BOOT;
default:
return "Not Available";
return Messages.UNAVAILABLE;
}
}
}

9
XenModel/FriendlyNames.Designer.cs generated
View File

@ -3084,6 +3084,15 @@ namespace XenAdmin {
}
}
/// <summary>
/// Looks up a localized string similar to Boot mode.
/// </summary>
public static string Label_VM_BootMode {
get {
return ResourceManager.GetString("Label-VM.BootMode", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Boot order.
/// </summary>

3
XenModel/FriendlyNames.resx
View File

@ -405,6 +405,9 @@
<data name="Label-VM.BootOrder" xml:space="preserve">
<value>Boot order</value>
</data>
<data name="Label-VM.BootMode" xml:space="preserve">
<value>Boot mode</value>
</data>
<data name="Label-VM.ImageId" xml:space="preserve">
<value>Image ID</value>
</data>

45
XenModel/Messages.Designer.cs generated
View File

@ -5868,6 +5868,15 @@ namespace XenAdmin {
}
}
/// <summary>
/// Looks up a localized string similar to BIOS Boot.
/// </summary>
public static string BIOS_BOOT {
get {
return ResourceManager.GetString("BIOS_BOOT", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to BIOS strings copied.
/// </summary>
@ -16552,15 +16561,6 @@ namespace XenAdmin {
}
}
/// <summary>
/// Looks up a localized string similar to Not available.
/// </summary>
public static string GPU_UNAVAILABLE {
get {
return ResourceManager.GetString("GPU_UNAVAILABLE", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Loading Data....
/// </summary>
@ -34517,6 +34517,24 @@ namespace XenAdmin {
}
}
/// <summary>
/// Looks up a localized string similar to UEFI Boot.
/// </summary>
public static string UEFI_BOOT {
get {
return ResourceManager.GetString("UEFI_BOOT", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to UEFI Secure Boot.
/// </summary>
public static string UEFI_SECURE_BOOT {
get {
return ResourceManager.GetString("UEFI_SECURE_BOOT", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to [XenCenter] was unable to import a saved search from file &apos;{0}&apos;.
///
@ -34528,6 +34546,15 @@ namespace XenAdmin {
}
}
/// <summary>
/// Looks up a localized string similar to Not available.
/// </summary>
public static string UNAVAILABLE {
get {
return ResourceManager.GetString("UNAVAILABLE", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to [XenCenter] will uncompress the file to &apos;{0}&apos;. After uncompression the original file &apos;{1}&apos; will be deleted. Continue?.
/// </summary>

15
XenModel/Messages.resx
View File

@ -2133,6 +2133,9 @@ This is a potentially dangerous operation and is not allowed.</value>
<data name="BIGGER_THAN" xml:space="preserve">
<value>bigger than</value>
</data>
<data name="BIOS_BOOT" xml:space="preserve">
<value>BIOS Boot</value>
</data>
<data name="BIOS_STRINGS_COPIED" xml:space="preserve">
<value>BIOS strings copied</value>
</data>
@ -5793,9 +5796,6 @@ Warning: to prevent data loss you must ensure that the LUN is not in use by any
<data name="GPU_RUBRIC_PLEASE_SELECT_WHICH_GPU_ONE" xml:space="preserve">
<value>Select which virtual GPU types are allowed on this GPU:</value>
</data>
<data name="GPU_UNAVAILABLE" xml:space="preserve">
<value>Not available</value>
</data>
<data name="GRAPHS_CANNOT_ADD_VM_HALTED" xml:space="preserve">
<value>It is not possible to add new performance graphs on VM '{0}' because the VM is not running.</value>
</data>
@ -11960,11 +11960,20 @@ Refer to the "[XenServer product] Administrator's Guide" for instructions on how
<data name="TYPE_PAGE_DESCRIPTION_HEADER_XVA" xml:space="preserve">
<value>Import a locally stored VM, template or snapshot as a new VM.</value>
</data>
<data name="UEFI_BOOT" xml:space="preserve">
<value>UEFI Boot</value>
</data>
<data name="UEFI_SECURE_BOOT" xml:space="preserve">
<value>UEFI Secure Boot</value>
</data>
<data name="UNABLE_TO_IMPORT_SEARCH" xml:space="preserve">
<value>[XenCenter] was unable to import a saved search from file '{0}'.
Verify that the file is a valid {1} export.</value>
</data>
<data name="UNAVAILABLE" xml:space="preserve">
<value>Not available</value>
</data>
<data name="UNCOMPRESS_APPLIANCE_DESCRIPTION" xml:space="preserve">
<value>[XenCenter] will uncompress the file to '{0}'. After uncompression the original file '{1}' will be deleted. Continue?</value>
</data>