From 696e5a43091fa889fe8d183844952be3ac42f991 Mon Sep 17 00:00:00 2001 From: Yogeshwar Srikrishnan Date: Thu, 16 Jun 2011 11:55:38 -0500 Subject: Changes to allow user creation without a tenant. --- keystone/db/sqlalchemy/api.py | 2 +- keystone/logic/service.py | 59 +++++++++++++--------------------------- keystone/test/unit/test_users.py | 22 +++++++++++---- 3 files changed, 37 insertions(+), 46 deletions(-) diff --git a/keystone/db/sqlalchemy/api.py b/keystone/db/sqlalchemy/api.py index d3146913..aa2fb652 100755 --- a/keystone/db/sqlalchemy/api.py +++ b/keystone/db/sqlalchemy/api.py @@ -669,7 +669,7 @@ def user_get_by_group(id, session=None): return user_group -def user_delete_tenant(id, tenant_id, session=None): +def user_delete_tenant_user(id, tenant_id, session=None): if not session: session = get_session() with session.begin(): diff --git a/keystone/logic/service.py b/keystone/logic/service.py index 693a4e3b..78be5d47 100755 --- a/keystone/logic/service.py +++ b/keystone/logic/service.py @@ -210,6 +210,7 @@ class IdentityService(object): # # Tenant Group Operations # + def create_tenant_group(self, admin_token, tenant, group): self.__validate_token(admin_token) @@ -429,12 +430,7 @@ class IdentityService(object): def create_user(self, admin_token, user): self.__validate_token(admin_token) - dtenant = db_api.tenant_get(user.tenant_id) - if dtenant == None: - raise fault.UnauthorizedFault("Unauthorized") - - if not dtenant.enabled: - raise fault.TenantDisabledFault("Your account has been disabled") + dtenant = self.validate_and_fetch_user_tenant(user.tenant_id) if not isinstance(user, users.User): raise fault.BadRequestFault("Expecting a User") @@ -459,7 +455,19 @@ class IdentityService(object): db_api.user_create(duser) return user + + def validate_and_fetch_user_tenant(self, tenant_id): + if tenant_id != None and len(tenant_id) > 0: + dtenant = db_api.tenant_get(tenant_id) + if dtenant == None: + raise fault.ItemNotFoundFault("The tenant is not found") + elif not dtenant.enabled: + raise fault.TenantDisabledFault("Your account has been disabled") + return dtenant + else: + return None + def get_tenant_users(self, admin_token, tenant_id, marker, limit, url): self.__validate_token(admin_token) @@ -527,30 +535,6 @@ class IdentityService(object): return users.User_Update(None, duser.id, duser.tenant_id, duser.email, duser.enabled, ts) - ## - ## GET Users with Pagination - ## - def get_users(self, admin_token, marker, limit, url): - (token, user) = self.__validate_token(admin_token) - # If Global admin return all tenants. - us = [] - dusers = db_api.user_get_page(marker, limit) - for duser in dusers: - us.append(users.User(None, - duser.id, - duser.tenant_id, - duser.email, - duser.enabled)) - prev, next = db_api.user_get_page_markers(marker, limit) - links = [] - if prev: - links.append(atom.Link('prev', "%s?'marker=%s&limit=%s'" \ - % (url, prev, limit))) - if next: - links.append(atom.Link('next', "%s?'marker=%s&limit=%s'" \ - % (url, next, limit))) - return users.Users(us, links) - def update_user(self, admin_token, user_id, user): self.__validate_token(admin_token) @@ -630,15 +614,7 @@ class IdentityService(object): raise fault.ItemNotFoundFault("The user could not be found") - dtenant = db_api.tenant_get(user.tenant_id) - - #Check if tenant exists.If user has passed a tenant that does not exist throw error. - #If user is trying to update to a tenant that is disabled throw an error. - if dtenant == None and len(user.tenant_id) > 0: - raise fault.ItemNotFoundFault("The tenant not found") - elif not dtenant.enabled: - raise fault.TenantDisabledFault("Your account has been disabled") - + dtenant = self.validate_and_fetch_user_tenant(user.tenant_id) values = {'tenant_id': user.tenant_id} db_api.user_update(user_id, values) return users.User_Update(None, None, user.tenant_id, None, None, None) @@ -650,7 +626,10 @@ class IdentityService(object): raise fault.ItemNotFoundFault("The user could not be found") dtenant = db_api.tenant_get(duser.tenant_id) - db_api.user_delete_tenant(user_id, dtenant.id) + if dtenant != None: + db_api.user_delete_tenant_user(user_id, dtenant.id) + else: + db_api.user_delete(user_id) return None def get_user_groups(self, admin_token, user_id, marker, limit, diff --git a/keystone/test/unit/test_users.py b/keystone/test/unit/test_users.py index b93672f8..7bde945c 100755 --- a/keystone/test/unit/test_users.py +++ b/keystone/test/unit/test_users.py @@ -35,6 +35,7 @@ class UserTest(unittest.TestCase): self.password = utils.get_password() self.email = utils.get_email() self.user = utils.get_user() + self.user1 = 'test_user1' self.userdisabled = utils.get_userdisabled() self.auth_token = utils.get_auth_token() self.exp_auth_token = utils.get_exp_auth_token() @@ -56,19 +57,29 @@ class CreateUserTest(UserTest): resp = utils.delete_user(self.user, str(self.auth_token)) - resp, content = utils.create_user(self.tenant, 'test_user1', + resp, content = utils.create_user(self.tenant, self.user1, str(self.auth_token)) - self.user = 'test_user1' + self.user = self.user1 resp_val = int(resp['status']) utils.handle_user_resp(self, content, resp_val, utils.content_type(resp)) self.assertEqual(201, resp_val) + + def test_a_user_witn_no_tenant(self): + resp = utils.delete_user(self.user1, str(self.auth_token)) + resp, content = utils.create_user(None, self.user1, + str(self.auth_token)) + self.user = self.user1 + resp_val = int(resp['status']) + utils.handle_user_resp(self, content, resp_val, + utils.content_type(resp)) + self.assertEqual(201, resp_val) + def test_a_user_create_xml(self): - utils.delete_user_xml(self.tenant, self.user, str(self.auth_token)) - resp, content = utils.create_user_xml(self.tenant, 'test_user1', + utils.delete_user_xml(self.tenant, self.user1, str(self.auth_token)) + resp, content = utils.create_user_xml(self.tenant, self.user1, str(self.auth_token)) - self.user = 'test_user1' resp_val = int(resp['status']) utils.handle_user_resp(self, content, resp_val, utils.content_type(resp)) @@ -1584,6 +1595,7 @@ class AddUserTest(UserTest): self.assertEqual(201, resp_val) def test_add_user_tenant_xml(self): + utils.delete_user(self.user, str(self.auth_token)) utils.create_tenant(self.tenant, str(self.auth_token)) resp, content = utils.create_user_xml(self.tenant, self.user, -- cgit From 22c315b48335e4e1e1ed71426908c3c4de08d9b1 Mon Sep 17 00:00:00 2001 From: Yogeshwar Srikrishnan Date: Thu, 16 Jun 2011 12:35:46 -0500 Subject: Pep8 changes. --- keystone/db/sqlalchemy/api.py | 1 + keystone/logic/service.py | 9 +++------ 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/keystone/db/sqlalchemy/api.py b/keystone/db/sqlalchemy/api.py index aa2fb652..89ab223f 100755 --- a/keystone/db/sqlalchemy/api.py +++ b/keystone/db/sqlalchemy/api.py @@ -859,6 +859,7 @@ def users_get_page(marker, limit, session=None): return session.query(user).\ order_by("id").limit(limit).all() + def users_get_page_markers(marker, limit, \ session=None): if not session: diff --git a/keystone/logic/service.py b/keystone/logic/service.py index 78be5d47..8b954899 100755 --- a/keystone/logic/service.py +++ b/keystone/logic/service.py @@ -455,19 +455,19 @@ class IdentityService(object): db_api.user_create(duser) return user - + def validate_and_fetch_user_tenant(self, tenant_id): if tenant_id != None and len(tenant_id) > 0: dtenant = db_api.tenant_get(tenant_id) if dtenant == None: raise fault.ItemNotFoundFault("The tenant is not found") elif not dtenant.enabled: - raise fault.TenantDisabledFault("Your account has been disabled") + raise fault.TenantDisabledFault( + "Your account has been disabled") return dtenant else: return None - def get_tenant_users(self, admin_token, tenant_id, marker, limit, url): self.__validate_token(admin_token) @@ -514,7 +514,6 @@ class IdentityService(object): (url, next, limit))) return users.Users(ts, links) - def get_user(self, admin_token, user_id): self.__validate_token(admin_token) duser = db_api.user_get(user_id) @@ -612,8 +611,6 @@ class IdentityService(object): duser = db_api.user_get(user_id) if duser == None: raise fault.ItemNotFoundFault("The user could not be found") - - dtenant = self.validate_and_fetch_user_tenant(user.tenant_id) values = {'tenant_id': user.tenant_id} db_api.user_update(user_id, values) -- cgit From f345bff9397614e8435ca47fd6b73218c3460ca8 Mon Sep 17 00:00:00 2001 From: Yogeshwar Srikrishnan Date: Thu, 16 Jun 2011 15:10:40 -0500 Subject: Changes to wadl to support user operations. --- doc/guide/src/docbkx/identity.wadl | 295 ++++++++++++++++++++++++++++++++++++- doc/guide/src/docbkx/xsd/api.xsd | 1 + doc/guide/src/docbkx/xsd/roles.xsd | 14 +- 3 files changed, 302 insertions(+), 8 deletions(-) mode change 100644 => 100755 doc/guide/src/docbkx/xsd/api.xsd mode change 100644 => 100755 doc/guide/src/docbkx/xsd/roles.xsd diff --git a/doc/guide/src/docbkx/identity.wadl b/doc/guide/src/docbkx/identity.wadl index 4b68f9a7..5960a485 100644 --- a/doc/guide/src/docbkx/identity.wadl +++ b/doc/guide/src/docbkx/identity.wadl @@ -65,16 +65,42 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -384,6 +410,273 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/doc/guide/src/docbkx/xsd/api.xsd b/doc/guide/src/docbkx/xsd/api.xsd old mode 100644 new mode 100755 index a23abd99..ebb1ca3b --- a/doc/guide/src/docbkx/xsd/api.xsd +++ b/doc/guide/src/docbkx/xsd/api.xsd @@ -13,4 +13,5 @@ + diff --git a/doc/guide/src/docbkx/xsd/roles.xsd b/doc/guide/src/docbkx/xsd/roles.xsd old mode 100644 new mode 100755 index 6f8cc207..c73d9a37 --- a/doc/guide/src/docbkx/xsd/roles.xsd +++ b/doc/guide/src/docbkx/xsd/roles.xsd @@ -4,12 +4,12 @@ elementFormDefault="qualified" attributeFormDefault="unqualified" xmlns="http://www.w3.org/2001/XMLSchema" - xmlns:idm="http://docs.openstack.org/identity/api/v2.0" + xmlns:identity="http://docs.openstack.org/identity/api/v2.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://docs.openstack.org/identity/api/v2.0" > - + - + - + - + - + @@ -91,7 +91,7 @@ - + \ No newline at end of file -- cgit From 08699d513f83c104d6e148a8e80afb9b02221e80 Mon Sep 17 00:00:00 2001 From: Yogeshwar Srikrishnan Date: Thu, 16 Jun 2011 16:00:15 -0500 Subject: Fixing existing methods on wadl. --- doc/guide/src/docbkx/identity.wadl | 16 +++---- doc/guide/src/docbkx/xsd/user.xsd | 97 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 105 insertions(+), 8 deletions(-) create mode 100755 doc/guide/src/docbkx/xsd/user.xsd diff --git a/doc/guide/src/docbkx/identity.wadl b/doc/guide/src/docbkx/identity.wadl index 5960a485..b153904d 100644 --- a/doc/guide/src/docbkx/identity.wadl +++ b/doc/guide/src/docbkx/identity.wadl @@ -27,7 +27,7 @@ - + @@ -87,6 +87,7 @@ + @@ -96,6 +97,7 @@ + @@ -105,6 +107,7 @@ + @@ -293,7 +296,7 @@ - + @@ -444,8 +447,8 @@ - - + + @@ -675,10 +678,7 @@ - - - - + + + + + + + + + + + + + +

+ A list of Users. +

+ + + + + + + +

+ A Keystone User. +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit From ca5ba70f68311c435531167a8e89f465507cf078 Mon Sep 17 00:00:00 2001 From: Yogeshwar Srikrishnan Date: Thu, 16 Jun 2011 16:47:12 -0500 Subject: Changes to include support for paginations. --- doc/guide/src/docbkx/xsd/baseURLs.xsd | 17 ++++++++++++++++- doc/guide/src/docbkx/xsd/roles.xsd | 15 +++++++++++++++ doc/guide/src/docbkx/xsd/user.xsd | 11 +++++++---- 3 files changed, 38 insertions(+), 5 deletions(-) mode change 100644 => 100755 doc/guide/src/docbkx/xsd/baseURLs.xsd diff --git a/doc/guide/src/docbkx/xsd/baseURLs.xsd b/doc/guide/src/docbkx/xsd/baseURLs.xsd old mode 100644 new mode 100755 index 54869140..e1d63887 --- a/doc/guide/src/docbkx/xsd/baseURLs.xsd +++ b/doc/guide/src/docbkx/xsd/baseURLs.xsd @@ -5,8 +5,15 @@ xmlns="http://www.w3.org/2001/XMLSchema" xmlns:idm="http://docs.openstack.org/identity/api/v2.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:vc="http://www.w3.org/2007/XMLSchema-versioning" + xmlns:atom="http://www.w3.org/2005/Atom" targetNamespace="http://docs.openstack.org/identity/api/v2.0" > + + + + + @@ -165,22 +173,29 @@ xml:lang="EN" xmlns="http://www.w3.org/1999/xhtml">

- A hyperlink refrence to the base URL. + A hyperlink reference to the base URL.

+ + + + + + + diff --git a/doc/guide/src/docbkx/xsd/roles.xsd b/doc/guide/src/docbkx/xsd/roles.xsd index c73d9a37..c01c190a 100755 --- a/doc/guide/src/docbkx/xsd/roles.xsd +++ b/doc/guide/src/docbkx/xsd/roles.xsd @@ -6,8 +6,15 @@ xmlns="http://www.w3.org/2001/XMLSchema" xmlns:identity="http://docs.openstack.org/identity/api/v2.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:vc="http://www.w3.org/2007/XMLSchema-versioning" + xmlns:atom="http://www.w3.org/2005/Atom" targetNamespace="http://docs.openstack.org/identity/api/v2.0" > + + + + @@ -63,12 +70,16 @@ + + + + @@ -86,12 +97,16 @@ + + + + \ No newline at end of file diff --git a/doc/guide/src/docbkx/xsd/user.xsd b/doc/guide/src/docbkx/xsd/user.xsd index 300d552b..991a1fb4 100755 --- a/doc/guide/src/docbkx/xsd/user.xsd +++ b/doc/guide/src/docbkx/xsd/user.xsd @@ -9,8 +9,9 @@ xmlns="http://www.w3.org/2001/XMLSchema" xmlns:identity="http://docs.openstack.org/identity/api/v2.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://docs.openstack.org/identity/api/v2.0" + xmlns:vc="http://www.w3.org/2007/XMLSchema-versioning" xmlns:atom="http://www.w3.org/2005/Atom" + targetNamespace="http://docs.openstack.org/identity/api/v2.0" > @@ -21,7 +22,7 @@ + xmlns="http://www.w3.org/2001/XMLSchema">

A list of Users.

@@ -33,7 +34,7 @@ + xmlns="http://www.w3.org/2001/XMLSchema">

A Keystone User.

@@ -48,7 +49,7 @@ - + @@ -90,8 +91,10 @@ + + -- cgit From b93c9b8ebe2b563e8fae0b608a35cc0c887bedc9 Mon Sep 17 00:00:00 2001 From: Yogeshwar Srikrishnan Date: Fri, 17 Jun 2011 11:16:51 -0500 Subject: Merging changes --- keystone/db/sqlalchemy/api/user.py | 2 +- keystone/logic/service.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) mode change 100644 => 100755 keystone/db/sqlalchemy/api/user.py diff --git a/keystone/db/sqlalchemy/api/user.py b/keystone/db/sqlalchemy/api/user.py old mode 100644 new mode 100755 index dfc7bbcf..9d2f901f --- a/keystone/db/sqlalchemy/api/user.py +++ b/keystone/db/sqlalchemy/api/user.py @@ -245,7 +245,7 @@ def get_group_by_tenant(id, session=None): return user_group -def delete_tenant(id, tenant_id, session=None): +def delete_tenant_user(id, tenant_id, session=None): if not session: session = get_session() with session.begin(): diff --git a/keystone/logic/service.py b/keystone/logic/service.py index ed624515..6840a3d7 100755 --- a/keystone/logic/service.py +++ b/keystone/logic/service.py @@ -628,7 +628,7 @@ class IdentityService(object): if dtenant != None: db_api.user.delete_tenant_user(user_id, dtenant.id) else: - db_api.user.user_delete(user_id) + db_api.user.delete(user_id) return None def get_user_groups(self, admin_token, user_id, marker, limit, -- cgit