From faa882b70e4fae48b6014eb4ca45b07926f4ab5a Mon Sep 17 00:00:00 2001 From: Roman Prykhodchenko Date: Fri, 14 Nov 2014 11:36:06 +0100 Subject: [PATCH] Do not refresh data on filtering stuff by cluster Listing nodes of node groups downloads all data from Nailgun so there is no need to refresh it during the following filtering by cluster id. Closes-bug: #1378963 Change-Id: Ib9f45225f6e3c91809ea0dbc47e79b3529b54d3b --- fuelclient/objects/node.py | 6 ++---- fuelclient/objects/nodegroup.py | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/fuelclient/objects/node.py b/fuelclient/objects/node.py index 20f4a7f..ff0db4a 100644 --- a/fuelclient/objects/node.py +++ b/fuelclient/objects/node.py @@ -152,7 +152,5 @@ class NodeCollection(object): return cls(Node.get_all()) def filter_by_env_id(self, env_id): - self.collection = filter( - lambda node: node.env_id == env_id, - self.collection - ) + predicate = lambda node: node.data['cluster'] == env_id + self.collection = filter(predicate, self.collection) diff --git a/fuelclient/objects/nodegroup.py b/fuelclient/objects/nodegroup.py index bd99365..7781451 100644 --- a/fuelclient/objects/nodegroup.py +++ b/fuelclient/objects/nodegroup.py @@ -81,7 +81,5 @@ class NodeGroupCollection(object): return cls(NodeGroup.get_all()) def filter_by_env_id(self, env_id): - self.collection = filter( - lambda group: group.env_id == env_id, - self.collection - ) + predicate = lambda group: group.data['cluster'] == env_id + self.collection = filter(predicate, self.collection)