From ad200286a570b65f800ac83acde9b56ce3a15e64 Mon Sep 17 00:00:00 2001 From: "Dustin J. Mitchell" Date: Thu, 23 Oct 2014 22:26:52 -0400 Subject: [PATCH] use the current ec2 backend, not necessarily us-east-1, for vpc operations --- moto/ec2/responses/vpcs.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/moto/ec2/responses/vpcs.py b/moto/ec2/responses/vpcs.py index 30df1ea9..7fb9d4ae 100644 --- a/moto/ec2/responses/vpcs.py +++ b/moto/ec2/responses/vpcs.py @@ -2,27 +2,26 @@ from __future__ import unicode_literals from jinja2 import Template from moto.core.responses import BaseResponse -from moto.ec2.models import ec2_backend from moto.ec2.utils import filters_from_querystring, vpc_ids_from_querystring class VPCs(BaseResponse): def create_vpc(self): cidr_block = self.querystring.get('CidrBlock')[0] - vpc = ec2_backend.create_vpc(cidr_block) + vpc = self.ec2_backend.create_vpc(cidr_block) template = Template(CREATE_VPC_RESPONSE) return template.render(vpc=vpc) def delete_vpc(self): vpc_id = self.querystring.get('VpcId')[0] - vpc = ec2_backend.delete_vpc(vpc_id) + vpc = self.ec2_backend.delete_vpc(vpc_id) template = Template(DELETE_VPC_RESPONSE) return template.render(vpc=vpc) def describe_vpcs(self): vpc_ids = vpc_ids_from_querystring(self.querystring) filters = filters_from_querystring(self.querystring) - vpcs = ec2_backend.get_all_vpcs(vpc_ids=vpc_ids, filters=filters) + vpcs = self.ec2_backend.get_all_vpcs(vpc_ids=vpc_ids, filters=filters) template = Template(DESCRIBE_VPCS_RESPONSE) return template.render(vpcs=vpcs)