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

Placed the CFU availability and the automated updates licence checks under the same group as requested per code review.

Browse Source 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
This commit is contained in:
Konstantina Chremmou 2018-07-04 01:20:35 +01:00 committed by Mihaela Stoica
parent 69c9d942ff
commit c2ae0a6069
3 changed files with 11 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
XenAdmin/Wizards/RollingUpgradeWizard/RollingUpgradeWizardPrecheckPage.cs
View File

@ -215,18 +215,17 @@ namespace XenAdmin.Wizards.RollingUpgradeWizard
groups.Add(new CheckGroup(Messages.CHECKING_SAFE_TO_UPGRADE, upgradeChecks));
}
//Checking automated updates license if apply updates checkbox is ticked
//Checking automated updates are possible if apply updates checkbox is ticked
if (ApplyUpdatesToNewVersion)
{
var automatedUpdateLicenseChecks = new List<Check>();
var automatedUpdateChecks = new List<Check>();
foreach (var pool in SelectedPools)
automatedUpdateLicenseChecks.Add(new AutomatedUpdatesLicenseCheck(pool));
automatedUpdateChecks.Add(new AutomatedUpdatesLicenseCheck(pool));
groups.Add(new CheckGroup(Messages.CHECKING_AUTOMATED_UPDATES_LICENSE_STATUS,
automatedUpdateLicenseChecks));
automatedUpdateChecks.Add(new CfuAvailabilityCheck());
var cfuCheck = new List<Check> {new CfuAvailabilityCheck()};
groups.Add(new CheckGroup(Messages.CHECKING_CFU_STATUS, cfuCheck));
groups.Add(new CheckGroup(Messages.CHECKING_AUTOMATED_UPDATES_POSSIBLE,
automatedUpdateChecks));
}
return groups;

15
XenModel/Messages.Designer.cs generated
View File

@ -6983,11 +6983,11 @@ namespace XenAdmin {
}
/// <summary>
/// Looks up a localized string similar to Checking automated updates license status.
/// Looks up a localized string similar to Checking automated updates can be applied.
/// </summary>
public static string CHECKING_AUTOMATED_UPDATES_LICENSE_STATUS {
public static string CHECKING_AUTOMATED_UPDATES_POSSIBLE {
get {
return ResourceManager.GetString("CHECKING_AUTOMATED_UPDATES_LICENSE_STATUS", resourceCulture);
return ResourceManager.GetString("CHECKING_AUTOMATED_UPDATES_POSSIBLE", resourceCulture);
}
}
@ -7000,15 +7000,6 @@ namespace XenAdmin {
}
}
/// <summary>
/// Looks up a localized string similar to Checking ability to download updates.
/// </summary>
public static string CHECKING_CFU_STATUS {
get {
return ResourceManager.GetString("CHECKING_CFU_STATUS", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Checking for pending restart.
/// </summary>

7
XenModel/Messages.resx
View File

@ -2533,15 +2533,12 @@ Do you want to assign these VMs to the schedule '{0}' instead?</value>
Do you want to assign it to the schedule '{2}' instead?</value>
</data>
<data name="CHECKING_AUTOMATED_UPDATES_LICENSE_STATUS" xml:space="preserve">
<value>Checking automated updates license status</value>
<data name="CHECKING_AUTOMATED_UPDATES_POSSIBLE" xml:space="preserve">
<value>Checking automated updates can be applied</value>
</data>
<data name="CHECKING_CANEVACUATE_STATUS" xml:space="preserve">
<value>Checking VM migration status</value>
</data>
<data name="CHECKING_CFU_STATUS" xml:space="preserve">
<value>Checking ability to download updates</value>
</data>
<data name="CHECKING_FOR_PENDING_RESTART" xml:space="preserve">
<value>Checking for pending restart</value>
</data>