You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@libcloud.apache.org by to...@apache.org on 2013/12/21 15:14:25 UTC
[3/6] git commit: Move "private" method to the end, add a docstrings.
Move "private" method to the end, add a docstrings.
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/850c9920
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/850c9920
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/850c9920
Branch: refs/heads/trunk
Commit: 850c992029ccfaab1131f069e5f3e7a6ff0cb4eb
Parents: 5739339
Author: Tomaz Muraus <to...@apache.org>
Authored: Sat Dec 21 15:05:03 2013 +0100
Committer: Tomaz Muraus <to...@apache.org>
Committed: Sat Dec 21 15:05:03 2013 +0100
----------------------------------------------------------------------
libcloud/compute/drivers/ec2.py | 77 +++++++++++++++++++-----------------
1 file changed, 41 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/850c9920/libcloud/compute/drivers/ec2.py
----------------------------------------------------------------------
diff --git a/libcloud/compute/drivers/ec2.py b/libcloud/compute/drivers/ec2.py
index 805f025..7083453 100644
--- a/libcloud/compute/drivers/ec2.py
+++ b/libcloud/compute/drivers/ec2.py
@@ -776,42 +776,6 @@ class BaseEC2NodeDriver(NodeDriver):
'description': description,
'state': state})
- def _get_common_security_group_params(self, group_id, protocol,
- from_port, to_port, cidr_ips,
- group_pairs):
-
- params = {'GroupId': id,
- 'IpPermissions.1.IpProtocol': protocol,
- 'IpPermissions.1.FromPort': from_port,
- 'IpPermissions.1.ToPort': to_port}
-
- if cidr_ips is not None:
- ip_ranges = {}
- for index, cidr_ip in enumerate(cidr_ips, 1):
- ip_ranges['IpPermissions.1.IpRanges.%s.CidrIp'
- % (index)] = cidr_ip
-
- params.update(ip_ranges)
-
- if group_pairs is not None:
- user_groups = {}
- for index, group_pair in enumerate(group_pairs, 1):
- if 'group_id' in group_pair.keys():
- user_groups['IpPermissions.1.Groups.%s.GroupId'
- % (index)] = group_pair['group_id']
-
- if 'group_name' in group_pair.keys():
- user_groups['IpPermissions.1.Groups.%s.GroupName'
- % (index)] = group_pair['group_name']
-
- if 'user_id' in group_pair.keys():
- user_groups['IpPermissions.1.Groups.%s.UserId'
- % (index)] = group_pair['user_id']
-
- params.update(user_groups)
-
- return params
-
def list_nodes(self, ex_node_ids=None):
"""
List all nodes
@@ -2261,6 +2225,47 @@ class BaseEC2NodeDriver(NodeDriver):
res = self.connection.request(self.path, params=params).object
return self._get_terminate_boolean(res)
+ def _get_common_security_group_params(self, group_id, protocol,
+ from_port, to_port, cidr_ips,
+ group_pairs):
+ """
+ Return a dictionary with common query parameters which are used when
+ operating on security groups.
+
+ :rtype: ``dict``
+ """
+ params = {'GroupId': id,
+ 'IpPermissions.1.IpProtocol': protocol,
+ 'IpPermissions.1.FromPort': from_port,
+ 'IpPermissions.1.ToPort': to_port}
+
+ if cidr_ips is not None:
+ ip_ranges = {}
+ for index, cidr_ip in enumerate(cidr_ips, 1):
+ ip_ranges['IpPermissions.1.IpRanges.%s.CidrIp'
+ % (index)] = cidr_ip
+
+ params.update(ip_ranges)
+
+ if group_pairs is not None:
+ user_groups = {}
+ for index, group_pair in enumerate(group_pairs, 1):
+ if 'group_id' in group_pair.keys():
+ user_groups['IpPermissions.1.Groups.%s.GroupId'
+ % (index)] = group_pair['group_id']
+
+ if 'group_name' in group_pair.keys():
+ user_groups['IpPermissions.1.Groups.%s.GroupName'
+ % (index)] = group_pair['group_name']
+
+ if 'user_id' in group_pair.keys():
+ user_groups['IpPermissions.1.Groups.%s.UserId'
+ % (index)] = group_pair['user_id']
+
+ params.update(user_groups)
+
+ return params
+
class EC2NodeDriver(BaseEC2NodeDriver):
"""