Adding missing socket count functionality.

Signed-off-by: Rob Dobson <[email protected]>

Author: rdobson

.pylint.rc

@@ -38,7 +38,7 @@ load-plugins=
 # --enable=similarities". If you want to run only the classes checker, but have
 # no Warning level messages displayed, use"--disable=all --enable=classes
 # --disable=W"
-disable=I0011,W0511,W0110,W0141,W0603,W0142,C0103,C0111,R0801,W0614,W0401,R0903,R0904,C0301,W0231
+disable=I0011,W0511,W0110,W0141,W0603,W0142,C0103,C0111,R0801,W0614,W0401,R0903,R0904,C0301,W0231,W0703
 
 
 [REPORTS]

hwinfo/host/dmidecode.py

@@ -16,6 +16,8 @@ class DmidecodeParser(CommandParser):
         r'System\ Information\n(.)*\n(.)*\n(.)*\n(.)*\n\tUUID:\ (?P<system_uuid>.*)\n',
         # Chassis Info
         r'Chassis\ Information\n(.)*\n\tType:\ (?P<chassis_type>.*)\n',
+        # Processor Info
+        r'Processor\ Information\n\tSocket\ Designation:\ (?P<socket_designation>.*)\n',
     ]
 
 

hwinfo/host/tests/data/dmidecode

@@ -131,6 +131,62 @@ Processor Information
 	Characteristics:
 		64-bit capable
 
+Handle 0x0401, DMI type 4, 40 bytes
+Processor Information
+	Socket Designation: CPU2
+	Type: Central Processor
+	Family: Xeon
+	Manufacturer: Intel
+	ID: E5 06 01 00 FF FB EB BF
+	Signature: Type 0, Family 6, Model 30, Stepping 5
+	Flags:
+		FPU (Floating-point unit on-chip)
+		VME (Virtual mode extension)
+		DE (Debugging extension)
+		PSE (Page size extension)
+		TSC (Time stamp counter)
+		MSR (Model specific registers)
+		PAE (Physical address extension)
+		MCE (Machine check exception)
+		CX8 (CMPXCHG8 instruction supported)
+		APIC (On-chip APIC hardware supported)
+		SEP (Fast system call)
+		MTRR (Memory type range registers)
+		PGE (Page global enable)
+		MCA (Machine check architecture)
+		CMOV (Conditional move instruction supported)
+		PAT (Page attribute table)
+		PSE-36 (36-bit page size extension)
+		CLFSH (CLFLUSH instruction supported)
+		DS (Debug store)
+		ACPI (ACPI supported)
+		MMX (MMX technology supported)
+		FXSR (FXSAVE and FXSTOR instructions supported)
+		SSE (Streaming SIMD extensions)
+		SSE2 (Streaming SIMD extensions 2)
+		SS (Self-snoop)
+		HTT (Multi-threading)
+		TM (Thermal monitor supported)
+		PBE (Pending break enabled)
+	Version: Intel(R) Xeon(R) CPU           X3450  @ 2.67GHz
+	Voltage: 1.2 V
+	External Clock: 4800 MHz
+	Max Speed: 3600 MHz
+	Current Speed: 2666 MHz
+	Status: Populated, Enabled
+	Upgrade: Socket LGA1366
+	L1 Cache Handle: 0x0700
+	L2 Cache Handle: 0x0701
+	L3 Cache Handle: 0x0702
+	Serial Number: Not Specified
+	Asset Tag: Not Specified
+	Part Number: Not Specified
+	Core Count: 4
+	Core Enabled: 4
+	Thread Count: 8
+	Characteristics:
+		64-bit capable
+
 Handle 0x0700, DMI type 7, 19 bytes
 Cache Information
 	Socket Designation: Not Specified

hwinfo/host/tests/test_dmidecode.py

@@ -18,6 +18,7 @@ class DmidecodeParserTests(unittest.TestCase):
         'system_serial_number': 'GZ7BS4J',
         'system_uuid': '4C4C4544-005A-3710-8042-C7C04F53344A',
         'chassis_type': 'Rack Mount Chassis',
+        'socket_designation': 'CPU1, CPU2',
     }
 
 
@@ -54,3 +55,6 @@ def test_dmidecode_system_uuid(self):
 
     def test_dmidecode_chassis_type(self):
         return self._assert_equal('chassis_type')
+
+    def test_dmidecode_socket_designation_type(self):
+        return self._assert_equal('socket_designation')

hwinfo/tools/inspector.py

@@ -7,8 +7,6 @@
 import os
 import sys
 import tarfile
-import random
-import string
 import tempfile
 import shutil
 
@@ -63,7 +61,6 @@ def find_in_tarball(tarball, filename):
 
 def read_files_from_tarball(tarball, files):
     tar = tarfile.open(tarball)
-    data = None
     tmpdir = tempfile.mkdtemp()
 
 
@@ -135,7 +132,7 @@ def get_cpuinfo_data(self):
         return self.exec_command(['cat /proc/cpuinfo'])
 
     def get_os_data(self):
-         return self.exec_command(['cat', '/etc/xensource-inventory'])
+        return self.exec_command(['cat', '/etc/xensource-inventory'])
 
     def get_os_info(self):
         rec = {}
@@ -155,11 +152,16 @@ def get_info(self):
         data = self.get_dmidecode_data()
         parser = dmidecode.DmidecodeParser(data)
         rec = parser.parse()
+        print rec
+        #Count sockets
+        if 'socket_designation' in rec:
+            rec['socket_count'] = len(rec['socket_designation'].split(','))
+
         try:
             os_rec = self.get_os_info()
             for k, v in os_rec.iteritems():
                 rec[k] = v
-        except:
+        except Exception:
             #Ignore failures. Only supports XS right now.
             pass
 

hwinfo/util/__init__.py

@@ -2,6 +2,23 @@
 
 import re
 
+def combine_dicts(recs):
+    """Combine a list of recs, appending values to matching keys"""
+    if not recs:
+        return None
+
+    if len(recs) == 1:
+        return recs.pop()
+
+    new_rec = {}
+    for rec in recs:
+        for k, v in rec.iteritems():
+            if k in new_rec:
+                new_rec[k] = "%s, %s" % (new_rec[k], v)
+            else:
+                new_rec[k] = v
+    return new_rec
+
 class CommandParser(object):
     """Object for extending to parse command outputs"""
 
@@ -29,10 +46,10 @@ def set_seperator(self, seperator):
     def parse_item(self, item):
         rec = {}
         for regex in self.ITEM_REGEXS:
-            match = re.search(regex, item)
-            if match:
-                rec = dict(rec.items() + match.groupdict().items())
-
+            matches = [m.groupdict() for m in re.finditer(regex, item)]
+            mdicts = combine_dicts(matches)
+            if mdicts:
+                rec = dict(rec.items() + mdicts.items())
         return rec
 
     def parse_items(self):