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

Merge pull request #136 from gnuoy/make-OpenStackBaseTest-multimodel-friendly

Browse Source 
Make OpenStackBaseTest model_alias aware
This commit is contained in:
Chris MacNaughton
2019-11-29 12:30:34 +01:00
committed by GitHub
parent d004a4152d e63fb86df2
commit 5a65e05c37
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zaza/openstack/charm_tests/test_utils.py
+8 -3
View File
@@ -114,10 +114,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