Repository: libcloud Updated Branches: refs/heads/trunk 63dbd4284 -> aebdd15ae
use existing _pathlist() function to convert key and an array of values into AWS query param format instead of doing this in every function Closes #319 Signed-off-by: Tomaz Muraus <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/aebdd15a Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/aebdd15a Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/aebdd15a Branch: refs/heads/trunk Commit: aebdd15aea4f8d81c7fb0245d287653773c06b3e Parents: 63dbd42 Author: Lior Goikhburg <[email protected]> Authored: Fri Jun 20 18:10:40 2014 +0400 Committer: Tomaz Muraus <[email protected]> Committed: Sat Jun 21 10:36:35 2014 +0200 ---------------------------------------------------------------------- libcloud/compute/drivers/ec2.py | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/aebdd15a/libcloud/compute/drivers/ec2.py ---------------------------------------------------------------------- diff --git a/libcloud/compute/drivers/ec2.py b/libcloud/compute/drivers/ec2.py index 22c1a64..db4ed76 100644 --- a/libcloud/compute/drivers/ec2.py +++ b/libcloud/compute/drivers/ec2.py @@ -2544,10 +2544,7 @@ class BaseEC2NodeDriver(NodeDriver): params = {'Action': 'DescribeVpcs'} if network_ids: - for network_idx, network_id in enumerate(network_ids): - network_idx += 1 # We want 1-based indexes - network_key = 'VpcId.%s' % network_idx - params[network_key] = network_id + params.update(self._pathlist('VpcId', network_ids)) if filters: params.update(self._build_filters(filters)) @@ -2719,10 +2716,7 @@ class BaseEC2NodeDriver(NodeDriver): params = {'Action': 'DescribeSecurityGroups'} if group_ids: - for id_idx, group_id in enumerate(group_ids): - id_idx += 1 # We want 1-based indexes - id_key = 'GroupId.%s' % (id_idx) - params[id_key] = group_id + params.update(self._pathlist('GroupId', group_ids)) if group_names: for name_idx, group_name in enumerate(group_names): @@ -4095,10 +4089,7 @@ class BaseEC2NodeDriver(NodeDriver): params = {'Action': 'DescribeRouteTables'} if route_table_ids: - for route_table_idx, route_table_id in enumerate(route_table_ids): - route_table_idx += 1 # We want 1-based indexes - route_table_key = 'RouteTableId.%s' % route_table_idx - params[route_table_key] = route_table_id + params.update(self._pathlist('RouteTableId', route_table_ids)) if filters: params.update(self._build_filters(filters))
