Adding a couple of extra device tests and improving REGEX to cope with '/' as well as refector the label/code expressions to make future updates simpler.

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

Author: rdobson

hwinfo/pci/__init__.py

@@ -6,7 +6,10 @@ def __init__(self, record):
         self.rec = record
 
     def lookup_value(self, k):
-        return self.rec[k]
+        if k in self.rec:
+            return self.rec[k]
+        else:
+            return "Unknown"
 
     def get_device_name(self):
         name = self.lookup_value('pci_device_name')
@@ -60,3 +63,5 @@ def get_info(self):
 
         if self.is_subdevice():
             return "%s %s (%s %s)" % (self.get_subvendor_name(), self.get_subdevice_name(), self.get_vendor_name(), self.get_device_name())
+        else:
+            return "%s %s" % (self.get_vendor_name(), self.get_device_name())

hwinfo/pci/lspci.py

@@ -39,15 +39,19 @@ class LspciNParser(CommandParser):
         'pci_device_type_id',
     ]
 
+
+LABEL_REGEX = r'[\w+\ \.\-\/]+'
+CODE_REGEX = r'[0-9a-fA-F]{4}'
+
 class LspciNNMMParser(CommandParser):
     """Parser object for the output of lspci -nnmm"""
 
     #02:00.1 "Ethernet controller [0200]" "Broadcom Corporation [14e4]" "NetXtreme II BCM5716 Gigabit Ethernet [163b]" -r20 "Dell [1028]" "Device [02a3]"
 
     ITEM_REGEXS = [
-        r'(?P<pci_device_bus_id>([0-9a-fA-F]{2}:[0-9a-fA-F]{2}\.[0-9a-fA-F]))\ "(?P<pci_device_type_name>[\w+\ \.\-]+)\ \[(?P<pci_device_type_id>[0-9a-fA-F]{4})\]"' \
-        + r'\ "(?P<pci_vendor_name>[\w+\ \.\-]+)\ \[(?P<pci_vendor_id>[0-9a-fA-F]{4})\]"\ "(?P<pci_device_name>[\w+\ \.\-]+)\ \[(?P<pci_device_id>[0-9a-fA-F]{4})\]"' \
-        + r'\ .*\ "((?P<pci_subvendor_name>[\w+\ \.\-]+)\ \[(?P<pci_subvendor_id>[0-9a-fA-F]{4})\])*"\ "((?P<pci_subdevice_name>[\w+\ \.\-]+)\ \[(?P<pci_subdevice_id>[0-9a-fA-F]{4})\])*',
+        r'(?P<pci_device_bus_id>([0-9a-fA-F]{2}:[0-9a-fA-F]{2}\.[0-9a-fA-F]))\ "(?P<pci_device_type_name>' + LABEL_REGEX + r')\ \[(?P<pci_device_type_id>' + CODE_REGEX + r')\]"' \
+        + r'\ "(?P<pci_vendor_name>' + LABEL_REGEX + r')\ \[(?P<pci_vendor_id>' + CODE_REGEX + r')\]"\ "(?P<pci_device_name>' + LABEL_REGEX + r')\ \[(?P<pci_device_id>' + CODE_REGEX + r')\]"' \
+        + r'\ .*\ "((?P<pci_subvendor_name>' + LABEL_REGEX + r')\ \[(?P<pci_subvendor_id>' + CODE_REGEX + r')\])*"\ "((?P<pci_subdevice_name>' + LABEL_REGEX + r')\ \[(?P<pci_subdevice_id>' + CODE_REGEX + r')\])*',
     ]
 
     ITEM_SEPERATOR = "\n"

hwinfo/pci/tests/test_lspci.py

@@ -162,6 +162,43 @@ def test_pci_subdevice_name(self):
     def test_pci_subdevice_id(self):
         self._assert_rec_key('pci_subdevice_id')
 
+class LsiDeviceParse(TestSingleDeviceNNMMParse):
+
+    SAMPLE_DATA = '03:00.0 "SCSI storage controller [0100]" "LSI Logic / Symbios Logic [1000]" "SAS1068E PCI-Express Fusion-MPT SAS [0058]" -r08 "Dell [1028]" "SAS 6/iR Integrated Blades RAID Controller [1f0f]"'
+
+    DEVICE_REC = {
+        'pci_device_bus_id': '03:00.0',
+        'pci_device_type_id': '0100',
+        'pci_device_type_name': 'SCSI storage controller',
+        'pci_vendor_name': 'LSI Logic / Symbios Logic',
+        'pci_vendor_id': '1000',
+        'pci_device_id': '0058',
+        'pci_device_name': 'SAS1068E PCI-Express Fusion-MPT SAS',
+        'pci_subvendor_name': 'Dell',
+        'pci_subvendor_id': '1028',
+        'pci_subdevice_name': 'SAS 6/iR Integrated Blades RAID Controller',
+        'pci_subdevice_id': '1f0f',
+    }
+
+
+class IntelUSBControllerDeviceParse(TestSingleDeviceNNMMParse):
+
+    SAMPLE_DATA = '00:1d.0 "USB controller [0c03]" "Intel Corporation [8086]" "5 Series/3400 Series Chipset USB2 Enhanced Host Controller [3b34]" -r05 -p20 "Dell [1028]" "Device [02a3]"'
+
+    DEVICE_REC = {
+        'pci_device_bus_id': '00:1d.0',
+        'pci_device_type_id': '0c03',
+        'pci_device_type_name': 'USB controller',
+        'pci_vendor_name': 'Intel Corporation',
+        'pci_vendor_id': '8086',
+        'pci_device_id': '3b34',
+        'pci_device_name': '5 Series/3400 Series Chipset USB2 Enhanced Host Controller',
+        'pci_subvendor_name': 'Dell',
+        'pci_subvendor_id': '1028',
+        'pci_subdevice_name': 'Device',
+        'pci_subdevice_id': '02a3',
+    }
+
 class TestMultiDeviceNNMMParse(unittest.TestCase):
 
     SAMPLE_FILE = '%s/lspci-nnmm' % DATA_DIR