Run the CFU availability check together with the check for the automated updates licence.

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
This commit is contained in:
Konstantina Chremmou 2018-07-03 21:53:55 +01:00 committed by Mihaela Stoica
parent f0952dbc88
commit 63e4ced7fe

View File

@ -142,14 +142,6 @@ namespace XenAdmin.Wizards.RollingUpgradeWizard
{ {
var groups = new List<CheckGroup>(); var groups = new List<CheckGroup>();
//Check for update file check
if (ApplyUpdatesToNewVersion)
{
var cfuCheck = new List<Check>();
cfuCheck.Add(new CfuAvailabilityCheck());
groups.Add(new CheckGroup(Messages.CHECKING_CFU_STATUS, cfuCheck));
}
//XenCenter version check (if any of the selected server version is not the latest) //XenCenter version check (if any of the selected server version is not the latest)
var latestCrVersion = Updates.XenServerVersions.FindAll(item => item.LatestCr).OrderByDescending(v => v.Version).FirstOrDefault(); var latestCrVersion = Updates.XenServerVersions.FindAll(item => item.LatestCr).OrderByDescending(v => v.Version).FirstOrDefault();
if (latestCrVersion != null && if (latestCrVersion != null &&
@ -232,6 +224,9 @@ namespace XenAdmin.Wizards.RollingUpgradeWizard
groups.Add(new CheckGroup(Messages.CHECKING_AUTOMATED_UPDATES_LICENSE_STATUS, groups.Add(new CheckGroup(Messages.CHECKING_AUTOMATED_UPDATES_LICENSE_STATUS,
automatedUpdateLicenseChecks)); automatedUpdateLicenseChecks));
var cfuCheck = new List<Check> {new CfuAvailabilityCheck()};
groups.Add(new CheckGroup(Messages.CHECKING_CFU_STATUS, cfuCheck));
} }
return groups; return groups;