Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2025-01-21 07:49:32 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

CA-311255: Fix duplicated entries of latest CR

Browse Source 
- the issue was that in one usage of PatchCanBeInstalledOnHost the wrong version was passed to the applicableVersion parameter (in CreateAlertForXenServerVersion)

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
This commit is contained in:
Mihaela Stoica 2019-05-17 12:13:49 +01:00 committed by Konstantina Chremmou
parent 0a6d66ce6d
commit aee265b85d
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
XenAdmin/Core/Updates.cs
View File

@ -456,7 +456,7 @@ namespace XenAdmin.Core
XenServerPatch serverPatch = xenServerPatch;
var noPatchHosts = hosts.Where(host => PatchCanBeInstalledOnHost(serverPatch, host, version));
var noPatchHosts = hosts.Where(host => PatchCanBeInstalledOnHost(serverPatch, host)).ToList();
if (noPatchHosts.Count() == hosts.Count)
alert.IncludeConnection(xenConnection);
@ -469,12 +469,14 @@ namespace XenAdmin.Core
return alerts;
}
private static bool PatchCanBeInstalledOnHost(XenServerPatch serverPatch, Host host, XenServerVersion patchApplicableVersion)
private static bool PatchCanBeInstalledOnHost(XenServerPatch serverPatch, Host host)
{
Debug.Assert(serverPatch != null);
Debug.Assert(host != null);
if (Helpers.productVersionCompare(patchApplicableVersion.Version.ToString(), host.ProductVersion()) != 0)
// A patch is applicable to host if the patch is amongst the current version patches
var patchIsApplicable = GetServerVersions(host, XenServerVersions).Any(v => v.Patches.Contains(serverPatch));
if (!patchIsApplicable)
return false;
// A patch can be installed on a host if:
@ -828,9 +830,9 @@ namespace XenAdmin.Core
// Show the Upgrade alert for a host if:
// - the host version is older than this version AND
// - there is no patch (amongst the current version patches) that can update to this version OR, if there is a patch, the patch cannot be installed
var patchApplicable = patch != null && GetServerVersions(master, XenServerVersions).Any(v => v.Patches.Contains(patch));
var outOfDateHosts = hosts.Where(host => new Version(Helpers.HostProductVersion(host)) < version.Version
&& (!patchApplicable || !PatchCanBeInstalledOnHost(patch, host, version)));
&& (patch == null || !PatchCanBeInstalledOnHost(patch, host))).ToList();
if (outOfDateHosts.Count() == hosts.Count)
alert.IncludeConnection(xc);