From 55a3f17e0ee29a31a205ab41c3e3e90d56fbd33d Mon Sep 17 00:00:00 2001 From: Sylvain Bauza Date: Tue, 28 Feb 2023 09:57:43 +0100 Subject: Update min support for Bobcat I needed to update some VDPA functests as they were verifying a Yoga compute service. NOTE(sbauza): For the moment, the grenade-skip-level is not voting but it will be done once I2b21e7d5f487f65ce4391f5c934046552d01a1e2 is merged. Change-Id: I8ef2a8f251a3142c359e14841459bffcc3b50ac9 --- nova/objects/service.py | 2 +- nova/tests/functional/libvirt/test_pci_sriov_servers.py | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/nova/objects/service.py b/nova/objects/service.py index b17b5c2050..1a4629cc84 100644 --- a/nova/objects/service.py +++ b/nova/objects/service.py @@ -253,7 +253,7 @@ NODE_IDENTITY_VERSION = 65 # and value be the latest service version that the release supports (for # example, before Bobcat RC1, please add 'Bobcat': XX where X is the latest # servion version that was added) -OLDEST_SUPPORTED_SERVICE_VERSION = 'Yoga' +OLDEST_SUPPORTED_SERVICE_VERSION = 'Antelope' SERVICE_VERSION_ALIASES = { 'Victoria': 52, 'Wallaby': 54, diff --git a/nova/tests/functional/libvirt/test_pci_sriov_servers.py b/nova/tests/functional/libvirt/test_pci_sriov_servers.py index 6b8b254af9..a2e9b4a804 100644 --- a/nova/tests/functional/libvirt/test_pci_sriov_servers.py +++ b/nova/tests/functional/libvirt/test_pci_sriov_servers.py @@ -1549,7 +1549,11 @@ class VDPAServersTest(_PCIServersWithMigrationTestBase): 'not supported for instance with vDPA ports', ex.response.text) + # NOTE(sbauza): Now we're post-Antelope release, we don't need to support + # this test def test_attach_interface_service_version_61(self): + self.flags(disable_compute_service_check_for_ffu=True, + group='workarounds') with mock.patch( "nova.objects.service.get_minimum_version_all_cells", return_value=61 @@ -1578,7 +1582,11 @@ class VDPAServersTest(_PCIServersWithMigrationTestBase): self.assertEqual(hostname, port['binding:host_id']) self.assertEqual(server['id'], port['device_id']) + # NOTE(sbauza): Now we're post-Antelope release, we don't need to support + # this test def test_detach_interface_service_version_61(self): + self.flags(disable_compute_service_check_for_ffu=True, + group='workarounds') with mock.patch( "nova.objects.service.get_minimum_version_all_cells", return_value=61 @@ -1871,7 +1879,11 @@ class VDPAServersTest(_PCIServersWithMigrationTestBase): self.assertEqual( dest, server['OS-EXT-SRV-ATTR:hypervisor_hostname']) + # NOTE(sbauza): Now we're post-Antelope release, we don't need to support + # this test def test_suspend_and_resume_service_version_62(self): + self.flags(disable_compute_service_check_for_ffu=True, + group='workarounds') with mock.patch( "nova.objects.service.get_minimum_version_all_cells", return_value=62 @@ -1890,7 +1902,11 @@ class VDPAServersTest(_PCIServersWithMigrationTestBase): self.assertPCIDeviceCounts(source, total=num_pci, free=num_pci - 2) self.assertEqual('ACTIVE', server['status']) + # NOTE(sbauza): Now we're post-Antelope release, we don't need to support + # this test def test_live_migrate_service_version_62(self): + self.flags(disable_compute_service_check_for_ffu=True, + group='workarounds') with mock.patch( "nova.objects.service.get_minimum_version_all_cells", return_value=62 -- cgit v1.2.1