openstack/barbican
Code Issues Proposed changes

Merge "Use keystone v3 credentials for functional tests"

Browse Source
This commit is contained in:
Jenkins 2014-12-18 02:08:02 +00:00 committed by Gerrit Code Review
commit 82478bb4ad
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
functionaltests/api/base.py
View File

@ -66,13 +66,13 @@ class TestCase(oslotest.BaseTestCase):
return name return name
class BarbicanCredentials(auth.KeystoneV2Credentials): class BarbicanCredentials(auth.KeystoneV3Credentials):
def __init__(self): def __init__(self):
credentials = dict( credentials = dict(
username=CONF.identity.admin_username, username=CONF.identity.admin_username,
password=CONF.identity.admin_password, password=CONF.identity.admin_password,
tenant_name=CONF.identity.admin_tenant_name project_name=CONF.identity.admin_tenant_name
) )
super(BarbicanCredentials, self).__init__(**credentials) super(BarbicanCredentials, self).__init__(**credentials)

4
functionaltests/common/client.py
View File

@ -31,8 +31,8 @@ class BarbicanClientAuth(auth.AuthBase):
self.username = credentials.username self.username = credentials.username
self.password = credentials.password self.password = credentials.password
self.project_id = credentials.tenant_id self.project_id = credentials.project_id
self.project_name = credentials.tenant_name self.project_name = credentials.project_name
self.token = auth_provider.get_token() self.token = auth_provider.get_token()
def __call__(self, r): def __call__(self, r):