MachineConfig.py: Optimised ioenlarge capacity to reuse api's

Removed duplicate API's in both common and machineconf file and simplified to make use of bmc.rest_api to call configured_enlarge_io()

Author: abdhaleegit

testcases/MachineConfig.py

@@ -36,7 +36,6 @@
 from common import OpTestASM
 from common import OpTestHMC
 from common import OpTestInstallUtil
-from common.OpTestEBMC import EBMCHostManagement
 from common.OpTestUtil import OpTestUtil
 from common.OpTestSystem import OpSystemState
 
@@ -441,6 +440,8 @@ def LparSetup(self, lpar_config=""):
                     return "Failed to enable Performance Information collection"
 
         self.cv_HMC.poweron_lpar()
+        time.sleep(60)
+        self.cv_SYSTEM.console.close()
         curr_proc_mode = self.cv_HMC.get_proc_mode()
         if proc_mode:
             if proc_mode in curr_proc_mode:
@@ -494,8 +495,6 @@ def __init__(self, cv_HMC=None, system_name=None,
         self.config = OpTestConfiguration.conf
         self.bmc_type = bmc_type
         self.bmc = bmc
-        if self.bmc_type == "FSP_PHYP" and iocapacity is not None:
-            self.bmc.cv_ASM.configure_enlarged_io(iocapacity)
 
     def CecSetup(self):
 
@@ -508,7 +507,7 @@ def CecSetup(self):
             self.hugepage_16gb_setup()
         if self.cec_dict['iocapacity'] is not None:
             if bmc_type == "EBMC_PHYP":
-                self.io_enlarge_cpacity()
+                self.bmc.rest_api.configure_enlarged_io(self.iocapacity)
             elif bmc_type == "FSP_PHYP":
                 self.cv_ASM.configure_enlarged_io(self.iocapacity)
         if self.setup:
@@ -540,7 +539,7 @@ def ValidateCEC_Setup(self):
             if self.bmc_type == "FSP_PHYP":
                 self.bmc.cv_ASM.configure_enlarged_io(self.iocapacity)
             else:
-                self.io_enlarge_capacity()
+                self.bmc.rest_api.configure_enlarged_io(self.iocapacity)
 
     def lmb_setup(self):
         # Configure the lmb as per user request
@@ -558,37 +557,6 @@ def setting_16gb_hugepage_profile(self):
             int(self.current_hgpg[0]))
         self.cv_HMC.set_lpar_cfg(attrs)
 
-    def io_enlarge_capacity(self):
-        """
-        Calling set IO Enlarge capacity if provided value is not same as current value
-        """
-        cur_iocapacity = self.get_current_ioadapter_enlarged_capacity()
-        log.info("Setting up ioenlarge capacity")
-        log.info("Current ioenlarge capacity value:"+str(cur_iocapacity))
-        if cur_iocapacity != self.iocapacity:
-            self.set_ioenlarge_capacity()
-        else:
-            log.info("Provided IO Enlarge capacity value is same as current value, Exiting...")
-
-    def get_current_ioadapter_enlarged_capacity(self):
-        """
-        Get ioadapter enlarged capcity value
-        """
-        log.debug("=====Get current IOAdapter Enlarge Capacity=====")
-        return self.bmc.rest_api.get_bios_attribute_value(
-            bios_attribute="hb_ioadapter_enlarged_capacity_current"
-        )
-
-    def set_ioenlarge_capacity(self):
-        """
-        Set ioadapter enlarged capcity value
-        """
-        log.debug("=====Set IOAdapter Enlarge Capacity=====")
-        self.bmc.rest_api.set_bios_attribute(
-                    bios_attribute="hb_ioadapter_enlarged_capacity",
-                    bios_attribute_val=self.iocapacity
-                )
-
 
 class OsConfig():
     '''