From 6df2ad787b32a7f1ea21f5c3c68f1e89242b12ff Mon Sep 17 00:00:00 2001 From: Artom Lifshitz Date: Wed, 18 Sep 2019 12:00:46 -0400 Subject: [PATCH] Add func test for 'required' PCI NUMA policy Iab82719527cbaae4af64e12a27b8561ea2d269c0 added a test for the 'preferred' PCI NUMA policy, but we had no test for 'required'. This patch adds one. Change-Id: Ic1760d6ca058a554c3677b186f99305d558389fa --- .../libvirt/test_pci_sriov_servers.py | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/nova/tests/functional/libvirt/test_pci_sriov_servers.py b/nova/tests/functional/libvirt/test_pci_sriov_servers.py index 13cbec5b2b7b..6d1edf6217b3 100644 --- a/nova/tests/functional/libvirt/test_pci_sriov_servers.py +++ b/nova/tests/functional/libvirt/test_pci_sriov_servers.py @@ -328,7 +328,7 @@ class PCIServersTest(_PCIServersTestBase): self._run_build_test(flavor_id, end_status='ERROR') -class PCIServersWithNUMAPoliciesTest(_PCIServersTestBase): +class PCIServersWithPreferredNUMATest(_PCIServersTestBase): ALIAS_NAME = 'a1' PCI_PASSTHROUGH_WHITELIST = [jsonutils.dumps( @@ -346,6 +346,7 @@ class PCIServersWithNUMAPoliciesTest(_PCIServersTestBase): 'numa_policy': fields.PCINUMAAffinityPolicy.PREFERRED, } )] + end_status = 'ACTIVE' def test_create_server_with_pci_dev_and_numa(self): """Validate behavior of 'preferred' PCI NUMA policy. @@ -375,4 +376,19 @@ class PCIServersWithNUMAPoliciesTest(_PCIServersTestBase): extra_spec['pci_passthrough:alias'] = '%s:1' % self.ALIAS_NAME flavor_id = self._create_flavor(extra_spec=extra_spec) - self._run_build_test(flavor_id) + self._run_build_test(flavor_id, end_status=self.end_status) + + +class PCIServersWithRequiredNUMATest(PCIServersWithPreferredNUMATest): + + ALIAS_NAME = 'a1' + 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, + } + )] + end_status = 'ERROR'