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

Make OpenStackBaseTest model_alias aware

Browse Source
This commit is contained in:
Liam Young
2019-11-29 11:04:53 +00:00
parent e51eb2c5c9
commit e63fb86df2
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
zaza/openstack/charm_tests/test_utils.py
View File

@@ -112,10 +112,15 @@ class OpenStackBaseTest(unittest.TestCase):
cls.resource_cleanup()
@classmethod
def setUpClass(cls, application_name=None):
def setUpClass(cls, application_name=None, model_alias=None):
"""Run setup for test class to create common resourcea."""
cls.keystone_session = openstack_utils.get_overcloud_keystone_session()
cls.model_name = model.get_juju_model()
cls.model_aliases = model.get_juju_model_aliases()
if model_alias:
cls.model_name = cls.model_aliases[model_alias]
else:
cls.model_name = model.get_juju_model()
cls.keystone_session = openstack_utils.get_overcloud_keystone_session(
model_name=cls.model_name)
cls.test_config = lifecycle_utils.get_charm_config(fatal=False)
if application_name:
cls.application_name = application_name