adds basic support for vpc-classic-link
This commit is contained in:
parent
b19abbc63e
commit
17cc46b91e
4 changed files with 145 additions and 7 deletions
|
|
@ -2433,8 +2433,8 @@ 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.is_default = 'true' if is_default else 'false'
|
||||
self.enable_dns_support = 'true'
|
||||
# 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"
|
||||
|
|
@ -2531,6 +2531,21 @@ class VPC(TaggedEC2Resource):
|
|||
self.cidr_block_association_set[association_id] = association_set
|
||||
return association_set
|
||||
|
||||
def enable_vpc_classic_link(self):
|
||||
# Check if current cidr block doesn't fall within the 10.0.0.0/8 block, excluding 10.0.0.0/16 and 10.1.0.0/16.
|
||||
# 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'):
|
||||
self.classic_link_enabled = "true"
|
||||
|
||||
return self.classic_link_enabled
|
||||
|
||||
def disable_vpc_classic_link(self):
|
||||
self.classic_link_enabled = "false"
|
||||
return self.classic_link_enabled
|
||||
|
||||
def disassociate_vpc_cidr_block(self, association_id):
|
||||
if self.cidr_block == self.cidr_block_association_set.get(
|
||||
association_id, {}
|
||||
|
|
@ -2661,6 +2676,14 @@ class VPCBackend(object):
|
|||
else:
|
||||
raise InvalidParameterValueError(attr_name)
|
||||
|
||||
def enable_vpc_classic_link(self, vpc_id):
|
||||
vpc = self.get_vpc(vpc_id)
|
||||
return vpc.enable_vpc_classic_link()
|
||||
|
||||
def disable_vpc_classic_link(self, vpc_id):
|
||||
vpc = self.get_vpc(vpc_id)
|
||||
return vpc.disable_vpc_classic_link()
|
||||
|
||||
def modify_vpc_attribute(self, vpc_id, attr_name, attr_value):
|
||||
vpc = self.get_vpc(vpc_id)
|
||||
if attr_name in ("enable_dns_support", "enable_dns_hostnames"):
|
||||
|
|
|
|||
|
|
@ -50,6 +50,28 @@ class VPCs(BaseResponse):
|
|||
template = self.response_template(DESCRIBE_VPC_ATTRIBUTE_RESPONSE)
|
||||
return template.render(vpc_id=vpc_id, attribute=attribute, value=value)
|
||||
|
||||
def describe_vpc_classic_link(self):
|
||||
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 = '2013-10-15' if 'Boto/' in self.headers.get('user-agent', '') else '2016-11-15'
|
||||
template = self.response_template(DESCRIBE_VPC_CLASSIC_LINK_RESPONSE)
|
||||
return template.render(vpcs=vpcs, doc_date=doc_date)
|
||||
|
||||
def enable_vpc_classic_link(self):
|
||||
vpc_id = self._get_param('VpcId')
|
||||
classic_link_enabled = self.ec2_backend.enable_vpc_classic_link(vpc_id=vpc_id)
|
||||
doc_date = '2013-10-15' if 'Boto/' in self.headers.get('user-agent', '') else '2016-11-15'
|
||||
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')
|
||||
classic_link_enabled = self.ec2_backend.disable_vpc_classic_link(vpc_id=vpc_id)
|
||||
doc_date = '2013-10-15' if 'Boto/' in self.headers.get('user-agent', '') else '2016-11-15'
|
||||
template = self.response_template(DISABLE_VPC_CLASSIC_LINK_RESPONSE)
|
||||
return template.render(classic_link_enabled=classic_link_enabled, doc_date=doc_date)
|
||||
|
||||
def modify_vpc_attribute(self):
|
||||
vpc_id = self._get_param("VpcId")
|
||||
|
||||
|
|
@ -149,6 +171,31 @@ CREATE_VPC_RESPONSE = """
|
|||
</vpc>
|
||||
</CreateVpcResponse>"""
|
||||
|
||||
DESCRIBE_VPC_CLASSIC_LINK_RESPONSE = """
|
||||
<DescribeVpcClassicLinkResponse xmlns="http://ec2.amazonaws.com/doc/{{doc_date}}/">
|
||||
<requestId>7a62c442-3484-4f42-9342-6942EXAMPLE</requestId>
|
||||
<vpcSet>
|
||||
{% for vpc in vpcs %}
|
||||
<item>
|
||||
<vpcId>{{ vpc.id }}</vpcId>
|
||||
<classicLinkEnabled>{{ vpc.classic_link_enabled }}</classicLinkEnabled>
|
||||
</item>
|
||||
{% endfor %}
|
||||
</vpcSet>
|
||||
</DescribeVpcClassicLinkResponse>"""
|
||||
|
||||
ENABLE_VPC_CLASSIC_LINK_RESPONSE = """
|
||||
<EnableVpcClassicLinkResponse xmlns="http://ec2.amazonaws.com/doc/{{doc_date}}/">
|
||||
<requestId>7a62c442-3484-4f42-9342-6942EXAMPLE</requestId>
|
||||
<return>{{ classic_link_enabled }}</return>
|
||||
</EnableVpcClassicLinkResponse>"""
|
||||
|
||||
DISABLE_VPC_CLASSIC_LINK_RESPONSE = """
|
||||
<DisableVpcClassicLinkResponse xmlns="http://ec2.amazonaws.com/doc/{{doc_date}}/">
|
||||
<requestId>7a62c442-3484-4f42-9342-6942EXAMPLE</requestId>
|
||||
<return>{{ classic_link_enabled }}</return>
|
||||
</DisableVpcClassicLinkResponse>"""
|
||||
|
||||
DESCRIBE_VPCS_RESPONSE = """
|
||||
<DescribeVpcsResponse xmlns="http://ec2.amazonaws.com/doc/{{doc_date}}/">
|
||||
<requestId>7a62c442-3484-4f42-9342-6942EXAMPLE</requestId>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue