x
/
tobiko
Code Issues Proposed changes

Fix ovn_resource_healthy function 

If the ovn resource is not present, skip the test

Change-Id: Ieb84d60cc7006591672ace4120b5f9752a67a9d9
This commit is contained in:
Eduardo Olivares 2020-03-05 11:13:47 +01:00
parent 8781f5281f
commit 395e5da29e
1 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
tobiko/tripleo/pacemaker.py
View File

@ -170,26 +170,25 @@ class PacemakerResourcesStatus(object):
return False
def ovn_resource_healthy(self):
if self.container_runtime() == 'podman':
nodes_num = self.resource_count("(ocf::heartbeat:redis):")
if nodes_num > 0:
return True
else:
master_num = self.resource_count_in_state(
"(ocf::heartbeat:redis):", "Master")
slave_num = self.resource_count_in_state(
"(ocf::heartbeat:redis):", "Slave")
if (master_num == 1) and (slave_num == nodes_num - master_num):
LOG.info(
"pcs status check: resource ovn is in healthy state")
return True
else:
LOG.info(
"pcs status check: resource ovn is in not in "
"healthy state")
return False
else:
if self.pcs_df.query(
'resource_type == "(ocf::ovn:ovndb-servers):"').empty:
LOG.info('pcs status check: ovn is not deployed, skipping ovn '
'resource check')
return True
nodes_num = self.resource_count("(ocf::ovn:ovndb-servers):")
master_num = self.resource_count_in_state(
"(ocf::ovn:ovndb-servers):", "Master")
slave_num = self.resource_count_in_state(
"(ocf::ovn:ovndb-servers):", "Slave")
if (master_num == 1) and (slave_num == nodes_num - master_num):
LOG.info(
"pcs status check: resource ovn is in healthy state")
return True
else:
LOG.info(
"pcs status check: resource ovn is in not in "
"healthy state")
return False
@property
def all_healthy(self):