summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzhurong <aaronzhu1121@gmail.com>2017-12-07 13:36:16 +0800
committerzhurong <aaronzhu1121@gmail.com>2017-12-07 13:36:16 +0800
commit64f763a4ac33899206dadb7481d0ef7f16b30c79 (patch)
tree665e1dab48a2dd066c485b76ab4ba1be0c74ab14
parentfe0ce2fb35dd75e126adb558177acf63c5a794e0 (diff)
Fix tempest-dsvm-murano-cfapi NoSuchOptError
Notes
Notes (review): Code-Review+2: zhurong <aaronzhu1121@gmail.com> Workflow+1: zhurong <aaronzhu1121@gmail.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Fri, 08 Dec 2017 00:48:46 +0000 Reviewed-on: https://review.openstack.org/526280 Project: openstack/murano-tempest-plugin Branch: refs/heads/master
-rw-r--r--murano_tempest_tests/tests/api/service_broker/base.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/murano_tempest_tests/tests/api/service_broker/base.py b/murano_tempest_tests/tests/api/service_broker/base.py
index 14222ec..faa63ca 100644
--- a/murano_tempest_tests/tests/api/service_broker/base.py
+++ b/murano_tempest_tests/tests/api/service_broker/base.py
@@ -46,9 +46,9 @@ class BaseServiceBrokerTest(test.BaseTestCase):
46 def setup_clients(cls): 46 def setup_clients(cls):
47 super(BaseServiceBrokerTest, cls).setup_clients() 47 super(BaseServiceBrokerTest, cls).setup_clients()
48 if not hasattr(cls, "os_primary"): 48 if not hasattr(cls, "os_primary"):
49 cls.username = CONF.identity.username 49 cls.username = cls.os_primary.credentials.username
50 cls.password = CONF.identity.password 50 cls.password = cls.os_primary.credentials.password
51 cls.tenant_name = CONF.identity.tenant_name 51 cls.tenant_name = cls.os_primary.credentials.tenant_name
52 cls.verify_nonempty(cls.username, cls.password, cls.tenant_name) 52 cls.verify_nonempty(cls.username, cls.password, cls.tenant_name)
53 cls.os_primary = clients.Manager() 53 cls.os_primary = clients.Manager()
54 cls.service_broker_client = cls.os_primary.service_broker_client 54 cls.service_broker_client = cls.os_primary.service_broker_client
@@ -126,9 +126,9 @@ class BaseServiceBrokerAdminTest(BaseServiceBrokerTest):
126 def setup_clients(cls): 126 def setup_clients(cls):
127 super(BaseServiceBrokerTest, cls).setup_clients() 127 super(BaseServiceBrokerTest, cls).setup_clients()
128 if not hasattr(cls, "os_admin"): 128 if not hasattr(cls, "os_admin"):
129 cls.username = CONF.identity.username 129 cls.username = CONF.auth.admin_username
130 cls.password = CONF.identity.password 130 cls.password = CONF.auth.admin_password
131 cls.tenant_name = CONF.identity.tenant_name 131 cls.tenant_name = CONF.auth.admin_project_name
132 cls.verify_nonempty(cls.username, cls.password, cls.tenant_name) 132 cls.verify_nonempty(cls.username, cls.password, cls.tenant_name)
133 cls.os_admin = clients.Manager() 133 cls.os_admin = clients.Manager()
134 cls.service_broker_client = cls.os_admin.service_broker_client 134 cls.service_broker_client = cls.os_admin.service_broker_client