From 2f5ef8f027515fe18d700d800ec4e9f911298fa3 Mon Sep 17 00:00:00 2001 From: Adam Dyess Date: Tue, 4 Feb 2020 14:25:05 -0600 Subject: [PATCH] eliminate multiple checks for post xenial-queens --- zaza/openstack/charm_tests/designate/__init__.py | 5 +++-- zaza/openstack/charm_tests/designate/tests.py | 6 ++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/zaza/openstack/charm_tests/designate/__init__.py b/zaza/openstack/charm_tests/designate/__init__.py index 7be4c14..66e2373 100644 --- a/zaza/openstack/charm_tests/designate/__init__.py +++ b/zaza/openstack/charm_tests/designate/__init__.py @@ -42,13 +42,14 @@ class BaseDesignateTest(test_utils.OpenStackBaseTest): ] # Get keystone session - keystone_api = 3 if os_release() >= os_release('xenial_queens') else 2 + cls.post_xenial_queens = os_release() >= os_release('xenial_queens') + keystone_api = 3 if cls.post_xenial_queens else 2 cls.keystone_session = openstack_utils.get_overcloud_keystone_session() cls.keystone = openstack_utils.get_keystone_session_client( cls.keystone_session, keystone_api ) - if os_release() >= os_release('xenial_queens'): + if cls.post_xenial_queens: cls.designate = openstack_utils.get_designate_session_client( session=cls.keystone_session ) diff --git a/zaza/openstack/charm_tests/designate/tests.py b/zaza/openstack/charm_tests/designate/tests.py index 65ae3c0..af9099d 100644 --- a/zaza/openstack/charm_tests/designate/tests.py +++ b/zaza/openstack/charm_tests/designate/tests.py @@ -144,9 +144,7 @@ class BindTests(BaseDesignateTest): name=self.TEST_DOMAIN, email="fred@amuletexample.com") - os_release = openstack_utils.get_os_release - post_xenial_queens = os_release() >= os_release('xenial_queens') - if post_xenial_queens: + if self.post_xenial_queens: new_domain = self.designate.zones.create( name=domain.name, email=domain.email) else: @@ -159,7 +157,7 @@ class BindTests(BaseDesignateTest): type="A", data=self.TEST_RECORD[self.TEST_WWW_RECORD]) - if post_xenial_queens: + if self.post_xenial_queens: _domain_id = new_domain['id'] self.designate.recordsets.create( _domain_id, _record.name, _record.type, [_record.data])