Arnike/watcher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix get_compute_node_by_hostname in nova_helper"

Browse Source
This commit is contained in:
Zuul
2018-02-05 06:47:10 +00:00
committed by Gerrit Code Review
parent 4849f8dde9 f32252d510
commit cb8d1a98d6
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
watcher/common/nova_helper.py
View File

@@ -52,14 +52,21 @@ class NovaHelper(object):
return self.nova.hypervisors.get(utils.Struct(id=node_id)) return self.nova.hypervisors.get(utils.Struct(id=node_id))
def get_compute_node_by_hostname(self, node_hostname): def get_compute_node_by_hostname(self, node_hostname):
"""Get compute node by ID (*not* UUID)""" """Get compute node by hostname"""
# We need to pass an object with an 'id' attribute to make it work
try: try:
compute_nodes = self.nova.hypervisors.search(node_hostname) hypervisors = [hv for hv in self.get_compute_node_list()
if len(compute_nodes) != 1: if hv.service['host'] == node_hostname]
if len(hypervisors) != 1:
# TODO(hidekazu)
# this may occur if VMware vCenter driver is used
raise exception.ComputeNodeNotFound(name=node_hostname) raise exception.ComputeNodeNotFound(name=node_hostname)
else:
compute_nodes = self.nova.hypervisors.search(
hypervisors[0].hypervisor_hostname)
if len(compute_nodes) != 1:
raise exception.ComputeNodeNotFound(name=node_hostname)
return self.get_compute_node_by_id(compute_nodes[0].id) return self.get_compute_node_by_id(compute_nodes[0].id)
except Exception as exc: except Exception as exc:
LOG.exception(exc) LOG.exception(exc)
raise exception.ComputeNodeNotFound(name=node_hostname) raise exception.ComputeNodeNotFound(name=node_hostname)