Launchpad itself

Merge lp:~adeuring/launchpad/hwdb-refactor-haldevice-2 into lp:launchpad

hwdb-refactor-haldevice-2
Merge into devel

Proposed by Abel Deuring on 2009-10-01

Status:	Merged
Merged at revision:	not available
Proposed branch:	lp:~adeuring/launchpad/hwdb-refactor-haldevice-2
Merge into:	lp:launchpad
Diff against target:	435 lines 2 files modified lib/canonical/launchpad/scripts/hwdbsubmissions.py (+140/-83) lib/canonical/launchpad/scripts/tests/test_hwdb_submission_processing.py (+82/-0)
To merge this branch:	bzr merge lp:~adeuring/launchpad/hwdb-refactor-haldevice-2
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Michael Nelson (community)	code	2009-10-01	Approve on 2009-10-01
Review via email: mp+12713@code.launchpad.net

Revision history for this message

Abel Deuring (adeuring) wrote on 2009-10-01:

Download full text (11.1 KiB)

This branch continues the refactoring of class HALDevice in l/c/l/scrpits/hwdbsubmissons.py

(see https://code.edge.launchpad.net/~adeuring/launchpad/hwdb-refactor-haldevice/+merge/12669)

It moves the properties real_bus and is_real_device into the new base class BaseDevice. The latter property needs access to the USB vendor/product IDs, which were retrieved by the HAL-specific mmethod getProperty(). These calls are replaced by the new properties usb_vendor_id and usb_product_id.

test: ./bin/test -t test_hwdb_submission_processing

= Launchpad lint =

Checking for conflicts. and issues in doctests and templates.
Running jslint, xmllint, pyflakes, and pylint.
Using normal rules.

Linting changed files:
lib/canonical/launchpad/scripts/hwdbsubmissions.py
lib/canonical/launchpad/scripts/tests/test_hwdb_submission_processing.py

== Pyflakes notices ==

lib/canonical/launchpad/scripts/hwdbsubmissions.py
22: redefinition of unused 'etree' from line 20

== Pylint notices ==

lib/canonical/launchpad/scripts/hwdbsubmissions.py
20: [F0401] Unable to import 'xml.etree.cElementTree' (No module named etree)

These complaints are caused by another, unrelated, branch that prepares the transition to Python 2.5

diff against the base branch (still in ec2test):

+ @property
+ def usb_vendor_id(self):
+ """The USB vendor ID of the device or None for Non-USB devices."""
+ raise NotImplementedError()
+
+ @property
+ def usb_product_id(self):
+ """The USB product ID of the device or None for Non-USB devices."""
+ raise NotImplementedError()
+
def translateScsiBus(self):
"""Return the real bus of a device where raw_bus=='scsi'.

@@ -1395,78 +1405,6 @@
"""Return the device bus as specified by HAL or udev."""
raise NotImplementedError()

-
-class HALDevice(BaseDevice):
- """The representation of a HAL device node."""
-
- def __init__(self, id, udi, properties, parser):
- """HALDevice constructor.
-
- :param id: The ID of the HAL device in the submission data as
- specified in <device id=...>.
- :type id: int
- :param udi: The UDI of the HAL device.
- :type udi: string
- :param properties: The HAL properties of the device.
- :type properties: dict
- :param parser: The parser processing a submission.
- :type parser: SubmissionParser
- """
- super(HALDevice, self).__init__(parser)
- self.id = id
- self.udi = udi
- self.properties = properties
-
- def getProperty(self, property_name):
- """Return the HAL property property_name.
-
- Note that there is no check of the property type.
- """
- if property_name not in self.properties:
- return None
- name, type_ = self.properties[property_name]
- return name
-
- @p...

This branch continues the refactoring of class HALDevice in l/c/l/scrpits/hwdbsubmissons.py

(see https://code.edge.launchpad.net/~adeuring/launchpad/hwdb-refactor-haldevice/+merge/12669)

test: ./bin/test -t test_hwdb_submission_processing

= Launchpad lint =

Checking for conflicts. and issues in doctests and templates.
Running jslint, xmllint, pyflakes, and pylint.
Using normal rules.

Linting changed files:
  lib/canonical/launchpad/scripts/hwdbsubmissions.py
  lib/canonical/launchpad/scripts/tests/test_hwdb_submission_processing.py

== Pyflakes notices ==

lib/canonical/launchpad/scripts/hwdbsubmissions.py
    22: redefinition of unused 'etree' from line 20

== Pylint notices ==

lib/canonical/launchpad/scripts/hwdbsubmissions.py
    20: [F0401] Unable to import 'xml.etree.cElementTree' (No module named etree)

These complaints are caused by another, unrelated, branch that prepares the transition to Python 2.5

diff against the base branch (still in ec2test):

=== modified file 'lib/canonical/launchpad/scripts/hwdbsubmissions.py'
--- lib/canonical/launchpad/scripts/hwdbsubmissions.py	2009-10-01 09:06:59 +0000
+++ lib/canonical/launchpad/scripts/hwdbsubmissions.py	2009-10-01 11:13:38 +0000
@@ -1294,6 +1294,16 @@
         """
         raise NotImplementedError()
 
+    @property
+    def usb_vendor_id(self):
+        """The USB vendor ID of the device or None for Non-USB devices."""
+        raise NotImplementedError()
+
+    @property
+    def usb_product_id(self):
+        """The USB product ID of the device or None for Non-USB devices."""
+        raise NotImplementedError()
+
     def translateScsiBus(self):
         """Return the real bus of a device where raw_bus=='scsi'.
 
@@ -1395,78 +1405,6 @@
         """Return the device bus as specified by HAL or udev."""
         raise NotImplementedError()
 
-
-class HALDevice(BaseDevice):
-    """The representation of a HAL device node."""
-
-    def __init__(self, id, udi, properties, parser):
-        """HALDevice constructor.
-
-        :param id: The ID of the HAL device in the submission data as
-            specified in <device id=...>.
-        :type id: int
-        :param udi: The UDI of the HAL device.
-        :type udi: string
-        :param properties: The HAL properties of the device.
-        :type properties: dict
-        :param parser: The parser processing a submission.
-        :type parser: SubmissionParser
-        """
-        super(HALDevice, self).__init__(parser)
-        self.id = id
-        self.udi = udi
-        self.properties = properties
-
-    def getProperty(self, property_name):
-        """Return the HAL property property_name.
-
-        Note that there is no check of the property type.
-        """
-        if property_name not in self.properties:
-            return None
-        name, type_ = self.properties[property_name]
-        return name
-
-    @property
-    def parent_udi(self):
-        """The UDI of the parent device."""
-        return self.getProperty('info.parent')
-
-    @property
-    def device_id(self):
-        """See `BaseDevice`."""
-        return self.udi
-
-    @property
-    def pci_class(self):
-        """See `BaseDevice`."""
-        return self.getProperty('pci.device_class')
-
-    @property
-    def pci_subclass(self):
-        """The PCI device sub-class of the device or None for Non-PCI devices.
-        """
-        return self.getProperty('pci.device_subclass')
-
-    @property
-    def raw_bus(self):
-        """See `BaseDevice`."""
-        # Older versions of HAL stored this value in the property
-        # info.bus; newer versions store it in info.subsystem.
-        #
-        # Note that info.bus is gone for all devices except the
-        # USB bus. For USB devices, the property info.bus returns more
-        # detailed data: info.subsystem has the value 'usb' for all
-        # HAL nodes belonging to USB devices, while info.bus has the
-        # value 'usb_device' for the root node of a USB device, and the
-        # value 'usb' for sub-nodes of a USB device. We use these
-        # different value to to find the root USB device node, hence
-        # try to read info.bus first.
-        result = self.getProperty('info.bus')
-        if result is not None:
-            return result
-        return self.getProperty('info.subsystem')
-
     @property
     def real_bus(self):
         """Return the bus this device connects to on the host side.
@@ -1627,7 +1565,7 @@
             info.bus == 'usb' is used for end points of USB devices;
             the root node of a USB device has info.bus == 'usb_device'.
 
-            info.bus == 'viedo4linux' is used for the "input aspect"
+            info.bus == 'video4linux' is used for the "input aspect"
             of video devices.
         """
         bus = self.raw_bus
@@ -1642,8 +1580,8 @@
             # info.bus property that we treat as a real device.
             return self.udi == ROOT_UDI
         elif bus == 'usb_device':
-            vendor_id = self.getProperty('usb_device.vendor_id')
-            product_id = self.getProperty('usb_device.product_id')
+            vendor_id = self.usb_vendor_id
+            product_id = self.usb_product_id
             if vendor_id == 0 and product_id == 0:
                 # double-check: The parent device should be a PCI host
                 # controller, identifiable by its device class and subclass.
@@ -1796,6 +1734,88 @@
             return False
         return True
 
+
+class HALDevice(BaseDevice):
+    """The representation of a HAL device node."""
+
+    def __init__(self, id, udi, properties, parser):
+        """HALDevice constructor.
+
+        :param id: The ID of the HAL device in the submission data as
+            specified in <device id=...>.
+        :type id: int
+        :param udi: The UDI of the HAL device.
+        :type udi: string
+        :param properties: The HAL properties of the device.
+        :type properties: dict
+        :param parser: The parser processing a submission.
+        :type parser: SubmissionParser
+        """
+        super(HALDevice, self).__init__(parser)
+        self.id = id
+        self.udi = udi
+        self.properties = properties
+
+    def getProperty(self, property_name):
+        """Return the HAL property property_name.
+
+        Note that there is no check of the property type.
+        """
+        if property_name not in self.properties:
+            return None
+        name, type_ = self.properties[property_name]
+        return name
+
+    @property
+    def parent_udi(self):
+        """The UDI of the parent device."""
+        return self.getProperty('info.parent')
+
+    @property
+    def device_id(self):
+        """See `BaseDevice`."""
+        return self.udi
+
+    @property
+    def pci_class(self):
+        """See `BaseDevice`."""
+        return self.getProperty('pci.device_class')
+
+    @property
+    def pci_subclass(self):
+        """The PCI device sub-class of the device or None for Non-PCI devices.
+        """
+        return self.getProperty('pci.device_subclass')
+
+    @property
+    def usb_vendor_id(self):
+        """See `BaseDevice`."""
+        return self.getProperty('usb_device.vendor_id')
+
+    @property
+    def usb_product_id(self):
+        """See `BaseDevice`."""
+        return self.getProperty('usb_device.product_id')
+
+    @property
+    def raw_bus(self):
+        """See `BaseDevice`."""
+        # Older versions of HAL stored this value in the property
+        # info.bus; newer versions store it in info.subsystem.
+        #
+        # Note that info.bus is gone for all devices except the
+        # USB bus. For USB devices, the property info.bus returns more
+        # detailed data: info.subsystem has the value 'usb' for all
+        # HAL nodes belonging to USB devices, while info.bus has the
+        # value 'usb_device' for the root node of a USB device, and the
+        # value 'usb' for sub-nodes of a USB device. We use these
+        # different value to to find the root USB device node, hence
+        # try to read info.bus first.
+        result = self.getProperty('info.bus')
+        if result is not None:
+            return result
+        return self.getProperty('info.subsystem')
+
     def getScsiVendorAndModelName(self):
         """Separate vendor and model name of SCSI decvices.
 
@@ -1869,13 +1889,11 @@
         """The vendor of this device."""
         return self.getVendorOrProduct('vendor')
 
-
     @property
     def product(self):
         """The vendor of this device."""
         return self.getVendorOrProduct('product')
 
-
     def getVendorOrProductID(self, type_):
         """Return the vendor or product ID for this device.

=== modified file 'lib/canonical/launchpad/scripts/tests/test_hwdb_submission_processing.py'
--- lib/canonical/launchpad/scripts/tests/test_hwdb_submission_processing.py	2009-10-01 09:06:59 +0000
+++ lib/canonical/launchpad/scripts/tests/test_hwdb_submission_processing.py	2009-10-01 11:13:55 +0000
@@ -415,7 +415,7 @@
         parser = SubmissionParser(self.log)
         device = HALDevice(1, '/some/udi/path', properties, parser)
         self.assertEqual(
-            device.pci_subclass, 1,
+             1, device.pci_subclass,
             'Unexpected value of HALDevice.pci_subclass.')
 
         properties = {}
@@ -425,6 +425,43 @@
              None, device.pci_subclass,
             'Unexpected value of HALDevice.pci_sub_class for Non-PCI device.')
 
+    def testHALDeviceUsbVendorId(self):
+        """Test of HALDevice.usb_vendor_id."""
+        properties = {
+            'usb_device.vendor_id': (1, 'int'),
+            }
+        parser = SubmissionParser(self.log)
+        device = HALDevice(1, '/some/udi/path', properties, parser)
+        self.assertEqual(
+             1, device.usb_vendor_id,
+            'Unexpected value of HALDevice.usb_vendor_id.')
+
+        properties = {}
+        parser = SubmissionParser(self.log)
+        device = HALDevice(1, '/some/udi/path', properties, parser)
+        self.assertEqual(
+             None, device.usb_vendor_id,
+            'Unexpected value of HALDevice.usb_vendor_id for Non-USB device.')
+
+    def testHALDeviceUsbProductId(self):
+        """Test of HALDevice.usb_product_id."""
+        properties = {
+            'usb_device.product_id': (1, 'int'),
+            }
+        parser = SubmissionParser(self.log)
+        device = HALDevice(1, '/some/udi/path', properties, parser)
+        self.assertEqual(
+             1, device.usb_product_id,
+            'Unexpected value of HALDevice.usb_product_id.')
+
+        properties = {}
+        parser = SubmissionParser(self.log)
+        device = HALDevice(1, '/some/udi/path', properties, parser)
+        self.assertEqual(
+             None, device.usb_product_id,
+            'Unexpected value of HALDevice.usb_product_id for Non-USB '
+            'device.')
+
     def testHalDeviceRawBus(self):
         """test of HALDevice.raw_bus."""
         properties = {

Revision history for this message

Michael Nelson (michael.nelson) wrote on 2009-10-01:

<noodles775> adeuring: gee, that's an unfortunate diff...
<adeuring> noodles775: why?
<noodles775> adeuring: Nothing wrong with your code, I jut meant the huge segment of HALDevice that diff has assumed has been deleted and added.
<adeuring> noodles775: Ah, OK.
<noodles775> adeuring: r=me
<adeuring> noodles775: thanks!
<noodles775> adeuring: did you try using the revision spec '-r x..y' with bzr send so that the colour-coded diff on the mp is just the revisions you want? If not, might be good for the third installment :)

review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Abel Deuring

Barki Mustapha

Celso Providelo

Christian Reis

Christy Awad

Colin Watson

Harpianto,ANDI

James Troup

John A Meinel

Kevin bush

Launchpad code reviewers

Launchpad code reviewers from Canonical

Matthew Tanner

Maximiliano Bertacchini

Oguz Ersoz

Simon Brakhane

Ubuntu-BR DevOps

William Grant

alhawiti

api.ng

pedro cavazos

todaioan

wenjingwen

to status/vote changes:

Tzaddi

Tzaddi Belding

Launchpad itself

Merge lp:~adeuring/launchpad/hwdb-refactor-haldevice-2 into lp:launchpad

Commit message

Description of the change

Preview Diff

Subscribers

 === modified file 'lib/canonical/launchpad/scripts/hwdbsubmissions.py'
 --- lib/canonical/launchpad/scripts/hwdbsubmissions.py	2009-09-29 15:05:09 +0000
 +++ lib/canonical/launchpad/scripts/hwdbsubmissions.py	2009-10-01 11:20:32 +0000
@@ -7,7 +7,7 @@
  data and for the community test submissions.
  """
--
++__metaclass__ = type
  __all__ = [
             'SubmissionParser',
             'process_pending_submissions',
@@ -1235,59 +1235,30 @@
          root_device.createDBData(submission, None)
          return True
--class HALDevice:
--    """The representation of a HAL device node."""
--
--    def __init__(self, id, udi, properties, parser):
--        """HALDevice constructor.
--
--        :param id: The ID of the HAL device in the submission data as
--            specified in <device id=...>.
--        :type id: int
--        :param udi: The UDI of the HAL device.
--        :type udi: string
--        :param properties: The HAL properties of the device.
--        :type properties: dict
--        :param parser: The parser processing a submission.
--        :type parser: SubmissionParser
--        """
--        self.id = id
--        self.udi = udi
--        self.properties = properties
++
++class BaseDevice:
++    """A base class to represent device data from HAL and udev."""
++
++    def __init__(self, parser):
          self.children = []
          self.parser = parser
          self.parent = None
++    # Translation of the HAL info.bus/info.subsystem property and the
++    # udev property SUBSYSTEM to HWBus enumerated buses.
++    subsystem_hwbus = {
++        'pcmcia': HWBus.PCMCIA,
++        'usb_device': HWBus.USB,
++        'ide': HWBus.IDE,
++        'serio': HWBus.SERIAL,
++        }
++
      def addChild(self, child):
          """Add a child device and set the child's parent."""
          assert type(child) == type(self)
          self.children.append(child)
          child.parent = self
--    def getProperty(self, property_name):
--        """Return the property property_name.
--
--        Note that there is no check of the property type.
--        """
--        if property_name not in self.properties:
--            return None
--        name, type_ = self.properties[property_name]
--        return name
--
--    @property
--    def parent_udi(self):
--        """The UDI of the parent device."""
--        return self.getProperty('info.parent')
--
--    # Translation of the HAL info.bus/info.subsystem property to HWBus
--    # enumerated buses.
--    hal_bus_hwbus = {
--        'pcmcia': HWBus.PCMCIA,
--        'usb_device': HWBus.USB,
--        'ide': HWBus.IDE,
--        'serio': HWBus.SERIAL,
--        }
--
      # Translation of subclasses of the PCI class storage to HWBus
      # enumerated buses. The Linux kernel accesses IDE and SATA disks
      # and CDROM drives via the SCSI system; we want to know the real bus
@@ -1307,6 +1278,32 @@
 : HWBus.SAS,
+         }
++    @property
++    def device_id(self):
++        """A unique ID for this device."""
++        raise NotImplementedError()
++
++    @property
++    def pci_class(self):
++        """The PCI device class of the device or None for Non-PCI devices."""
++        raise NotImplementedError()
++
++    @property
++    def pci_subclass(self):
++        """The PCI device sub-class of the device or None for Non-PCI devices.
++        """
++        raise NotImplementedError()
++
++    @property
++    def usb_vendor_id(self):
++        """The USB vendor ID of the device or None for Non-USB devices."""
++        raise NotImplementedError()
++
++    @property
++    def usb_product_id(self):
++        """The USB product ID of the device or None for Non-USB devices."""
++        raise NotImplementedError()
++
      def translateScsiBus(self):
          """Return the real bus of a device where raw_bus=='scsi'.
@@ -1321,29 +1318,29 @@
          parent = self.parent
          if parent is None:
              self.parser._logWarning(
--                'Found SCSI device without a parent: %s.' % self.udi)
++                'Found SCSI device without a parent: %s.' % self.device_id)
              return None
          grandparent = parent.parent
          if grandparent is None:
              self.parser._logWarning(
--                'Found SCSI device without a grandparent: %s.' % self.udi)
++                'Found SCSI device without a grandparent: %s.'
++                % self.device_id)
              return None
          grandparent_bus = grandparent.raw_bus
          if grandparent_bus == 'pci':
--            if (grandparent.getProperty('pci.device_class')
--                != PCI_CLASS_STORAGE):
++            if (grandparent.pci_class != PCI_CLASS_STORAGE):
                  # This is not a storage class PCI device? This
                  # indicates a bug somewhere in HAL or in the hwdb
                  # client, or a fake submission.
--                device_class = grandparent.getProperty('pci.device_class')
++                device_class = grandparent.pci_class
                  self.parser._logWarning(
                      'A (possibly fake) SCSI device %s is connected to '
                      'PCI device %s that has the PCI device class %s; '
                      'expected class 1 (storage).'
--                    % (self.udi, grandparent.udi, device_class))
++                    % (self.device_id, grandparent.device_id, device_class))
                  return None
--            pci_subclass = grandparent.getProperty('pci.device_subclass')
++            pci_subclass = grandparent.pci_subclass
              return self.pci_storage_subclass_hwbus.get(pci_subclass)
          elif grandparent_bus == 'usb':
              # USB storage devices have the following HAL device hierarchy:
@@ -1395,38 +1392,18 @@
          # subclass 7).
          # XXX Abel Deuring 2005-05-14 How can we detect ExpressCards?
          # I do not have any such card at present...
--        parent_class = self.parent.getProperty('pci.device_class')
--        parent_subclass = self.parent.getProperty('pci.device_subclass')
++        parent_class = self.parent.pci_class
++        parent_subclass = self.parent.pci_subclass
          if (parent_class == PCI_CLASS_BRIDGE
              and parent_subclass == PCI_SUBCLASS_BRIDGE_CARDBUS):
              return HWBus.PCCARD
          else:
              return HWBus.PCI
--    translate_bus_name = {
--        'pci': translatePciBus,
--        'scsi': translateScsiBus,
--        }
--
      @property
      def raw_bus(self):
--        """Return the device bus as specified by HAL.
--
--        Older versions of HAL stored this value in the property
--        info.bus; newer versions store it in info.subsystem.
--        """
--        # Note that info.bus is gone for all devices except the
--        # USB bus. For USB devices, the property info.bus returns more
--        # detailed data: info.subsystem has the value 'usb' for all
--        # HAL nodes belonging to USB devices, while info.bus has the
--        # value 'usb_device' for the root node of a USB device, and the
--        # value 'usb' for sub-nodes of a USB device. We use these
--        # different value to to find the root USB device node, hence
--        # try to read info.bus first.
--        result = self.getProperty('info.bus')
--        if result is not None:
--            return result
--        return self.getProperty('info.subsystem')
++        """Return the device bus as specified by HAL or udev."""
++        raise NotImplementedError()
      @property
      def real_bus(self):
@@ -1436,7 +1413,7 @@
              cannot be determined.
          """
          device_bus = self.raw_bus
--        result = self.hal_bus_hwbus.get(device_bus)
++        result = self.subsystem_hwbus.get(device_bus)
          if result is not None:
              return result
@@ -1588,7 +1565,7 @@
              info.bus == 'usb' is used for end points of USB devices;
              the root node of a USB device has info.bus == 'usb_device'.
--            info.bus == 'viedo4linux' is used for the "input aspect"
++            info.bus == 'video4linux' is used for the "input aspect"
              of video devices.
          """
          bus = self.raw_bus
@@ -1603,8 +1580,8 @@
              # info.bus property that we treat as a real device.
              return self.udi == ROOT_UDI
          elif bus == 'usb_device':
--            vendor_id = self.getProperty('usb_device.vendor_id')
--            product_id = self.getProperty('usb_device.product_id')
++            vendor_id = self.usb_vendor_id
++            product_id = self.usb_product_id
              if vendor_id == 0 and product_id == 0:
                  # double-check: The parent device should be a PCI host
                  # controller, identifiable by its device class and subclass.
@@ -1612,8 +1589,8 @@
                  # possible bridges, like ISA->USB..
                  parent = self.parent
                  parent_bus = parent.raw_bus
--                parent_class = parent.getProperty('pci.device_class')
--                parent_subclass = parent.getProperty('pci.device_subclass')
++                parent_class = parent.pci_class
++                parent_subclass = parent.pci_subclass
                  if (parent_bus == 'pci'
                      and parent_class == PCI_CLASS_SERIALBUS_CONTROLLER
                      and parent_subclass == PCI_SUBCLASS_SERIALBUS_USB):
@@ -1757,6 +1734,88 @@
              return False
          return True
++
++class HALDevice(BaseDevice):
++    """The representation of a HAL device node."""
++
++    def __init__(self, id, udi, properties, parser):
++        """HALDevice constructor.
++
++        :param id: The ID of the HAL device in the submission data as
++            specified in <device id=...>.
++        :type id: int
++        :param udi: The UDI of the HAL device.
++        :type udi: string
++        :param properties: The HAL properties of the device.
++        :type properties: dict
++        :param parser: The parser processing a submission.
++        :type parser: SubmissionParser
++        """
++        super(HALDevice, self).__init__(parser)
++        self.id = id
++        self.udi = udi
++        self.properties = properties
++
++    def getProperty(self, property_name):
++        """Return the HAL property property_name.
++
++        Note that there is no check of the property type.
++        """
++        if property_name not in self.properties:
++            return None
++        name, type_ = self.properties[property_name]
++        return name
++
++    @property
++    def parent_udi(self):
++        """The UDI of the parent device."""
++        return self.getProperty('info.parent')
++
++    @property
++    def device_id(self):
++        """See `BaseDevice`."""
++        return self.udi
++
++    @property
++    def pci_class(self):
++        """See `BaseDevice`."""
++        return self.getProperty('pci.device_class')
++
++    @property
++    def pci_subclass(self):
++        """The PCI device sub-class of the device or None for Non-PCI devices.
++        """
++        return self.getProperty('pci.device_subclass')
++
++    @property
++    def usb_vendor_id(self):
++        """See `BaseDevice`."""
++        return self.getProperty('usb_device.vendor_id')
++
++    @property
++    def usb_product_id(self):
++        """See `BaseDevice`."""
++        return self.getProperty('usb_device.product_id')
++
++    @property
++    def raw_bus(self):
++        """See `BaseDevice`."""
++        # Older versions of HAL stored this value in the property
++        # info.bus; newer versions store it in info.subsystem.
++        #
++        # Note that info.bus is gone for all devices except the
++        # USB bus. For USB devices, the property info.bus returns more
++        # detailed data: info.subsystem has the value 'usb' for all
++        # HAL nodes belonging to USB devices, while info.bus has the
++        # value 'usb_device' for the root node of a USB device, and the
++        # value 'usb' for sub-nodes of a USB device. We use these
++        # different value to to find the root USB device node, hence
++        # try to read info.bus first.
++        result = self.getProperty('info.bus')
++        if result is not None:
++            return result
++        return self.getProperty('info.subsystem')
++
      def getScsiVendorAndModelName(self):
          """Separate vendor and model name of SCSI decvices.
@@ -1830,13 +1889,11 @@
          """The vendor of this device."""
          return self.getVendorOrProduct('vendor')
--
      @property
      def product(self):
          """The vendor of this device."""
          return self.getVendorOrProduct('product')
--
      def getVendorOrProductID(self, type_):
          """Return the vendor or product ID for this device.
 === modified file 'lib/canonical/launchpad/scripts/tests/test_hwdb_submission_processing.py'
 --- lib/canonical/launchpad/scripts/tests/test_hwdb_submission_processing.py	2009-06-25 05:30:52 +0000
 +++ lib/canonical/launchpad/scripts/tests/test_hwdb_submission_processing.py	2009-10-01 11:20:32 +0000
@@ -380,6 +380,88 @@
                           'Unexpected value of HALDevice.parent_udi, '
                           'when no parent information available.')
++    def testHALDeviceDeviceId(self):
++        """Test of HALDevice.device_id."""
++        properties = {}
++        parser = SubmissionParser(self.log)
++        device = HALDevice(1, '/some/udi/path', properties, parser)
++        self.assertEqual(
++            '/some/udi/path', device.device_id,
++            'Unexpected value of HALDevice.device_id')
++
++    def testHALDevicePciClass(self):
++        """Test of HALDevice.pci_class."""
++        properties = {
++            'pci.device_class': (1, 'int'),
++            }
++        parser = SubmissionParser(self.log)
++        device = HALDevice(1, '/some/udi/path', properties, parser)
++        self.assertEqual(
++             1, device.pci_class,
++            'Unexpected value of HALDevice.pci_class.')
++
++        properties = {}
++        parser = SubmissionParser(self.log)
++        device = HALDevice(1, '/some/udi/path', properties, parser)
++        self.assertEqual(
++            None, device.pci_class,
++            'Unexpected value of HALDevice.pci_class for Non-PCI device.')
++
++    def testHALDevicePciSubClass(self):
++        """Test of HALDevice.pci_subclass."""
++        properties = {
++            'pci.device_subclass': (1, 'int'),
++            }
++        parser = SubmissionParser(self.log)
++        device = HALDevice(1, '/some/udi/path', properties, parser)
++        self.assertEqual(
++             1, device.pci_subclass,
++            'Unexpected value of HALDevice.pci_subclass.')
++
++        properties = {}
++        parser = SubmissionParser(self.log)
++        device = HALDevice(1, '/some/udi/path', properties, parser)
++        self.assertEqual(
++             None, device.pci_subclass,
++            'Unexpected value of HALDevice.pci_sub_class for Non-PCI device.')
++
++    def testHALDeviceUsbVendorId(self):
++        """Test of HALDevice.usb_vendor_id."""
++        properties = {
++            'usb_device.vendor_id': (1, 'int'),
++            }
++        parser = SubmissionParser(self.log)
++        device = HALDevice(1, '/some/udi/path', properties, parser)
++        self.assertEqual(
++             1, device.usb_vendor_id,
++            'Unexpected value of HALDevice.usb_vendor_id.')
++
++        properties = {}
++        parser = SubmissionParser(self.log)
++        device = HALDevice(1, '/some/udi/path', properties, parser)
++        self.assertEqual(
++             None, device.usb_vendor_id,
++            'Unexpected value of HALDevice.usb_vendor_id for Non-USB device.')
++
++    def testHALDeviceUsbProductId(self):
++        """Test of HALDevice.usb_product_id."""
++        properties = {
++            'usb_device.product_id': (1, 'int'),
++            }
++        parser = SubmissionParser(self.log)
++        device = HALDevice(1, '/some/udi/path', properties, parser)
++        self.assertEqual(
++             1, device.usb_product_id,
++            'Unexpected value of HALDevice.usb_product_id.')
++
++        properties = {}
++        parser = SubmissionParser(self.log)
++        device = HALDevice(1, '/some/udi/path', properties, parser)
++        self.assertEqual(
++             None, device.usb_product_id,
++            'Unexpected value of HALDevice.usb_product_id for Non-USB '
++            'device.')
++
      def testHalDeviceRawBus(self):
          """test of HALDevice.raw_bus."""
          properties = {