1 files changed, 107 insertions, 0 deletions
diff --git a/nova/tests/functional/regressions/test_bug_1995153.py b/nova/tests/functional/regressions/test_bug_1995153.py
new file mode 100644
index 0000000000..f4e61d06df
--- /dev/null
+++ b/nova/tests/functional/regressions/test_bug_1995153.py
@@ -0,0 +1,107 @@
+# Copyright (C) 2023 Red Hat, Inc
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+
+import fixtures
+from unittest import mock
+
+from oslo_serialization import jsonutils
+from oslo_utils import units
+
+from nova.objects import fields
+from nova.tests.fixtures import libvirt as fakelibvirt
+from nova.tests.functional import integrated_helpers
+from nova.tests.functional.libvirt import base
+
+
+class Bug1995153RegressionTest(
+    base.ServersTestBase,
+    integrated_helpers.InstanceHelperMixin
+):
+
+    ADDITIONAL_FILTERS = ['NUMATopologyFilter', 'PciPassthroughFilter']
+
+    ALIAS_NAME = 'a1'
+    PCI_DEVICE_SPEC = [jsonutils.dumps(
+        {
+            'vendor_id': fakelibvirt.PCI_VEND_ID,
+            'product_id': fakelibvirt.PCI_PROD_ID,
+        }
+    )]
+    # we set the numa_affinity policy to required to ensure strict affinity
+    # between pci devices and the guest cpu and memory will be enforced.
+    PCI_ALIAS = [jsonutils.dumps(
+        {
+            'vendor_id': fakelibvirt.PCI_VEND_ID,
+            'product_id': fakelibvirt.PCI_PROD_ID,
+            'name': ALIAS_NAME,
+            'device_type': fields.PciDeviceType.STANDARD,
+            'numa_policy': fields.PCINUMAAffinityPolicy.REQUIRED,
+        }
+    )]
+
+    def setUp(self):
+        super(Bug1995153RegressionTest, self).setUp()
+        self.flags(
+            device_spec=self.PCI_DEVICE_SPEC,
+            alias=self.PCI_ALIAS,
+            group='pci'
+        )
+        host_manager = self.scheduler.manager.host_manager
+        pci_filter_class = host_manager.filter_cls_map['PciPassthroughFilter']
+        host_pass_mock = mock.Mock(wraps=pci_filter_class().host_passes)
+        self.mock_filter = self.useFixture(fixtures.MockPatch(
+            'nova.scheduler.filters.pci_passthrough_filter'
+            '.PciPassthroughFilter.host_passes',
+            side_effect=host_pass_mock)).mock
+
+    def test_socket_policy_bug_1995153(self):
+        """Previously, the numa_usage_from_instance_numa() method in
+        hardware.py saved the host NUMAToplogy object with NUMACells that have
+        no `socket` set. This was an omission in the original implementation of
+        the `socket` PCI NUMA affinity policy. The consequence was that any
+        code path that called into numa_usage_from_instance_numa() would
+        clobber the host NUMA topology in the database with a socket-less
+        version. Booting an instance with NUMA toplogy would do that, for
+        example. If then a second instance was booted with the `socket` PCI
+        NUMA affinity policy, it would read the socket-less host NUMATopology
+        from the database, and error out with a NotImplementedError. This was
+        bug 1995153. Demonstrate that this is fixed.
+        """
+        host_info = fakelibvirt.HostInfo(
+            cpu_nodes=2, cpu_sockets=1, cpu_cores=2, cpu_threads=2,
+            kB_mem=(16 * units.Gi) // units.Ki)
+        self.flags(cpu_dedicated_set='0-3', group='compute')
+        pci_info = fakelibvirt.HostPCIDevicesInfo(num_pci=1, numa_node=1)
+
+        self.start_compute(host_info=host_info, pci_info=pci_info)
+
+        extra_spec = {
+            'hw:cpu_policy': 'dedicated',
+            'pci_passthrough:alias': '%s:1' % self.ALIAS_NAME,
+            'hw:pci_numa_affinity_policy': 'socket'
+        }
+        # Boot a first instance with a guest NUMA topology to run the
+        # numa_usage_from_instance_numa() and update the host NUMATopology in
+        # the database.
+        self._create_server(
+            flavor_id=self._create_flavor(
+                extra_spec={'hw:cpu_policy': 'dedicated'}))
+
+        # Boot an instance with the `socket` PCI NUMA affinity policy and
+        # assert that it boots correctly now.
+        flavor_id = self._create_flavor(extra_spec=extra_spec)
+        self._create_server(flavor_id=flavor_id)
+        self.assertTrue(self.mock_filter.called)