From 64f763a4ac33899206dadb7481d0ef7f16b30c79 Mon Sep 17 00:00:00 2001 From: zhurong Date: Thu, 7 Dec 2017 13:36:16 +0800 Subject: [PATCH] Fix tempest-dsvm-murano-cfapi NoSuchOptError Change-Id: Ieb0a94fec4ba3ae25ee65eda442b4cdef090d3fd --- .../tests/api/service_broker/base.py | 12 ++++++------ 1 file 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): def setup_clients(cls): super(BaseServiceBrokerTest, cls).setup_clients() if not hasattr(cls, "os_primary"): - cls.username = CONF.identity.username - cls.password = CONF.identity.password - cls.tenant_name = CONF.identity.tenant_name + cls.username = cls.os_primary.credentials.username + cls.password = cls.os_primary.credentials.password + cls.tenant_name = cls.os_primary.credentials.tenant_name cls.verify_nonempty(cls.username, cls.password, cls.tenant_name) cls.os_primary = clients.Manager() cls.service_broker_client = cls.os_primary.service_broker_client @@ -126,9 +126,9 @@ class BaseServiceBrokerAdminTest(BaseServiceBrokerTest): def setup_clients(cls): super(BaseServiceBrokerTest, cls).setup_clients() if not hasattr(cls, "os_admin"): - cls.username = CONF.identity.username - cls.password = CONF.identity.password - cls.tenant_name = CONF.identity.tenant_name + cls.username = CONF.auth.admin_username + cls.password = CONF.auth.admin_password + cls.tenant_name = CONF.auth.admin_project_name cls.verify_nonempty(cls.username, cls.password, cls.tenant_name) cls.os_admin = clients.Manager() cls.service_broker_client = cls.os_admin.service_broker_client