performa/os-faults
Code Issues Proposed changes

Use filter in get_nodes

Browse Source 
* Simplifies code of get_nodes for fuel and tcpcloud
  drivers.

Change-Id: I02569c55a01396cb82f13186e4f16a9daa651503
This commit is contained in:
Anton Studenov 2017-01-19 17:28:38 +03:00
parent af67e544b3
commit 6c31641cfc
2 changed files with 12 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
os_faults/drivers/fuel.py
View File

@ -16,7 +16,6 @@ import logging
from os_faults.ansible import executor
from os_faults.api import cloud_management
from os_faults.api import error
from os_faults.api import node_collection
from os_faults.common import service
from os_faults import utils
@ -418,7 +417,6 @@ class FuelManagement(cloud_management.CloudManagement):
jump_host=self.master_node_address)
self.cached_cloud_hosts = list()
self.fqdn_to_hosts = dict()
def verify(self):
"""Verify connection to the cloud."""
@ -441,7 +439,6 @@ class FuelManagement(cloud_management.CloudManagement):
host = node_collection.Host(ip=r['ip'], mac=r['mac'],
fqdn=r['fqdn'])
self.cached_cloud_hosts.append(host)
self.fqdn_to_hosts[host.fqdn] = host
return self.cached_cloud_hosts
@ -475,19 +472,12 @@ class FuelManagement(cloud_management.CloudManagement):
:param fqdns: list of FQDNs or None to retrieve all nodes
:return: NodesCollection
"""
hosts = self._get_cloud_hosts()
nodes = self.NODE_CLS(cloud_management=self,
power_management=self.power_management,
hosts=self._get_cloud_hosts())
if fqdns:
LOG.debug('Trying to find nodes with FQDNs: %s', fqdns)
hosts = list()
for fqdn in fqdns:
if fqdn in self.fqdn_to_hosts:
hosts.append(self.fqdn_to_hosts[fqdn])
else:
raise error.NodeCollectionError(
'Node with FQDN \'%s\' not found!' % fqdn)
LOG.debug('The following nodes were found: %s', hosts)
return self.NODE_CLS(cloud_management=self,
power_management=self.power_management,
hosts=hosts)
nodes = nodes.filter(lambda node: node.fqdn in fqdns)
LOG.debug('The following nodes were found: %s', nodes.hosts)
return nodes

22
os_faults/drivers/tcpcloud.py
View File

@ -17,7 +17,6 @@ import yaml
from os_faults.ansible import executor
from os_faults.api import cloud_management
from os_faults.api import error
from os_faults.api import node_collection
from os_faults.common import service
from os_faults import utils
@ -280,7 +279,6 @@ class TCPCloudManagement(cloud_management.CloudManagement):
'slave_name_regexp', '^(?!cfg|mon)')
self.cached_cloud_hosts = list()
self.fqdn_to_hosts = dict()
def verify(self):
"""Verify connection to the cloud."""
@ -307,7 +305,6 @@ class TCPCloudManagement(cloud_management.CloudManagement):
mac=net_data[self.slave_iface]['hwaddr'],
fqdn=fqdn)
self.cached_cloud_hosts.append(host)
self.fqdn_to_hosts[host.fqdn] = host
self.cached_cloud_hosts = sorted(self.cached_cloud_hosts)
return self.cached_cloud_hosts
@ -342,19 +339,12 @@ class TCPCloudManagement(cloud_management.CloudManagement):
:param fqdns: list of FQDNs or None to retrieve all nodes
:return: NodesCollection
"""
hosts = self._get_cloud_hosts()
nodes = self.NODE_CLS(cloud_management=self,
power_management=self.power_management,
hosts=self._get_cloud_hosts())
if fqdns:
LOG.debug('Trying to find nodes with FQDNs: %s', fqdns)
hosts = []
for fqdn in fqdns:
if fqdn in self.fqdn_to_hosts:
hosts.append(self.fqdn_to_hosts[fqdn])
else:
raise error.NodeCollectionError(
'Node with FQDN \'%s\' not found!' % fqdn)
LOG.debug('The following nodes were found: %s', hosts)
return self.NODE_CLS(cloud_management=self,
power_management=self.power_management,
hosts=hosts)
nodes = nodes.filter(lambda node: node.fqdn in fqdns)
LOG.debug('The following nodes were found: %s', nodes.hosts)
return nodes