Merge pull request #818 from shirishaganta1/shared-mode-proc-mem

MachineConfig.py:Add support which boots the lpar in user defined shared mode
open-power · Apr 8, 2024 · 749e149 · 749e149
2 parents c9259b0 + 27220a3
commit 749e149
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/common/OpTestHMC.py b/common/OpTestHMC.py
@@ -412,10 +412,11 @@ def change_proc_mode(self, proc_mode, sharing_mode, min_proc_units, desired_proc
         '''
         if proc_mode == 'shared':
             self.set_lpar_cfg("proc_mode=shared,sharing_mode=%s,min_proc_units=%s,max_proc_units=%s,"
-                              "desired_proc_units=%s,min_procs=%s,desired_procs=%s,max_procs=%s" %
+                              "desired_proc_units=%s,min_procs=%s,desired_procs=%s,max_procs=%s,"
+                              "min_mem=%s,desired_mem=%s,max_mem=%s" %
                               (sharing_mode, min_proc_units, max_proc_units, desired_proc_units,
                                overcommit_ratio*int(min_proc_units), overcommit_ratio*int(desired_proc_units),
-                               overcommit_ratio*int(max_proc_units)))
+                               3*int(max_proc_units),min_memory, desired_memory, max_memory))
         elif proc_mode == 'ded':
             self.set_lpar_cfg("proc_mode=ded,sharing_mode=%s,min_procs=%s,max_procs=%s,desired_procs=%s,"
                               "min_mem=%s,desired_mem=%s,max_mem=%s" %

diff --git a/testcases/MachineConfig.py b/testcases/MachineConfig.py
@@ -189,16 +189,26 @@ def LparSetup(self):
             try: self.desired_proc_units = float(conf.args.desired_proc_units)
             except AttributeError:
                 self.desired_proc_units = 2.0
-            try: self.max_proc_units = float(conf.args.max_proc_units)
+            try: self.max_proc_units = float(self.cv_HMC.get_available_proc_resources()[0])
             except AttributeError:
                 self.max_proc_units = 2.0
             try: self.overcommit_ratio = int(conf.args.overcommit_ratio)
             except AttributeError:
                 self.overcommit_ratio = 1
+            try: self.min_memory = conf.args.min_memory
+            except AttributeError:
+                self.min_memory = "4096"
+            try: self.desired_memory = conf.args.desired_memory
+            except AttributeError:
+                self.desired_memory = "40960"
+            try: self.max_memory = conf.args.max_memory
+            except AttributeError:
+                self.max_memory = int(self.cv_HMC.get_available_mem_resources()[0]) + int(self.desired_memory)
             proc_mode = 'shared'
             self.cv_HMC.profile_bckup()
             self.cv_HMC.change_proc_mode(proc_mode, self.sharing_mode, self.min_proc_units,
-                                         self.desired_proc_units, self.max_proc_units, self.overcommit_ratio)
+                                         self.desired_proc_units, self.max_proc_units, 
+                                         self.min_memory, self.desired_memory, self.max_memory,self.overcommit_ratio)
         '''
         If cpu=dedicated is passed in machine_config lpar proc mode changes to dedicated mode.
         Pass sharing_mode, min_proc_units, max_proc_units and desired_proc_units in config file.
@@ -231,7 +241,7 @@ def LparSetup(self):
                 self.desired_memory = "40960"
             try: self.max_memory = conf.args.max_memory
             except AttributeError:
-                self.max_memory = self.cv_HMC.get_available_mem_resources()[0]
+                self.max_memory = int(self.cv_HMC.get_available_mem_resources()[0]) + int(self.desired_memory)
             proc_mode = 'ded'
             self.cv_HMC.profile_bckup()
             self.cv_HMC.change_proc_mode(proc_mode, self.sharing_mode, self.min_proc_units,