From 3398244f140efd93463872f746a0ae51f0d8ac51 Mon Sep 17 00:00:00 2001 From: Cat Cai Date: Mon, 11 Nov 2019 12:09:52 -0800 Subject: [PATCH] Fix styling problems --- moto/ec2/models.py | 14 +++---- moto/ec2/responses/vpcs.py | 12 +++--- tests/test_ec2/test_vpcs.py | 78 +++++++++++++++++++------------------ 3 files changed, 53 insertions(+), 51 deletions(-) diff --git a/moto/ec2/models.py b/moto/ec2/models.py index 2adfb138a..5b4ef62f6 100644 --- a/moto/ec2/models.py +++ b/moto/ec2/models.py @@ -2433,9 +2433,9 @@ class VPC(TaggedEC2Resource): self.dhcp_options = None self.state = "available" self.instance_tenancy = instance_tenancy - self.is_default = 'true' if is_default else 'false' - self.enable_dns_support = 'true' - self.classic_link_enabled = 'false' + self.is_default = "true" if is_default else "false" + self.enable_dns_support = "true" + self.classic_link_enabled = "false" # This attribute is set to 'true' only for default VPCs # or VPCs created using the wizard of the VPC console self.enable_dns_hostnames = "true" if is_default else "false" @@ -2537,8 +2537,8 @@ class VPC(TaggedEC2Resource): # Doesn't check any route tables, maybe something for in the future? # See https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/vpc-classiclink.html#classiclink-limitations network_address = ipaddress.ip_network(self.cidr_block).network_address - if network_address not in ipaddress.ip_network('10.0.0.0/8') or network_address in ipaddress.ip_network( - '10.0.0.0/16') or network_address in ipaddress.ip_network('10.1.0.0/16'): + if network_address not in ipaddress.ip_network("10.0.0.0/8") or network_address in ipaddress.ip_network( + "10.0.0.0/16") or network_address in ipaddress.ip_network("10.1.0.0/16"): self.classic_link_enabled = "true" return self.classic_link_enabled @@ -2548,11 +2548,11 @@ class VPC(TaggedEC2Resource): return self.classic_link_enabled def enable_vpc_classic_link_dns_support(self): - self.classic_link_dns_supported = 'true' + self.classic_link_dns_supported = "true" return self.classic_link_dns_supported def disable_vpc_classic_link_dns_support(self): - self.classic_link_dns_supported = 'false' + self.classic_link_dns_supported = "false" return self.classic_link_dns_supported def disassociate_vpc_cidr_block(self, association_id): diff --git a/moto/ec2/responses/vpcs.py b/moto/ec2/responses/vpcs.py index 3729deef8..5f0030aa8 100644 --- a/moto/ec2/responses/vpcs.py +++ b/moto/ec2/responses/vpcs.py @@ -41,7 +41,7 @@ class VPCs(BaseResponse): return template.render(vpc_id=vpc_id, attribute=attribute, value=value) def describe_vpc_classic_link_dns_support(self): - vpc_ids = self._get_multi_param('VpcIds') + vpc_ids = self._get_multi_param("VpcIds") filters = filters_from_querystring(self.querystring) vpcs = self.ec2_backend.get_all_vpcs(vpc_ids=vpc_ids, filters=filters) doc_date = self._get_doc_date() @@ -49,21 +49,21 @@ class VPCs(BaseResponse): return template.render(vpcs=vpcs, doc_date=doc_date) def enable_vpc_classic_link_dns_support(self): - vpc_id = self._get_param('VpcId') + vpc_id = self._get_param("VpcId") classic_link_dns_supported = self.ec2_backend.enable_vpc_classic_link_dns_support(vpc_id=vpc_id) doc_date = self._get_doc_date() template = self.response_template(ENABLE_VPC_CLASSIC_LINK_DNS_SUPPORT_RESPONSE) return template.render(classic_link_dns_supported=classic_link_dns_supported, doc_date=doc_date) def disable_vpc_classic_link_dns_support(self): - vpc_id = self._get_param('VpcId') + vpc_id = self._get_param("VpcId") classic_link_dns_supported = self.ec2_backend.disable_vpc_classic_link_dns_support(vpc_id=vpc_id) doc_date = self._get_doc_date() template = self.response_template(DISABLE_VPC_CLASSIC_LINK_DNS_SUPPORT_RESPONSE) return template.render(classic_link_dns_supported=classic_link_dns_supported, doc_date=doc_date) def describe_vpc_classic_link(self): - vpc_ids = self._get_multi_param('VpcId') + vpc_ids = self._get_multi_param("VpcId") filters = filters_from_querystring(self.querystring) vpcs = self.ec2_backend.get_all_vpcs(vpc_ids=vpc_ids, filters=filters) doc_date = self._get_doc_date() @@ -71,14 +71,14 @@ class VPCs(BaseResponse): return template.render(vpcs=vpcs, doc_date=doc_date) def enable_vpc_classic_link(self): - vpc_id = self._get_param('VpcId') + vpc_id = self._get_param("VpcId") classic_link_enabled = self.ec2_backend.enable_vpc_classic_link(vpc_id=vpc_id) doc_date = self._get_doc_date() template = self.response_template(ENABLE_VPC_CLASSIC_LINK_RESPONSE) return template.render(classic_link_enabled=classic_link_enabled, doc_date=doc_date) def disable_vpc_classic_link(self): - vpc_id = self._get_param('VpcId') + vpc_id = self._get_param("VpcId") classic_link_enabled = self.ec2_backend.disable_vpc_classic_link(vpc_id=vpc_id) doc_date = self._get_doc_date() template = self.response_template(DISABLE_VPC_CLASSIC_LINK_RESPONSE) diff --git a/tests/test_ec2/test_vpcs.py b/tests/test_ec2/test_vpcs.py index 2e48fe019..f93ead823 100644 --- a/tests/test_ec2/test_vpcs.py +++ b/tests/test_ec2/test_vpcs.py @@ -676,133 +676,135 @@ def test_create_vpc_with_invalid_cidr_range(): vpc = ec2.create_vpc(CidrBlock=vpc_cidr_block) str(ex.exception).should.equal( "An error occurred (InvalidVpc.Range) when calling the CreateVpc " - "operation: The CIDR '{}' is invalid.".format(vpc_cidr_block)) + "operation: The CIDR '{}' is invalid.".format(vpc_cidr_block) + ) + @mock_ec2 def test_enable_vpc_classic_link(): - ec2 = boto3.resource('ec2', region_name='us-west-1') + ec2 = boto3.resource("ec2", region_name="us-west-1") # Create VPC - vpc = ec2.create_vpc(CidrBlock='10.1.0.0/16') + vpc = ec2.create_vpc(CidrBlock="10.1.0.0/16") response = ec2.meta.client.enable_vpc_classic_link(VpcId=vpc.id) - assert response.get('Return').should.be.true + assert response.get("Return").should.be.true @mock_ec2 def test_enable_vpc_classic_link_failure(): - ec2 = boto3.resource('ec2', region_name='us-west-1') + ec2 = boto3.resource("ec2", region_name="us-west-1") # Create VPC - vpc = ec2.create_vpc(CidrBlock='10.90.0.0/16') + vpc = ec2.create_vpc(CidrBlock="10.90.0.0/16") response = ec2.meta.client.enable_vpc_classic_link(VpcId=vpc.id) - assert response.get('Return').should.be.false + assert response.get("Return").should.be.false @mock_ec2 def test_disable_vpc_classic_link(): - ec2 = boto3.resource('ec2', region_name='us-west-1') + ec2 = boto3.resource("ec2", region_name="us-west-1") # Create VPC - vpc = ec2.create_vpc(CidrBlock='10.0.0.0/16') + vpc = ec2.create_vpc(CidrBlock="10.0.0.0/16") ec2.meta.client.enable_vpc_classic_link(VpcId=vpc.id) response = ec2.meta.client.disable_vpc_classic_link(VpcId=vpc.id) - assert response.get('Return').should.be.false + assert response.get("Return").should.be.false @mock_ec2 def test_describe_classic_link_enabled(): - ec2 = boto3.resource('ec2', region_name='us-west-1') + ec2 = boto3.resource("ec2", region_name="us-west-1") # Create VPC - vpc = ec2.create_vpc(CidrBlock='10.0.0.0/16') + vpc = ec2.create_vpc(CidrBlock="10.0.0.0/16") ec2.meta.client.enable_vpc_classic_link(VpcId=vpc.id) response = ec2.meta.client.describe_vpc_classic_link(VpcIds=[vpc.id]) - assert response.get('Vpcs')[0].get('ClassicLinkEnabled').should.be.true + assert response.get("Vpcs")[0].get("ClassicLinkEnabled").should.be.true @mock_ec2 def test_describe_classic_link_disabled(): - ec2 = boto3.resource('ec2', region_name='us-west-1') + ec2 = boto3.resource("ec2", region_name="us-west-1") # Create VPC - vpc = ec2.create_vpc(CidrBlock='10.90.0.0/16') + vpc = ec2.create_vpc(CidrBlock="10.90.0.0/16") response = ec2.meta.client.describe_vpc_classic_link(VpcIds=[vpc.id]) - assert response.get('Vpcs')[0].get('ClassicLinkEnabled').should.be.false + assert response.get("Vpcs")[0].get("ClassicLinkEnabled").should.be.false @mock_ec2 def test_describe_classic_link_multiple(): - ec2 = boto3.resource('ec2', region_name='us-west-1') + ec2 = boto3.resource("ec2", region_name="us-west-1") # Create VPC - vpc1 = ec2.create_vpc(CidrBlock='10.90.0.0/16') - vpc2 = ec2.create_vpc(CidrBlock='10.0.0.0/16') + vpc1 = ec2.create_vpc(CidrBlock="10.90.0.0/16") + vpc2 = ec2.create_vpc(CidrBlock="10.0.0.0/16") ec2.meta.client.enable_vpc_classic_link(VpcId=vpc2.id) response = ec2.meta.client.describe_vpc_classic_link(VpcIds=[vpc1.id, vpc2.id]) - assert response.get('Vpcs')[0].get('ClassicLinkEnabled').should.be.false - assert response.get('Vpcs')[1].get('ClassicLinkEnabled').should.be.true + assert response.get("Vpcs")[0].get("ClassicLinkEnabled").should.be.false + assert response.get("Vpcs")[1].get("ClassicLinkEnabled").should.be.true @mock_ec2 def test_enable_vpc_classic_link_dns_support(): - ec2 = boto3.resource('ec2', region_name='us-west-1') + ec2 = boto3.resource("ec2", region_name="us-west-1") # Create VPC - vpc = ec2.create_vpc(CidrBlock='10.1.0.0/16') + vpc = ec2.create_vpc(CidrBlock="10.1.0.0/16") response = ec2.meta.client.enable_vpc_classic_link_dns_support(VpcId=vpc.id) - assert response.get('Return').should.be.true + assert response.get("Return").should.be.true @mock_ec2 def test_disable_vpc_classic_link_dns_support(): - ec2 = boto3.resource('ec2', region_name='us-west-1') + ec2 = boto3.resource("ec2", region_name="us-west-1") # Create VPC - vpc = ec2.create_vpc(CidrBlock='10.0.0.0/16') + vpc = ec2.create_vpc(CidrBlock="10.0.0.0/16") ec2.meta.client.enable_vpc_classic_link_dns_support(VpcId=vpc.id) response = ec2.meta.client.disable_vpc_classic_link_dns_support(VpcId=vpc.id) - assert response.get('Return').should.be.false + assert response.get("Return").should.be.false @mock_ec2 def test_describe_classic_link_dns_support_enabled(): - ec2 = boto3.resource('ec2', region_name='us-west-1') + ec2 = boto3.resource("ec2", region_name="us-west-1") # Create VPC - vpc = ec2.create_vpc(CidrBlock='10.0.0.0/16') + vpc = ec2.create_vpc(CidrBlock="10.0.0.0/16") ec2.meta.client.enable_vpc_classic_link_dns_support(VpcId=vpc.id) response = ec2.meta.client.describe_vpc_classic_link_dns_support(VpcIds=[vpc.id]) - assert response.get('Vpcs')[0].get('ClassicLinkDnsSupported').should.be.true + assert response.get("Vpcs")[0].get("ClassicLinkDnsSupported").should.be.true @mock_ec2 def test_describe_classic_link_dns_support_disabled(): - ec2 = boto3.resource('ec2', region_name='us-west-1') + ec2 = boto3.resource("ec2", region_name="us-west-1") # Create VPC - vpc = ec2.create_vpc(CidrBlock='10.90.0.0/16') + vpc = ec2.create_vpc(CidrBlock="10.90.0.0/16") response = ec2.meta.client.describe_vpc_classic_link_dns_support(VpcIds=[vpc.id]) - assert response.get('Vpcs')[0].get('ClassicLinkDnsSupported').should.be.false + assert response.get("Vpcs")[0].get("ClassicLinkDnsSupported").should.be.false @mock_ec2 def test_describe_classic_link_dns_support_multiple(): - ec2 = boto3.resource('ec2', region_name='us-west-1') + ec2 = boto3.resource("ec2", region_name="us-west-1") # Create VPC - vpc1 = ec2.create_vpc(CidrBlock='10.90.0.0/16') - vpc2 = ec2.create_vpc(CidrBlock='10.0.0.0/16') + vpc1 = ec2.create_vpc(CidrBlock="10.90.0.0/16") + vpc2 = ec2.create_vpc(CidrBlock="10.0.0.0/16") ec2.meta.client.enable_vpc_classic_link_dns_support(VpcId=vpc2.id) response = ec2.meta.client.describe_vpc_classic_link_dns_support(VpcIds=[vpc1.id, vpc2.id]) - assert response.get('Vpcs')[0].get('ClassicLinkDnsSupported').should.be.false - assert response.get('Vpcs')[1].get('ClassicLinkDnsSupported').should.be.true + assert response.get("Vpcs")[0].get("ClassicLinkDnsSupported").should.be.false + assert response.get("Vpcs")[1].get("ClassicLinkDnsSupported").should.be.true