From 5ae6bbb948518a3b706fc2d9cef3260e4560f678 Mon Sep 17 00:00:00 2001 From: Konstantina Chremmou Date: Mon, 13 Nov 2023 18:04:23 +0000 Subject: [PATCH] Corrections as per code review. Signed-off-by: Konstantina Chremmou --- .../Wizards/PatchingWizard/PatchingWizard.cs | 3 +- .../PatchingWizard_PatchingPage.cs | 3 + .../Actions/Updates/UploadUpdateAction.cs | 13 +- XenModel/Messages.Designer.cs | 195 ++---------------- XenModel/Messages.resx | 73 +------ 5 files changed, 39 insertions(+), 248 deletions(-) diff --git a/XenAdmin/Wizards/PatchingWizard/PatchingWizard.cs b/XenAdmin/Wizards/PatchingWizard/PatchingWizard.cs index 9228f1d3c..e6f002047 100644 --- a/XenAdmin/Wizards/PatchingWizard/PatchingWizard.cs +++ b/XenAdmin/Wizards/PatchingWizard/PatchingWizard.cs @@ -28,7 +28,6 @@ * SUCH DAMAGE. */ -using System; using System.Collections.Generic; using System.Windows.Forms; using XenAdmin.Actions; @@ -326,7 +325,7 @@ private AsyncAction GetCleanActionForPoolUpdate(Pool_update update) if (update == null || update.Connection == null || !update.Connection.IsConnected) return null; - return new DelegatedAsyncAction(update.Connection, Messages.REMOVE_PATCH, "", "", session => + return new DelegatedAsyncAction(update.Connection, Messages.PATCHINGWIZARD_REMOVE_UPDATE, "", "", session => { try { diff --git a/XenAdmin/Wizards/PatchingWizard/PatchingWizard_PatchingPage.cs b/XenAdmin/Wizards/PatchingWizard/PatchingWizard_PatchingPage.cs index bbee2d97c..df609e80a 100644 --- a/XenAdmin/Wizards/PatchingWizard/PatchingWizard_PatchingPage.cs +++ b/XenAdmin/Wizards/PatchingWizard/PatchingWizard_PatchingPage.cs @@ -30,6 +30,7 @@ using System; using System.Collections.Generic; +using System.Diagnostics; using System.IO; using System.Linq; using System.Text; @@ -194,6 +195,8 @@ private List CompileManualHostPlan(Pool pool, out List applicabl if (SelectedUpdateType == UpdateType.ISO) { + Debug.Assert(PoolUpdate != null, "PoolUpdate should not be null!"); + if (PoolUpdate != null) //ely or greater { foreach (var server in SelectedServers) diff --git a/XenModel/Actions/Updates/UploadUpdateAction.cs b/XenModel/Actions/Updates/UploadUpdateAction.cs index 185dd927d..79f32fe61 100644 --- a/XenModel/Actions/Updates/UploadUpdateAction.cs +++ b/XenModel/Actions/Updates/UploadUpdateAction.cs @@ -58,14 +58,11 @@ public class UploadUpdateAction : AsyncAction, IByteProgressAction public string ByteProgressDescription { get; set; } private Pool_update poolUpdate; - public Pool_update PoolUpdate - { - get { return poolUpdate; } - } + public Pool_update PoolUpdate => poolUpdate; public UploadUpdateAction(IXenConnection connection, List selectedServers, string path, bool suppressHistory) - : base(connection, null, Messages.SUPP_PACK_UPLOADING, suppressHistory) + : base(connection, null, Messages.UPLOAD_UPDATE_UPLOADING, suppressHistory) { Host = Helpers.GetCoordinator(connection) ?? throw new NullReferenceException(); @@ -104,7 +101,7 @@ public override void RecomputeCanCancel() private string UploadSupplementalPack(SR sr) { - this.Description = String.Format(Messages.SUPP_PACK_UPLOADING_TO, _updateName, sr.Name()); + this.Description = String.Format(Messages.UPLOAD_UPDATE_UPLOADING_TO_SR, _updateName, sr.Name()); log.DebugFormat("Creating vdi of size {0} bytes on SR '{1}'", _totalUpdateSize, sr.Name()); VDI vdi = NewVDI(sr); @@ -134,7 +131,7 @@ private string UploadSupplementalPack(SR sr) HTTP.UpdateProgressDelegate progressDelegate = delegate(int percent) { var sr1 = sr; - var descr = string.Format(Messages.UPLOAD_PATCH_UPLOADING_TO_SR_PROGRESS_DESCRIPTION, _updateName, sr1.Name(), + var descr = string.Format(Messages.UPLOAD_UPDATE_UPLOADING_TO_SR_PROGRESS_DESCRIPTION, _updateName, sr1.Name(), Util.DiskSizeString(percent * _totalUpdateSize / 100, "F1"), Util.DiskSizeString(_totalUpdateSize)); var actionPercent = (int)((totalUploaded * 100 + percent) / totalCount); @@ -228,7 +225,7 @@ private string UploadSupplementalPack(SR sr) VdiRefsPerHost.Add(server, vdiRef); totalUploaded++; - Description = string.Format(Messages.SUPP_PACK_UPLOADED, sr.Name()); + Description = string.Format(Messages.UPLOAD_UPDATE_UPLOADED, sr.Name()); foreach (Host host in servers) SrsWithUploadedUpdatesPerHost[host] = sr; diff --git a/XenModel/Messages.Designer.cs b/XenModel/Messages.Designer.cs index 2d47ae38c..be93e2b4e 100755 --- a/XenModel/Messages.Designer.cs +++ b/XenModel/Messages.Designer.cs @@ -420,51 +420,6 @@ public static string ACTION_CHANGING_SHADOW_MULTIPLIER_FOR { } } - /// - /// Looks up a localized string similar to Checking disk space on {0}. - /// - public static string ACTION_CHECK_DISK_SPACE_DESCRIPTION { - get { - return ResourceManager.GetString("ACTION_CHECK_DISK_SPACE_DESCRIPTION", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Check disk space. - /// - public static string ACTION_CHECK_DISK_SPACE_TITLE { - get { - return ResourceManager.GetString("ACTION_CHECK_DISK_SPACE_TITLE", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Cleaning up disk space on {0}. - /// - public static string ACTION_CLEANUP_DISK_SPACE_DESCRIPTION { - get { - return ResourceManager.GetString("ACTION_CLEANUP_DISK_SPACE_DESCRIPTION", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Successfully cleaned up disk space on {0}. - /// - public static string ACTION_CLEANUP_DISK_SPACE_SUCCESS { - get { - return ResourceManager.GetString("ACTION_CLEANUP_DISK_SPACE_SUCCESS", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Clean up disk space. - /// - public static string ACTION_CLEANUP_DISK_SPACE_TITLE { - get { - return ResourceManager.GetString("ACTION_CLEANUP_DISK_SPACE_TITLE", resourceCulture); - } - } - /// /// Looks up a localized string similar to Configuring PVS-Accelerator. /// @@ -5476,15 +5431,6 @@ public static string ALL_TYPES_AND_FOLDERS { } } - /// - /// Looks up a localized string similar to All Updates Applied. - /// - public static string ALL_UPDATES_APPLIED { - get { - return ResourceManager.GetString("ALL_UPDATES_APPLIED", resourceCulture); - } - } - /// /// Looks up a localized string similar to &Allow to continue. /// @@ -30030,6 +29976,15 @@ public static string PATCHINGWIZARD_PRECHECKPAGE_TITLE { } } + /// + /// Looks up a localized string similar to Remove Update. + /// + public static string PATCHINGWIZARD_REMOVE_UPDATE { + get { + return ResourceManager.GetString("PATCHINGWIZARD_REMOVE_UPDATE", resourceCulture); + } + } + /// /// Looks up a localized string similar to Delete update installation files. /// @@ -32765,15 +32720,6 @@ public static string REMOVE_GROUPING { } } - /// - /// Looks up a localized string similar to Remove Update. - /// - public static string REMOVE_PATCH { - get { - return ResourceManager.GetString("REMOVE_PATCH", resourceCulture); - } - } - /// /// Looks up a localized string similar to &Remove Server.... /// @@ -32954,15 +32900,6 @@ public static string REMOVED_FROM_FOLDER { } } - /// - /// Looks up a localized string similar to Removed update '{0}'. - /// - public static string REMOVED_UPDATE { - get { - return ResourceManager.GetString("REMOVED_UPDATE", resourceCulture); - } - } - /// /// Looks up a localized string similar to Removed from vApp . /// @@ -33008,15 +32945,6 @@ public static string REMOVING_SERVERS_FROM_POOL { } } - /// - /// Looks up a localized string similar to Removing Update '{0}'.... - /// - public static string REMOVING_UPDATE { - get { - return ResourceManager.GetString("REMOVING_UPDATE", resourceCulture); - } - } - /// /// Looks up a localized string similar to Removing from vApp. /// @@ -36357,17 +36285,6 @@ public static string SUPP_PACK_DESCRIPTION { } } - /// - /// Looks up a localized string similar to Failed to install supplemental pack '{0}' on '{1}'. - /// - ///Refer to the "{2} Administrator's Guide" for instructions on how to manually install a supplemental pack on a server.. - /// - public static string SUPP_PACK_INSTALL_FAILED { - get { - return ResourceManager.GetString("SUPP_PACK_INSTALL_FAILED", resourceCulture); - } - } - /// /// Looks up a localized string similar to {0} (not installed on {1}). /// @@ -36386,33 +36303,6 @@ public static string SUPP_PACK_TEMP_VDI_DESCRIPTION { } } - /// - /// Looks up a localized string similar to File uploaded to '{0}'. - /// - public static string SUPP_PACK_UPLOADED { - get { - return ResourceManager.GetString("SUPP_PACK_UPLOADED", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Uploading file. - /// - public static string SUPP_PACK_UPLOADING { - get { - return ResourceManager.GetString("SUPP_PACK_UPLOADING", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Uploading update '{0}' to '{1}'. - /// - public static string SUPP_PACK_UPLOADING_TO { - get { - return ResourceManager.GetString("SUPP_PACK_UPLOADING_TO", resourceCulture); - } - } - /// /// Looks up a localized string similar to {0} (not the same version on all hosts). /// @@ -37863,15 +37753,6 @@ public static string UPDATES_WIZARD_APPLYING_UPDATE { } } - /// - /// Looks up a localized string similar to Installing update on {0} servers.... - /// - public static string UPDATES_WIZARD_APPLYING_UPDATE_MULTIPLE_HOSTS { - get { - return ResourceManager.GetString("UPDATES_WIZARD_APPLYING_UPDATE_MULTIPLE_HOSTS", resourceCulture); - } - } - /// /// Looks up a localized string similar to Installing updates on {0}... . /// @@ -38380,15 +38261,6 @@ public static string UPDATES_WIZARD_REFRESHING_CDN_UPDATES_LIST { } } - /// - /// Looks up a localized string similar to Deleting update installation file {0} from {1}... . - /// - public static string UPDATES_WIZARD_REMOVING_UPDATE { - get { - return ResourceManager.GetString("UPDATES_WIZARD_REMOVING_UPDATE", resourceCulture); - } - } - /// /// Looks up a localized string similar to Removing update file {0}.... /// @@ -38743,65 +38615,38 @@ public static string UPGRADEWIZARD_WARNING_INCOMPATIBLE_CPUS { } /// - /// Looks up a localized string similar to Completed. + /// Looks up a localized string similar to Update uploaded to '{0}'. /// - public static string UPLOAD_PATCH_UPLOADED_DESCRIPTION { + public static string UPLOAD_UPDATE_UPLOADED { get { - return ResourceManager.GetString("UPLOAD_PATCH_UPLOADED_DESCRIPTION", resourceCulture); + return ResourceManager.GetString("UPLOAD_UPDATE_UPLOADED", resourceCulture); } } /// - /// Looks up a localized string similar to Uploading update {0}.... + /// Looks up a localized string similar to Uploading update. /// - public static string UPLOAD_PATCH_UPLOADING_DESCRIPTION { + public static string UPLOAD_UPDATE_UPLOADING { get { - return ResourceManager.GetString("UPLOAD_PATCH_UPLOADING_DESCRIPTION", resourceCulture); + return ResourceManager.GetString("UPLOAD_UPDATE_UPLOADING", resourceCulture); } } /// - /// Looks up a localized string similar to Uploading update {0} ({1} of {2}).... + /// Looks up a localized string similar to Uploading update '{0}' to '{1}'. /// - public static string UPLOAD_PATCH_UPLOADING_PROGRESS_DESCRIPTION { + public static string UPLOAD_UPDATE_UPLOADING_TO_SR { get { - return ResourceManager.GetString("UPLOAD_PATCH_UPLOADING_PROGRESS_DESCRIPTION", resourceCulture); + return ResourceManager.GetString("UPLOAD_UPDATE_UPLOADING_TO_SR", resourceCulture); } } /// /// Looks up a localized string similar to Uploading update '{0}' to '{1}' ({2} of {3}).... /// - public static string UPLOAD_PATCH_UPLOADING_TO_SR_PROGRESS_DESCRIPTION { - get { - return ResourceManager.GetString("UPLOAD_PATCH_UPLOADING_TO_SR_PROGRESS_DESCRIPTION", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Uploading Update.... - /// - public static string UPLOADING_PATCH { - get { - return ResourceManager.GetString("UPLOADING_PATCH", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Uploading - {0}%. - /// - public static string UPLOADING_PATCH_PROGRESS { - get { - return ResourceManager.GetString("UPLOADING_PATCH_PROGRESS", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Uploading to server '{0}'.... - /// - public static string UPLOADING_PATCH_TO { + public static string UPLOAD_UPDATE_UPLOADING_TO_SR_PROGRESS_DESCRIPTION { get { - return ResourceManager.GetString("UPLOADING_PATCH_TO", resourceCulture); + return ResourceManager.GetString("UPLOAD_UPDATE_UPLOADING_TO_SR_PROGRESS_DESCRIPTION", resourceCulture); } } diff --git a/XenModel/Messages.resx b/XenModel/Messages.resx index 2e4f0691d..cf20992e8 100755 --- a/XenModel/Messages.resx +++ b/XenModel/Messages.resx @@ -237,21 +237,6 @@ Changing shadow multiplier for '{0}'... - - Checking disk space on {0} - - - Check disk space - - - Cleaning up disk space on {0} - - - Successfully cleaned up disk space on {0} - - - Clean up disk space - Configuring PVS-Accelerator @@ -1999,9 +1984,6 @@ Note that if RBAC is enabled, only alerts which you have privileges to dismiss w All resources and folders - - All Updates Applied - &Allow to continue @@ -10414,6 +10396,9 @@ This will cancel the update process and may leave your system in an unstable sta Perform update pre-checks on selected servers + + Remove Update + Delete update installation files @@ -11354,9 +11339,6 @@ Click Server Status Report to open the Compile Server Status Report Wizard or cl Remove Grouping - - Remove Update - &Remove Server... @@ -11417,9 +11399,6 @@ Click Server Status Report to open the Compile Server Status Report Wizard or cl Removed from folder - - Removed update '{0}' - Removed from vApp @@ -11435,9 +11414,6 @@ Click Server Status Report to open the Compile Server Status Report Wizard or cl Removing servers from pool - - Removing Update '{0}'... - Removing from vApp @@ -12567,26 +12543,12 @@ You may need to reboot your server(s) to enable SR-IOV network. {0} (version {1}) - - Failed to install supplemental pack '{0}' on '{1}'. - -Refer to the "{2} Administrator's Guide" for instructions on how to manually install a supplemental pack on a server. - {0} (not installed on {1}) Temporary virtual disk used for the installation of Supplemental Packs - - File uploaded to '{0}' - - - Uploading file - - - Uploading update '{0}' to '{1}' - {0} (not the same version on all hosts) @@ -13077,9 +13039,6 @@ Note that if RBAC is enabled, only updates which you have privileges to dismiss Installing update {0} on {1}... - - Installing update on {0} servers... - Installing updates on {0}... @@ -13252,9 +13211,6 @@ Please check your settings and try again. Refreshing the updates list for {0}... - - Deleting update installation file {0} from {1}... - Removing update file {0}... @@ -13374,27 +13330,18 @@ Please check your settings and try again. {0}: Check skipped because hosts in pool '{1}' have incompatible CPUs - - Completed + + Update uploaded to '{0}' - - Uploading update {0}... + + Uploading update - - Uploading update {0} ({1} of {2})... + + Uploading update '{0}' to '{1}' - + Uploading update '{0}' to '{1}' ({2} of {3})... - - Uploading Update... - - - Uploading - {0}% - - - Uploading to server '{0}'... - Upgrade your server license to enable Active Directory. Active Directory allows you to configure {0} access control by adding named user accounts.