CA-371311: Handle network USB devices as PCI for interface rename

Currently the presence of any network USB device causes issues with the interface rename due to not being considered during the rename. For instance this causes collisions causing renames to fail due to destination name already used. Signed-off-by: Frediano Ziglio <[email protected]>
xenserver · Feb 9, 2024 · a48151a · a48151a
1 parent feeb478
commit a48151a
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 0 deletions.
diff --git a/tests/data/all_ethN.biosdevname b/tests/data/all_ethN.biosdevname
@@ -66,3 +66,11 @@ VPD Port: 4
 VPD Index: 1
 VPD PCI master: 0000:07:00.1
 
+BIOS device: eth4
+Kernel name: eth4
+Permanent MAC: 40:54:00:12:34:56
+Assigned MAC : 40:54:00:12:34:56
+Driver: cdc_ether
+Driver version: 22-Aug-2005
+Firmware version: CDC Ethernet Device
+Bus Info: usb-0000:00:02.0-1
diff --git a/tests/data/physical.biosdevname b/tests/data/physical.biosdevname
@@ -66,3 +66,11 @@ VPD Port: 4
 VPD Index: 1
 VPD PCI master: 0000:07:00.1
 
+BIOS device: 
+Kernel name: eth4
+Permanent MAC: 40:54:00:12:34:56
+Assigned MAC : 40:54:00:12:34:56
+Driver: cdc_ether
+Driver version: 22-Aug-2005
+Firmware version: CDC Ethernet Device
+Bus Info: usb-0000:00:02.0-1
diff --git a/tests/test_biosdevname.py b/tests/test_biosdevname.py
@@ -53,3 +53,7 @@ def test(self):
 
         self.assertEqual(devices['eth0']['BIOS device'],
                          {'all_ethN': 'eth0', 'physical': 'em1'})
+
+        self.assertEqual(devices['eth4']['BIOS device'],
+                         {'all_ethN': 'eth4', 'physical': ''})
+        self.assertEqual(devices['eth4']['Bus Info'], '0000:00:02.0')
diff --git a/xcp/net/biosdevname.py b/xcp/net/biosdevname.py
@@ -74,6 +74,10 @@ def all_devices_all_names():
                  "BIOS device" not in dinfo ):
                 continue
 
+            # Treat USB devices the PCI device of their host adapter
+            if dinfo.get("Bus Info", "").startswith("usb-"):
+                dinfo["Bus Info"] = dinfo["Bus Info"].split('-')[1]
+
             kname = dinfo["Kernel name"]
 
             if kname in devices: