x/python-ganttclient
Code Issues Proposed changes

refactoring usage of exception.Duplicate errors

Browse Source
This commit is contained in:
Brian Waldon
2011-04-19 13:17:21 -04:00
parent c9fef336d7
commit 917ccf509b
2 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
nova/auth/dbdriver.py
View File

@@ -81,7 +81,7 @@ class DbDriver(object):
user_ref = db.user_create(context.get_admin_context(), values) user_ref = db.user_create(context.get_admin_context(), values)
return self._db_user_to_auth_user(user_ref) return self._db_user_to_auth_user(user_ref)
except exception.Duplicate, e: except exception.Duplicate, e:
raise exception.Duplicate(_('User %s already exists') % name) raise exception.UserExists(user=name)
def _db_user_to_auth_user(self, user_ref): def _db_user_to_auth_user(self, user_ref):
return {'id': user_ref['id'], return {'id': user_ref['id'],
@@ -132,8 +132,7 @@ class DbDriver(object):
try: try:
project = db.project_create(context.get_admin_context(), values) project = db.project_create(context.get_admin_context(), values)
except exception.Duplicate: except exception.Duplicate:
raise exception.Duplicate(_("Project can't be created because " raise exception.ProjectExists(project=name)
"project %s already exists") % name)
for member in members: for member in members:
db.project_add_member(context.get_admin_context(), db.project_add_member(context.get_admin_context(),

11
nova/auth/ldapdriver.py
View File

@@ -171,7 +171,7 @@ class LdapDriver(object):
def create_user(self, name, access_key, secret_key, is_admin): def create_user(self, name, access_key, secret_key, is_admin):
"""Create a user""" """Create a user"""
if self.__user_exists(name): if self.__user_exists(name):
raise exception.Duplicate(_("LDAP user %s already exists") % name) raise exception.LDAPUserExists(user=name)
if FLAGS.ldap_user_modify_only: if FLAGS.ldap_user_modify_only:
if self.__ldap_user_exists(name): if self.__ldap_user_exists(name):
# Retrieve user by name # Retrieve user by name
@@ -226,8 +226,7 @@ class LdapDriver(object):
description=None, member_uids=None): description=None, member_uids=None):
"""Create a project""" """Create a project"""
if self.__project_exists(name): if self.__project_exists(name):
raise exception.Duplicate(_("Project can't be created because " raise exception.ProjectExists(project=name)
"project %s already exists") % name)
if not self.__user_exists(manager_uid): if not self.__user_exists(manager_uid):
raise exception.NotFound(_("Project can't be created because " raise exception.NotFound(_("Project can't be created because "
"manager %s doesn't exist") "manager %s doesn't exist")
@@ -471,8 +470,7 @@ class LdapDriver(object):
description, member_uids=None): description, member_uids=None):
"""Create a group""" """Create a group"""
if self.__group_exists(group_dn): if self.__group_exists(group_dn):
raise exception.Duplicate(_("Group can't be created because " raise exception.LDAPGroupExists(group=name)
"group %s already exists") % name)
members = [] members = []
if member_uids is not None: if member_uids is not None:
for member_uid in member_uids: for member_uid in member_uids:
@@ -512,8 +510,7 @@ class LdapDriver(object):
raise exception.NotFound(_("The group at dn %s doesn't exist") % raise exception.NotFound(_("The group at dn %s doesn't exist") %
group_dn) group_dn)
if self.__is_in_group(uid, group_dn): if self.__is_in_group(uid, group_dn):
raise exception.Duplicate(_("User %(uid)s is already a member of " raise exception.LDAPMembershipExists(uid=uid, group_dn=group_dn)
"the group %(group_dn)s") % locals())
attr = [(self.ldap.MOD_ADD, 'member', self.__uid_to_dn(uid))] attr = [(self.ldap.MOD_ADD, 'member', self.__uid_to_dn(uid))]
self.conn.modify_s(group_dn, attr) self.conn.modify_s(group_dn, attr)