Removal of obsolete code (resolves CA-375774).

XenAdmin/Diagnostics/Checks/CertificateKeyLengthCheck.cs

@@ -29,14 +29,14 @@
  */
 
 using System;
-using XenAdmin.Core;
-using XenAPI;
-using XenAdmin.Diagnostics.Problems;
 using System.Collections.Generic;
 using System.Linq;
 using System.Security.Cryptography.X509Certificates;
-using XenAdmin.Diagnostics.Hotfixing;
+using XenAdmin.Actions.Updates;
+using XenAdmin.Core;
+using XenAdmin.Diagnostics.Problems;
 using XenAdmin.Diagnostics.Problems.HostProblem;
+using XenAPI;
 
 namespace XenAdmin.Diagnostics.Checks
 {
@@ -62,8 +62,7 @@ protected override Problem RunHostCheck()
 
             if (!_manualUpgrade)
             {
-                var hotfix = HotfixFactory.Hotfix(Host);
-                if (hotfix != null && hotfix.ShouldBeAppliedTo(Host))
+                if (RpuHotfix.Exists(Host, out var hotfix) && hotfix.ShouldBeAppliedTo(Host))
                     return new HostDoesNotHaveHotfixWarning(this, Host);
             }
 

XenAdmin/Diagnostics/Checks/HostHasHotfixCheck.cs

@@ -1,34 +1,34 @@
-/* Copyright (c) Cloud Software Group, Inc. 
- * 
- * Redistribution and use in source and binary forms, 
- * with or without modification, are permitted provided 
- * that the following conditions are met: 
- * 
- * *   Redistributions of source code must retain the above 
- *     copyright notice, this list of conditions and the 
- *     following disclaimer. 
- * *   Redistributions in binary form must reproduce the above 
- *     copyright notice, this list of conditions and the 
- *     following disclaimer in the documentation and/or other 
- *     materials provided with the distribution. 
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 
- * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, 
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR 
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
+/* Copyright (c) Cloud Software Group, Inc.
+ *
+ * Redistribution and use in source and binary forms,
+ * with or without modification, are permitted provided
+ * that the following conditions are met:
+ *
+ * *   Redistributions of source code must retain the above
+ *     copyright notice, this list of conditions and the
+ *     following disclaimer.
+ * *   Redistributions in binary form must reproduce the above
+ *     copyright notice, this list of conditions and the
+ *     following disclaimer in the documentation and/or other
+ *     materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+ * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
-using XenAdmin.Diagnostics.Hotfixing;
+using XenAdmin.Actions.Updates;
 using XenAdmin.Diagnostics.Problems;
 using XenAdmin.Diagnostics.Problems.HostProblem;
 using XenAPI;
@@ -45,9 +45,8 @@ public HostHasHotfixCheck(Host host)
 
         protected override Problem RunHostCheck()
         {
-            var hotfix = HotfixFactory.Hotfix(Host);
-            if (hotfix != null && hotfix.ShouldBeAppliedTo(Host))
-                return new HostDoesNotHaveHotfix(this, Host);
+            if (RpuHotfix.Exists(Host, out var hotfix) && hotfix.ShouldBeAppliedTo(Host))
+                return new HostDoesNotHaveHotfix(this, Host, hotfix);
 
             return null;
         }

XenAdmin/Diagnostics/Checks/HostMemoryPostUpgradeCheck.cs

@@ -30,8 +30,8 @@
 
 using System;
 using System.Collections.Generic;
+using XenAdmin.Actions.Updates;
 using XenAdmin.Core;
-using XenAdmin.Diagnostics.Hotfixing;
 using XenAdmin.Diagnostics.Problems;
 using XenAdmin.Diagnostics.Problems.HostProblem;
 using XenAPI;
@@ -54,8 +54,7 @@ public HostMemoryPostUpgradeCheck(Host host, Dictionary<string, string> installM
 
         protected override Problem RunHostCheck()
         {
-            var hotfix = HotfixFactory.Hotfix(Host);
-            if (hotfix != null && hotfix.ShouldBeAppliedTo(Host))
+            if (RpuHotfix.Exists(Host, out var hotfix) && hotfix.ShouldBeAppliedTo(Host))
                 return new HostDoesNotHaveHotfixWarning(this, Host);
 
             if (TryGetDom0MemoryPostUpgrade(out var dom0MemoryPostUpgrade))

XenAdmin/Diagnostics/Checks/PVGuestsCheck.cs

@@ -31,8 +31,8 @@
 using System;
 using System.Linq;
 using System.Collections.Generic;
+using XenAdmin.Actions.Updates;
 using XenAdmin.Core;
-using XenAdmin.Diagnostics.Hotfixing;
 using XenAdmin.Diagnostics.Problems;
 using XenAdmin.Diagnostics.Problems.PoolProblem;
 using XenAdmin.Diagnostics.Problems.HostProblem;
@@ -97,8 +97,7 @@ protected override Problem RunHostCheck()
 
             if (!_manualUpgrade)
             {
-                var hotfix = HotfixFactory.Hotfix(Host);
-                if (hotfix != null && hotfix.ShouldBeAppliedTo(Host))
+                if (RpuHotfix.Exists(Host, out var hotfix) && hotfix.ShouldBeAppliedTo(Host))
                     return new HostDoesNotHaveHotfixWarning(this, Host);
             }
 

XenAdmin/Diagnostics/Checks/PoolContainerManagementCheck.cs

@@ -30,8 +30,8 @@
 
 using System;
 using System.Collections.Generic;
+using XenAdmin.Actions.Updates;
 using XenAdmin.Core;
-using XenAdmin.Diagnostics.Hotfixing;
 using XenAdmin.Diagnostics.Problems;
 using XenAdmin.Diagnostics.Problems.HostProblem;
 using XenAdmin.Diagnostics.Problems.PoolProblem;
@@ -85,8 +85,7 @@ protected override Problem RunHostCheck()
 
             if (!_manualUpgrade)
             {
-                var hotfix = HotfixFactory.Hotfix(Host);
-                if (hotfix != null && hotfix.ShouldBeAppliedTo(Host))
+                if (RpuHotfix.Exists(Host, out var hotfix) && hotfix.ShouldBeAppliedTo(Host))
                     return new HostDoesNotHaveHotfixWarning(this, Host);
             }
 

XenAdmin/Diagnostics/Checks/PoolHasDeprecatedSrsCheck.cs

@@ -30,8 +30,8 @@
 
 using System.Collections.Generic;
 using System.Linq;
+using XenAdmin.Actions.Updates;
 using XenAdmin.Core;
-using XenAdmin.Diagnostics.Hotfixing;
 using XenAdmin.Diagnostics.Problems;
 using XenAdmin.Diagnostics.Problems.HostProblem;
 using XenAdmin.Diagnostics.Problems.PoolProblem;
@@ -59,8 +59,7 @@ protected override Problem RunHostCheck()
         {
             if (!_manualUpgrade)
             {
-                var hotfix = HotfixFactory.Hotfix(Host);
-                if (hotfix != null && hotfix.ShouldBeAppliedTo(Host))
+                if (RpuHotfix.Exists(Host, out var hotfix) && hotfix.ShouldBeAppliedTo(Host))
                     return new HostDoesNotHaveHotfixWarning(this, Host);
             }
 

XenAdmin/Diagnostics/Checks/PoolLegacySslCheck.cs

@@ -30,8 +30,8 @@
 
 using System;
 using System.Collections.Generic;
+using XenAdmin.Actions.Updates;
 using XenAdmin.Core;
-using XenAdmin.Diagnostics.Hotfixing;
 using XenAdmin.Diagnostics.Problems;
 using XenAdmin.Diagnostics.Problems.HostProblem;
 using XenAdmin.Diagnostics.Problems.PoolProblem;
@@ -94,8 +94,7 @@ protected override Problem RunHostCheck()
 
             if (!_manualUpgrade)
             {
-                var hotfix = HotfixFactory.Hotfix(Host);
-                if (hotfix != null && hotfix.ShouldBeAppliedTo(Host))
+                if (RpuHotfix.Exists(Host, out var hotfix) && hotfix.ShouldBeAppliedTo(Host))
                     return new HostDoesNotHaveHotfixWarning(this, Host);
             }
 

XenAdmin/Diagnostics/Checks/PowerOniLoCheck.cs

@@ -30,8 +30,8 @@
 
 using System;
 using System.Collections.Generic;
+using XenAdmin.Actions.Updates;
 using XenAdmin.Core;
-using XenAdmin.Diagnostics.Hotfixing;
 using XenAdmin.Diagnostics.Problems;
 using XenAdmin.Diagnostics.Problems.HostProblem;
 using XenAPI;
@@ -89,8 +89,7 @@ protected override Problem RunHostCheck()
 
             if (!_manualUpgrade)
             {
-                var hotfix = HotfixFactory.Hotfix(Host);
-                if (hotfix != null && hotfix.ShouldBeAppliedTo(Host))
+                if (RpuHotfix.Exists(Host, out var hotfix) && hotfix.ShouldBeAppliedTo(Host))
                     return new HostDoesNotHaveHotfixWarning(this, Host);
             }
 

XenAdmin/Diagnostics/Checks/PrepareToUpgradeCheck.cs

@@ -30,7 +30,7 @@
 
 using System;
 using System.Collections.Generic;
-using XenAdmin.Diagnostics.Hotfixing;
+using XenAdmin.Actions.Updates;
 using XenAdmin.Diagnostics.Problems;
 using XenAdmin.Diagnostics.Problems.HostProblem;
 using XenAPI;
@@ -54,8 +54,7 @@ public PrepareToUpgradeCheck(Host host, Dictionary<string, string> installMethod
 
         protected override Problem RunHostCheck()
         {
-            var hotfix = HotfixFactory.Hotfix(Host);
-            if (hotfix != null && hotfix.ShouldBeAppliedTo(Host))
+            if (RpuHotfix.Exists(Host, out var hotfix) && hotfix.ShouldBeAppliedTo(Host))
                 return new HostDoesNotHaveHotfixWarning(this, Host);
 
             try

XenAdmin/Diagnostics/Checks/SafeToUpgradeCheck.cs

@@ -30,8 +30,8 @@
 
 using System;
 using System.Collections.Generic;
+using XenAdmin.Actions.Updates;
 using XenAdmin.Core;
-using XenAdmin.Diagnostics.Hotfixing;
 using XenAdmin.Diagnostics.Problems;
 using XenAdmin.Diagnostics.Problems.HostProblem;
 using XenAPI;
@@ -54,8 +54,7 @@ public SafeToUpgradeCheck(Host host, Dictionary<string, string> installMethodCon
 
         protected override Problem RunHostCheck()
         {
-            var hotfix = HotfixFactory.Hotfix(Host);
-            if (hotfix != null && hotfix.ShouldBeAppliedTo(Host))
+            if (RpuHotfix.Exists(Host, out var hotfix) && hotfix.ShouldBeAppliedTo(Host))
                 return new HostDoesNotHaveHotfixWarning(this, Host);
 
             try

XenAdmin/Diagnostics/Checks/UpgradeRequiresEUA.cs

@@ -32,12 +32,12 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Forms;
+using XenAdmin.Actions.Updates;
 using XenAdmin.Core;
-using XenAPI;
 using XenAdmin.Diagnostics.Problems;
 using XenAdmin.Diagnostics.Problems.UtilityProblem;
-using XenAdmin.Diagnostics.Hotfixing;
 using XenAdmin.Diagnostics.Problems.HostProblem;
+using XenAPI;
 
 namespace XenAdmin.Diagnostics.Checks
 {
@@ -103,8 +103,7 @@ protected override Problem RunCheck()
 
             foreach (var host in Hosts)
             {
-                var hotfix = HotfixFactory.Hotfix(host);
-                if (hotfix != null && hotfix.ShouldBeAppliedTo(host))
+                if (RpuHotfix.Exists(host, out var hotfix) && hotfix.ShouldBeAppliedTo(host))
                     return new HostDoesNotHaveHotfixWarning(this, host);
             }
 

XenAdmin/Diagnostics/Checks/VSwitchControllerCheck.cs

@@ -30,8 +30,8 @@
 
 using System;
 using System.Collections.Generic;
+using XenAdmin.Actions.Updates;
 using XenAdmin.Core;
-using XenAdmin.Diagnostics.Hotfixing;
 using XenAdmin.Diagnostics.Problems;
 using XenAdmin.Diagnostics.Problems.HostProblem;
 using XenAdmin.Diagnostics.Problems.PoolProblem;
@@ -91,8 +91,7 @@ protected override Problem RunHostCheck()
 
             if (!_manualUpgrade)
             {
-                var hotfix = HotfixFactory.Hotfix(Host);
-                if (hotfix != null && hotfix.ShouldBeAppliedTo(Host))
+                if (RpuHotfix.Exists(Host, out var hotfix) && hotfix.ShouldBeAppliedTo(Host))
                     return new HostDoesNotHaveHotfixWarning(this, Host);
             }