Merge "Cache [pci]alias parsing" into stable/2025.1

Author: Zuul

nova/pci/request.py

@@ -37,7 +37,7 @@
     These two aliases define a device request meaning: vendor_id is "8086" and
     product_id is "0442" or "0443".
     """
-
+import functools
 import typing as ty
 
 import jsonschema
@@ -173,6 +173,7 @@ def _validate_aliases(aliases):
     _validate_required_ids(aliases)
 
 
+@functools.cache
 def get_alias_from_config() -> Alias:
     """Parse and validate PCI aliases from the nova config.
 

nova/test.py

@@ -61,6 +61,7 @@
 from nova import exception
 from nova import objects
 from nova.objects import base as objects_base
+from nova.pci import request
 from nova import quota
 from nova.scheduler.client import report
 from nova.scheduler import utils as scheduler_utils
@@ -189,6 +190,10 @@ def setUp(self):
         self.useFixture(
             nova_fixtures.PropagateTestCaseIdToChildEventlets(self.id()))
 
+        # Ensure that the pci alias is reset between test cases running in
+        # the same process
+        request.get_alias_from_config.cache_clear()
+
         # How many of which service we've started. {$service-name: $count}
         self._service_fixture_count = collections.defaultdict(int)
 
@@ -425,6 +430,10 @@ def flags(self, **kw):
         group = kw.pop('group', None)
         for k, v in kw.items():
             CONF.set_override(k, v, group)
+            # loading and validating alias is cached so if it is reconfigured
+            # we need to reset the cache
+            if k == 'alias' and group == 'pci':
+                request.get_alias_from_config.cache_clear()
 
     def reset_flags(self, *k, **kw):
         """Reset flag variables for a test."""

nova/tests/unit/pci/test_request.py

@@ -342,6 +342,23 @@ def test_get_alias_from_config_missing_ids_or_rc_pci_in_placement(self):
             "product_id fields set or resource_class field set.",
             str(ex))
 
+    def test_get_alias_from_config_cached(self):
+        alias = jsonutils.dumps({
+            "name": "a5",
+            "vendor_id": "4444",
+            "product_id": "4444",
+        })
+        self.flags(alias=[alias], group='pci')
+
+        origi_loads = jsonutils.loads
+
+        with mock.patch('oslo_serialization.jsonutils.loads') as mock_loads:
+            mock_loads.side_effect = origi_loads
+            request.get_alias_from_config()
+            request.get_alias_from_config()
+
+        mock_loads.assert_called_once()
+
     def _verify_result(self, expected, real):
         exp_real = zip(expected, real)
         for exp, real in exp_real: