Fix tempest-dsvm-murano-cfapi NoSuchOptError
Change-Id: Ieb0a94fec4ba3ae25ee65eda442b4cdef090d3fd
This commit is contained in:
parent
fe0ce2fb35
commit
64f763a4ac
@ -46,9 +46,9 @@ class BaseServiceBrokerTest(test.BaseTestCase):
|
|||||||
def setup_clients(cls):
|
def setup_clients(cls):
|
||||||
super(BaseServiceBrokerTest, cls).setup_clients()
|
super(BaseServiceBrokerTest, cls).setup_clients()
|
||||||
if not hasattr(cls, "os_primary"):
|
if not hasattr(cls, "os_primary"):
|
||||||
cls.username = CONF.identity.username
|
cls.username = cls.os_primary.credentials.username
|
||||||
cls.password = CONF.identity.password
|
cls.password = cls.os_primary.credentials.password
|
||||||
cls.tenant_name = CONF.identity.tenant_name
|
cls.tenant_name = cls.os_primary.credentials.tenant_name
|
||||||
cls.verify_nonempty(cls.username, cls.password, cls.tenant_name)
|
cls.verify_nonempty(cls.username, cls.password, cls.tenant_name)
|
||||||
cls.os_primary = clients.Manager()
|
cls.os_primary = clients.Manager()
|
||||||
cls.service_broker_client = cls.os_primary.service_broker_client
|
cls.service_broker_client = cls.os_primary.service_broker_client
|
||||||
@ -126,9 +126,9 @@ class BaseServiceBrokerAdminTest(BaseServiceBrokerTest):
|
|||||||
def setup_clients(cls):
|
def setup_clients(cls):
|
||||||
super(BaseServiceBrokerTest, cls).setup_clients()
|
super(BaseServiceBrokerTest, cls).setup_clients()
|
||||||
if not hasattr(cls, "os_admin"):
|
if not hasattr(cls, "os_admin"):
|
||||||
cls.username = CONF.identity.username
|
cls.username = CONF.auth.admin_username
|
||||||
cls.password = CONF.identity.password
|
cls.password = CONF.auth.admin_password
|
||||||
cls.tenant_name = CONF.identity.tenant_name
|
cls.tenant_name = CONF.auth.admin_project_name
|
||||||
cls.verify_nonempty(cls.username, cls.password, cls.tenant_name)
|
cls.verify_nonempty(cls.username, cls.password, cls.tenant_name)
|
||||||
cls.os_admin = clients.Manager()
|
cls.os_admin = clients.Manager()
|
||||||
cls.service_broker_client = cls.os_admin.service_broker_client
|
cls.service_broker_client = cls.os_admin.service_broker_client
|
||||||
|
Loading…
Reference in New Issue
Block a user