Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2024-11-23 12:30:50 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

CP-39687: Exporting VMs with vTPMs to XVA package is now supported.

Browse Source 
Signed-off-by: Konstantina Chremmou <Konstantina.Chremmou@cloud.com>
This commit is contained in:
Konstantina Chremmou 2023-04-24 21:53:24 +01:00
parent 947f938016
commit 240fa78333
6 changed files with 78 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
XenAdmin/Wizards/ExportWizard/ExportSelectVMsPage.Designer.cs generated
View File

@ -50,7 +50,7 @@
this.label2 = new System.Windows.Forms.Label();
this._tlpWarning = new System.Windows.Forms.TableLayoutPanel();
this.pictureBox2 = new System.Windows.Forms.PictureBox();
this.label1 = new System.Windows.Forms.Label();
this.labelWarning = new System.Windows.Forms.Label();
this.tableLayoutPanel2.SuspendLayout();
this.m_tlpInfo.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
@ -208,7 +208,7 @@
//
resources.ApplyResources(this._tlpWarning, "_tlpWarning");
this._tlpWarning.Controls.Add(this.pictureBox2, 0, 0);
this._tlpWarning.Controls.Add(this.label1, 1, 0);
this._tlpWarning.Controls.Add(this.labelWarning, 1, 0);
this._tlpWarning.Name = "_tlpWarning";
//
// pictureBox2
@ -218,10 +218,10 @@
this.pictureBox2.Name = "pictureBox2";
this.pictureBox2.TabStop = false;
//
// label1
// labelWarning
//
resources.ApplyResources(this.label1, "label1");
this.label1.Name = "label1";
resources.ApplyResources(this.labelWarning, "labelWarning");
this.labelWarning.Name = "labelWarning";
//
// ExportSelectVMsPage
//
@ -270,6 +270,6 @@
private System.Windows.Forms.DataGridViewTextBoxColumn columnVapp;
private System.Windows.Forms.TableLayoutPanel _tlpWarning;
private System.Windows.Forms.PictureBox pictureBox2;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.Label labelWarning;
}
}

21
XenAdmin/Wizards/ExportWizard/ExportSelectVMsPage.cs
View File

@ -304,9 +304,24 @@ namespace XenAdmin.Wizards.ExportWizard
{
var count = VMsToExport.Count;
m_tlpInfo.Visible = ExportAsXva && count > 1;
_tlpWarning.Visible = !Helpers.FeatureForbidden(Connection, Host.RestrictVtpm) &&
Helpers.XapiEqualOrGreater_22_26_0(Connection) &&
VMsToExport.Any(v => v.VTPMs.Count > 0);
if (Helpers.FeatureForbidden(Connection, Host.RestrictVtpm) ||
!Helpers.XapiEqualOrGreater_22_26_0(Connection) ||
!VMsToExport.Any(v => v.VTPMs.Count > 0))
{
_tlpWarning.Visible = false;
}
else if (Helpers.XapiEqualOrGreater_23_9_0(Connection))
{
labelWarning.Text = Messages.VTPM_EXPORT_UNSUPPORTED_FOR_OVF;
_tlpWarning.Visible = !ExportAsXva;
}
else
{
labelWarning.Text = Messages.VTPM_EXPORT_UNSUPPORTED_FOR_ALL;
_tlpWarning.Visible = true;
}
m_buttonNextEnabled = ExportAsXva ? count == 1 : count > 0;
m_buttonClearAll.Enabled = count > 0;
m_buttonSelectAll.Enabled = count < m_dataGridView.RowCount;

48
XenAdmin/Wizards/ExportWizard/ExportSelectVMsPage.resx
View File

@ -148,7 +148,7 @@
<value>m_ctrlError</value>
</data>
<data name="&gt;&gt;m_ctrlError.Type" xml:space="preserve">
<value>XenAdmin.Controls.Common.PasswordFailure, [XenCenter_No_Space]Main, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
<value>XenAdmin.Controls.Common.PasswordFailure, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;m_ctrlError.Parent" xml:space="preserve">
<value>tableLayoutPanel2</value>
@ -185,7 +185,7 @@ Note that only VMs that are currently shut down or suspended are listed here.</v
<value>m_labelIntro</value>
</data>
<data name="&gt;&gt;m_labelIntro.Type" xml:space="preserve">
<value>XenAdmin.Controls.Common.AutoHeightLabel, [XenCenter_No_Space]Main, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
<value>XenAdmin.Controls.Common.AutoHeightLabel, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;m_labelIntro.Parent" xml:space="preserve">
<value>tableLayoutPanel2</value>
@ -311,7 +311,7 @@ Note that only VMs that are currently shut down or suspended are listed here.</v
<value>autoHeightLabel1</value>
</data>
<data name="&gt;&gt;autoHeightLabel1.Type" xml:space="preserve">
<value>XenAdmin.Controls.Common.AutoHeightLabel, [XenCenter_No_Space]Main, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
<value>XenAdmin.Controls.Common.AutoHeightLabel, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;autoHeightLabel1.Parent" xml:space="preserve">
<value>m_tlpInfo</value>
@ -323,7 +323,7 @@ Note that only VMs that are currently shut down or suspended are listed here.</v
<value>Fill</value>
</data>
<data name="m_tlpInfo.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 295</value>
<value>3, 299</value>
</data>
<data name="m_tlpInfo.RowCount" type="System.Int32, mscorlib">
<value>1</value>
@ -392,7 +392,7 @@ Note that only VMs that are currently shut down or suspended are listed here.</v
<value>6, 3, 6, 3</value>
</data>
<data name="m_dataGridView.Size" type="System.Drawing.Size, System.Drawing">
<value>567, 180</value>
<value>567, 184</value>
</data>
<data name="m_dataGridView.TabIndex" type="System.Int32, mscorlib">
<value>102</value>
@ -452,7 +452,7 @@ Note that only VMs that are currently shut down or suspended are listed here.</v
<value>Fill</value>
</data>
<data name="tableLayoutPanel3.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 260</value>
<value>3, 264</value>
</data>
<data name="tableLayoutPanel3.RowCount" type="System.Int32, mscorlib">
<value>1</value>
@ -500,7 +500,7 @@ Note that only VMs that are currently shut down or suspended are listed here.</v
<value>m_searchTextBox</value>
</data>
<data name="&gt;&gt;m_searchTextBox.Type" xml:space="preserve">
<value>XenAdmin.Controls.SearchTextBox, [XenCenter_No_Space]Main, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
<value>XenAdmin.Controls.SearchTextBox, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;m_searchTextBox.Parent" xml:space="preserve">
<value>tableLayoutPanel4</value>
@ -598,47 +598,47 @@ Note that only VMs that are currently shut down or suspended are listed here.</v
<data name="&gt;&gt;pictureBox2.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="label1.AutoSize" type="System.Boolean, mscorlib">
<data name="labelWarning.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="label1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<data name="labelWarning.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
<data name="label1.Location" type="System.Drawing.Point, System.Drawing">
<data name="labelWarning.Location" type="System.Drawing.Point, System.Drawing">
<value>25, 0</value>
</data>
<data name="label1.Size" type="System.Drawing.Size, System.Drawing">
<value>545, 26</value>
<data name="labelWarning.Size" type="System.Drawing.Size, System.Drawing">
<value>545, 22</value>
</data>
<data name="label1.TabIndex" type="System.Int32, mscorlib">
<data name="labelWarning.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
</data>
<data name="label1.Text" xml:space="preserve">
<value>Exporting VMs with attached vTPMs is not supported. If you export and re-import these VMs, some of their security features may be deactivated and the VMs may not start.</value>
<data name="labelWarning.Text" xml:space="preserve">
<value>labelWarning</value>
</data>
<data name="&gt;&gt;label1.Name" xml:space="preserve">
<value>label1</value>
<data name="&gt;&gt;labelWarning.Name" xml:space="preserve">
<value>labelWarning</value>
</data>
<data name="&gt;&gt;label1.Type" xml:space="preserve">
<data name="&gt;&gt;labelWarning.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;label1.Parent" xml:space="preserve">
<data name="&gt;&gt;labelWarning.Parent" xml:space="preserve">
<value>_tlpWarning</value>
</data>
<data name="&gt;&gt;label1.ZOrder" xml:space="preserve">
<data name="&gt;&gt;labelWarning.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="_tlpWarning.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
<data name="_tlpWarning.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 327</value>
<value>3, 331</value>
</data>
<data name="_tlpWarning.RowCount" type="System.Int32, mscorlib">
<value>1</value>
</data>
<data name="_tlpWarning.Size" type="System.Drawing.Size, System.Drawing">
<value>573, 26</value>
<value>573, 22</value>
</data>
<data name="_tlpWarning.TabIndex" type="System.Int32, mscorlib">
<value>105</value>
@ -656,7 +656,7 @@ Note that only VMs that are currently shut down or suspended are listed here.</v
<value>6</value>
</data>
<data name="_tlpWarning.LayoutSettings" type="System.Windows.Forms.TableLayoutSettings, System.Windows.Forms">
<value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="pictureBox2" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="label1" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="AutoSize,0,Percent,100" /&gt;&lt;Rows Styles="AutoSize,0" /&gt;&lt;/TableLayoutSettings&gt;</value>
<value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="pictureBox2" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="labelWarning" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="AutoSize,0,Percent,100" /&gt;&lt;Rows Styles="AutoSize,0" /&gt;&lt;/TableLayoutSettings&gt;</value>
</data>
<data name="tableLayoutPanel2.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
@ -731,6 +731,6 @@ Note that only VMs that are currently shut down or suspended are listed here.</v
<value>ExportSelectVMsPage</value>
</data>
<data name="&gt;&gt;$this.Type" xml:space="preserve">
<value>XenAdmin.Controls.XenTabPage, [XenCenter_No_Space]Main, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
<value>XenAdmin.Controls.XenTabPage, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
</root>

18
XenModel/Messages.Designer.cs generated
View File

@ -40129,6 +40129,24 @@ namespace XenAdmin {
}
}
/// <summary>
/// Looks up a localized string similar to Your selection includes VMs with attached vTPMs. If you export and re-import these VMs, the vTPM data will not be preserved. Some of the VMs&apos; security features may be deactivated and the VMs may not start..
/// </summary>
public static string VTPM_EXPORT_UNSUPPORTED_FOR_ALL {
get {
return ResourceManager.GetString("VTPM_EXPORT_UNSUPPORTED_FOR_ALL", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to VMs with attached vTPMs can only be exported in XVA format. If you export and re-import these VMs, the vTPM data will not be preserved. Some of the VMs&apos; security features may be deactivated and the VMs may not start..
/// </summary>
public static string VTPM_EXPORT_UNSUPPORTED_FOR_OVF {
get {
return ResourceManager.GetString("VTPM_EXPORT_UNSUPPORTED_FOR_OVF", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to The maximum number of vTPMs that can be attached to this VM is {0}..
/// </summary>

6
XenModel/Messages.resx
View File

@ -13861,6 +13861,12 @@ Schedule:
<data name="VTPM_ATTACHED_ONE" xml:space="preserve">
<value>A vTPM is attached to this VM.</value>
</data>
<data name="VTPM_EXPORT_UNSUPPORTED_FOR_ALL" xml:space="preserve">
<value>Your selection includes VMs with attached vTPMs. If you export and re-import these VMs, the vTPM data will not be preserved. Some of the VMs' security features may be deactivated and the VMs may not start.</value>
</data>
<data name="VTPM_EXPORT_UNSUPPORTED_FOR_OVF" xml:space="preserve">
<value>VMs with attached vTPMs can only be exported in XVA format. If you export and re-import these VMs, the vTPM data will not be preserved. Some of the VMs' security features may be deactivated and the VMs may not start.</value>
</data>
<data name="VTPM_MAX_REACHED" xml:space="preserve">
<value>The maximum number of vTPMs that can be attached to this VM is {0}.</value>
</data>

6
XenModel/Utils/Helpers.Versions.cs
View File

@ -450,6 +450,12 @@ namespace XenAdmin.Core
return coordinator == null || ProductVersionCompare(coordinator.GetXapiVersion(), "22.33.0") >= 0;
}
public static bool XapiEqualOrGreater_23_9_0(IXenConnection conn)
{
var coordinator = GetCoordinator(conn);
return coordinator == null || ProductVersionCompare(coordinator.GetXapiVersion(), "23.9.0") >= 0;
}
public static bool XapiEqualOrGreater_23_10_0(IXenConnection conn)
{
var coordinator = GetCoordinator(conn);