q-dev: do not include port id in device identity

device identity should contain only device provided data

Author: piotrbartman

qubes/ext/block.py

@@ -235,7 +235,7 @@ def device_id(self) -> str:
             p_info = p.backend_domain.devices[p.devclass][p.port_id]
             parent_identity = p_info.device_id
             if p.devclass == 'usb':
-                parent_identity = f'{p.port_id}:{parent_identity}'
+                parent_identity = f'{parent_identity}'
         if self._interface_num:
             # device interface number (not partition)
             self_id = self._interface_num

qubes/tests/devices_block.py

@@ -260,7 +260,7 @@ def test_000_device_get(self):
         self.assertEqual(device_info.parent_device, parent)
         self.assertEqual(device_info.attachment, front)
         self.assertEqual(device_info.device_id,
-                         '1-1.1:0000:0000::?******:1.0')
+                         '0000:0000::?******:1.0')
         self.assertEqual(
             device_info.data.get('test_frontend_domain', None), None)
         self.assertEqual(device_info.device_node, '/dev/sda')