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

Removed accessors that were set but never used. Removed unused constructors.

Browse Source 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
This commit is contained in:
Konstantina Chremmou 2018-10-28 15:20:30 +00:00 committed by Mihaela Stoica
parent e63ca825e4
commit 3e0a958783
4 changed files with 5 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
XenAdmin/Diagnostics/Checks/PatchPrecheckCheck.cs
View File

@ -45,8 +45,9 @@ namespace XenAdmin.Diagnostics.Checks
{ {
class PatchPrecheckCheck : HostCheck class PatchPrecheckCheck : HostCheck
{ {
private readonly Pool_patch _patch; private static readonly log4net.ILog log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
private readonly Pool_update _update; private readonly Pool_patch Patch;
private readonly Pool_update Update;
private static Regex PrecheckErrorRegex = new Regex("(<error).+(</error>)"); private static Regex PrecheckErrorRegex = new Regex("(<error).+(</error>)");
private static Regex LivePatchResponseRegex = new Regex("(<livepatch).+(</livepatch>)"); private static Regex LivePatchResponseRegex = new Regex("(<livepatch).+(</livepatch>)");
@ -54,27 +55,17 @@ namespace XenAdmin.Diagnostics.Checks
private readonly Dictionary<string, livepatch_status> livePatchCodesByHost; private readonly Dictionary<string, livepatch_status> livePatchCodesByHost;
private SR srUploadedUpdates; private SR srUploadedUpdates;
public PatchPrecheckCheck(Host host, Pool_patch patch)
: this(host, patch, null)
{
}
public PatchPrecheckCheck(Host host, Pool_update update)
: this(host, update, null)
{
}
public PatchPrecheckCheck(Host host, Pool_patch patch, Dictionary<string, livepatch_status> livePatchCodesByHost) public PatchPrecheckCheck(Host host, Pool_patch patch, Dictionary<string, livepatch_status> livePatchCodesByHost)
: base(host) : base(host)
{ {
_patch = patch; Patch = patch;
this.livePatchCodesByHost = livePatchCodesByHost; this.livePatchCodesByHost = livePatchCodesByHost;
} }
public PatchPrecheckCheck(Host host, Pool_update update, Dictionary<string, livepatch_status> livePatchCodesByHost, SR srUploadedUpdates = null) public PatchPrecheckCheck(Host host, Pool_update update, Dictionary<string, livepatch_status> livePatchCodesByHost, SR srUploadedUpdates = null)
: base(host) : base(host)
{ {
_update = update; Update = update;
this.livePatchCodesByHost = livePatchCodesByHost; this.livePatchCodesByHost = livePatchCodesByHost;
this.srUploadedUpdates = srUploadedUpdates; this.srUploadedUpdates = srUploadedUpdates;
} }
@ -158,18 +149,6 @@ namespace XenAdmin.Diagnostics.Checks
get { return Messages.SERVER_SIDE_CHECK_DESCRIPTION; } get { return Messages.SERVER_SIDE_CHECK_DESCRIPTION; }
} }
public Pool_patch Patch
{
get { return _patch; }
}
public Pool_update Update
{
get { return _update; }
}
private static readonly log4net.ILog log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
/// <summary> /// <summary>
/// Find problem from xml result /// Find problem from xml result
/// </summary> /// </summary>

3
XenAdmin/Wizards/PatchingWizard/PatchingWizard.cs
View File

@ -120,7 +120,6 @@ namespace XenAdmin.Wizards.PatchingWizard
PatchingWizard_SelectServers.WizardMode = wizardMode; PatchingWizard_SelectServers.WizardMode = wizardMode;
PatchingWizard_SelectServers.SelectedUpdateType = updateType; PatchingWizard_SelectServers.SelectedUpdateType = updateType;
PatchingWizard_SelectServers.Patch = existPatch;
PatchingWizard_SelectServers.SelectedUpdateAlert = alertPatch; PatchingWizard_SelectServers.SelectedUpdateAlert = alertPatch;
PatchingWizard_SelectServers.FileFromDiskAlert = fileFromDiskAlertPatch; PatchingWizard_SelectServers.FileFromDiskAlert = fileFromDiskAlertPatch;
PatchingWizard_SelectServers.FileFromDiskHasUpdateXml = fileFromDiskHasUpdateXml; PatchingWizard_SelectServers.FileFromDiskHasUpdateXml = fileFromDiskHasUpdateXml;
@ -151,7 +150,6 @@ namespace XenAdmin.Wizards.PatchingWizard
PatchingWizard_PrecheckPage.WizardMode = wizardMode; PatchingWizard_PrecheckPage.WizardMode = wizardMode;
PatchingWizard_PrecheckPage.Patch = existPatch; PatchingWizard_PrecheckPage.Patch = existPatch;
PatchingWizard_PrecheckPage.PoolUpdate = null; //reset the PoolUpdate property; it will be updated on leaving the Upload page, if this page is visible PatchingWizard_PrecheckPage.PoolUpdate = null; //reset the PoolUpdate property; it will be updated on leaving the Upload page, if this page is visible
PatchingWizard_PrecheckPage.SelectedUpdateType = updateType;
PatchingWizard_PrecheckPage.UpdateAlert = alertPatch ?? fileFromDiskAlertPatch; PatchingWizard_PrecheckPage.UpdateAlert = alertPatch ?? fileFromDiskAlertPatch;
PatchingWizard_AutomatedUpdatesPage.WizardMode = wizardMode; PatchingWizard_AutomatedUpdatesPage.WizardMode = wizardMode;
@ -192,7 +190,6 @@ namespace XenAdmin.Wizards.PatchingWizard
PatchingWizard_SelectPatchPage.SelectedExistingPatch = PatchingWizard_UploadPage.Patch; PatchingWizard_SelectPatchPage.SelectedExistingPatch = PatchingWizard_UploadPage.Patch;
PatchingWizard_SelectServers.SelectedUpdateType = UpdateType.Existing; PatchingWizard_SelectServers.SelectedUpdateType = UpdateType.Existing;
PatchingWizard_SelectServers.Patch = PatchingWizard_UploadPage.Patch;
PatchingWizard_PrecheckPage.Patch = PatchingWizard_UploadPage.Patch; PatchingWizard_PrecheckPage.Patch = PatchingWizard_UploadPage.Patch;

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

@ -653,7 +653,6 @@ namespace XenAdmin.Wizards.PatchingWizard
return !checkInProgress && !actionInProgress && !problemsFound; return !checkInProgress && !actionInProgress && !problemsFound;
} }
public UpdateType SelectedUpdateType { private get; set; }
public Pool_patch Patch { private get; set; } public Pool_patch Patch { private get; set; }
public Pool_update PoolUpdate { private get; set; } public Pool_update PoolUpdate { private get; set; }

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

@ -486,8 +486,6 @@ namespace XenAdmin.Wizards.PatchingWizard
#region Accessors #region Accessors
public Pool_patch Patch { private get; set; }
public List<Host> SelectedMasters public List<Host> SelectedMasters
{ {
get get