arif/zaza-openstack-tests
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

eliminate multiple checks for post xenial-queens

Browse Source
This commit is contained in:
Adam Dyess
2020-02-04 14:25:05 -06:00
parent b88bccd526
commit 2f5ef8f027
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
zaza/openstack/charm_tests/designate/__init__.py
View File

@@ -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
)

6
zaza/openstack/charm_tests/designate/tests.py
View File

@@ -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])