From f6a9ce358ffd25a8ab7cf6111a1cb59526c70968 Mon Sep 17 00:00:00 2001 From: Maysa Macedo Date: Mon, 6 Nov 2023 21:41:28 -0300 Subject: [PATCH] Fix FailureDomains check on manifests test The `FailureDomains` was updated to become a pointer, consequently the field may be absent in the `OpenShiftMachineV1Beta1MachineTemplate`. This commits updates the manifests test to take that into account. --- scripts/openstack/manifest-tests/base-case/test_cpms.py | 2 +- scripts/openstack/manifest-tests/zero-workers/test_cpms.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/openstack/manifest-tests/base-case/test_cpms.py b/scripts/openstack/manifest-tests/base-case/test_cpms.py index 663b4dc9a5..6a4ec96edf 100755 --- a/scripts/openstack/manifest-tests/base-case/test_cpms.py +++ b/scripts/openstack/manifest-tests/base-case/test_cpms.py @@ -18,7 +18,7 @@ class ControlPlaneMachineSet(unittest.TestCase): def test_compute_zones(self): """Assert that the OpenStack CPMS failureDomains value is empty.""" - self.assertNotIn("openstack", self.cpms["spec"]["template"]["machines_v1beta1_machine_openshift_io"]["failureDomains"]) + self.assertIsNone(self.cpms["spec"]["template"]["machines_v1beta1_machine_openshift_io"].get("failureDomains")) if __name__ == '__main__': diff --git a/scripts/openstack/manifest-tests/zero-workers/test_cpms.py b/scripts/openstack/manifest-tests/zero-workers/test_cpms.py index 663b4dc9a5..6a4ec96edf 100755 --- a/scripts/openstack/manifest-tests/zero-workers/test_cpms.py +++ b/scripts/openstack/manifest-tests/zero-workers/test_cpms.py @@ -18,7 +18,7 @@ class ControlPlaneMachineSet(unittest.TestCase): def test_compute_zones(self): """Assert that the OpenStack CPMS failureDomains value is empty.""" - self.assertNotIn("openstack", self.cpms["spec"]["template"]["machines_v1beta1_machine_openshift_io"]["failureDomains"]) + self.assertIsNone(self.cpms["spec"]["template"]["machines_v1beta1_machine_openshift_io"].get("failureDomains")) if __name__ == '__main__':