diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-06-14 23:04:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-06-14 23:04:28 +0000 |
| commit | 543714b83d82629d01b52600da41400db2868873 (patch) | |
| tree | 37b6f4b7185575a300921d2afa211c5a6f7f4522 /keystone/identity | |
| parent | bc1c10e1fecd78a61a4f6710ed8a7aca769db455 (diff) | |
| parent | 716f4027ee57c146f3b472f1edae0c11503240c3 (diff) | |
| download | keystone-543714b83d82629d01b52600da41400db2868873.tar.gz keystone-543714b83d82629d01b52600da41400db2868873.tar.xz keystone-543714b83d82629d01b52600da41400db2868873.zip | |
Merge "Add checks to test if enabled is bool"
Diffstat (limited to 'keystone/identity')
| -rw-r--r-- | keystone/identity/core.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/keystone/identity/core.py b/keystone/identity/core.py index 6f30c744..205c8849 100644 --- a/keystone/identity/core.py +++ b/keystone/identity/core.py @@ -16,6 +16,7 @@ """Main entry point into the Identity service.""" +from keystone import clean from keystone.common import dependency from keystone.common import logging from keystone.common import manager @@ -74,8 +75,8 @@ class Manager(manager.Manager): def create_user(self, context, user_id, user_ref): user = user_ref.copy() - if 'enabled' not in user: - user['enabled'] = True + user.setdefault('enabled', True) + user['enabled'] = clean.user_enabled(user['enabled']) return self.driver.create_user(user_id, user) def create_group(self, context, group_id, group_ref): @@ -86,8 +87,8 @@ class Manager(manager.Manager): def create_project(self, context, tenant_id, tenant_ref): tenant = tenant_ref.copy() - if 'enabled' not in tenant: - tenant['enabled'] = True + tenant.setdefault('enabled', True) + tenant['enabled'] = clean.project_enabled(tenant['enabled']) if 'description' not in tenant: tenant['description'] = '' return self.driver.create_project(tenant_id, tenant) |