File 0001-Use-default_project_id-for-v3-users.patch of Package openstack-dashboard
From 30d07f97d20a77d7361311fb6da1bd67303bc028 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dirk@dmllr.de>
Date: Mon, 27 Jan 2014 17:25:44 +0100
Subject: [PATCH] Use default_project_id for v3 users
The identity v3 api defines a default_project_id, not a project_id.
See https://github.com/openstack/identity-api/blob/master/openstack-identity-api/v3/src/markdown/identity-api-v3.md#users-v3users
Change-Id: I880c249deb4da73b3eeaaad7ee24e85ae7d08ce0
Closes-Bug: #1205520
(cherry picked from commit 2b8dc7fc045a23050ac66cd9662aa34664ff06c9)
---
openstack_dashboard/api/keystone.py | 4 ++--
openstack_dashboard/dashboards/admin/projects/tests.py | 2 +-
openstack_dashboard/dashboards/admin/users/views.py | 2 +-
openstack_dashboard/test/test_data/keystone_data.py | 8 ++++----
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/openstack_dashboard/api/keystone.py b/openstack_dashboard/api/keystone.py
index 83abedf..7ba4904 100644
--- a/openstack_dashboard/api/keystone.py
+++ b/openstack_dashboard/api/keystone.py
@@ -45,8 +45,8 @@ DEFAULT_ROLE = None
# add a couple utility methods to it.
class IdentityAPIVersionManager(base.APIVersionManager):
def upgrade_v2_user(self, user):
- if getattr(user, "project_id", None) is None:
- user.project_id = getattr(user, "tenantId", None)
+ if getattr(user, "default_project_id", None) is None:
+ user.default_project_id = getattr(user, "tenantId", None)
return user
def get_project_manager(self, *args, **kwargs):
diff --git a/openstack_dashboard/dashboards/admin/projects/tests.py b/openstack_dashboard/dashboards/admin/projects/tests.py
index 0a6c5ad..30f79d3 100644
--- a/openstack_dashboard/dashboards/admin/projects/tests.py
+++ b/openstack_dashboard/dashboards/admin/projects/tests.py
@@ -699,7 +699,7 @@ class UpdateProjectWorkflowTests(test.BaseAdminViewTests):
def _get_proj_users(self, project_id):
return [user for user in self.users.list()
- if user.project_id == project_id]
+ if user.default_project_id == project_id]
def _get_proj_groups(self, project_id):
return [group for group in self.groups.list()
diff --git a/openstack_dashboard/dashboards/admin/users/views.py b/openstack_dashboard/dashboards/admin/users/views.py
index 13c3c44..0d12667 100644
--- a/openstack_dashboard/dashboards/admin/users/views.py
+++ b/openstack_dashboard/dashboards/admin/users/views.py
@@ -99,7 +99,7 @@ class UpdateView(forms.ModalFormView):
'domain_name': domain_name,
'id': user.id,
'name': user.name,
- 'project': user.project_id,
+ 'project': user.default_project_id,
'email': getattr(user, 'email', None)}
diff --git a/openstack_dashboard/test/test_data/keystone_data.py b/openstack_dashboard/test/test_data/keystone_data.py
index b8b794b..01d97ac 100644
--- a/openstack_dashboard/test/test_data/keystone_data.py
+++ b/openstack_dashboard/test/test_data/keystone_data.py
@@ -163,7 +163,7 @@ def data(TEST):
'email': 'test@example.com',
'password': 'password',
'token': 'test_token',
- 'project_id': '1',
+ 'default_project_id': '1',
'enabled': True,
'domain_id': "1"}
user = users.User(None, user_dict)
@@ -172,7 +172,7 @@ def data(TEST):
'email': 'two@example.com',
'password': 'password',
'token': 'test_token',
- 'project_id': '1',
+ 'default_project_id': '1',
'enabled': True,
'domain_id': "1"}
user2 = users.User(None, user_dict)
@@ -181,7 +181,7 @@ def data(TEST):
'email': 'three@example.com',
'password': 'password',
'token': 'test_token',
- 'project_id': '1',
+ 'default_project_id': '1',
'enabled': True,
'domain_id': "1"}
user3 = users.User(None, user_dict)
@@ -190,7 +190,7 @@ def data(TEST):
'email': 'four@example.com',
'password': 'password',
'token': 'test_token',
- 'project_id': '2',
+ 'default_project_id': '2',
'enabled': True,
'domain_id': "2"}
user4 = users.User(None, user_dict)
--
1.9.3
