Change reporting to return uknown device names with the form '[Device XXXX]'.

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

Author: rdobson

hwinfo/pci/__init__.py

@@ -16,7 +16,7 @@ def get_device_name(self):
         if name == 'Device':
             # If the input has come from lspci, this is the value for
             # not being able to find a key in the pciids db.
-            return 'unknown [%s]' % self.get_device_id()
+            return '[Device %s]' % self.get_device_id()
         else:
             return name
 
@@ -35,7 +35,7 @@ def get_subdevice_name(self):
         if name == 'Device':
             # If the input has come from lspci, this is the value for
             # not being able to find a key in the pciids db.
-            return 'unknown [%s]' % self.get_subdevice_id()
+            return '[Device %s]' % self.get_subdevice_id()
         else:
             return name
 
@@ -57,7 +57,7 @@ def get_pci_id(self):
         )
 
     def is_subdevice(self):
-        return 'pci_subvendor_id' in self.rec and 'pci_subdevice_id' in self.rec
+        return self.lookup_value('pci_subvendor_id') and self.lookup_value('pci_subdevice_id')
 
     def get_info(self):
 

hwinfo/pci/tests/test_pci.py

@@ -36,7 +36,7 @@ def test_get_vendor_id(self):
 
     def test_get_subdevice_name(self):
         name = self.device.get_subdevice_name()
-        self.assertEqual(name, 'unknown [02a3]')
+        self.assertEqual(name, '[Device 02a3]')
 
     def test_get_subvendor_name(self):
         name = self.device.get_subvendor_name()
@@ -63,4 +63,4 @@ def test_is_subdevice(self):
 
     def test_get_device_info(self):
         info = self.device.get_info()
-        self.assertEqual(info, 'Dell unknown [02a3] (Broadcom Corporation NetXtreme II BCM5716 Gigabit Ethernet)')
+        self.assertEqual(info, 'Dell [Device 02a3] (Broadcom Corporation NetXtreme II BCM5716 Gigabit Ethernet)')