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

CA-122558: Name methods creating updates after the type of the update created to

Browse Source 
avoid confusion.

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
This commit is contained in:
Konstantina Chremmou 2013-12-05 12:59:38 +00:00
parent ce20127827
commit d2efa81a31
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CFUValidator/CFUValidator.cs
View File

@ -115,13 +115,13 @@ namespace CFUValidator
SetupMocks(xenServerPatches, xenServerVersions);
Status = "Determining XenCenter update required...";
var xcupdateAlert = XenAdmin.Core.Updates.NewXenCenterVersionAlert(xenCenterVersions, new Version(ServerVersion));
var xcupdateAlert = XenAdmin.Core.Updates.NewXenCenterUpdateAlert(xenCenterVersions, new Version(ServerVersion));
Status = "Determining XenServer update required...";
var updateAlert = XenAdmin.Core.Updates.NewServerVersionAlert(xenServerVersions);
var updateAlert = XenAdmin.Core.Updates.NewXenServerUpdateAlert(xenServerVersions);
Status = "Determining patches required...";
var patchAlerts = XenAdmin.Core.Updates.NewServerPatchesAlerts(xenServerVersions, xenServerPatches);
var patchAlerts = XenAdmin.Core.Updates.NewXenServerPatchAlerts(xenServerVersions, xenServerPatches);
//Build patch checks list
List<AlertFeatureValidator> validators = new List<AlertFeatureValidator>

20
XenAdmin/Core/Updates.cs
View File

@ -123,15 +123,15 @@ namespace XenAdmin.Core
XenServerVersions = action.XenServerVersions;
XenServerPatches = action.XenServerPatches;
var xenCenterAlert = NewXenCenterVersionAlert(action.XenCenterVersions, Program.Version);
var xenCenterAlert = NewXenCenterUpdateAlert(action.XenCenterVersions, Program.Version);
if (xenCenterAlert != null)
updateAlerts.Add(xenCenterAlert);
var xenServerUpdateAlert = NewServerVersionAlert(action.XenServerVersions);
var xenServerUpdateAlert = NewXenServerUpdateAlert(action.XenServerVersions);
if (xenServerUpdateAlert != null)
updateAlerts.Add(xenServerUpdateAlert);
var xenServerPatchAlerts = NewServerPatchesAlerts(action.XenServerVersions, action.XenServerPatches);
var xenServerPatchAlerts = NewXenServerPatchAlerts(action.XenServerVersions, action.XenServerPatches);
if (xenServerPatchAlerts != null)
{
foreach (var xenServerPatchAlert in xenServerPatchAlerts)
@ -217,7 +217,7 @@ namespace XenAdmin.Core
latest.FirstOrDefault(xcv => string.IsNullOrEmpty(xcv.Lang));
}
public static XenCenterUpdateAlert NewXenCenterVersionAlert(List<XenCenterVersion> xenCenterVersions, Version currentProgramVersion)
public static XenCenterUpdateAlert NewXenCenterUpdateAlert(List<XenCenterVersion> xenCenterVersions, Version currentProgramVersion)
{
if (Helpers.CommonCriteriaCertificationRelease)
return null;
@ -239,13 +239,13 @@ namespace XenAdmin.Core
return null;
}
public static List<XenServerPatchAlert> NewServerPatchesAlerts(List<XenServerVersion> xenServerVersions,
public static List<XenServerPatchAlert> NewXenServerPatchAlerts(List<XenServerVersion> xenServerVersions,
List<XenServerPatch> xenServerPatches)
{
if (Helpers.CommonCriteriaCertificationRelease)
return null;
var alerts = GetServerPatchesAlerts(xenServerVersions, xenServerPatches);
var alerts = GetServerPatchAlerts(xenServerVersions, xenServerPatches);
return alerts.Where(alert => !alert.CanIgnore).ToList();
}
@ -261,7 +261,7 @@ namespace XenAdmin.Core
return alert;
}
private static List<XenServerPatchAlert> GetServerPatchesAlerts(List<XenServerVersion> xenServerVersions,
private static List<XenServerPatchAlert> GetServerPatchAlerts(List<XenServerVersion> xenServerVersions,
List<XenServerPatch> xenServerPatches)
{
List<XenServerPatchAlert> alerts = new List<XenServerPatchAlert>();
@ -313,7 +313,7 @@ namespace XenAdmin.Core
return alerts;
}
public static XenServerUpdateAlert NewServerVersionAlert(List<XenServerVersion> xenServerVersions)
public static XenServerUpdateAlert NewXenServerUpdateAlert(List<XenServerVersion> xenServerVersions)
{
if (Helpers.CommonCriteriaCertificationRelease)
return null;
@ -351,7 +351,7 @@ namespace XenAdmin.Core
if (!AllowUpdates || !Properties.Settings.Default.AllowXenServerUpdates)
return;
var alert = NewServerVersionAlert(XenServerVersions);
var alert = NewXenServerUpdateAlert(XenServerVersions);
if (alert == null)
return;
@ -370,7 +370,7 @@ namespace XenAdmin.Core
if (!AllowUpdates || !Properties.Settings.Default.AllowPatchesUpdates)
return;
var alerts = GetServerPatchesAlerts(XenServerVersions, XenServerPatches);
var alerts = GetServerPatchAlerts(XenServerVersions, XenServerPatches);
foreach (var alert in alerts)
{