openstack
/
murano
Code Issues Proposed changes

Do not force admin credentials in service broker test suite 

- Allow tempest to use its default admin credentials usage mechanism
for service broker.

Change-Id: I08f25abc384fcbb82debee8ef169e42c87eb011b
Closes-Bug: #1569449
(cherry picked from commit cb0561a4c7)
This commit is contained in:
Victor Ryzhenkin 2016-04-13 15:00:43 +03:00 committed by Nikolay Starodubtsev
parent 562b6fc0af
commit 40ffdea35e
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
murano_tempest_tests/tests/api/service_broker/base.py
View File

@ -121,14 +121,5 @@ class BaseServiceBrokerAdminTest(BaseServiceBrokerTest):
@classmethod
def resource_setup(cls):
if hasattr(CONF.identity, 'admin_username'):
cls.username = CONF.identity.admin_username
cls.password = CONF.identity.admin_password
cls.tenant_name = CONF.identity.admin_tenant_name
else:
cls.username = CONF.auth.admin_username
cls.password = CONF.auth.admin_password
cls.tenant_name = CONF.auth.admin_tenant_name
cls.verify_nonempty(cls.username, cls.password, cls.tenant_name)
cls.os = clients.Manager()
super(BaseServiceBrokerAdminTest, cls).resource_setup()