Convert all EC2Response Mixins to subclasses.

moto/ec2/responses/amis.py

@@ -1,10 +1,11 @@
 from jinja2 import Template
 
+from moto.core.responses import BaseResponse
 from moto.ec2.models import ec2_backend
 from moto.ec2.utils import instance_ids_from_querystring, image_ids_from_querystring
 
 
-class AmisResponse(object):
+class AmisResponse(BaseResponse):
     def create_image(self):
         name = self.querystring.get('Name')[0]
         if "Description" in self.querystring:

moto/ec2/responses/availability_zones_and_regions.py

@@ -1,9 +1,10 @@
 from jinja2 import Template
 
+from moto.core.responses import BaseResponse
 from moto.ec2.models import ec2_backend
 
 
-class AvailabilityZonesAndRegions(object):
+class AvailabilityZonesAndRegions(BaseResponse):
     def describe_availability_zones(self):
         zones = ec2_backend.describe_availability_zones()
         template = Template(DESCRIBE_ZONES_RESPONSE)

moto/ec2/responses/elastic_block_store.py

@@ -1,9 +1,10 @@
 from jinja2 import Template
 
+from moto.core.responses import BaseResponse
 from moto.ec2.models import ec2_backend
 
 
-class ElasticBlockStore(object):
+class ElasticBlockStore(BaseResponse):
     def attach_volume(self):
         volume_id = self.querystring.get('VolumeId')[0]
         instance_id = self.querystring.get('InstanceId')[0]

moto/ec2/responses/elastic_ip_addresses.py

@@ -1,11 +1,11 @@
 from jinja2 import Template
 
+from moto.core.responses import BaseResponse
 from moto.ec2.models import ec2_backend
 from moto.ec2.utils import sequence_from_querystring
 
 
-
+class ElasticIPAddresses(BaseResponse):
-class ElasticIPAddresses(object):
     def allocate_address(self):
         if "Domain" in self.querystring:
             domain = self.querystring.get('Domain')[0]

moto/ec2/responses/general.py

@@ -1,10 +1,11 @@
 from jinja2 import Template
 
+from moto.core.responses import BaseResponse
 from moto.ec2.models import ec2_backend
 from moto.ec2.utils import instance_ids_from_querystring
 
 
-class General(object):
+class General(BaseResponse):
     def get_console_output(self):
         self.instance_ids = instance_ids_from_querystring(self.querystring)
         instance_id = self.instance_ids[0]

moto/ec2/responses/instances.py

@@ -1,12 +1,13 @@
 from jinja2 import Template
 
+from moto.core.responses import BaseResponse
 from moto.core.utils import camelcase_to_underscores
 from moto.ec2.models import ec2_backend
 from moto.ec2.utils import instance_ids_from_querystring, filters_from_querystring, filter_reservations
 from moto.ec2.exceptions import InvalidIdError
 
 
-class InstanceResponse(object):
+class InstanceResponse(BaseResponse):
     def describe_instances(self):
         instance_ids = instance_ids_from_querystring(self.querystring)
         if instance_ids:

moto/ec2/responses/security_groups.py

@@ -1,5 +1,6 @@
 from jinja2 import Template
 
+from moto.core.responses import BaseResponse
 from moto.ec2.models import ec2_backend
 
 
@@ -20,7 +21,7 @@ def process_rules_from_querystring(querystring):
     return (name, ip_protocol, from_port, to_port, ip_ranges, source_groups)
 
 
-class SecurityGroups(object):
+class SecurityGroups(BaseResponse):
     def authorize_security_group_egress(self):
         raise NotImplementedError('SecurityGroups.authorize_security_group_egress is not yet implemented')
 

moto/ec2/responses/spot_instances.py

@@ -1,9 +1,10 @@
 from jinja2 import Template
 
+from moto.core.responses import BaseResponse
 from moto.ec2.models import ec2_backend
 
 
-class SpotInstances(object):
+class SpotInstances(BaseResponse):
     def _get_param(self, param_name):
         return self.querystring.get(param_name, [None])[0]
 

moto/ec2/responses/subnets.py

@@ -1,9 +1,10 @@
 from jinja2 import Template
 
+from moto.core.responses import BaseResponse
 from moto.ec2.models import ec2_backend
 
 
-class Subnets(object):
+class Subnets(BaseResponse):
     def create_subnet(self):
         vpc_id = self.querystring.get('VpcId')[0]
         cidr_block = self.querystring.get('CidrBlock')[0]

moto/ec2/responses/tags.py

@@ -1,10 +1,11 @@
 from jinja2 import Template
 
+from moto.core.responses import BaseResponse
 from moto.ec2.models import ec2_backend
 from moto.ec2.utils import resource_ids_from_querystring
 
 
-class TagResponse(object):
+class TagResponse(BaseResponse):
 
     def create_tags(self):
         resource_ids = resource_ids_from_querystring(self.querystring)

moto/ec2/responses/vpcs.py

@@ -1,9 +1,10 @@
 from jinja2 import Template
 
+from moto.core.responses import BaseResponse
 from moto.ec2.models import ec2_backend
 
 
-class VPCs(object):
+class VPCs(BaseResponse):
     def create_vpc(self):
         cidr_block = self.querystring.get('CidrBlock')[0]
         vpc = ec2_backend.create_vpc(cidr_block)