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

Merge remote-tracking branch 'upstream/REQ-411' into REQ-411

Browse Source 
Conflicts:
	XenAdmin/Wizards/PatchingWizard/PatchingWizard_SelectServers.resx
This commit is contained in:
Mihaela Stoica 2017-03-28 12:44:54 +01:00
commit 47ccbd4581
9 changed files with 117 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
XenAdmin/Wizards/PatchingWizard/PatchingWizard_AutomatedUpdatesPage.cs
View File

@ -140,7 +140,16 @@ namespace XenAdmin.Wizards.PatchingWizard
return;
}
Debug.Assert(WizardMode != WizardMode.NewVersion || (WizardMode == WizardMode.NewVersion && UpdateAlert != null), "For version updates the UpdateAlert shouldn't be null");
Debug.Assert(WizardMode == WizardMode.AutomatedUpdates || WizardMode == WizardMode.NewVersion && UpdateAlert != null);
if (WizardMode == WizardMode.AutomatedUpdates)
{
labelTitle.Text = Messages.PATCHINGWIZARD_UPLOAD_AND_INSTALL_TITLE_AUTOMATED_MODE;
}
else if (WizardMode == WizardMode.NewVersion)
{
labelTitle.Text = Messages.PATCHINGWIZARD_UPLOAD_AND_INSTALL_TITLE_NEW_VERSION_AUTOMATED_MODE;
}
foreach (var pool in SelectedPools)
{
@ -615,7 +624,15 @@ namespace XenAdmin.Wizards.PatchingWizard
private void AllWorkersFinished()
{
labelTitle.Text = Messages.PATCHINGWIZARD_UPDATES_DONE_AUTOMATED_UPDATES_MODE;
if (WizardMode == WizardMode.AutomatedUpdates)
{
labelTitle.Text = Messages.PATCHINGWIZARD_UPDATES_DONE_AUTOMATED_UPDATES_MODE;
}
else if (WizardMode == WizardMode.NewVersion)
{
labelTitle.Text = Messages.PATCHINGWIZARD_UPDATES_DONE_AUTOMATED_NEW_VERSION_MODE;
}
progressBar.Value = 100;
pictureBox1.Image = null;
labelError.Text = Messages.CLOSE_WIZARD_CLICK_FINISH;

4
XenAdmin/Wizards/PatchingWizard/PatchingWizard_AutomatedUpdatesPage.designer.cs generated
View File

@ -86,7 +86,7 @@ namespace XenAdmin.Wizards.PatchingWizard
this.errorLinkLabel.Name = "errorLinkLabel";
this.errorLinkLabel.TabStop = true;
//
// PatchingWizard_AutoUpdatingPage
// PatchingWizard_AutomatedUpdatesPage
//
resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
@ -94,7 +94,7 @@ namespace XenAdmin.Wizards.PatchingWizard
this.Controls.Add(this.progressBar);
this.Controls.Add(this.textBoxLog);
this.Controls.Add(this.labelTitle);
this.Name = "PatchingWizard_AutoUpdatingPage";
this.Name = "PatchingWizard_AutomatedUpdatesPage";
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();

7
XenAdmin/Wizards/PatchingWizard/PatchingWizard_AutomatedUpdatesPage.resx
View File

@ -126,14 +126,11 @@
<value>3, 13</value>
</data>
<data name="labelTitle.Size" type="System.Drawing.Size, System.Drawing">
<value>92, 13</value>
<value>0, 13</value>
</data>
<data name="labelTitle.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="labelTitle.Text" xml:space="preserve">
<value>Installing updates:</value>
</data>
<data name="&gt;&gt;labelTitle.Name" xml:space="preserve">
<value>labelTitle</value>
</data>
@ -355,7 +352,7 @@
<value>511, 335</value>
</data>
<data name="&gt;&gt;$this.Name" xml:space="preserve">
<value>PatchingWizard_AutoUpdatingPage</value>
<value>PatchingWizard_AutomatedUpdatesPage</value>
</data>
<data name="&gt;&gt;$this.Type" xml:space="preserve">
<value>XenAdmin.Controls.XenTabPage, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>

24
XenAdmin/Wizards/PatchingWizard/PatchingWizard_PrecheckPage.cs
View File

@ -420,6 +420,26 @@ namespace XenAdmin.Wizards.PatchingWizard
}
}
//Checking reboot required and can evacuate host for version updates
if (WizardMode == Wizards.PatchingWizard.WizardMode.NewVersion && UpdateAlert != null && UpdateAlert.Patch != null && UpdateAlert.Patch.after_apply_guidance == after_apply_guidance.restartHost)
{
checks.Add(new KeyValuePair<string, List<Check>>(Messages.CHECKING_SERVER_NEEDS_REBOOT, new List<Check>()));
checkGroup = checks[checks.Count - 1].Value;
var guidance = new List<after_apply_guidance>() { UpdateAlert.Patch.after_apply_guidance };
foreach (var host in SelectedServers)
{
checkGroup.Add(new HostNeedsRebootCheck(host, guidance, LivePatchCodesByHost));
}
checks.Add(new KeyValuePair<string, List<Check>>(Messages.CHECKING_CANEVACUATE_STATUS, new List<Check>()));
checkGroup = checks[checks.Count - 1].Value;
foreach (Host host in SelectedServers)
{
checkGroup.Add(new AssertCanEvacuateCheck(host, LivePatchCodesByHost));
}
}
return checks;
}
@ -443,7 +463,7 @@ namespace XenAdmin.Wizards.PatchingWizard
}
//Checking if the host needs a reboot
if (WizardMode != WizardMode.SingleUpdate)
if (WizardMode == WizardMode.SingleUpdate)
{
checks.Add(new KeyValuePair<string, List<Check>>(Messages.CHECKING_SERVER_NEEDS_REBOOT, new List<Check>()));
checkGroup = checks[checks.Count - 1].Value;
@ -459,7 +479,7 @@ namespace XenAdmin.Wizards.PatchingWizard
//Checking can evacuate host
//CA-97061 - evacuate host -> suspended VMs. This is only needed for restartHost
//Also include this check for the supplemental packs (patch == null), as their guidance is restartHost
if (patch == null || patch.after_apply_guidance.Contains(after_apply_guidance.restartHost))
if (WizardMode != WizardMode.NewVersion && (patch == null || patch.after_apply_guidance.Contains(after_apply_guidance.restartHost)))
{
checks.Add(new KeyValuePair<string, List<Check>>(Messages.CHECKING_CANEVACUATE_STATUS, new List<Check>()));
checkGroup = checks[checks.Count - 1].Value;

19
XenAdmin/Wizards/PatchingWizard/PatchingWizard_SelectPatchPage.resx
View File

@ -241,13 +241,14 @@
<value>23, 83</value>
</data>
<data name="automatedUpdatesOptionLabel.Size" type="System.Drawing.Size, System.Drawing">
<value>575, 13</value>
<value>575, 26</value>
</data>
<data name="automatedUpdatesOptionLabel.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
</data>
<data name="automatedUpdatesOptionLabel.Text" xml:space="preserve">
<value>[XenCenter] will download and install all current updates from [Citrix], usually with only a single reboot at the end.</value>
<value>[XenCenter] will download and install all released updates on the current version from [Citrix], usually with only a single reboot at the end.
</value>
</data>
<data name="&gt;&gt;automatedUpdatesOptionLabel.Name" xml:space="preserve">
<value>automatedUpdatesOptionLabel</value>
@ -268,19 +269,19 @@
<value>NoControl</value>
</data>
<data name="downloadUpdateRadioButton.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 108</value>
<value>3, 121</value>
</data>
<data name="downloadUpdateRadioButton.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 12, 3, 3</value>
</data>
<data name="downloadUpdateRadioButton.Size" type="System.Drawing.Size, System.Drawing">
<value>163, 17</value>
<value>235, 17</value>
</data>
<data name="downloadUpdateRadioButton.TabIndex" type="System.Int32, mscorlib">
<value>4</value>
</data>
<data name="downloadUpdateRadioButton.Text" xml:space="preserve">
<value>&amp;Download update from [Citrix]</value>
<value>&amp;Download update or new version from [Citrix]</value>
</data>
<data name="&gt;&gt;downloadUpdateRadioButton.Name" xml:space="preserve">
<value>downloadUpdateRadioButton</value>
@ -583,7 +584,7 @@
<value>1</value>
</data>
<data name="tableLayoutPanelSpinner.Location" type="System.Drawing.Point, System.Drawing">
<value>178, 81</value>
<value>178, 75</value>
</data>
<data name="tableLayoutPanelSpinner.RowCount" type="System.Int32, mscorlib">
<value>1</value>
@ -664,7 +665,7 @@
<value>Vertical</value>
</data>
<data name="dataGridViewPatches.Size" type="System.Drawing.Size, System.Drawing">
<value>575, 189</value>
<value>575, 176</value>
</data>
<data name="dataGridViewPatches.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@ -685,10 +686,10 @@
<value>Fill</value>
</data>
<data name="panel1.Location" type="System.Drawing.Point, System.Drawing">
<value>23, 131</value>
<value>23, 144</value>
</data>
<data name="panel1.Size" type="System.Drawing.Size, System.Drawing">
<value>575, 189</value>
<value>575, 176</value>
</data>
<data name="panel1.TabIndex" type="System.Int32, mscorlib">
<value>5</value>

17
XenAdmin/Wizards/PatchingWizard/PatchingWizard_SelectServers.cs
View File

@ -42,6 +42,7 @@ using XenAdmin.Properties;
using XenAPI;
using XenAdmin.Alerts;
using System.Linq;
using System.Diagnostics;
namespace XenAdmin.Wizards.PatchingWizard
{
@ -96,9 +97,19 @@ namespace XenAdmin.Wizards.PatchingWizard
try
{
poolSelectionOnly = WizardMode == WizardMode.AutomatedUpdates || SelectedUpdateAlert != null || FileFromDiskAlert != null;
label1.Text = WizardMode == WizardMode.AutomatedUpdates
? Messages.PATCHINGWIZARD_SELECTSERVERPAGE_RUBRIC_AUTOMATED_MODE
: poolSelectionOnly ? Messages.PATCHINGWIZARD_SELECTSERVERPAGE_RUBRIC_POOL_SELECTION : Messages.PATCHINGWIZARD_SELECTSERVERPAGE_RUBRIC_DEFAULT;
switch (WizardMode)
{
case WizardMode.AutomatedUpdates :
label1.Text = Messages.PATCHINGWIZARD_SELECTSERVERPAGE_RUBRIC_AUTOMATED_MODE;
break;
case WizardMode.NewVersion :
label1.Text = Messages.PATCHINGWIZARD_SELECTSERVERPAGE_RUBRIC_NEW_VERSION_MODE;
break;
case WizardMode.SingleUpdate :
label1.Text = poolSelectionOnly ? Messages.PATCHINGWIZARD_SELECTSERVERPAGE_RUBRIC_POOL_SELECTION : Messages.PATCHINGWIZARD_SELECTSERVERPAGE_RUBRIC_DEFAULT;
break;
}
// catch selected servers, in order to restore selection after the dataGrid is reloaded
List<Host> selectedServers = SelectedServers;

3
XenAdmin/Wizards/PatchingWizard/PatchingWizard_SelectServers.resx
View File

@ -240,9 +240,6 @@
<data name="label1.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
</data>
<data name="label1.Text" xml:space="preserve">
<value>rubric</value>
</data>
<data name="&gt;&gt;label1.Name" xml:space="preserve">
<value>label1</value>
</data>

36
XenModel/Messages.Designer.cs generated
View File

@ -27228,6 +27228,15 @@ namespace XenAdmin {
}
}
/// <summary>
/// Looks up a localized string similar to Select one or more pools or standalone servers that you want to update to the new version..
/// </summary>
public static string PATCHINGWIZARD_SELECTSERVERPAGE_RUBRIC_NEW_VERSION_MODE {
get {
return ResourceManager.GetString("PATCHINGWIZARD_SELECTSERVERPAGE_RUBRIC_NEW_VERSION_MODE", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Select one or more pools or standalone servers where you want to apply the selected update.
///Servers where this update cannot be applied appear disabled in this list..
@ -27274,6 +27283,15 @@ namespace XenAdmin {
}
}
/// <summary>
/// Looks up a localized string similar to The new version has been installed..
/// </summary>
public static string PATCHINGWIZARD_UPDATES_DONE_AUTOMATED_NEW_VERSION_MODE {
get {
return ResourceManager.GetString("PATCHINGWIZARD_UPDATES_DONE_AUTOMATED_NEW_VERSION_MODE", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Automated updates have finished..
/// </summary>
@ -27283,6 +27301,24 @@ namespace XenAdmin {
}
}
/// <summary>
/// Looks up a localized string similar to Installing updates:.
/// </summary>
public static string PATCHINGWIZARD_UPLOAD_AND_INSTALL_TITLE_AUTOMATED_MODE {
get {
return ResourceManager.GetString("PATCHINGWIZARD_UPLOAD_AND_INSTALL_TITLE_AUTOMATED_MODE", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Installing new version:.
/// </summary>
public static string PATCHINGWIZARD_UPLOAD_AND_INSTALL_TITLE_NEW_VERSION_AUTOMATED_MODE {
get {
return ResourceManager.GetString("PATCHINGWIZARD_UPLOAD_AND_INSTALL_TITLE_NEW_VERSION_AUTOMATED_MODE", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to [XenCenter] is now downloading your update and uploading it to the servers specified in the previous step.
///Please wait for these operations to complete, then click Next to continue with the installation..

12
XenModel/Messages.resx
View File

@ -9394,6 +9394,9 @@ Greyed out servers cannot be updated with automated updates.</value>
<value>Select one or more servers where you want to apply the selected update.
Servers where this update cannot be applied appear disabled in this list.</value>
</data>
<data name="PATCHINGWIZARD_SELECTSERVERPAGE_RUBRIC_NEW_VERSION_MODE" xml:space="preserve">
<value>Select one or more pools or standalone servers that you want to update to the new version.</value>
</data>
<data name="PATCHINGWIZARD_SELECTSERVERPAGE_RUBRIC_POOL_SELECTION" xml:space="preserve">
<value>Select one or more pools or standalone servers where you want to apply the selected update.
Servers where this update cannot be applied appear disabled in this list.</value>
@ -9410,6 +9413,9 @@ Servers where this update cannot be applied appear disabled in this list.</value
<data name="PATCHINGWIZARD_SELECTSERVERPAGE_TITLE" xml:space="preserve">
<value>Select the servers you wish to update</value>
</data>
<data name="PATCHINGWIZARD_UPDATES_DONE_AUTOMATED_NEW_VERSION_MODE" xml:space="preserve">
<value>The new version has been installed.</value>
</data>
<data name="PATCHINGWIZARD_UPDATES_DONE_AUTOMATED_UPDATES_MODE" xml:space="preserve">
<value>Automated updates have finished.</value>
</data>
@ -9430,6 +9436,12 @@ Please wait for this operation to complete, then click Next to continue with the
<data name="PATCHINGWIZARD_UPLOADPAGE_TITLE_ONLY_UPLOAD" xml:space="preserve">
<value>Uploading the selected file to your servers</value>
</data>
<data name="PATCHINGWIZARD_UPLOAD_AND_INSTALL_TITLE_AUTOMATED_MODE" xml:space="preserve">
<value>Installing updates:</value>
</data>
<data name="PATCHINGWIZARD_UPLOAD_AND_INSTALL_TITLE_NEW_VERSION_AUTOMATED_MODE" xml:space="preserve">
<value>Installing new version:</value>
</data>
<data name="PATCHING_EJECT_CDS" xml:space="preserve">
<value>Eject any virtual CDs from your VMs</value>
</data>