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

Basic requirements VPN GW (#4276)

Browse Source
This commit is contained in:
Mohit Alonja 2021-09-10 22:51:29 +05:30 committed by GitHub
parent d5ffce650f
commit e061d371c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
moto/ec2/models.py
View File

@ -6702,9 +6702,10 @@ class VpnGatewayBackend(object):
def detach_vpn_gateway(self, vpn_gateway_id, vpc_id): def detach_vpn_gateway(self, vpn_gateway_id, vpc_id):
vpn_gateway = self.get_vpn_gateway(vpn_gateway_id) vpn_gateway = self.get_vpn_gateway(vpn_gateway_id)
self.get_vpc(vpc_id) self.get_vpc(vpc_id)
detached = vpn_gateway.attachments.pop(vpc_id, None) detached = vpn_gateway.attachments.get(vpc_id, None)
if not detached: if not detached:
raise InvalidVPCIdError(vpc_id) raise InvalidVPCIdError(vpc_id)
detached.state = "detached"
return detached return detached

10
moto/ec2/responses/virtual_private_gateways.py
View File

@ -53,15 +53,13 @@ CREATE_VPN_GATEWAY_RESPONSE = """
<requestId>7a62c49f-347e-4fc4-9331-6e8eEXAMPLE</requestId> <requestId>7a62c49f-347e-4fc4-9331-6e8eEXAMPLE</requestId>
<vpnGateway> <vpnGateway>
<vpnGatewayId>{{ vpn_gateway.id }}</vpnGatewayId> <vpnGatewayId>{{ vpn_gateway.id }}</vpnGatewayId>
<state>available</state> <state>{{ vpn_gateway.state }}</state>
<type>{{ vpn_gateway.type }}</type> <type>{{ vpn_gateway.type }}</type>
<availabilityZone>{{ vpn_gateway.availability_zone }}</availabilityZone> <availabilityZone>{{ vpn_gateway.availability_zone }}</availabilityZone>
<attachments/> <attachments/>
<tagSet> <tagSet>
{% for tag in vpn_gateway.get_tags() %} {% for tag in vpn_gateway.get_tags() %}
<item> <item>
<resourceId>{{ tag.resource_id }}</resourceId>
<resourceType>{{ tag.resource_type }}</resourceType>
<key>{{ tag.key }}</key> <key>{{ tag.key }}</key>
<value>{{ tag.value }}</value> <value>{{ tag.value }}</value>
</item> </item>
@ -77,9 +75,9 @@ DESCRIBE_VPN_GATEWAYS_RESPONSE = """
{% for vpn_gateway in vpn_gateways %} {% for vpn_gateway in vpn_gateways %}
<item> <item>
<vpnGatewayId>{{ vpn_gateway.id }}</vpnGatewayId> <vpnGatewayId>{{ vpn_gateway.id }}</vpnGatewayId>
<state>available</state> <state>{{ vpn_gateway.state }}</state>
<type>{{ vpn_gateway.id }}</type> <type>{{ vpn_gateway.id }}</type>
<availabilityZone>us-east-1a</availabilityZone> <availabilityZone>{{ vpn_gateway.availability_zone }}</availabilityZone>
<attachments> <attachments>
{% for attachment in vpn_gateway.attachments.values() %} {% for attachment in vpn_gateway.attachments.values() %}
<item> <item>
@ -92,8 +90,6 @@ DESCRIBE_VPN_GATEWAYS_RESPONSE = """
<tagSet> <tagSet>
{% for tag in vpn_gateway.get_tags() %} {% for tag in vpn_gateway.get_tags() %}
<item> <item>
<resourceId>{{ tag.resource_id }}</resourceId>
<resourceType>{{ tag.resource_type }}</resourceType>
<key>{{ tag.key }}</key> <key>{{ tag.key }}</key>
<value>{{ tag.value }}</value> <value>{{ tag.value }}</value>
</item> </item>

3
tests/terraform-tests.success.txt
View File

@ -120,4 +120,7 @@ TestAccAwsEc2ManagedPrefixList
TestAccAWSEgressOnlyInternetGateway TestAccAWSEgressOnlyInternetGateway
TestAccAWSSecurityGroup_ TestAccAWSSecurityGroup_
TestAccAWSInternetGateway TestAccAWSInternetGateway
TestAccAWSVpnGateway_basic
TestAccAWSVpnGateway_delete
TestAccAWSVpnGateway_tags
TestAccAWSSecurityGroupRule_ TestAccAWSSecurityGroupRule_

3
tests/test_ec2/test_virtual_private_gateways.py
View File

@ -271,4 +271,5 @@ def test_detach_vpn_gateway():
gateway = conn.get_all_vpn_gateways()[0] gateway = conn.get_all_vpn_gateways()[0]
attachments = gateway.attachments attachments = gateway.attachments
attachments.should.have.length_of(0) attachments.should.have.length_of(1)
attachments[0].state.should.equal("detached")