x
/
tobiko
Code Issues Proposed changes

Fix how OVN process validations filter node names 

Node names where filtered with startswith(node_group), where node_group
could be controller, compute, networker, ...
An accurate re filter with exact node hostnames will be used instead

Change-Id: I9913998f19630ef26e251af2d05ea66599928db6
This commit is contained in:
Eduardo Olivares 2020-11-10 10:48:26 +01:00
parent 16b925e3f9
commit 9e3ee70813
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tobiko/tripleo/processes.py
View File

@ -1,5 +1,6 @@
from __future__ import absolute_import
import re
import time
from oslo_log import log
@ -185,8 +186,13 @@ class OvercloudProcessesStatus(object):
LOG.debug(f"{process_dict['node_group']} is not "
"a node group part of this Openstack cloud")
continue
node_list = [node.name
for node in
topology.list_openstack_nodes(
group=process_dict['node_group'])]
node_names_re = re.compile(r'|'.join(node_list))
node_filter = (ovn_proc_filtered_df.overcloud_node.
str.startswith(process_dict['node_group']))
str.match(node_names_re))
# obtain the processes running on a specific type of nodes
ovn_proc_filtered_per_node_df = \
ovn_proc_filtered_df[node_filter]
@ -197,8 +203,7 @@ class OvercloudProcessesStatus(object):
f" of processes {process_dict['name']} running on "
f"{process_dict['node_group']} nodes")
elif process_dict['number'] == 'all':
num_nodes = len(topology.list_openstack_nodes(
group=process_dict['node_group']))
num_nodes = len(node_list)
assert num_nodes == len(ovn_proc_filtered_per_node_df), (
"Unexpected number of processes "
f"{process_dict['name']} running on "