test: refactor setupDummyOOBM into parent class to resolve DRY violation

Author: Chinmay048

test/integration/smoke/test_hostha_kvm.py

@@ -156,20 +156,6 @@ def configureAndEnableHostHa(self):
         response = self.apiclient.enableHAForHost(self.getHostHaEnableCmd())
         self.assertEqual(response.haenable, True)
 
-    def setupDummyOOBM(self):
-        from apache.cloudstack.api.command.admin.outOfBandManagement import configureOutOfBandManagementForHost, enableOutOfBandManagementForHost
-        oobm_cmd = configureOutOfBandManagementForHost.configureOutOfBandManagementForHostCmd()
-        oobm_cmd.hostid = self.host.id
-        oobm_cmd.address = "10.1.1.1"
-        oobm_cmd.driver = "ipmitool"
-        oobm_cmd.username = "admin"
-        oobm_cmd.password = "password"
-        self.apiclient.configureOutOfBandManagementForHost(oobm_cmd)
-        
-        enable_oobm_cmd = enableOutOfBandManagementForHost.enableOutOfBandManagementForHostCmd()
-        enable_oobm_cmd.hostid = self.host.id
-        self.apiclient.enableOutOfBandManagementForHost(enable_oobm_cmd)
-
     def configureAndDisableHostHa(self):
         self.setupDummyOOBM()
         self.apiclient.configureHAForHost(self.getHostHaConfigCmd())

test/integration/smoke/test_hostha_simulator.py

@@ -126,21 +126,6 @@ def getListHostHAResources(self):
         cmd = listHostHAResources.listHostHAResourcesCmd()
         cmd.hostid = self.getHost().id
         return cmd
-
-    def setupDummyOOBM(self):
-        from apache.cloudstack.api.command.admin.outOfBandManagement import configureOutOfBandManagementForHost, enableOutOfBandManagementForHost
-        
-        oobm_cmd = configureOutOfBandManagementForHost.configureOutOfBandManagementForHostCmd()
-        oobm_cmd.hostid = self.host.id
-        oobm_cmd.address = "10.1.1.1"
-        oobm_cmd.driver = "ipmitool"
-        oobm_cmd.username = "admin"
-        oobm_cmd.password = "password"
-        self.apiclient.configureOutOfBandManagementForHost(oobm_cmd)
-        
-        enable_oobm_cmd = enableOutOfBandManagementForHost.enableOutOfBandManagementForHostCmd()
-        enable_oobm_cmd.hostid = self.host.id
-        self.apiclient.enableOutOfBandManagementForHost(enable_oobm_cmd)
 
     def configureAndEnableHostHa(self, initialize=True):
         self.setupDummyOOBM()

tools/marvin/marvin/cloudstackTestCase.py

@@ -77,6 +77,27 @@ def tearDownClass(cls):
         except Exception as e:
             raise Exception("Warning: Exception during cleanup : %s" % e)
 
+    def setupDummyOOBM(self):
+        try:
+            from apache.cloudstack.api.command.admin import outOfBandManagement
+        except ImportError:
+            self.debug("OOBM module not available, skipping dummy setup.")
+            return
+
+        conf_cls = outOfBandManagement.configureOutOfBandManagementForHost
+        oobm_cmd = conf_cls.configureOutOfBandManagementForHostCmd()
+        oobm_cmd.hostid = self.host.id
+        oobm_cmd.address = "10.1.1.1"
+        oobm_cmd.driver = "ipmitool"
+        oobm_cmd.username = "admin"
+        oobm_cmd.password = "password"
+        self.apiclient.configureOutOfBandManagementForHost(oobm_cmd)
+
+        en_cls = outOfBandManagement.enableOutOfBandManagementForHost
+        enable_oobm_cmd = en_cls.enableOutOfBandManagementForHostCmd()
+        enable_oobm_cmd.hostid = self.host.id
+        self.apiclient.enableOutOfBandManagementForHost(enable_oobm_cmd)
+
     def tearDown(self):
         self.debug("Cleaning up the resources")
         try: