Error handling: Model-level validations, proper error responses.

moto/ec2/exceptions.py

@@ -2,12 +2,6 @@ from werkzeug.exceptions import BadRequest
 from jinja2 import Template
 
 
-class InvalidIdError(RuntimeError):
-    def __init__(self, id_value):
-        super(InvalidIdError, self).__init__()
-        self.id = id_value
-
-
 class EC2ClientError(BadRequest):
     def __init__(self, code, message):
         super(EC2ClientError, self).__init__()
@@ -21,6 +15,14 @@ class DependencyViolationError(EC2ClientError):
             "DependencyViolation", message)
 
 
+class MissingParameterError(EC2ClientError):
+    def __init__(self, parameter):
+        super(MissingParameterError, self).__init__(
+            "MissingParameter",
+            "The request must contain the parameter {0}"
+            .format(parameter))
+
+
 class InvalidDHCPOptionsIdError(EC2ClientError):
     def __init__(self, dhcp_options_id):
         super(InvalidDHCPOptionsIdError, self).__init__(
@@ -29,6 +31,30 @@ class InvalidDHCPOptionsIdError(EC2ClientError):
             .format(dhcp_options_id))
 
 
+class MalformedDHCPOptionsIdError(EC2ClientError):
+    def __init__(self, dhcp_options_id):
+        super(MalformedDHCPOptionsIdError, self).__init__(
+            "InvalidDhcpOptionsId.Malformed",
+            "Invalid id: \"{0}\" (expecting \"dopt-...\")"
+            .format(dhcp_options_id))
+
+
+class InvalidKeyPairNameError(EC2ClientError):
+    def __init__(self, key):
+        super(InvalidKeyPairNameError, self).__init__(
+            "InvalidKeyPair.NotFound",
+            "The keypair '{0}' does not exist."
+            .format(key))
+
+
+class InvalidKeyPairDuplicateError(EC2ClientError):
+    def __init__(self, key):
+        super(InvalidKeyPairDuplicateError, self).__init__(
+            "InvalidKeyPair.Duplicate",
+            "The keypair '{0}' already exists."
+            .format(key))
+
+
 class InvalidVPCIdError(EC2ClientError):
     def __init__(self, vpc_id):
         super(InvalidVPCIdError, self).__init__(
@@ -37,6 +63,108 @@ class InvalidVPCIdError(EC2ClientError):
             .format(vpc_id))
 
 
+class InvalidSubnetIdError(EC2ClientError):
+    def __init__(self, subnet_id):
+        super(InvalidSubnetIdError, self).__init__(
+            "InvalidSubnetID.NotFound",
+            "The subnet ID '{0}' does not exist"
+            .format(subnet_id))
+
+
+class InvalidSecurityGroupDuplicateError(EC2ClientError):
+    def __init__(self, name):
+        super(InvalidSecurityGroupDuplicateError, self).__init__(
+            "InvalidGroup.Duplicate",
+            "The security group '{0}' already exists"
+            .format(name))
+
+
+class InvalidSecurityGroupNotFoundError(EC2ClientError):
+    def __init__(self, name):
+        super(InvalidSecurityGroupNotFoundError, self).__init__(
+            "InvalidGroup.NotFound",
+            "The security group '{0}' does not exist"
+            .format(name))
+
+
+class InvalidPermissionNotFoundError(EC2ClientError):
+    def __init__(self):
+        super(InvalidPermissionNotFoundError, self).__init__(
+            "InvalidPermission.NotFound",
+            "Could not find a matching ingress rule")
+
+
+class InvalidInstanceIdError(EC2ClientError):
+    def __init__(self, instance_id):
+        super(InvalidInstanceIdError, self).__init__(
+            "InvalidInstanceID.NotFound",
+            "The instance ID '{0}' does not exist"
+            .format(instance_id))
+
+
+class InvalidAMIIdError(EC2ClientError):
+    def __init__(self, ami_id):
+        super(InvalidAMIIdError, self).__init__(
+            "InvalidAMIID.NotFound",
+            "The image id '[{0}]' does not exist"
+            .format(ami_id))
+
+
+class InvalidSnapshotIdError(EC2ClientError):
+    def __init__(self, snapshot_id):
+        super(InvalidSnapshotIdError, self).__init__(
+            "InvalidSnapshot.NotFound",
+            "") # Note: AWS returns empty message for this, as of 2014.08.22.
+
+
+class InvalidVolumeIdError(EC2ClientError):
+    def __init__(self, volume_id):
+        super(InvalidVolumeIdError, self).__init__(
+            "InvalidVolume.NotFound",
+            "The volume '{0}' does not exist."
+            .format(volume_id))
+
+
+class InvalidVolumeAttachmentError(EC2ClientError):
+    def __init__(self, volume_id, instance_id):
+        super(InvalidVolumeAttachmentError, self).__init__(
+            "InvalidAttachment.NotFound",
+            "Volume {0} can not be detached from {1} because it is not attached"
+            .format(volume_id, instance_id))
+
+
+class InvalidDomainError(EC2ClientError):
+    def __init__(self, domain):
+        super(InvalidDomainError, self).__init__(
+            "InvalidParameterValue",
+            "Invalid value '{0}' for domain."
+            .format(domain))
+
+
+class InvalidAddressError(EC2ClientError):
+    def __init__(self, ip):
+        super(InvalidAddressError, self).__init__(
+            "InvalidAddress.NotFound",
+            "Address '{0}' not found."
+            .format(ip))
+
+
+class InvalidAllocationIdError(EC2ClientError):
+    def __init__(self, allocation_id):
+        super(InvalidAllocationIdError, self).__init__(
+            "InvalidAllocationID.NotFound",
+            "Allocation ID '{0}' not found."
+            .format(allocation_id))
+
+
+class InvalidAssociationIdError(EC2ClientError):
+    def __init__(self, association_id):
+        super(InvalidAssociationIdError, self).__init__(
+            "InvalidAssociationID.NotFound",
+            "Association ID '{0}' not found."
+            .format(association_id))
+
+
 class InvalidVPCPeeringConnectionIdError(EC2ClientError):
     def __init__(self, vpc_peering_connection_id):
         super(InvalidVPCPeeringConnectionIdError, self).__init__(
@@ -61,9 +189,9 @@ class InvalidParameterValueError(EC2ClientError):
             .format(parameter_value))
 
 
-class InvalidInternetGatewayIDError(EC2ClientError):
+class InvalidInternetGatewayIdError(EC2ClientError):
     def __init__(self, internet_gateway_id):
-        super(InvalidInternetGatewayIDError, self).__init__(
+        super(InvalidInternetGatewayIdError, self).__init__(
             "InvalidInternetGatewayID.NotFound",
             "InternetGatewayID {0} does not exist."
             .format(internet_gateway_id))
@@ -78,11 +206,11 @@ class GatewayNotAttachedError(EC2ClientError):
 
 
 class ResourceAlreadyAssociatedError(EC2ClientError):
-    def __init__(self, resource):
+    def __init__(self, resource_id):
         super(ResourceAlreadyAssociatedError, self).__init__(
             "Resource.AlreadyAssociated",
             "Resource {0} is already associated."
-            .format(str(resource)))
+            .format(resource_id))
 
 
 ERROR_RESPONSE = u"""<?xml version="1.0" encoding="UTF-8"?>