Merge "pci: add OWNER_CYBORG constant and fix trait"

cyborg/accelerator/drivers/gpu/nvidia/sysinfo.py

@@ -51,7 +51,7 @@ def _get_traits(vendor_id, product_id, vgpu_type_name=None):
     Example PGPU traits:
     {traits:["OWNER_CYBORG", "CUSTOM_NVIDIA_1EB8"]}
     """
-    traits = ["OWNER_CYBORG"]
+    traits = [constants.OWNER_CYBORG]
     # PGPU trait
     gpu_trait = "_".join(
         (

cyborg/accelerator/drivers/pci/pci/sysinfo.py

@@ -54,7 +54,7 @@ def _get_traits(vendor_id, product_id):
     Example PGPU traits:
     {traits:["OWNER_CYBORG", "CUSTOM_PCI_1EB8"]}
     """
-    traits = []
+    traits = [constants.OWNER_CYBORG]
     vendor_name = pci_utils.VENDOR_MAPS.get(vendor_id)
     if vendor_name:
         traits.append("CUSTOM_PCI_" + vendor_name.upper())

cyborg/common/constants.py

@@ -142,4 +142,8 @@ SUPPORT_RESOURCES = (FPGA, GPU, VGPU, PGPU, QAT, NIC, SSD) = (
 FPGA_TRAITS = (FPGA_FUNCTION_ID,) = ("CUSTOM_FPGA_FUNCTION_ID",)
 
 
+# Standard os-traits trait marking a resource provider managed by Cyborg.
+OWNER_CYBORG = 'OWNER_CYBORG'
+
+
 RESOURCES_PREFIX = "resources:"

cyborg/tests/unit/accelerator/drivers/pci/pci/test_sysinfo.py

@@ -55,7 +55,11 @@ class TestSysinfo(base.DietTestCase):
             'devices': devices,
             'hostname': hostname,
             'rc': constants.RESOURCES['PCI'],
-            'traits': ['CUSTOM_PCI_NVIDIA', 'CUSTOM_PCI_PRODUCT_ID_1EB8'],
+            'traits': [
+                constants.OWNER_CYBORG,
+                'CUSTOM_PCI_NVIDIA',
+                'CUSTOM_PCI_PRODUCT_ID_1EB8',
+            ],
         }
 
     def test_match_standard_device(self):
@@ -89,9 +93,14 @@ class TestSysinfo(base.DietTestCase):
         m = sysinfo.LSPCI_PATTERN.match('')
         self.assertIsNone(m)
 
+    def test_owner_cyborg_trait_always_present(self):
+        result = sysinfo._get_traits('10de', '1eb8')
+        self.assertIn(constants.OWNER_CYBORG, result['traits'])
+
     def test_known_vendor(self):
         result = sysinfo._get_traits('10de', '1eb8')
         traits = result['traits']
+        self.assertIn(constants.OWNER_CYBORG, traits)
         self.assertIn('CUSTOM_PCI_NVIDIA', traits)
         self.assertIn('CUSTOM_PCI_PRODUCT_ID_1EB8', traits)
 
@@ -99,11 +108,11 @@ class TestSysinfo(base.DietTestCase):
         result = sysinfo._get_traits('dead', 'beef')
         traits = result['traits']
         self.assertIn('CUSTOM_PCI_PRODUCT_ID_BEEF', traits)
-        # No vendor trait should be present
-        vendor_traits = [
+        # Only OWNER_CYBORG and the product trait should be present
+        non_product_traits = [
             t for t in traits if not t.startswith('CUSTOM_PCI_PRODUCT_ID')
         ]
-        self.assertEqual([], vendor_traits)
+        self.assertEqual([constants.OWNER_CYBORG], non_product_traits)
 
     def test_product_id_uppercased(self):
         result = sysinfo._get_traits('dead', 'abcd')
@@ -174,6 +183,7 @@ class TestDiscoverPcis(base.TestCase):
         trait_vals = [
             a['value'] for a in attr_data if a['key'].startswith('trait')
         ]
+        self.assertIn(constants.OWNER_CYBORG, trait_vals)
         self.assertIn('CUSTOM_PCI_NVIDIA', trait_vals)
         self.assertIn('CUSTOM_PCI_PRODUCT_ID_1EB8', trait_vals)
 
@@ -194,11 +204,11 @@ class TestDiscoverPcis(base.TestCase):
             a['value'] for a in attr_data if a['key'].startswith('trait')
         ]
         self.assertIn('CUSTOM_PCI_PRODUCT_ID_BEEF', trait_vals)
-        # Ensure no vendor-specific trait is present
-        vendor_traits = [
+        # Only OWNER_CYBORG and the product trait should be present
+        non_product_traits = [
             t for t in trait_vals if not t.startswith('CUSTOM_PCI_PRODUCT_ID')
         ]
-        self.assertEqual([], vendor_traits)
+        self.assertEqual([constants.OWNER_CYBORG], non_product_traits)
 
     @mock.patch(_MOCK_GET_PCI, autospec=True)
     def test_discover_multiple_devices_filtered(self, mock_pci):

releasenotes/notes/pci-owner-cyborg-trait-a1b2c3d4e5f6a7b8.yaml

@@ -0,0 +1,13 @@
+---
+fixes:
+  - |
+    The PCI driver now includes the standard ``OWNER_CYBORG`` trait in the
+    trait list reported for PCI devices, consistent with the existing NVIDIA
+    GPU driver behaviour. This trait is a standard os-traits marker
+    (``os_traits.OWNER_CYBORG``) that signals the resource provider is managed
+    by Cyborg and is stored in both the Cyborg ``attributes`` table and
+    reported to Placement as a resource provider trait. It has no effect on
+    Nova VM scheduling unless a device profile explicitly requires it.
+    ``OWNER_CYBORG`` is now also defined as a named constant in
+    ``cyborg.common.constants`` to prevent typos and improve consistency
+    across all drivers.