diff options
author | Lin Hua Cheng <lin-hua.cheng@hp.com> | 2013-08-01 20:50:51 -0700 |
---|---|---|
committer | Lin Hua Cheng <lin-hua.cheng@hp.com> | 2013-08-01 20:50:51 -0700 |
commit | 355c9ccf90e9787b4f10fefba156569df79e4e8c (patch) | |
tree | e2637fa41f7f2b1daa9839ff10101dd7cd0d24f4 | |
parent | a81bfc251b33b7f796cc72327159d1e547689523 (diff) | |
download | tuskar-ui-355c9ccf90e9787b4f10fefba156569df79e4e8c.tar.gz |
Fixed keystone test data to match openstack_auth.
Fixes bug 1207599
Change-Id: I2cc333911cc0d07cab9c0c550a8d0d69f374634c
-rw-r--r-- | openstack_dashboard/test/test_data/keystone_data.py | 54 |
1 files changed, 37 insertions, 17 deletions
diff --git a/openstack_dashboard/test/test_data/keystone_data.py b/openstack_dashboard/test/test_data/keystone_data.py index b9d41920..e92131b1 100644 --- a/openstack_dashboard/test/test_data/keystone_data.py +++ b/openstack_dashboard/test/test_data/keystone_data.py @@ -17,14 +17,15 @@ from datetime import timedelta from django.conf import settings from django.utils import datetime_safe +from keystoneclient.access import AccessInfo from keystoneclient.v2_0 import ec2 from keystoneclient.v2_0 import roles from keystoneclient.v2_0 import tenants -from keystoneclient.v2_0 import tokens from keystoneclient.v2_0 import users from keystoneclient.v3 import domains from keystoneclient.v3 import groups +from openstack_auth.user import Token from openstack_dashboard.test.test_data.utils import TestDataContainer @@ -223,22 +224,41 @@ def data(TEST): tomorrow = datetime_safe.datetime.now() + timedelta(days=1) expiration = datetime_safe.datetime.isoformat(tomorrow) - scoped_token = tokens.Token(tokens.TokenManager, - dict(token={"id": "test_token_id", - "expires": expiration, - "tenant": tenant_dict, - "tenants": [tenant_dict]}, - user={"id": "test_user_id", - "name": "test_user", - "roles": [member_role_dict]}, - serviceCatalog=TEST.service_catalog)) - unscoped_token = tokens.Token(tokens.TokenManager, - dict(token={"id": "test_token_id", - "expires": expiration}, - user={"id": "test_user_id", - "name": "test_user", - "roles": [member_role_dict]}, - serviceCatalog=TEST.service_catalog)) + scoped_token_dict = { + 'access': { + 'token': { + 'id': "test_token_id", + 'expires': expiration, + 'tenant': tenant_dict, + 'tenants': [tenant_dict]}, + 'user': { + 'id': "test_user_id", + 'name': "test_user", + 'roles': [member_role_dict]}, + 'serviceCatalog': TEST.service_catalog + } + } + + scoped_access_info = AccessInfo.factory(resp=None, + body=scoped_token_dict) + + unscoped_token_dict = { + 'access': { + 'token': { + 'id': "test_token_id", + 'expires': expiration}, + 'user': { + 'id': "test_user_id", + 'name': "test_user", + 'roles': [member_role_dict]}, + 'serviceCatalog': TEST.service_catalog + } + } + unscoped_access_info = AccessInfo.factory(resp=None, + body=unscoped_token_dict) + + scoped_token = Token(scoped_access_info) + unscoped_token = Token(unscoped_access_info) TEST.tokens.add(scoped_token, unscoped_token) TEST.token = scoped_token # your "current" token. TEST.tokens.scoped_token = scoped_token |