openstack
/
murano
Code Issues Proposed changes

Replace obsolete way of get creds in tempest tests 

Tempest now uses 'get_configured_admin_credentials' instead of
'get_configured_credentials' which we still use in murano.

Change-Id: Idd397504ca9e4c2141e1dc96e59ed57c9266e1dc
Closes-Bug: #1586912
(cherry picked from commit 5c8285de1e)
This commit is contained in:
Nikolay Starodubtsev 2016-05-30 09:48:17 +03:00 committed by Kirill Zaitsev
parent 492d716b7a
commit 4d12e4eb01
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
murano_tempest_tests/clients.py
View File

@ -23,7 +23,7 @@ from murano_tempest_tests.services.service_broker import service_broker_client
class Manager(clients.Manager):
def __init__(self,
credentials=common_creds.get_configured_credentials(
credentials=common_creds.get_configured_admin_credentials(
'identity_admin'),
service=None):
super(Manager, self).__init__(credentials, service)
@ -37,4 +37,4 @@ class Manager(clients.Manager):
class AltManager(Manager):
def __init__(self, service=None):
super(AltManager, self).__init__(
common_creds.get_configured_credentials('alt_user'), service)
common_creds.get_configured_admin_credentials('alt_user'), service)

2
murano_tempest_tests/tests/api/application_catalog/base.py
View File

@ -47,7 +47,7 @@ class BaseApplicationCatalogTest(test.BaseTestCase):
cls.dynamic_cred = dynamic_creds.DynamicCredentialProvider(
identity_version=CONF.identity.auth_version,
name=cls.__name__, admin_role=cls.admin_role,
admin_creds=common_creds.get_configured_credentials(
admin_creds=common_creds.get_configured_admin_credentials(
'identity_admin'))
if type_of_creds == 'primary':
creds = cls.dynamic_cred.get_primary_creds()