Yasuke/moto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix styling problems

Browse Source
This commit is contained in:
Cat Cai 2019-11-11 12:09:52 -08:00
parent 2b19416ab0
commit 3398244f14
3 changed files with 53 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
moto/ec2/models.py
View File

@ -2433,9 +2433,9 @@ class VPC(TaggedEC2Resource):
self.dhcp_options = None self.dhcp_options = None
self.state = "available" self.state = "available"
self.instance_tenancy = instance_tenancy self.instance_tenancy = instance_tenancy
self.is_default = 'true' if is_default else 'false' self.is_default = "true" if is_default else "false"
self.enable_dns_support = 'true' self.enable_dns_support = "true"
self.classic_link_enabled = 'false' self.classic_link_enabled = "false"
# This attribute is set to 'true' only for default VPCs # This attribute is set to 'true' only for default VPCs
# or VPCs created using the wizard of the VPC console # or VPCs created using the wizard of the VPC console
self.enable_dns_hostnames = "true" if is_default else "false" 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? # 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 # See https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/vpc-classiclink.html#classiclink-limitations
network_address = ipaddress.ip_network(self.cidr_block).network_address 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( 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'): "10.0.0.0/16") or network_address in ipaddress.ip_network("10.1.0.0/16"):
self.classic_link_enabled = "true" self.classic_link_enabled = "true"
return self.classic_link_enabled return self.classic_link_enabled
@ -2548,11 +2548,11 @@ class VPC(TaggedEC2Resource):
return self.classic_link_enabled return self.classic_link_enabled
def enable_vpc_classic_link_dns_support(self): 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 return self.classic_link_dns_supported
def disable_vpc_classic_link_dns_support(self): 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 return self.classic_link_dns_supported
def disassociate_vpc_cidr_block(self, association_id): def disassociate_vpc_cidr_block(self, association_id):

12
moto/ec2/responses/vpcs.py
View File

@ -41,7 +41,7 @@ class VPCs(BaseResponse):
return template.render(vpc_id=vpc_id, attribute=attribute, value=value) return template.render(vpc_id=vpc_id, attribute=attribute, value=value)
def describe_vpc_classic_link_dns_support(self): 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) filters = filters_from_querystring(self.querystring)
vpcs = self.ec2_backend.get_all_vpcs(vpc_ids=vpc_ids, filters=filters) vpcs = self.ec2_backend.get_all_vpcs(vpc_ids=vpc_ids, filters=filters)
doc_date = self._get_doc_date() doc_date = self._get_doc_date()
@ -49,21 +49,21 @@ class VPCs(BaseResponse):
return template.render(vpcs=vpcs, doc_date=doc_date) return template.render(vpcs=vpcs, doc_date=doc_date)
def enable_vpc_classic_link_dns_support(self): 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) classic_link_dns_supported = self.ec2_backend.enable_vpc_classic_link_dns_support(vpc_id=vpc_id)
doc_date = self._get_doc_date() doc_date = self._get_doc_date()
template = self.response_template(ENABLE_VPC_CLASSIC_LINK_DNS_SUPPORT_RESPONSE) 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) return template.render(classic_link_dns_supported=classic_link_dns_supported, doc_date=doc_date)
def disable_vpc_classic_link_dns_support(self): 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) classic_link_dns_supported = self.ec2_backend.disable_vpc_classic_link_dns_support(vpc_id=vpc_id)
doc_date = self._get_doc_date() doc_date = self._get_doc_date()
template = self.response_template(DISABLE_VPC_CLASSIC_LINK_DNS_SUPPORT_RESPONSE) 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) return template.render(classic_link_dns_supported=classic_link_dns_supported, doc_date=doc_date)
def describe_vpc_classic_link(self): 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) filters = filters_from_querystring(self.querystring)
vpcs = self.ec2_backend.get_all_vpcs(vpc_ids=vpc_ids, filters=filters) vpcs = self.ec2_backend.get_all_vpcs(vpc_ids=vpc_ids, filters=filters)
doc_date = self._get_doc_date() doc_date = self._get_doc_date()
@ -71,14 +71,14 @@ class VPCs(BaseResponse):
return template.render(vpcs=vpcs, doc_date=doc_date) return template.render(vpcs=vpcs, doc_date=doc_date)
def enable_vpc_classic_link(self): 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) classic_link_enabled = self.ec2_backend.enable_vpc_classic_link(vpc_id=vpc_id)
doc_date = self._get_doc_date() doc_date = self._get_doc_date()
template = self.response_template(ENABLE_VPC_CLASSIC_LINK_RESPONSE) template = self.response_template(ENABLE_VPC_CLASSIC_LINK_RESPONSE)
return template.render(classic_link_enabled=classic_link_enabled, doc_date=doc_date) return template.render(classic_link_enabled=classic_link_enabled, doc_date=doc_date)
def disable_vpc_classic_link(self): 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) classic_link_enabled = self.ec2_backend.disable_vpc_classic_link(vpc_id=vpc_id)
doc_date = self._get_doc_date() doc_date = self._get_doc_date()
template = self.response_template(DISABLE_VPC_CLASSIC_LINK_RESPONSE) template = self.response_template(DISABLE_VPC_CLASSIC_LINK_RESPONSE)

78
tests/test_ec2/test_vpcs.py
View File

@ -676,133 +676,135 @@ def test_create_vpc_with_invalid_cidr_range():
vpc = ec2.create_vpc(CidrBlock=vpc_cidr_block) vpc = ec2.create_vpc(CidrBlock=vpc_cidr_block)
str(ex.exception).should.equal( str(ex.exception).should.equal(
"An error occurred (InvalidVpc.Range) when calling the CreateVpc " "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 @mock_ec2
def test_enable_vpc_classic_link(): 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 # 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) 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 @mock_ec2
def test_enable_vpc_classic_link_failure(): 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 # 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) 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 @mock_ec2
def test_disable_vpc_classic_link(): 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 # 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) ec2.meta.client.enable_vpc_classic_link(VpcId=vpc.id)
response = ec2.meta.client.disable_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 @mock_ec2
def test_describe_classic_link_enabled(): 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 # 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) ec2.meta.client.enable_vpc_classic_link(VpcId=vpc.id)
response = ec2.meta.client.describe_vpc_classic_link(VpcIds=[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 @mock_ec2
def test_describe_classic_link_disabled(): 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 # 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]) 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 @mock_ec2
def test_describe_classic_link_multiple(): 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 # Create VPC
vpc1 = ec2.create_vpc(CidrBlock='10.90.0.0/16') vpc1 = ec2.create_vpc(CidrBlock="10.90.0.0/16")
vpc2 = ec2.create_vpc(CidrBlock='10.0.0.0/16') vpc2 = ec2.create_vpc(CidrBlock="10.0.0.0/16")
ec2.meta.client.enable_vpc_classic_link(VpcId=vpc2.id) ec2.meta.client.enable_vpc_classic_link(VpcId=vpc2.id)
response = ec2.meta.client.describe_vpc_classic_link(VpcIds=[vpc1.id, 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")[0].get("ClassicLinkEnabled").should.be.false
assert response.get('Vpcs')[1].get('ClassicLinkEnabled').should.be.true assert response.get("Vpcs")[1].get("ClassicLinkEnabled").should.be.true
@mock_ec2 @mock_ec2
def test_enable_vpc_classic_link_dns_support(): 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 # 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) 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 @mock_ec2
def test_disable_vpc_classic_link_dns_support(): 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 # 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) 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) 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 @mock_ec2
def test_describe_classic_link_dns_support_enabled(): 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 # 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) 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]) 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 @mock_ec2
def test_describe_classic_link_dns_support_disabled(): 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 # 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]) 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 @mock_ec2
def test_describe_classic_link_dns_support_multiple(): 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 # Create VPC
vpc1 = ec2.create_vpc(CidrBlock='10.90.0.0/16') vpc1 = ec2.create_vpc(CidrBlock="10.90.0.0/16")
vpc2 = ec2.create_vpc(CidrBlock='10.0.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) 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]) 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")[0].get("ClassicLinkDnsSupported").should.be.false
assert response.get('Vpcs')[1].get('ClassicLinkDnsSupported').should.be.true assert response.get("Vpcs")[1].get("ClassicLinkDnsSupported").should.be.true