Skip to content

[LIBCLOUD-580] node filters for ec2 driver #320

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
zerthimon wants to merge 2 commits into from
Closed

[LIBCLOUD-580] node filters for ec2 driver #320

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6051e0b
[LIBCLOUD-580] node filters for ec2 driver
zerthimon Jun 20, 2014
0b14b73
[LIBCLOUD-580] rename filters to ex_filters
zerthimon Jun 23, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion libcloud/compute/drivers/ec2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1875,7 +1875,7 @@ class BaseEC2NodeDriver(NodeDriver):
'terminated': NodeState.TERMINATED
}

def list_nodes(self, ex_node_ids=None):
def list_nodes(self, ex_node_ids=None, ex_filters=None):
"""
List all nodes

Expand All @@ -1886,21 +1886,34 @@ def list_nodes(self, ex_node_ids=None):
:param ex_node_ids: List of ``node.id``
:type ex_node_ids: ``list`` of ``str``

:param ex_filters: The filters so that the response includes
information for only certain nodes.
:type ex_filters: ``dict``

:rtype: ``list`` of :class:`Node`
"""

params = {'Action': 'DescribeInstances'}

if ex_node_ids:
params.update(self._pathlist('InstanceId', ex_node_ids))

if ex_filters:
params.update(self._build_filters(ex_filters))

elem = self.connection.request(self.path, params=params).object

nodes = []
for rs in findall(element=elem, xpath='reservationSet/item',
namespace=NAMESPACE):
nodes += self._to_nodes(rs, 'instancesSet/item')

nodes_elastic_ips_mappings = self.ex_describe_addresses(nodes)

for node in nodes:
ips = nodes_elastic_ips_mappings[node.id]
node.public_ips.extend(ips)

return nodes

def list_sizes(self, location=None):
Expand Down