From 27c1b15df1d9d1a244c854f854b96e5defb90c87 Mon Sep 17 00:00:00 2001 From: Juan Antonio Osorio Robles Date: Wed, 17 Dec 2014 01:00:43 +0200 Subject: [PATCH] Use keystone v3 credentials for functional tests Change-Id: I017bb6d85f4dea6b20926f825227f46b3c6f0942 Partially implements: blueprint replace-concept-of-tenants-for-projects --- functionaltests/api/base.py | 4 ++-- functionaltests/common/client.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/functionaltests/api/base.py b/functionaltests/api/base.py index c50193c77..e3f9ef0b2 100644 --- a/functionaltests/api/base.py +++ b/functionaltests/api/base.py @@ -66,13 +66,13 @@ class TestCase(oslotest.BaseTestCase): return name -class BarbicanCredentials(auth.KeystoneV2Credentials): +class BarbicanCredentials(auth.KeystoneV3Credentials): def __init__(self): credentials = dict( username=CONF.identity.admin_username, password=CONF.identity.admin_password, - tenant_name=CONF.identity.admin_tenant_name + project_name=CONF.identity.admin_tenant_name ) super(BarbicanCredentials, self).__init__(**credentials) diff --git a/functionaltests/common/client.py b/functionaltests/common/client.py index 60c77841d..cac986ea9 100644 --- a/functionaltests/common/client.py +++ b/functionaltests/common/client.py @@ -31,8 +31,8 @@ class BarbicanClientAuth(auth.AuthBase): self.username = credentials.username self.password = credentials.password - self.project_id = credentials.tenant_id - self.project_name = credentials.tenant_name + self.project_id = credentials.project_id + self.project_name = credentials.project_name self.token = auth_provider.get_token() def __call__(self, r):