WIP: Refactoring

java/code/src/com/redhat/rhn/GlobalInstanceHolder.java

@@ -41,7 +41,6 @@
 import com.suse.manager.webui.services.iface.SaltApi;
 import com.suse.manager.webui.services.iface.SystemQuery;
 import com.suse.manager.webui.services.iface.VirtManager;
-import com.suse.manager.webui.services.impl.SaltService;
 import com.suse.manager.webui.utils.MinionActionUtils;
 import com.suse.manager.webui.utils.UserPreferenceUtils;
 import com.suse.manager.webui.utils.ViewHelper;
@@ -58,23 +57,20 @@ public class GlobalInstanceHolder {
     private GlobalInstanceHolder() {
     }
 
-    private static final SaltService SALT_SERVICE = new SaltService();
-    public static final SystemQuery SYSTEM_QUERY = SALT_SERVICE;
-    public static final SaltApi SALT_API = SALT_SERVICE;
+    public static final SaltApi SALT_API = new SaltApi();
+    public static final SystemQuery SYSTEM_QUERY = new SystemQuery(SALT_API);
     public static final ServerGroupManager SERVER_GROUP_MANAGER = new ServerGroupManager(SALT_API);
     public static final FormulaManager FORMULA_MANAGER = new FormulaManager(SALT_API);
-    public static final SaltUtils SALT_UTILS = new SaltUtils(SYSTEM_QUERY, SALT_API);
+    public static final SaltUtils SALT_UTILS = new SaltUtils(SALT_API);
     public static final SaltKeyUtils SALT_KEY_UTILS = new SaltKeyUtils(SALT_API);
-    public static final SaltServerActionService SALT_SERVER_ACTION_SERVICE = new SaltServerActionService(
-            SALT_API, SALT_UTILS, SALT_KEY_UTILS);
+    public static final SaltServerActionService SALT_SERVER_ACTION_SERVICE = new SaltServerActionService(SALT_API);
     public static final Access ACCESS = new Access();
     public static final AclFactory ACL_FACTORY = new AclFactory(ACCESS);
     // Referenced from JSP
     public static final MenuTree MENU_TREE = new MenuTree(ACL_FACTORY);
     public static final UserPreferenceUtils USER_PREFERENCE_UTILS = new UserPreferenceUtils(ACL_FACTORY);
     public static final RenderUtils RENDER_UTILS = new RenderUtils(ACL_FACTORY);
-    public static final MinionActionUtils MINION_ACTION_UTILS = new MinionActionUtils(
-            SALT_SERVER_ACTION_SERVICE, SALT_API, SALT_UTILS);
+    public static final MinionActionUtils MINION_ACTION_UTILS = new MinionActionUtils(SALT_SERVER_ACTION_SERVICE);
     public static final KubernetesManager KUBERNETES_MANAGER = new KubernetesManager(SALT_API);
     public static final VirtManager VIRT_MANAGER = new VirtManagerSalt(SALT_API);
     public static final RegularMinionBootstrapper REGULAR_MINION_BOOTSTRAPPER =

java/code/src/com/redhat/rhn/common/NoWheelResultsException.java

@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2022 SUSE LLC
+ *
+ * This software is licensed to you under the GNU General Public License,
+ * version 2 (GPLv2). There is NO WARRANTY for this software, express or
+ * implied, including the implied warranties of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
+ * along with this software; if not, see
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+ *
+ * Red Hat trademarks are not licensed under GPLv2. No permission is
+ * granted to use or replicate Red Hat trademarks that are incorporated
+ * in this software or its documentation.
+ */
+package com.redhat.rhn.common;
+
+/**
+ * NoWheelResultsException
+ */
+public class NoWheelResultsException extends RhnRuntimeException {
+
+    /**
+     * Default Constructor
+     */
+    public NoWheelResultsException() {
+        super();
+    }
+
+    /**
+     * Constructor
+     * @param errorMessage
+     */
+    public NoWheelResultsException(String errorMessage) {
+        super(errorMessage);
+    }
+    /**
+     * Constructor
+     * @param errorMessage
+     * @param err
+     */
+    public NoWheelResultsException(String errorMessage, Throwable err) {
+        super(errorMessage, err);
+    }
+
+
+
+}

java/code/src/com/redhat/rhn/frontend/action/systems/entitlements/test/SystemEntitlementsSetupActionTest.java

@@ -48,9 +48,9 @@
 
 import com.suse.manager.virtualization.VirtManagerSalt;
 import com.suse.manager.webui.services.iface.MonitoringManager;
+import com.suse.manager.webui.services.iface.SaltApi;
 import com.suse.manager.webui.services.iface.VirtManager;
 import com.suse.manager.webui.services.impl.SaltSSHService;
-import com.suse.manager.webui.services.impl.SaltService;
 import com.suse.salt.netapi.datatypes.target.MinionList;
 
 import org.jmock.Expectations;
@@ -70,7 +70,7 @@ public class SystemEntitlementsSetupActionTest extends RhnMockStrutsTestCase {
      */
 
     private Mockery context = new Mockery();
-    private SaltService saltServiceMock;
+    private SaltApi saltApiMock;
     private SystemEntitlementManager systemEntitlementManager;
 
     @Override
@@ -79,16 +79,16 @@ public void setUp() throws Exception {
         super.setUp();
         Config.get().setBoolean(ConfigDefaults.KIWI_OS_IMAGE_BUILDING_ENABLED, "true");
         context.setImposteriser(ByteBuddyClassImposteriser.INSTANCE);
-        saltServiceMock = context.mock(SaltService.class);
-        ServerGroupManager serverGroupManager = new ServerGroupManager(saltServiceMock);
-        VirtManager virtManager = new VirtManagerSalt(saltServiceMock);
-        MonitoringManager monitoringManager = new FormulaMonitoringManager(saltServiceMock);
+        saltApiMock = context.mock(SaltApi.class);
+        ServerGroupManager serverGroupManager = new ServerGroupManager(saltApiMock);
+        VirtManager virtManager = new VirtManagerSalt(saltApiMock);
+        MonitoringManager monitoringManager = new FormulaMonitoringManager(saltApiMock);
         systemEntitlementManager = new SystemEntitlementManager(
                 new SystemUnentitler(virtManager, monitoringManager, serverGroupManager),
-                new SystemEntitler(saltServiceMock, virtManager, monitoringManager, serverGroupManager)
+                new SystemEntitler(saltApiMock, virtManager, monitoringManager, serverGroupManager)
         );
         context.checking(new Expectations() {{
-            allowing(saltServiceMock).refreshPillar(with(any(MinionList.class)));
+            allowing(saltApiMock).refreshPillar(with(any(MinionList.class)));
         }});
         setRequestPathInfo("/systems/SystemEntitlements");
         UserTestUtils.addManagement(user.getOrg());
@@ -165,7 +165,7 @@ public void testContainerBuildHostType() throws Exception {
     @Test
     public void testOSImageBuildHostType() throws Exception {
         context.checking(new Expectations() {{
-            allowing(saltServiceMock).generateSSHKey(with(equal(SaltSSHService.SSH_KEY_PATH)));
+            allowing(saltApiMock).generateSSHKey(with(equal(SaltSSHService.SSH_KEY_PATH)));
         }});
 
         Server server = MinionServerFactoryTest.createTestMinionServer(user);

java/code/src/com/redhat/rhn/frontend/xmlrpc/image/test/ImageInfoHandlerTest.java

@@ -69,9 +69,9 @@
 
 import com.suse.manager.virtualization.VirtManagerSalt;
 import com.suse.manager.webui.services.iface.MonitoringManager;
+import com.suse.manager.webui.services.iface.SaltApi;
 import com.suse.manager.webui.services.iface.VirtManager;
 import com.suse.manager.webui.services.impl.SaltSSHService;
-import com.suse.manager.webui.services.impl.SaltService;
 import com.suse.manager.webui.services.impl.runner.MgrUtilRunner;
 import com.suse.salt.netapi.datatypes.target.MinionList;
 
@@ -103,7 +103,7 @@ public class ImageInfoHandlerTest extends BaseHandlerTestCase {
     }};
 
     private static TaskomaticApi taskomaticApi;
-    private SaltService saltServiceMock;
+    private SaltApi saltApiMock;
     private SystemEntitlementManager systemEntitlementManager;
 
     @Override
@@ -112,18 +112,18 @@ public void setUp() throws Exception {
         super.setUp();
         context.setImposteriser(ByteBuddyClassImposteriser.INSTANCE);
         Config.get().setBoolean(ConfigDefaults.KIWI_OS_IMAGE_BUILDING_ENABLED, "true");
-        saltServiceMock = context.mock(SaltService.class);
-        ServerGroupManager serverGroupManager = new ServerGroupManager(saltServiceMock);
-        VirtManager virtManager = new VirtManagerSalt(saltServiceMock);
-        MonitoringManager monitoringManager = new FormulaMonitoringManager(saltServiceMock);
+        saltApiMock = context.mock(SaltApi.class);
+        ServerGroupManager serverGroupManager = new ServerGroupManager(saltApiMock);
+        VirtManager virtManager = new VirtManagerSalt(saltApiMock);
+        MonitoringManager monitoringManager = new FormulaMonitoringManager(saltApiMock);
         systemEntitlementManager = new SystemEntitlementManager(
                 new SystemUnentitler(virtManager, monitoringManager, serverGroupManager),
-                new SystemEntitler(saltServiceMock, virtManager, monitoringManager, serverGroupManager)
+                new SystemEntitler(saltApiMock, virtManager, monitoringManager, serverGroupManager)
         );
-        handler = new ImageInfoHandler(saltServiceMock);
+        handler = new ImageInfoHandler(saltApiMock);
         context.checking(new Expectations() {{
-            allowing(saltServiceMock).refreshPillar(with(any(MinionList.class)));
-            allowing(saltServiceMock).removeFile(
+            allowing(saltApiMock).refreshPillar(with(any(MinionList.class)));
+            allowing(saltApiMock).removeFile(
                 with(equal(Paths.get(String.format("/srv/www/os-images/%d/testimg.tgz", admin.getOrg().getId())))));
             will(returnValue(Optional.of(true)));
         }});
@@ -161,7 +161,7 @@ public final void testimportContainerImage() throws Exception {
             assertEquals("Image already exists.", e.getMessage());
         }
 
-        ImageInfoFactory.delete(info.get(), saltServiceMock);
+        ImageInfoFactory.delete(info.get(), saltApiMock);
         ret = handler.importContainerImage(admin, "my-external-image", "1.0",
                 server.getId().intValue(), store.getLabel(), "", getNow());
         assertTrue(ret > 0);
@@ -194,7 +194,7 @@ public final void testScheduleOSImageBuild() throws Exception {
         ImageInfoFactory.setTaskomaticApi(getTaskomaticApi());
         MgrUtilRunner.ExecResult mockResult = new MgrUtilRunner.ExecResult();
         context.checking(new Expectations() {{
-                allowing(saltServiceMock).generateSSHKey(with(equal(SaltSSHService.SSH_KEY_PATH)));
+                allowing(saltApiMock).generateSSHKey(with(equal(SaltSSHService.SSH_KEY_PATH)));
                 will(returnValue(Optional.of(mockResult)));
         }});
 

java/code/src/com/redhat/rhn/manager/formula/test/FormulaManagerTest.java

@@ -44,7 +44,7 @@
 import com.redhat.rhn.testing.TestUtils;
 import com.redhat.rhn.testing.UserTestUtils;
 
-import com.suse.manager.webui.services.impl.SaltService;
+import com.suse.manager.webui.services.iface.SaltApi;
 import com.suse.salt.netapi.datatypes.target.MinionList;
 import com.suse.utils.Json;
 
@@ -78,7 +78,7 @@ public class FormulaManagerTest extends JMockBaseTestCaseWithUser {
 
     static final String TEMP_PATH = "formulas/";
     static final String FORMULA_NAME = "dhcpd";
-    private SaltService saltServiceMock;
+    private SaltApi saltApiMock;
     private FormulaManager manager;
     private Path metadataDir;
 
@@ -90,9 +90,9 @@ public void setUp() throws Exception {
         super.setUp();
         setImposteriser(ByteBuddyClassImposteriser.INSTANCE);
         MockConnection.clear();
-        saltServiceMock = mock(SaltService.class);
+        saltApiMock = mock(SaltApi.class);
         metadataDir = Files.createTempDirectory("metadata");
-        manager = new FormulaManager(saltServiceMock);
+        manager = new FormulaManager(saltApiMock);
         FormulaFactory.setDataDir(tmpSaltRoot.toString());
         FormulaFactory.setMetadataDirOfficial(metadataDir.toString());
         createMetadataFiles();
@@ -119,7 +119,7 @@ public void testValidContents() throws Exception {
         Map<String, Object> contents = Json.GSON.fromJson(contentsData, Map.class);
 
         Map<String, Object> layout = Json.GSON.fromJson(layoutData, Map.class);
-        FormulaManager formulaManager = new FormulaManager(saltServiceMock);
+        FormulaManager formulaManager = new FormulaManager(saltApiMock);
         formulaManager.validateContents(contents, layout);
 
     }
@@ -138,7 +138,7 @@ public void testInValidContents() throws Exception {
 
         contents.put("test", "dummy"); // add a random field
 
-        FormulaManager formulaManager = new FormulaManager(saltServiceMock);
+        FormulaManager formulaManager = new FormulaManager(saltApiMock);
         try {
             formulaManager.validateContents(contents, layout);
             fail("Exception expected but didn't throw");
@@ -160,7 +160,7 @@ public void testSaveGroupFormulaData() throws Exception {
         FormulaFactory.setDataDir(tmpSaltRoot.resolve(TEMP_PATH).toString());
 
         context().checking(new Expectations() {{
-            allowing(saltServiceMock).refreshPillar(with(any(MinionList.class)));
+            allowing(saltApiMock).refreshPillar(with(any(MinionList.class)));
         }});
         manager.saveGroupFormulaData(user, managed.getId(), FORMULA_NAME, contents);
         Map<String, Object> savedFormulaData =
@@ -182,7 +182,7 @@ public void testEnableFormula() throws Exception {
         FormulaFactory.setMetadataDirOfficial(metadataDir.toString());
 
         context().checking(new Expectations() {{
-            allowing(saltServiceMock).refreshPillar(with(any(MinionList.class)));
+            allowing(saltApiMock).refreshPillar(with(any(MinionList.class)));
         }});
         manager.enableFormula(minion, FORMULA_NAME);
         List<String> enabledFormulas = FormulaFactory.getFormulasByMinion(minion);
@@ -202,7 +202,7 @@ public void testSaveServerFormulaData() throws Exception {
         MinionServer minion = MinionServerFactoryTest.createTestMinionServer(user);
         FormulaFactory.setDataDir(tmpSaltRoot.resolve(TEMP_PATH).toString());
         context().checking(new Expectations() {{
-            allowing(saltServiceMock).refreshPillar(with(any(MinionList.class)));
+            allowing(saltApiMock).refreshPillar(with(any(MinionList.class)));
         }});
         manager.saveServerFormulaData(user, minion.getId(), FORMULA_NAME, contents);
         Map<String, Object> savedFormulaData =
@@ -223,7 +223,7 @@ public void testSaveServerFormulaDataForUnAuthorized() throws Exception {
         Map<String, Object> contents = Json.GSON.fromJson(contentsData, Map.class);
         MinionServer minion = MinionServerFactoryTest.createTestMinionServer(user);
         FormulaFactory.setDataDir(tmpSaltRoot.resolve(TEMP_PATH).toString());
-        FormulaManager formulaManager = new FormulaManager(saltServiceMock);
+        FormulaManager formulaManager = new FormulaManager(saltApiMock);
         User testUser = UserTestUtils.createUser("test-user", user.getOrg().getId());
         try {
             formulaManager.saveServerFormulaData(testUser, minion.getId(), FORMULA_NAME, contents);
@@ -256,10 +256,10 @@ public void testGetCombinedFormulaDataForSystems() throws Exception {
 
         // Server should have a monitoring entitlement after being added to the group
         context().checking(new Expectations() {{
-            allowing(saltServiceMock).refreshPillar(with(any(MinionList.class)));
+            allowing(saltApiMock).refreshPillar(with(any(MinionList.class)));
         }});
         SystemManager systemManager = new SystemManager(ServerFactory.SINGLETON, ServerGroupFactory.SINGLETON,
-                saltServiceMock);
+                saltApiMock);
         systemManager.addServerToServerGroup(minion, group);
         assertTrue(SystemManager.hasEntitlement(minion.getId(), EntitlementManager.MONITORING));
 
@@ -308,7 +308,7 @@ public void testListEndpoints() throws Exception {
         Map<String, Object> formulaValuesMap = Json.GSON.fromJson(formulaValues, Map.class);
         FormulaFactory.setDataDir(tmpSaltRoot.resolve(TEMP_PATH).toString());
         context().checking(new Expectations() {{
-            allowing(saltServiceMock).refreshPillar(with(any(MinionList.class)));
+            allowing(saltApiMock).refreshPillar(with(any(MinionList.class)));
         }});
         FormulaFactory.saveServerFormulas(minion, Collections.singletonList(PROMETHEUS_EXPORTERS));
         manager.saveServerFormulaData(user, minion.getId(), PROMETHEUS_EXPORTERS, formulaValuesMap);

java/code/src/com/redhat/rhn/manager/system/entitling/test/SystemEntitlementManagerTest.java

@@ -41,9 +41,9 @@
 
 import com.suse.manager.virtualization.VirtManagerSalt;
 import com.suse.manager.webui.services.iface.MonitoringManager;
+import com.suse.manager.webui.services.iface.SaltApi;
 import com.suse.manager.webui.services.iface.VirtManager;
 import com.suse.manager.webui.services.impl.SaltSSHService;
-import com.suse.manager.webui.services.impl.SaltService;
 import com.suse.salt.netapi.datatypes.target.MinionList;
 
 import org.jmock.Expectations;
@@ -53,24 +53,24 @@
 
 public class SystemEntitlementManagerTest extends JMockBaseTestCaseWithUser {
 
-    private SaltService saltServiceMock;
+    private SaltApi saltApiMock;
     private SystemEntitlementManager systemEntitlementManager;
 
     @Override
     @BeforeEach
     public void setUp() throws Exception {
         super.setUp();
         setImposteriser(ByteBuddyClassImposteriser.INSTANCE);
-        saltServiceMock = mock(SaltService.class);
-        ServerGroupManager serverGroupManager = new ServerGroupManager(saltServiceMock);
-        VirtManager virtManager = new VirtManagerSalt(saltServiceMock);
-        MonitoringManager monitoringManager = new FormulaMonitoringManager(saltServiceMock);
+        saltApiMock = mock(SaltApi.class);
+        ServerGroupManager serverGroupManager = new ServerGroupManager(saltApiMock);
+        VirtManager virtManager = new VirtManagerSalt(saltApiMock);
+        MonitoringManager monitoringManager = new FormulaMonitoringManager(saltApiMock);
         systemEntitlementManager = new SystemEntitlementManager(
                 new SystemUnentitler(virtManager, monitoringManager, serverGroupManager),
-                new SystemEntitler(saltServiceMock, virtManager, monitoringManager, serverGroupManager)
+                new SystemEntitler(saltApiMock, virtManager, monitoringManager, serverGroupManager)
         );
         context().checking(new Expectations() {{
-            allowing(saltServiceMock).refreshPillar(with(any(MinionList.class)));
+            allowing(saltApiMock).refreshPillar(with(any(MinionList.class)));
         }});
     }
 
@@ -117,7 +117,7 @@ public void testEntitleServer() throws Exception {
         //Test OS Image Build Host
 
         context().checking(new Expectations() {{
-            allowing(saltServiceMock).generateSSHKey(with(equal(SaltSSHService.SSH_KEY_PATH)));
+            allowing(saltApiMock).generateSSHKey(with(equal(SaltSSHService.SSH_KEY_PATH)));
         }});
 
         minion.setServerArch(ServerFactory.lookupServerArchByLabel("x86_64-redhat-linux"));

java/code/src/com/redhat/rhn/manager/system/test/SystemManagerMockTest.java

@@ -34,7 +34,7 @@
 import com.redhat.rhn.testing.TestUtils;
 import com.redhat.rhn.testing.UserTestUtils;
 
-import com.suse.manager.webui.services.impl.SaltService;
+import com.suse.manager.webui.services.iface.SaltApi;
 import com.suse.manager.webui.services.impl.runner.MgrUtilRunner;
 
 import org.apache.commons.codec.digest.DigestUtils;
@@ -88,16 +88,16 @@ public void testRemovingServerInvalidatesTokens() throws Exception {
 
         MinionServer server = TestUtils.saveAndReload(testMinionServer);
 
-        SaltService saltServiceMock = mock(SaltService.class);
+        SaltApi saltApiMock = mock(SaltApi.class);
 
         context().checking(new Expectations() {{
-            allowing(saltServiceMock).deleteKey(testMinionServer.getMinionId());
-            allowing(saltServiceMock).removeSaltSSHKnownHost(testMinionServer.getHostname());
+            allowing(saltApiMock).deleteKey(testMinionServer.getMinionId());
+            allowing(saltApiMock).removeSaltSSHKnownHost(testMinionServer.getHostname());
             will(returnValue(Optional.of(new MgrUtilRunner.RemoveKnowHostResult("removed", ""))));
         }});
 
         SystemManager systemManager = new SystemManager(ServerFactory.SINGLETON, ServerGroupFactory.SINGLETON,
-                saltServiceMock);
+                saltApiMock);
         systemManager.deleteServer(server.getOrg().getActiveOrgAdmins().get(0), server.getId());
 
         assertFalse(tokenBase.getValid());