Op-test sysinfo Enhancement

Signed-off-by: yeswanth <yeswanth@linux.ibm.com>

Author: yeswanth6096

CONFIG.YAML

@@ -4,6 +4,9 @@ LINUX:
         - "hostname"
         - "cat /etc/os-release | grep PRETTY_NAME"
         - "uname -r"
+        - "lsmcode" #Firmware
+        - "tail /proc/cpuinfo | grep cpu" # will give info whether its P8/P9,P10 or P11
+
 HMC:
   COMMANDS:
        - "lshmc -V"  #HMC software version, release, service pack, and build level
@@ -15,3 +18,30 @@ HMC:
        - "lshwres -r virtualio --rsubtype eth -m SYS --level lpar" #Virtual Ethernet Adapter (VEA) Info
        - "lshwres -r virtualio --rsubtype scsi -m SYS --level lpar" #scsi Adapter Info
        - "lshwres -r virtualio --rsubtype fc -m SYS --level lpar"  #fc Adapter Info
+       - "lssyscfg -r lpar -m SYS -F name,kvm_capable" #To check KVM capable lpars
+       - "lssysconn -r all" # This command lists system connections and includes the FSP/BMC IP address.
+
+IO:
+  COMMANDS:
+    - "lshwres -r io -m SYS --rsubtype slot --filter 'lpar_names=LPAR_NAME'"  # List physical IO
+    - "lshwres -r virtualio --rsubtype fc --level lpar -m SYS -F adapter_type,lpar_name,slot_num,remote_lpar_name,remote_slot_num,wwpns"  # List virtual IOs
+
+KVM:
+  COMMANDS:
+    - "arch"  # Architecture
+    - "lscpu | grep 'Model name' | cut -f 2 -d ':' | awk '{$1=$1}1'"  # Processor
+    - "nproc"  # No-of-CPUs
+    - "free -mh"  # RAM
+
+BMC_or_FSP:
+      COMMANDS:
+        - lsmcode | grep -o 'FW[0-9]*\.[0-9]*'  # indicates the firmware level and variant for the system's Baseboard Management Controller (BMC). 
+VIOS: 
+  COMMANDS: 
+     - "lscfg" # Display hardware configuration information.
+     - "vmstat" # Copy: Report virtual memory statistics.
+
+FS:
+ COMMANDS:
+     - "mkfs.ext4 -V"
+     - "mkfs.xfs -V"

common/OpTestHMC.py

@@ -1138,9 +1138,19 @@ def set_system(self, system):
         self.pty = self.get_console()
         self.pty.set_system(system)
         log.info("Collecting OS sysinfo")
-        self.sysinfo.get_OSconfig(self.pty, self.expect_prompt)
+        self.sysinfo.get_config(self.pty, self.expect_prompt,self.mg_system,self.lpar_name,'LINUX')
         log.info("Collecting HMC details")
-        self.sysinfo.get_HMCconfig(self.ssh, self.expect_prompt,self.mg_system)
+        self.sysinfo.get_config(self.ssh, self.expect_prompt,self.mg_system,self.lpar_name,'HMC')
+        log.info("Collecting IO details")
+        self.sysinfo.get_config(self.ssh, self.expect_prompt,self.mg_system,self.lpar_name,'IO')
+        log.info("Collecting KVM info")
+        self.sysinfo.get_config(self.pty, self.expect_prompt,self.mg_system,self.lpar_name,'KVM')
+        log.info("Collecting BMC_or_FSP info")
+        self.sysinfo.get_config(self.pty, self.expect_prompt,self.mg_system,self.lpar_name,'BMC_or_FSP')
+        log.info("Collecting VIOS info")
+        self.sysinfo.get_config(self.pty, self.expect_prompt,self.mg_system,self.lpar_name,'VIOS')
+        log.info("Collecting FS info")
+        self.sysinfo.get_config(self.pty, self.expect_prompt,self.mg_system,self.lpar_name,'FS')
 
     def get_host_console(self):
         '''

common/OpTestSysinfo.py

@@ -40,34 +40,30 @@ class OpTestSysinfo():
     def __init__(self):
         with open(config_file, "r") as file:
             self.config_actions = yaml.safe_load(file)
-            list_of_commands = self.config_actions["LINUX"]["COMMANDS"]
-            get_HMCconfig_cmds  = self.config_actions["HMC"]["COMMANDS"]
-
-    def get_OSconfig(self, pty, prompt):
-        # Collect config related data from the OS
-        try:
-            list_of_commands = self.config_actions["LINUX"]["COMMANDS"]
-            print("########### OS Sysinfo ########")
-            for index, each_cmd in enumerate(list_of_commands, start=0):
-                pty.sendline(each_cmd)
-                rc = pty.expect([prompt, pexpect.TIMEOUT, pexpect.EOF], timeout=10)
-        except CommandFailed as cf:
-            raise cf
-
-    def get_HMCconfig(self, pty, prompt,CEC_name):
-        # Collect config data from HMC
-        ################ HMC INFO ####################
-        get_HMCconfig_cmds  = self.config_actions["HMC"]["COMMANDS"]
-        for index, each_cmd in enumerate(get_HMCconfig_cmds, start=0):
-             if re.search('SYS', each_cmd):
-                 new_cmd=re.sub('SYS',CEC_name,each_cmd)
-                 try:
-                   output = pty.run_command(new_cmd)
-                 except Exception as e: 
+    
+    def get_config(self, pty,prompt,CEC_name,LPAR,action_name):
+        # Collect config data based on action_name
+        get_config_cmds  = self.config_actions[action_name]["COMMANDS"]
+        for index, each_cmd in enumerate(get_config_cmds, start=0):
+             if re.search(r'SYS|LPAR_NAME', each_cmd):
+                new_cmd=each_cmd
+                # Replace placeholders
+                new_cmd = re.sub(r'SYS', CEC_name, new_cmd)
+                new_cmd = re.sub(r'LPAR_NAME', LPAR, new_cmd)
+                try:
+                    if action_name in ['HMC', 'IO']:
+                        output = pty.run_command(new_cmd)
+                    else:
+                        pty.sendline(new_cmd)
+                        rc = pty.expect([prompt, pexpect.TIMEOUT, pexpect.EOF], timeout=10)
+                except Exception as e:
                    print('command failed due to system error')
              else:
                 try:
-                    output = pty.run_command(each_cmd)
+                    if action_name == 'HMC':
+                        output = pty.run_command(each_cmd)
+                    else:
+                        pty.sendline(each_cmd)
+                        rc = pty.expect([prompt, pexpect.TIMEOUT, pexpect.EOF], timeout=10)
                 except Exception as e:
-                          print('command failed due to system error')
-
+                    print('command failed due to system error')