x/python-ganttclient
Code Issues Proposed changes

Addressing exception.NotFound across the project

Browse Source
This commit is contained in:
Brian Waldon
2011-04-21 15:50:04 -04:00
parent 2052866404
commit 731084a9d4
5 changed files with 35 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
nova/auth/dbdriver.py
View File

@@ -103,9 +103,7 @@ class DbDriver(object):
"""Create a project""" """Create a project"""
manager = db.user_get(context.get_admin_context(), manager_uid) manager = db.user_get(context.get_admin_context(), manager_uid)
if not manager: if not manager:
raise exception.NotFound(_("Project can't be created because " raise exception.UserNotFound(user_id=manager_uid)
"manager %s doesn't exist")
% manager_uid)
# description is a required attribute # description is a required attribute
if description is None: if description is None:
@@ -119,9 +117,7 @@ class DbDriver(object):
for member_uid in member_uids: for member_uid in member_uids:
member = db.user_get(context.get_admin_context(), member_uid) member = db.user_get(context.get_admin_context(), member_uid)
if not member: if not member:
raise exception.NotFound(_("Project can't be created " raise exception.UserNotFound(user_id=member_uid)
"because user %s doesn't exist")
% member_uid)
members.add(member) members.add(member)
values = {'id': name, values = {'id': name,
@@ -154,9 +150,7 @@ class DbDriver(object):
if manager_uid: if manager_uid:
manager = db.user_get(context.get_admin_context(), manager_uid) manager = db.user_get(context.get_admin_context(), manager_uid)
if not manager: if not manager:
raise exception.NotFound(_("Project can't be modified because " raise exception.UserNotFound(user_id=manager_uid)
"manager %s doesn't exist") %
manager_uid)
values['project_manager'] = manager['id'] values['project_manager'] = manager['id']
if description: if description:
values['description'] = description values['description'] = description
@@ -244,8 +238,8 @@ class DbDriver(object):
def _validate_user_and_project(self, user_id, project_id): def _validate_user_and_project(self, user_id, project_id):
user = db.user_get(context.get_admin_context(), user_id) user = db.user_get(context.get_admin_context(), user_id)
if not user: if not user:
raise exception.NotFound(_('User "%s" not found') % user_id) raise exception.UserNotFound(user_id=user_id)
project = db.project_get(context.get_admin_context(), project_id) project = db.project_get(context.get_admin_context(), project_id)
if not project: if not project:
raise exception.NotFound(_('Project "%s" not found') % project_id) raise exception.ProjectNotFound(project_id=project_id)
return user, project return user, project

48
nova/auth/ldapdriver.py
View File

@@ -202,8 +202,7 @@ class LdapDriver(object):
self.conn.modify_s(self.__uid_to_dn(name), attr) self.conn.modify_s(self.__uid_to_dn(name), attr)
return self.get_user(name) return self.get_user(name)
else: else:
raise exception.NotFound(_("LDAP object for %s doesn't exist") raise exception.LDAPUserNotFound(user_id=name)
% name)
else: else:
attr = [ attr = [
('objectclass', ['person', ('objectclass', ['person',
@@ -229,9 +228,7 @@ class LdapDriver(object):
raise exception.Duplicate(_("Project can't be created because " raise exception.Duplicate(_("Project can't be created because "
"project %s already exists") % 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.LDAPUserNotFound(user_id=manager_uid)
"manager %s doesn't exist")
% manager_uid)
manager_dn = self.__uid_to_dn(manager_uid) manager_dn = self.__uid_to_dn(manager_uid)
# description is a required attribute # description is a required attribute
if description is None: if description is None:
@@ -240,9 +237,7 @@ class LdapDriver(object):
if member_uids is not None: if member_uids is not None:
for member_uid in member_uids: for member_uid in member_uids:
if not self.__user_exists(member_uid): if not self.__user_exists(member_uid):
raise exception.NotFound(_("Project can't be created " raise exception.LDAPUserNotFound(user_id=member_uid)
"because user %s doesn't exist")
% member_uid)
members.append(self.__uid_to_dn(member_uid)) members.append(self.__uid_to_dn(member_uid))
# always add the manager as a member because members is required # always add the manager as a member because members is required
if not manager_dn in members: if not manager_dn in members:
@@ -265,9 +260,7 @@ class LdapDriver(object):
attr = [] attr = []
if manager_uid: if manager_uid:
if not self.__user_exists(manager_uid): if not self.__user_exists(manager_uid):
raise exception.NotFound(_("Project can't be modified because " raise exception.LDAPUserNotFound(user_id=manager_uid)
"manager %s doesn't exist")
% manager_uid)
manager_dn = self.__uid_to_dn(manager_uid) manager_dn = self.__uid_to_dn(manager_uid)
attr.append((self.ldap.MOD_REPLACE, LdapDriver.project_attribute, attr.append((self.ldap.MOD_REPLACE, LdapDriver.project_attribute,
manager_dn)) manager_dn))
@@ -347,7 +340,7 @@ class LdapDriver(object):
def delete_user(self, uid): def delete_user(self, uid):
"""Delete a user""" """Delete a user"""
if not self.__user_exists(uid): if not self.__user_exists(uid):
raise exception.NotFound(_("User %s doesn't exist") % uid) raise exception.LDAPUserNotFound(user_id=uid)
self.__remove_from_all(uid) self.__remove_from_all(uid)
if FLAGS.ldap_user_modify_only: if FLAGS.ldap_user_modify_only:
# Delete attributes # Delete attributes
@@ -477,9 +470,7 @@ class LdapDriver(object):
if member_uids is not None: if member_uids is not None:
for member_uid in member_uids: for member_uid in member_uids:
if not self.__user_exists(member_uid): if not self.__user_exists(member_uid):
raise exception.NotFound(_("Group can't be created " raise exception.LDAPUserNotFound(user_id=member_uid)
"because user %s doesn't exist")
% member_uid)
members.append(self.__uid_to_dn(member_uid)) members.append(self.__uid_to_dn(member_uid))
dn = self.__uid_to_dn(uid) dn = self.__uid_to_dn(uid)
if not dn in members: if not dn in members:
@@ -494,8 +485,7 @@ class LdapDriver(object):
def __is_in_group(self, uid, group_dn): def __is_in_group(self, uid, group_dn):
"""Check if user is in group""" """Check if user is in group"""
if not self.__user_exists(uid): if not self.__user_exists(uid):
raise exception.NotFound(_("User %s can't be searched in group " raise exception.LDAPUserNotFound(user_id=uid)
"because the user doesn't exist") % uid)
if not self.__group_exists(group_dn): if not self.__group_exists(group_dn):
return False return False
res = self.__find_object(group_dn, res = self.__find_object(group_dn,
@@ -506,11 +496,9 @@ class LdapDriver(object):
def __add_to_group(self, uid, group_dn): def __add_to_group(self, uid, group_dn):
"""Add user to group""" """Add user to group"""
if not self.__user_exists(uid): if not self.__user_exists(uid):
raise exception.NotFound(_("User %s can't be added to the group " raise exception.LDAPUserNotFound(user_id=uid)
"because the user doesn't exist") % uid)
if not self.__group_exists(group_dn): if not self.__group_exists(group_dn):
raise exception.NotFound(_("The group at dn %s doesn't exist") % raise exception.LDAPGroupNotFound(group_id=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.Duplicate(_("User %(uid)s is already a member of "
"the group %(group_dn)s") % locals()) "the group %(group_dn)s") % locals())
@@ -520,15 +508,12 @@ class LdapDriver(object):
def __remove_from_group(self, uid, group_dn): def __remove_from_group(self, uid, group_dn):
"""Remove user from group""" """Remove user from group"""
if not self.__group_exists(group_dn): if not self.__group_exists(group_dn):
raise exception.NotFound(_("The group at dn %s doesn't exist") raise exception.LDAPGroupNotFound(group_id=group_dn)
% group_dn)
if not self.__user_exists(uid): if not self.__user_exists(uid):
raise exception.NotFound(_("User %s can't be removed from the " raise exception.LDAPUserNotFound(user_id=uid)
"group because the user doesn't exist")
% uid)
if not self.__is_in_group(uid, group_dn): if not self.__is_in_group(uid, group_dn):
raise exception.NotFound(_("User %s is not a member of the group") raise exception.LDAPGroupMembershipNotFound(user_id=uid,
% uid) group_id=group_dn)
# NOTE(vish): remove user from group and any sub_groups # NOTE(vish): remove user from group and any sub_groups
sub_dns = self.__find_group_dns_with_member(group_dn, uid) sub_dns = self.__find_group_dns_with_member(group_dn, uid)
for sub_dn in sub_dns: for sub_dn in sub_dns:
@@ -548,9 +533,7 @@ class LdapDriver(object):
def __remove_from_all(self, uid): def __remove_from_all(self, uid):
"""Remove user from all roles and projects""" """Remove user from all roles and projects"""
if not self.__user_exists(uid): if not self.__user_exists(uid):
raise exception.NotFound(_("User %s can't be removed from all " raise exception.LDAPUserNotFound(user_id=uid)
"because the user doesn't exist")
% uid)
role_dns = self.__find_group_dns_with_member( role_dns = self.__find_group_dns_with_member(
FLAGS.role_project_subtree, uid) FLAGS.role_project_subtree, uid)
for role_dn in role_dns: for role_dn in role_dns:
@@ -563,8 +546,7 @@ class LdapDriver(object):
def __delete_group(self, group_dn): def __delete_group(self, group_dn):
"""Delete Group""" """Delete Group"""
if not self.__group_exists(group_dn): if not self.__group_exists(group_dn):
raise exception.NotFound(_("Group at dn %s doesn't exist") raise exception.LDAPGroupNotFound(group_id=group_dn)
% group_dn)
self.conn.delete_s(group_dn) self.conn.delete_s(group_dn)
def __delete_roles(self, project_dn): def __delete_roles(self, project_dn):

14
nova/auth/manager.py
View File

@@ -270,8 +270,7 @@ class AuthManager(object):
LOG.debug('user: %r', user) LOG.debug('user: %r', user)
if user is None: if user is None:
LOG.audit(_("Failed authorization for access key %s"), access_key) LOG.audit(_("Failed authorization for access key %s"), access_key)
raise exception.NotFound(_('No user found for access key %s') raise exception.AccessKeyNotFound(access_key=access_key)
% access_key)
# NOTE(vish): if we stop using project name as id we need better # NOTE(vish): if we stop using project name as id we need better
# logic to find a default project for user # logic to find a default project for user
@@ -285,8 +284,7 @@ class AuthManager(object):
uname = user.name uname = user.name
LOG.audit(_("failed authorization: no project named %(pjid)s" LOG.audit(_("failed authorization: no project named %(pjid)s"
" (user=%(uname)s)") % locals()) " (user=%(uname)s)") % locals())
raise exception.NotFound(_('No project called %s could be found') raise exception.ProjectNotFound(project_id=project_id)
% project_id)
if not self.is_admin(user) and not self.is_project_member(user, if not self.is_admin(user) and not self.is_project_member(user,
project): project):
uname = user.name uname = user.name
@@ -295,8 +293,8 @@ class AuthManager(object):
pjid = project.id pjid = project.id
LOG.audit(_("Failed authorization: user %(uname)s not admin" LOG.audit(_("Failed authorization: user %(uname)s not admin"
" and not member of project %(pjname)s") % locals()) " and not member of project %(pjname)s") % locals())
raise exception.NotFound(_('User %(uid)s is not a member of' raise exception.ProjectMembershipNotFound(project_id=pjid,
' project %(pjid)s') % locals()) user_id=uid)
if check_type == 's3': if check_type == 's3':
sign = signer.Signer(user.secret.encode()) sign = signer.Signer(user.secret.encode())
expected_signature = sign.s3_authorization(headers, verb, path) expected_signature = sign.s3_authorization(headers, verb, path)
@@ -420,9 +418,9 @@ class AuthManager(object):
@param project: Project in which to add local role. @param project: Project in which to add local role.
""" """
if role not in FLAGS.allowed_roles: if role not in FLAGS.allowed_roles:
raise exception.NotFound(_("The %s role can not be found") % role) raise exception.UserRoleNotFound(role_id=role)
if project is not None and role in FLAGS.global_roles: if project is not None and role in FLAGS.global_roles:
raise exception.NotFound(_("The %s role is global only") % role) raise exception.GlobalRoleNotAllowed(role_id=role)
uid = User.safe_id(user) uid = User.safe_id(user)
pid = Project.safe_id(project) pid = Project.safe_id(project)
if project: if project:

20
nova/tests/test_scheduler.py
View File

@@ -120,12 +120,11 @@ class SchedulerTestCase(test.TestCase):
dest = 'dummydest' dest = 'dummydest'
ctxt = context.get_admin_context() ctxt = context.get_admin_context()
try: self.assertRaises(exception.NotFound, scheduler.show_host_resources,
scheduler.show_host_resources(ctxt, dest) ctxt, dest)
except exception.NotFound, e: #TODO(bcwaldon): reimplement this functionality
c1 = (e.message.find(_("does not exist or is not a " #c1 = (e.message.find(_("does not exist or is not a "
"compute node.")) >= 0) # "compute node.")) >= 0)
self.assertTrue(c1)
def _dic_is_equal(self, dic1, dic2, keys=None): def _dic_is_equal(self, dic1, dic2, keys=None):
"""Compares 2 dictionary contents(Helper method)""" """Compares 2 dictionary contents(Helper method)"""
@@ -941,7 +940,7 @@ class FakeRerouteCompute(api.reroute_compute):
def go_boom(self, context, instance): def go_boom(self, context, instance):
raise exception.InstanceNotFound("boom message", instance) raise exception.InstanceNotFound(instance_id=instance)
def found_instance(self, context, instance): def found_instance(self, context, instance):
@@ -990,11 +989,8 @@ class ZoneRedirectTest(test.TestCase):
def test_routing_flags(self): def test_routing_flags(self):
FLAGS.enable_zone_routing = False FLAGS.enable_zone_routing = False
decorator = FakeRerouteCompute("foo") decorator = FakeRerouteCompute("foo")
try: self.assertRaises(exception.InstanceNotFound, decorator(go_boom),
result = decorator(go_boom)(None, None, 1) None, None, 1)
self.assertFail(_("Should have thrown exception."))
except exception.InstanceNotFound, e:
self.assertEquals(e.message, 'boom message')
def test_get_collection_context_and_id(self): def test_get_collection_context_and_id(self):
decorator = api.reroute_compute("foo") decorator = api.reroute_compute("foo")

2
nova/tests/test_volume.py
View File

@@ -142,7 +142,7 @@ class VolumeTestCase(test.TestCase):
self.assertEqual(vol['status'], "available") self.assertEqual(vol['status'], "available")
self.volume.delete_volume(self.context, volume_id) self.volume.delete_volume(self.context, volume_id)
self.assertRaises(exception.Error, self.assertRaises(exception.VolumeNotFound,
db.volume_get, db.volume_get,
self.context, self.context,
volume_id) volume_id)