From e63fb86df2f3d96104f476331d288e4d30309313 Mon Sep 17 00:00:00 2001 From: Liam Young Date: Fri, 29 Nov 2019 11:04:53 +0000 Subject: [PATCH] Make OpenStackBaseTest model_alias aware --- zaza/openstack/charm_tests/test_utils.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/zaza/openstack/charm_tests/test_utils.py b/zaza/openstack/charm_tests/test_utils.py index c800bee..4f2f712 100644 --- a/zaza/openstack/charm_tests/test_utils.py +++ b/zaza/openstack/charm_tests/test_utils.py @@ -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