Merge pull request #918 from yeswanth6096/optest-sysinfo-enhance

Optest sysinfo enhancement

Author: PraveenPenguin

CONFIG.YAML

@@ -1,9 +1,22 @@
 LINUX:
- COMMANDS:
-        - "date"
+  COMMANDS:
         - "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
+        #kvm commands
+        - "arch"  # Architecture
+        - "lscpu | grep 'Model name' | cut -f 2 -d ':' | awk '{$1=$1}1'"  # Processor
+        - "nproc"  # No-of-CPUs
+        - "free -mh"  # RAM
+        #VIOS Commands
+        - "lscfg" # Display hardware configuration information.
+        - "vmstat" # Copy: Report virtual memory statistics.
+        #FS Commands
+        - "mkfs.ext4 -V"
+        - "mkfs.xfs -V"
+
 HMC:
   COMMANDS:
        - "lshmc -V"  #HMC software version, release, service pack, and build level
@@ -15,3 +28,10 @@ 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
+
+

common/OpTestHMC.py

@@ -1140,7 +1140,7 @@ def set_system(self, system):
         log.info("Collecting OS sysinfo")
         self.sysinfo.get_OSconfig(self.pty, self.expect_prompt)
         log.info("Collecting HMC details")
-        self.sysinfo.get_HMCconfig(self.ssh, self.expect_prompt,self.mg_system)
+        self.sysinfo.get_HMCconfig(self.ssh, self.expect_prompt,self.mg_system,self.lpar_name)
 
     def get_host_console(self):
         '''
@@ -1392,4 +1392,4 @@ def run_command(self, i_cmd, timeout=15):
         '''
         Wrapper command for run_command from util
         '''
-        return self.util.run_command(self, i_cmd, timeout)
+        return self.util.run_command(self, i_cmd, timeout)

common/OpTestSysinfo.py

@@ -54,20 +54,23 @@ def get_OSconfig(self, pty, prompt):
         except CommandFailed as cf:
             raise cf
 
-    def get_HMCconfig(self, pty, prompt,CEC_name):
+    def get_HMCconfig(self, pty, prompt,CEC_name,LPAR):
         # Collect config data from HMC
         ################ HMC INFO ####################
         get_HMCconfig_cmds  = self.config_actions["HMC"]["COMMANDS"]
+        print("########### HMC Sysinfo ########")
         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:
+            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:
                    output = pty.run_command(new_cmd)
-                 except Exception as e: 
+                except Exception as e:
                    print('command failed due to system error')
-             else:
+            else:
                 try:
                     output = pty.run_command(each_cmd)
                 except Exception as e:
                           print('command failed due to system error')
-