Addressing exception.NotFound across the project

1 files changed, 60 insertions, 71 deletions

diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index cd6052506..0e5433490 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -137,7 +137,7 @@ def service_get(context, service_id, session=None):
                      first()
 
     if not result:
-        raise exception.NotFound(_('No service for id %s') % service_id)
+        raise exception.ServiceNotFound(service_id=service_id)
 
     return result
 
@@ -196,8 +196,7 @@ def service_get_all_compute_by_host(context, host):
                   all()
 
     if not result:
-        raise exception.NotFound(_("%s does not exist or is not "
-                                   "a compute node.") % host)
+        raise exception.ComputeHostNotFound(host=host)
 
     return result
 
@@ -284,8 +283,7 @@ def service_get_by_args(context, host, binary):
                      filter_by(deleted=can_read_deleted(context)).\
                      first()
     if not result:
-        raise exception.NotFound(_('No service for %(host)s, %(binary)s')
-                % locals())
+        raise exception.HostBinaryNotFound(host=host, binary=binary)
 
     return result
 
@@ -323,7 +321,7 @@ def compute_node_get(context, compute_id, session=None):
                      first()
 
     if not result:
-        raise exception.NotFound(_('No computeNode for id %s') % compute_id)
+        raise exception.ComputeHostNotFound(host=compute_id)
 
     return result
 
@@ -359,7 +357,7 @@ def certificate_get(context, certificate_id, session=None):
                      first()
 
     if not result:
-        raise exception.NotFound('No certificate for id %s' % certificate_id)
+        raise exception.CertificateNotFound(certificate_id=certificate_id)
 
     return result
 
@@ -564,7 +562,7 @@ def floating_ip_get_by_address(context, address, session=None):
                      filter_by(deleted=can_read_deleted(context)).\
                      first()
     if not result:
-        raise exception.NotFound('No floating ip for address %s' % address)
+        raise exception.FloatingIpNotFound(fixed_ip=address)
 
     return result
 
@@ -672,7 +670,7 @@ def fixed_ip_get_all(context, session=None):
         session = get_session()
     result = session.query(models.FixedIp).all()
     if not result:
-        raise exception.NotFound(_('No fixed ips defined'))
+        raise exception.NoFloatingIpsDefined()
 
     return result
 
@@ -688,7 +686,7 @@ def fixed_ip_get_all_by_host(context, host=None):
                     all()
 
     if not result:
-        raise exception.NotFound(_('No fixed ips for this host defined'))
+        raise exception.NoFloatingIpsDefinedForHost(host=host)
 
     return result
 
@@ -704,7 +702,7 @@ def fixed_ip_get_by_address(context, address, session=None):
                      options(joinedload('instance')).\
                      first()
     if not result:
-        raise exception.NotFound(_('No floating ip for address %s') % address)
+        raise exception.FloatingIpNotFound(fixed_ip=address)
 
     if is_user_context(context):
         authorize_project_context(context, result.instance.project_id)
@@ -725,7 +723,7 @@ def fixed_ip_get_all_by_instance(context, instance_id):
                  filter_by(instance_id=instance_id).\
                  filter_by(deleted=False)
     if not rv:
-        raise exception.NotFound(_('No address for instance %s') % instance_id)
+        raise exception.NoFloatingIpsFoundForInstance(instance_id=instance_id)
     return rv
 
 
@@ -848,9 +846,7 @@ def instance_get(context, instance_id, session=None):
                          filter_by(deleted=False).\
                          first()
     if not result:
-        raise exception.InstanceNotFound(_('Instance %s not found')
-                                         % instance_id,
-                                         instance_id)
+        raise exception.InstanceNotFound(instance_id=instance_id)
 
     return result
 
@@ -1126,8 +1122,7 @@ def key_pair_get(context, user_id, name, session=None):
                      filter_by(deleted=can_read_deleted(context)).\
                      first()
     if not result:
-        raise exception.NotFound(_('no keypair for user %(user_id)s,'
-                ' name %(name)s') % locals())
+        raise exception.KeypairNotFound(user_id=user_id, name=name)
     return result
 
 
@@ -1253,7 +1248,7 @@ def network_get(context, network_id, session=None):
                          filter_by(deleted=False).\
                          first()
     if not result:
-        raise exception.NotFound(_('No network for id %s') % network_id)
+        raise exception.NetworkNotFound(network_id=network_id)
 
     return result
 
@@ -1263,7 +1258,7 @@ def network_get_all(context):
     session = get_session()
     result = session.query(models.Network)
     if not result:
-        raise exception.NotFound(_('No networks defined'))
+        raise exception.NoNetworksFound()
     return result
 
 
@@ -1292,7 +1287,7 @@ def network_get_by_bridge(context, bridge):
                  first()
 
     if not result:
-        raise exception.NotFound(_('No network for bridge %s') % bridge)
+        raise exception.NetworkNotFoundForBridge(bridge=bridge)
     return result
 
 
@@ -1303,8 +1298,7 @@ def network_get_by_cidr(context, cidr):
                 filter_by(cidr=cidr).first()
 
     if not result:
-        raise exception.NotFound(_('Network with cidr %s does not exist') %
-                                  cidr)
+        raise exception.NetworkNotFoundForCidr(cidr=cidr)
     return result
 
 
@@ -1318,7 +1312,7 @@ def network_get_by_instance(_context, instance_id):
                  filter_by(deleted=False).\
                  first()
     if not rv:
-        raise exception.NotFound(_('No network for instance %s') % instance_id)
+        raise exception.NetworkNotFoundForInstance(instance_id=instance_id)
     return rv
 
 
@@ -1331,7 +1325,7 @@ def network_get_all_by_instance(_context, instance_id):
                  filter_by(instance_id=instance_id).\
                  filter_by(deleted=False)
     if not rv:
-        raise exception.NotFound(_('No network for instance %s') % instance_id)
+        raise exception.NetworkNotFoundForInstance(instance_id=instance_id)
     return rv
 
 
@@ -1345,7 +1339,7 @@ def network_set_host(context, network_id, host_id):
                               with_lockmode('update').\
                               first()
         if not network_ref:
-            raise exception.NotFound(_('No network for id %s') % network_id)
+            raise exception.NetworkNotFound(network_id=network_id)
 
         # NOTE(vish): if with_lockmode isn't supported, as in sqlite,
         #             then this has concurrency issues
@@ -1470,7 +1464,7 @@ def auth_token_get(context, token_hash, session=None):
                   filter_by(deleted=can_read_deleted(context)).\
                   first()
     if not tk:
-        raise exception.NotFound(_('Token %s does not exist') % token_hash)
+        raise exception.AuthTokenNotFound(token=token_hash)
     return tk
 
 
@@ -1504,7 +1498,7 @@ def quota_get(context, project_id, session=None):
                      filter_by(deleted=can_read_deleted(context)).\
                      first()
     if not result:
-        raise exception.NotFound(_('No quota for project_id %s') % project_id)
+        raise exception.ProjectQuotaNotFound(project_id=project_id)
 
     return result
 
@@ -1659,8 +1653,7 @@ def volume_get(context, volume_id, session=None):
                          filter_by(deleted=False).\
                          first()
     if not result:
-        raise exception.VolumeNotFound(_('Volume %s not found') % volume_id,
-                                       volume_id)
+        raise exception.VolumeNotFound(volume_id=volume_id)
 
     return result
 
@@ -1692,7 +1685,7 @@ def volume_get_all_by_instance(context, instance_id):
                      filter_by(deleted=False).\
                      all()
     if not result:
-        raise exception.NotFound(_('No volume for instance %s') % instance_id)
+        raise exception.VolumeNotFoundForInstance(instance_id=instance_id)
     return result
 
 
@@ -1717,8 +1710,7 @@ def volume_get_instance(context, volume_id):
                      options(joinedload('instance')).\
                      first()
     if not result:
-        raise exception.VolumeNotFound(_('Volume %s not found') % volume_id,
-                                       volume_id)
+        raise exception.VolumeNotFound(volume_id=volume_id)
 
     return result.instance
 
@@ -1730,8 +1722,7 @@ def volume_get_shelf_and_blade(context, volume_id):
                      filter_by(volume_id=volume_id).\
                      first()
     if not result:
-        raise exception.NotFound(_('No export device found for volume %s') %
-                                 volume_id)
+        raise exception.ExportDeviceNotFoundForVolume(volume_id=volume_id)
 
     return (result.shelf_id, result.blade_id)
 
@@ -1743,8 +1734,7 @@ def volume_get_iscsi_target_num(context, volume_id):
                      filter_by(volume_id=volume_id).\
                      first()
     if not result:
-        raise exception.NotFound(_('No target id found for volume %s') %
-                                 volume_id)
+        raise exception.ISCSITargetNotFoundForVolume(volume_id=volume_id)
 
     return result.target_num
 
@@ -1788,8 +1778,8 @@ def security_group_get(context, security_group_id, session=None):
                          options(joinedload_all('rules')).\
                          first()
     if not result:
-        raise exception.NotFound(_("No security group with id %s") %
-                                 security_group_id)
+        raise exception.SecurityGroupNotFound(
+                security_group_id=security_group_id)
     return result
 
 
@@ -1804,9 +1794,8 @@ def security_group_get_by_name(context, project_id, group_name):
                         options(joinedload_all('instances')).\
                         first()
     if not result:
-        raise exception.NotFound(
-            _('No security group named %(group_name)s'
-            ' for project: %(project_id)s') % locals())
+        raise exception.SecurityGroupNotFoundForProject(project_id=project_id,
+                                                 security_group_id=group_name)
     return result
 
 
@@ -1907,8 +1896,8 @@ def security_group_rule_get(context, security_group_rule_id, session=None):
                          filter_by(id=security_group_rule_id).\
                          first()
     if not result:
-        raise exception.NotFound(_("No secuity group rule with id %s") %
-                                 security_group_rule_id)
+        raise exception.SecurityGroupNotFoundForRule(
+                                               rule_id=security_group_rule_id)
     return result
 
 
@@ -1981,7 +1970,7 @@ def user_get(context, id, session=None):
                      first()
 
     if not result:
-        raise exception.NotFound(_('No user for id %s') % id)
+        raise exception.UserNotFound(user_id=id)
 
     return result
 
@@ -1997,7 +1986,7 @@ def user_get_by_access_key(context, access_key, session=None):
                    first()
 
     if not result:
-        raise exception.NotFound(_('No user for access key %s') % access_key)
+        raise exception.AccessKeyNotFound(access_key=access_key)
 
     return result
 
@@ -2062,7 +2051,7 @@ def project_get(context, id, session=None):
                      first()
 
     if not result:
-        raise exception.NotFound(_("No project with id %s") % id)
+        raise exception.ProjectNotFound(project_id=id)
 
     return result
 
@@ -2083,7 +2072,7 @@ def project_get_by_user(context, user_id):
                    options(joinedload_all('projects')).\
                    first()
     if not user:
-        raise exception.NotFound(_('Invalid user_id %s') % user_id)
+        raise exception.UserNotFound(user_id=user_id)
     return user.projects
 
 
@@ -2223,8 +2212,7 @@ def migration_get(context, id, session=None):
     result = session.query(models.Migration).\
                      filter_by(id=id).first()
     if not result:
-        raise exception.NotFound(_("No migration found with id %s")
-                % id)
+        raise exception.MigrationNotFound(migration_id=id)
     return result
 
 
@@ -2235,8 +2223,8 @@ def migration_get_by_instance_and_status(context, instance_id, status):
                      filter_by(instance_id=instance_id).\
                      filter_by(status=status).first()
     if not result:
-        raise exception.NotFound(_("No migration found for instance "
-                "%(instance_id)s with status %(status)s") % locals())
+        raise exception.MigrationNotFoundByStatus(instance_id=instance_id,
+                                                  status=status)
     return result
 
 
@@ -2257,8 +2245,7 @@ def console_pool_get(context, pool_id):
                      filter_by(id=pool_id).\
                      first()
     if not result:
-        raise exception.NotFound(_("No console pool with id %(pool_id)s")
-                % locals())
+        raise exception.ConsolePoolNotFound(pool_id=pool_id)
 
     return result
 
@@ -2274,9 +2261,9 @@ def console_pool_get_by_host_type(context, compute_host, host,
                    options(joinedload('consoles')).\
                    first()
     if not result:
-        raise exception.NotFound(_('No console pool of type %(console_type)s '
-                                   'for compute host %(compute_host)s '
-                                   'on proxy host %(host)s') % locals())
+        raise exception.ConsolePoolNotFoundForHostType(host=host,
+                                                  console_type=console_type,
+                                                  compute_host=compute_host )
     return result
 
 
@@ -2314,8 +2301,8 @@ def console_get_by_pool_instance(context, pool_id, instance_id):
                    options(joinedload('pool')).\
                    first()
     if not result:
-        raise exception.NotFound(_('No console for instance %(instance_id)s '
-                                 'in pool %(pool_id)s') % locals())
+        raise exception.ConsoleNotFoundInPoolForInstance(pool_id=pool_id,
+                                                 instance_id=instance_id)
     return result
 
 
@@ -2336,9 +2323,11 @@ def console_get(context, console_id, instance_id=None):
         query = query.filter_by(instance_id=instance_id)
     result = query.options(joinedload('pool')).first()
     if not result:
-        idesc = (_("on instance %s") % instance_id) if instance_id else ""
-        raise exception.NotFound(_("No console with id %(console_id)s"
-                                   " %(idesc)s") % locals())
+        if instance_id:
+            raise exception.ConsoleNotFoundForInstance(console_id=console_id,
+                                                       instance_id=instance_id)
+        else:
+            raise exception.ConsoleNotFound(console_id=console_id)
     return result
 
 
@@ -2377,7 +2366,7 @@ def instance_type_get_all(context, inactive=False):
             inst_dict[i['name']] = dict(i)
         return inst_dict
     else:
-        raise exception.NotFound
+        raise exception.NoInstanceTypesFound()
 
 
 @require_context
@@ -2388,7 +2377,7 @@ def instance_type_get_by_id(context, id):
                     filter_by(id=id).\
                     first()
     if not inst_type:
-        raise exception.NotFound(_("No instance type with id %s") % id)
+        raise exception.InstanceTypeNotFound(instance_type=id)
     else:
         return dict(inst_type)
 
@@ -2401,7 +2390,7 @@ def instance_type_get_by_name(context, name):
                     filter_by(name=name).\
                     first()
     if not inst_type:
-        raise exception.NotFound(_("No instance type with name %s") % name)
+        raise exception.InstanceTypeNotFoundByName(instance_type_name=name)
     else:
         return dict(inst_type)
 
@@ -2414,7 +2403,7 @@ def instance_type_get_by_flavor_id(context, id):
                                     filter_by(flavorid=int(id)).\
                                     first()
     if not inst_type:
-        raise exception.NotFound(_("No flavor with flavorid %s") % id)
+        raise exception.FlavorNotFound(flavor_id=id)
     else:
         return dict(inst_type)
 
@@ -2427,7 +2416,7 @@ def instance_type_destroy(context, name):
                                       filter_by(name=name)
     records = instance_type_ref.update(dict(deleted=True))
     if records == 0:
-        raise exception.NotFound
+        raise exception.InstanceTypeNotFoundByName(instance_type_name=name)
     else:
         return instance_type_ref
 
@@ -2442,7 +2431,7 @@ def instance_type_purge(context, name):
                                       filter_by(name=name)
     records = instance_type_ref.delete()
     if records == 0:
-        raise exception.NotFound
+        raise exception.InstanceTypeNotFoundByName(instance_type_name=name)
     else:
         return instance_type_ref
 
@@ -2463,7 +2452,7 @@ def zone_update(context, zone_id, values):
     session = get_session()
     zone = session.query(models.Zone).filter_by(id=zone_id).first()
     if not zone:
-        raise exception.NotFound(_("No zone with id %(zone_id)s") % locals())
+        raise exception.ZoneNotFound(zone_id=zone_id)
     zone.update(values)
     zone.save()
     return zone
@@ -2483,7 +2472,7 @@ def zone_get(context, zone_id):
     session = get_session()
     result = session.query(models.Zone).filter_by(id=zone_id).first()
     if not result:
-        raise exception.NotFound(_("No zone with id %(zone_id)s") % locals())
+        raise exception.ZoneNotFound(zone_id=zone_id)
     return result
 
 
@@ -2533,8 +2522,8 @@ def instance_metadata_get_item(context, instance_id, key):
                     first()
 
     if not meta_result:
-        raise exception.NotFound(_('Invalid metadata key for instance %s') %
-                                    instance_id)
+        raise exception.InstanceMetadataNotFound(metadata_key=key,
+                                                 instance_id=instance_id)
     return meta_result