Adding CPU parser info to the inspector tool for command line retrival.

Signed-off-by: Rob Dobson <rob.dobson@citrix.com>

Author: rdobson

hwinfo/host/cpuinfo.py

@@ -6,6 +6,7 @@
 
 class CPUInfoParser(CommandParser):
 
+    ITEM_SEPERATOR = "\n\n"
 
     ITEM_REGEXS = [
         REGEX_TEMPLATE % ('processor', 'processor'),

hwinfo/host/tests/data/cpuinfo

@@ -0,0 +1,80 @@
+processor	: 0
+vendor_id	: GenuineIntel
+cpu family	: 6
+model		: 30
+model name	: Intel(R) Xeon(R) CPU           X3430  @ 2.40GHz
+stepping	: 5
+microcode	: 0x3
+cpu MHz		: 2394.052
+cache size	: 8192 KB
+fpu		: yes
+fpu_exception	: yes
+cpuid level	: 11
+wp		: yes
+flags		: fpu de tsc msr pae mce cx8 apic sep mca cmov pat clflush acpi mmx fxsr sse sse2 ss ht syscall nx lm constant_tsc rep_good nopl nonstop_tsc pni monitor vmx est ssse3 cx16 sse4_1 sse4_2 popcnt hypervisor lahf_lm dtherm tpr_shadow vnmi flexpriority ept vpid
+bogomips	: 4788.10
+clflush size	: 64
+cache_alignment	: 64
+address sizes	: 36 bits physical, 48 bits virtual
+power management:
+
+processor	: 1
+vendor_id	: GenuineIntel
+cpu family	: 6
+model		: 30
+model name	: Intel(R) Xeon(R) CPU           X3430  @ 2.40GHz
+stepping	: 5
+microcode	: 0x3
+cpu MHz		: 2394.052
+cache size	: 8192 KB
+fpu		: yes
+fpu_exception	: yes
+cpuid level	: 11
+wp		: yes
+flags		: fpu de tsc msr pae mce cx8 apic sep mca cmov pat clflush acpi mmx fxsr sse sse2 ss ht syscall nx lm constant_tsc rep_good nopl nonstop_tsc pni monitor vmx est ssse3 cx16 sse4_1 sse4_2 popcnt hypervisor lahf_lm dtherm tpr_shadow vnmi flexpriority ept vpid
+bogomips	: 4788.10
+clflush size	: 64
+cache_alignment	: 64
+address sizes	: 36 bits physical, 48 bits virtual
+power management:
+
+processor	: 2
+vendor_id	: GenuineIntel
+cpu family	: 6
+model		: 30
+model name	: Intel(R) Xeon(R) CPU           X3430  @ 2.40GHz
+stepping	: 5
+microcode	: 0x3
+cpu MHz		: 2394.052
+cache size	: 8192 KB
+fpu		: yes
+fpu_exception	: yes
+cpuid level	: 11
+wp		: yes
+flags		: fpu de tsc msr pae mce cx8 apic sep mca cmov pat clflush acpi mmx fxsr sse sse2 ss ht syscall nx lm constant_tsc rep_good nopl nonstop_tsc pni monitor vmx est ssse3 cx16 sse4_1 sse4_2 popcnt hypervisor lahf_lm dtherm tpr_shadow vnmi flexpriority ept vpid
+bogomips	: 4788.10
+clflush size	: 64
+cache_alignment	: 64
+address sizes	: 36 bits physical, 48 bits virtual
+power management:
+
+processor	: 3
+vendor_id	: GenuineIntel
+cpu family	: 6
+model		: 30
+model name	: Intel(R) Xeon(R) CPU           X3430  @ 2.40GHz
+stepping	: 5
+microcode	: 0x3
+cpu MHz		: 2394.052
+cache size	: 8192 KB
+fpu		: yes
+fpu_exception	: yes
+cpuid level	: 11
+wp		: yes
+flags		: fpu de tsc msr pae mce cx8 apic sep mca cmov pat clflush acpi mmx fxsr sse sse2 ss ht syscall nx lm constant_tsc rep_good nopl nonstop_tsc pni monitor vmx est ssse3 cx16 sse4_1 sse4_2 popcnt hypervisor lahf_lm dtherm tpr_shadow vnmi flexpriority ept vpid
+bogomips	: 4788.10
+clflush size	: 64
+cache_alignment	: 64
+address sizes	: 36 bits physical, 48 bits virtual
+power management:
+

hwinfo/host/tests/test_cpuinfo.py

@@ -56,7 +56,7 @@ def setUp(self):
         self.parser = CPUInfoParser(self.DATA.strip())
 
     def _assert_equal(self, key):
-        rec = self.parser.parse()
+        rec = self.parser.parse_items()[0]
         return self.assertEqual(rec[key], self.DATA_REC[key])
 
     def test_cpuinfo_processor(self):
@@ -112,3 +112,17 @@ def test_cache_alignment(self):
 
     def test_address_sizes(self):
         return self._assert_equal('address_sizes')
+
+class CPUInfoMultipleParseTest(unittest.TestCase):
+
+    DATA_FILE = "%s/cpuinfo" % DATA_DIR
+
+    def setUp(self):
+        fh = open(self.DATA_FILE)
+        data = fh.read()
+        fh.close()
+        self.parser = CPUInfoParser(data)
+
+    def test_number_of_processors(self):
+        recs = self.parser.parse_items()
+        self.assertEqual(len(recs), 4)

hwinfo/tools/inspector.py

@@ -10,6 +10,7 @@
 from hwinfo.pci.lspci import *
 
 from hwinfo.host import dmidecode
+from hwinfo.host import cpuinfo
 
 def remote_command(host, username, password, cmd):
     client = paramiko.SSHClient()
@@ -54,6 +55,9 @@ def get_lspci_data(self):
     def get_dmidecode_data(self):
         return self.exec_command(['dmidecode'])
 
+    def get_cpuinfo_data(self):
+        return self.exec_command(['cat /proc/cpuinfo'])
+
     def get_pci_devices(self):
         data = self.get_lspci_data()
         parser = LspciNNMMParser(data)
@@ -66,6 +70,11 @@ def get_info(self):
         rec = parser.parse()
         return rec
 
+    def get_cpu_info(self):
+        data = self.get_cpuinfo_data()
+        parser = cpuinfo.CPUInfoParser(data)
+        return parser.parse_items()
+
 def search_for_file(dirname, filename):
     for root, _, files in os.walk(dirname):
         if filename in files:
@@ -93,6 +102,9 @@ def get_lspci_data(self):
     def get_dmidecode_data(self):
         return self._load_from_file('dmidecode.out')
 
+    def get_cpuinfo_data(self):
+        return self._load_from_file('cpuinfo')
+
 def pci_filter(devices, types):
     res = []
     for device in devices:
@@ -122,6 +134,13 @@ def rec_to_table(rec):
         table.add_row([k, v])
     return table
 
+def tabulate_recs(recs, header):
+    table = PrettyTable(header)
+    for rec in recs:
+        vls = [rec[k] for k in header]
+        table.add_row(vls)
+    return table
+
 def tabulate_pci_recs(recs):
     header = [
         'vendor_name',
@@ -133,18 +152,26 @@ def tabulate_pci_recs(recs):
         'subdevice_name',
         'subdevice_id',
     ]
-    table = PrettyTable(header)
-    for rec in recs:
-        vls = [rec[k] for k in header]
-        table.add_row(vls)
-    return table
+    return tabulate_recs(recs, header)
+
+def tabulate_cpu_recs(recs):
+    header = [
+        'processor',
+        'vendor_id',
+        'cpu_family',
+        'model',
+        'stepping',
+        'model_name',
+        'cpu_mhz',
+    ]
+    return tabulate_recs(recs, header)
 
 def main():
     """Entry Point"""
 
     parser = ArgumentParser(prog="hwinfo")
 
-    filter_choices = ['bios', 'nic', 'storage', 'gpu']
+    filter_choices = ['bios', 'nic', 'storage', 'gpu', 'cpu']
     parser.add_argument("-f", "--filter", choices=filter_choices, help="Query a specific class.")
     parser.add_argument("-m", "--machine", default='localhost', help="Remote host address.")
     parser.add_argument("-u", "--username", help="Username for remote host.")
@@ -173,6 +200,12 @@ def main():
         print rec_to_table(host.get_info())
         print ""
 
+    if 'cpu' in options:
+        print "CPU Info:"
+        print ""
+        print tabulate_cpu_recs(host.get_cpu_info())
+        print ""
+
     if 'nic' in options:
         devices = pci_filter_for_nics(host.get_pci_devices())
         print "Ethernet Controller Info:"