catalin/moto
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

making requested fix

Browse source 
used sequence_from_querystring and removed added functon vpn_connection_ids_from_query_string
added tests
This commit is contained in:
earthmant 2015-12-03 13:19:10 +02:00
commit 76a939cee6
3 changed files with 40 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
moto/ec2/responses/vpn_connections.py
View file

@ -1,6 +1,6 @@
from __future__ import unicode_literals
from moto.core.responses import BaseResponse
from moto.ec2.utils import filters_from_querystring, vpn_connection_ids_from_query_string
from moto.ec2.utils import filters_from_querystring, sequence_from_querystring
class VPNConnections(BaseResponse):
@ -20,7 +20,7 @@ class VPNConnections(BaseResponse):
return template.render(vpn_connection=vpn_connection)
def describe_vpn_connections(self):
vpn_connection_ids = vpn_connection_ids_from_query_string(self.querystring)
vpn_connection_ids = sequence_from_querystring('VpnConnectionId', self.querystring)
filters = filters_from_querystring(self.querystring)
vpn_connections = self.ec2_backend.get_all_vpn_connections(
vpn_connection_ids=vpn_connection_ids, filters=filters)

8
moto/ec2/utils.py
View file

@ -197,14 +197,6 @@ def vpc_ids_from_querystring(querystring_dict):
return vpc_ids
def vpn_connection_ids_from_query_string(querystring_dict):
vpn_connection_ids = []
for key, value in querystring_dict.items():
if 'VpnConnectionId' in key:
vpn_connection_ids.append(value[0])
return vpn_connection_ids
def sequence_from_querystring(parameter, querystring_dict):
parameter_values = []
for key, value in querystring_dict.items():