Merge pull request xenserver#1313 from GaborApatiNagy/CA-232944

Mihaela Stoica · web-flow · commit ba62aa9aa21f · 2016-11-25T14:22:54.000Z
CA-232944: Displaying server name as well
diff --git a/XenAdmin/Diagnostics/Problems/HostProblem/ConflictingUpdatePresent.cs b/XenAdmin/Diagnostics/Problems/HostProblem/ConflictingUpdatePresent.cs
@@ -49,7 +49,7 @@ public override string Description
         {
             get 
             {
-                return string.Format(Messages.UPDATES_WIZARD_PRECHECK_FAILED_CONFLICTING_UPDATE, confilctedUpdates);
+                return string.Format(Messages.UPDATES_WIZARD_PRECHECK_FAILED_CONFLICTING_UPDATE, ServerName, confilctedUpdates);
             }
         }
 
diff --git a/XenAdmin/Diagnostics/Problems/HostProblem/HostDoesNotHaveHotfix.cs b/XenAdmin/Diagnostics/Problems/HostProblem/HostDoesNotHaveHotfix.cs
@@ -55,7 +55,7 @@ public HostDoesNotHaveHotfix(HostHasHotfixCheck check, Host server)
 
         public override string Description
         {
-            get { return string.Format(Messages.REQUIRED_HOTFIX_ISNOT_INSTALLED, Server.Name); }
+            get { return string.Format(Messages.REQUIRED_HOTFIX_ISNOT_INSTALLED, ServerName); }
         }
 
         public override string HelpMessage
diff --git a/XenAdmin/Diagnostics/Problems/HostProblem/HostMaintenanceMode.cs b/XenAdmin/Diagnostics/Problems/HostProblem/HostMaintenanceMode.cs
@@ -46,7 +46,7 @@ public HostMaintenanceMode(Check check,  Host host)
 
         public override string Description
         {
-            get { return string.Format(Messages.UPDATES_WIZARD_HOST_MAINTENANCE_MODE,Server); }
+            get { return string.Format(Messages.UPDATES_WIZARD_HOST_MAINTENANCE_MODE, ServerName); }
         }
 
         protected override AsyncAction CreateAction(out bool cancelled)
diff --git a/XenAdmin/Diagnostics/Problems/HostProblem/HostNotLive.cs b/XenAdmin/Diagnostics/Problems/HostProblem/HostNotLive.cs
@@ -47,7 +47,7 @@ public HostNotLive(Check check, Host host)
 
         public override string Description
         {
-            get { return string.Format(Messages.UPDATES_WIZARD_HOST_NOT_LIVE,Server); }
+            get { return string.Format(Messages.UPDATES_WIZARD_HOST_NOT_LIVE, ServerName); }
         }
 
         public override string HelpMessage
diff --git a/XenAdmin/Diagnostics/Problems/HostProblem/HostOutOfSpaceProblem.cs b/XenAdmin/Diagnostics/Problems/HostProblem/HostOutOfSpaceProblem.cs
@@ -89,13 +89,13 @@ public override string Description
                 switch (diskSpaceReq.Operation)
                 {
                     case DiskSpaceRequirements.OperationTypes.install :
-                        return string.Format(Messages.NOT_ENOUGH_SPACE_MESSAGE_INSTALL, Server.Name, name);
+                        return string.Format(Messages.NOT_ENOUGH_SPACE_MESSAGE_INSTALL, ServerName, name);
                     
                     case DiskSpaceRequirements.OperationTypes.upload :
-                        return string.Format(Messages.NOT_ENOUGH_SPACE_MESSAGE_UPLOAD, Server.Name, name);
+                        return string.Format(Messages.NOT_ENOUGH_SPACE_MESSAGE_UPLOAD, ServerName, name);
                     
                     case DiskSpaceRequirements.OperationTypes.autoupdate :
-                        return string.Format(Messages.NOT_ENOUGH_SPACE_MESSAGE_AUTO_UPDATE, Server.Name);
+                        return string.Format(Messages.NOT_ENOUGH_SPACE_MESSAGE_AUTO_UPDATE, ServerName);
 
                     default:
                         Debug.Assert(false);
diff --git a/XenAdmin/Diagnostics/Problems/HostProblem/HostProblem.cs b/XenAdmin/Diagnostics/Problems/HostProblem/HostProblem.cs
@@ -47,6 +47,14 @@ protected HostProblem(Check check,  Host server)
             _server = server;
         }
 
+        public string ServerName
+        {
+            get
+            {
+                return Helpers.GetName(_server).Ellipsise(30);
+            }
+        }
+
         public Host Server
         {
             get
@@ -57,7 +65,7 @@ public Host Server
 
         public sealed override string Title
         {
-            get { return string.Format(Messages.PROBLEM_HOSTPROBLEM_TITLE, Helpers.GetName(Server).Ellipsise(30)); }
+            get { return string.Format(Messages.PROBLEM_HOSTPROBLEM_TITLE, ServerName); }
         }
 
 
diff --git a/XenAdmin/Diagnostics/Problems/HostProblem/NotEnoughMem.cs b/XenAdmin/Diagnostics/Problems/HostProblem/NotEnoughMem.cs
@@ -53,7 +53,7 @@ public NotEnoughMem(Check check, Host host)
 
         public override string Description
         {
-            get { return string.Format(Messages.UPDATES_WIZARD_NO_MEMORY, Server.Name); }
+            get { return string.Format(Messages.UPDATES_WIZARD_NO_MEMORY, ServerName); }
         }
 
         protected override AsyncAction CreateAction(out bool cancelled)
diff --git a/XenAdmin/Diagnostics/Problems/HostProblem/PrecheckFailed.cs b/XenAdmin/Diagnostics/Problems/HostProblem/PrecheckFailed.cs
@@ -49,7 +49,7 @@ public PrecheckFailed(Check check, Host host, Failure failure)
 
         public override string Description
         {
-            get { return string.Format(Messages.UPDATES_WIZARD_PRECHECK_FAILED, _host, Failure.Message); }
+            get { return string.Format(Messages.UPDATES_WIZARD_PRECHECK_FAILED, ServerName, Failure.Message); }
         }
 
         public override string HelpMessage
diff --git a/XenAdmin/Diagnostics/Problems/HostProblem/PrerequisiteUpdateMissing.cs b/XenAdmin/Diagnostics/Problems/HostProblem/PrerequisiteUpdateMissing.cs
@@ -50,7 +50,7 @@ public override string Description
         {
             get 
             {
-                return string.Format(Messages.UPDATES_WIZARD_PRECHECK_FAILED_REQUIRED_UPDATE_MISSING, requiredUpdates);
+                return string.Format(Messages.UPDATES_WIZARD_PRECHECK_FAILED_REQUIRED_UPDATE_MISSING, ServerName, requiredUpdates);
             }
         }
 
diff --git a/XenAdmin/Diagnostics/Problems/HostProblem/WrongServerVersion.cs b/XenAdmin/Diagnostics/Problems/HostProblem/WrongServerVersion.cs
@@ -56,10 +56,10 @@ public override string Description
             {
                 if (!string.IsNullOrEmpty(_versionRequired))
                 {
-                    return string.Format(Messages.PATCH_FOR_XENSERVER_VERSION, _versionRequired);
+                    return string.Format(Messages.PATCH_FOR_XENSERVER_VERSION, ServerName,_versionRequired);
                 }
 
-                return Messages.UPDATE_FOR_DIFFERENT_XENSERVER_VERSION;
+                return string.Format(Messages.UPDATE_FOR_DIFFERENT_XENSERVER_VERSION, ServerName);
             }
         }
 
diff --git a/XenModel/Messages.Designer.cs b/XenModel/Messages.Designer.cs
diff --git a/XenModel/Messages.resx b/XenModel/Messages.resx
@@ -9398,7 +9398,7 @@ Date created: {2}
 Size: {3}</value>
   </data>
   <data name="PATCH_FOR_XENSERVER_VERSION" xml:space="preserve">
-    <value>This patch is for servers with version matching the regular expression '{0}'.</value>
+    <value>{0}: This patch is for servers with version matching the regular expression '{1}'.</value>
   </data>
   <data name="PATCH_NOT_FOUND" xml:space="preserve">
     <value>Not found</value>
@@ -11695,13 +11695,13 @@ Check your settings and try again.</value>
     <value>{0}: {1}</value>
   </data>
   <data name="UPDATES_WIZARD_PRECHECK_FAILED_CONFLICTING_UPDATE" xml:space="preserve">
-    <value>Conflicting update(s) are present: {0}</value>
+    <value>{0}: Conflicting update(s) are present: {1}</value>
   </data>
   <data name="UPDATES_WIZARD_PRECHECK_FAILED_ON_ALL_SERVERS" xml:space="preserve">
     <value>Pre-update checks failed on the selected servers.  The update will not be applied.</value>
   </data>
   <data name="UPDATES_WIZARD_PRECHECK_FAILED_REQUIRED_UPDATE_MISSING" xml:space="preserve">
-    <value>Prerequisite update(s) are missing: {0}</value>
+    <value>{0}: Prerequisite update(s) are missing: {1}</value>
   </data>
   <data name="UPDATES_WIZARD_PRECHECK_FAILED_TITLE" xml:space="preserve">
     <value>Update precheck failed on server '{0}'</value>
@@ -11787,7 +11787,7 @@ Note that if RBAC is enabled, only updates which you have privileges to dismiss
     <value>You have applied filters to the list of updates. Do you wish to export all updates from every connected server, or only the updates you have chosen to view?</value>
   </data>
   <data name="UPDATE_FOR_DIFFERENT_XENSERVER_VERSION" xml:space="preserve">
-    <value>This update is not compatible with this server version.</value>
+    <value>{0}: This update is not compatible with this server version.</value>
   </data>
   <data name="UPDATE_MANAGER_CANNOT_REMOVE_APPLIED_PATCH" xml:space="preserve">
     <value>Cannot remove an update which is applied to any servers.</value>

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public override string Description`
`49`	`49`	`{`
`50`	`50`	`get`
`51`	`51`	`{`
`52`		`- return string.Format(Messages.UPDATES_WIZARD_PRECHECK_FAILED_CONFLICTING_UPDATE, confilctedUpdates);`
	`52`	`+ return string.Format(Messages.UPDATES_WIZARD_PRECHECK_FAILED_CONFLICTING_UPDATE, ServerName, confilctedUpdates);`
`53`	`53`	`}`
`54`	`54`	`}`
`55`	`55`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public HostDoesNotHaveHotfix(HostHasHotfixCheck check, Host server)`
`55`	`55`
`56`	`56`	`public override string Description`
`57`	`57`	`{`
`58`		`- get { return string.Format(Messages.REQUIRED_HOTFIX_ISNOT_INSTALLED, Server.Name); }`
	`58`	`+ get { return string.Format(Messages.REQUIRED_HOTFIX_ISNOT_INSTALLED, ServerName); }`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`public override string HelpMessage`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public HostMaintenanceMode(Check check, Host host)`
`46`	`46`
`47`	`47`	`public override string Description`
`48`	`48`	`{`
`49`		`- get { return string.Format(Messages.UPDATES_WIZARD_HOST_MAINTENANCE_MODE,Server); }`
	`49`	`+ get { return string.Format(Messages.UPDATES_WIZARD_HOST_MAINTENANCE_MODE, ServerName); }`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`protected override AsyncAction CreateAction(out bool cancelled)`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public HostNotLive(Check check, Host host)`
`47`	`47`
`48`	`48`	`public override string Description`
`49`	`49`	`{`
`50`		`- get { return string.Format(Messages.UPDATES_WIZARD_HOST_NOT_LIVE,Server); }`
	`50`	`+ get { return string.Format(Messages.UPDATES_WIZARD_HOST_NOT_LIVE, ServerName); }`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`public override string HelpMessage`
Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,14 @@ protected HostProblem(Check check, Host server)`
`47`	`47`	`_server = server;`
`48`	`48`	`}`
`49`	`49`
	`50`	`+ public string ServerName`
	`51`	`+ {`
	`52`	`+ get`
	`53`	`+ {`
	`54`	`+ return Helpers.GetName(_server).Ellipsise(30);`
	`55`	`+ }`
	`56`	`+ }`
	`57`	`+`
`50`	`58`	`public Host Server`
`51`	`59`	`{`
`52`	`60`	`get`
`@@ -57,7 +65,7 @@ public Host Server`
`57`	`65`
`58`	`66`	`public sealed override string Title`
`59`	`67`	`{`
`60`		`- get { return string.Format(Messages.PROBLEM_HOSTPROBLEM_TITLE, Helpers.GetName(Server).Ellipsise(30)); }`
	`68`	`+ get { return string.Format(Messages.PROBLEM_HOSTPROBLEM_TITLE, ServerName); }`
`61`	`69`	`}`
`62`	`70`
`63`	`71`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public NotEnoughMem(Check check, Host host)`
`53`	`53`
`54`	`54`	`public override string Description`
`55`	`55`	`{`
`56`		`- get { return string.Format(Messages.UPDATES_WIZARD_NO_MEMORY, Server.Name); }`
	`56`	`+ get { return string.Format(Messages.UPDATES_WIZARD_NO_MEMORY, ServerName); }`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`protected override AsyncAction CreateAction(out bool cancelled)`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public PrecheckFailed(Check check, Host host, Failure failure)`
`49`	`49`
`50`	`50`	`public override string Description`
`51`	`51`	`{`
`52`		`- get { return string.Format(Messages.UPDATES_WIZARD_PRECHECK_FAILED, _host, Failure.Message); }`
	`52`	`+ get { return string.Format(Messages.UPDATES_WIZARD_PRECHECK_FAILED, ServerName, Failure.Message); }`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`public override string HelpMessage`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public override string Description`
`50`	`50`	`{`
`51`	`51`	`get`
`52`	`52`	`{`
`53`		`- return string.Format(Messages.UPDATES_WIZARD_PRECHECK_FAILED_REQUIRED_UPDATE_MISSING, requiredUpdates);`
	`53`	`+ return string.Format(Messages.UPDATES_WIZARD_PRECHECK_FAILED_REQUIRED_UPDATE_MISSING, ServerName, requiredUpdates);`
`54`	`54`	`}`
`55`	`55`	`}`
`56`	`56`
Original file line number	Diff line number	Diff line change
`@@ -56,10 +56,10 @@ public override string Description`
`56`	`56`	`{`
`57`	`57`	`if (!string.IsNullOrEmpty(_versionRequired))`
`58`	`58`	`{`
`59`		`- return string.Format(Messages.PATCH_FOR_XENSERVER_VERSION, _versionRequired);`
	`59`	`+ return string.Format(Messages.PATCH_FOR_XENSERVER_VERSION, ServerName,_versionRequired);`
`60`	`60`	`}`
`61`	`61`
`62`		`- return Messages.UPDATE_FOR_DIFFERENT_XENSERVER_VERSION;`
	`62`	`+ return string.Format(Messages.UPDATE_FOR_DIFFERENT_XENSERVER_VERSION, ServerName);`
`63`	`63`	`}`
`64`	`64`	`}`
`65`	`65`