Ignore checking srv-volumes-backup.mount service for kvm03 node in tests_services.py::test_check_services
Change-Id: I0f937e70a1bb7a12e9abe300b14c2915e51d8eff
Closes-Bug: #PROD-26053(PROD:26053)
diff --git a/cvp-sanity/cvp_checks/tests/test_services.py b/cvp-sanity/cvp_checks/tests/test_services.py
index a623508..95dfb51 100644
--- a/cvp-sanity/cvp_checks/tests/test_services.py
+++ b/cvp-sanity/cvp_checks/tests/test_services.py
@@ -3,8 +3,18 @@
import os
from cvp_checks import utils
+# Some nodes can have services that are not applicable for other noder in similar group.
+# For example , there are 3 node in kvm group, but just kvm03 node has srv-volumes-backup.mount service
+# in service.get_all
+# NODE NAME SERVICE_NAME
+inconsistency_rule = {"kvm03": ["srv-volumes-backup.mount", "rsync"]}
+
def test_check_services(local_salt_client, nodes_in_group):
+ """
+ Skips services if they are not consistent for all node.
+ Inconsistent services will be checked with another test case
+ """
output = local_salt_client.cmd("L@"+','.join(nodes_in_group), 'service.get_all', expr_form='compound')
if len(output.keys()) < 2:
@@ -22,15 +32,83 @@
diff = []
row = []
for node in nodes:
- if srv in output[node]:
+ short_name_of_node = node.split('.')[0]
+ if inconsistency_rule.get(short_name_of_node) is not None and srv in inconsistency_rule[short_name_of_node]:
+ # Found service on node and it SHOULD be there
+ break
+ elif srv in output[node]:
+ # Found service on node
diff.append(srv)
row.append("{}: +".format(node))
else:
+ # Not found expected service on node
row.append("{}: No service".format(node))
- if diff.count(diff[0]) < len(nodes):
+ if diff.__len__() > 0 and diff.count(diff[0]) < len(nodes):
row.sort()
row.insert(0, srv)
pkts_data.append(row)
- assert len(pkts_data) <= 1, \
+ assert len(pkts_data) == 0, \
"Several problems found: {0}".format(
json.dumps(pkts_data, indent=4))
+
+
+# TODO : remake this test to make workable https://mirantis.jira.com/browse/PROD-25958
+
+# def _check_services_on_special_node(local_salt_client, nodes_in_group):
+# """
+# Check that specific node has service.
+# Nodes and proper services should be defined in inconsistency_rule dictionary
+#
+# :print: Table with nodes which don't have required services and not existed services
+# """
+#
+# output = local_salt_client.cmd("L@" + ','.join(nodes_in_group), 'service.get_all', expr_form='compound')
+# if len(output.keys()) < 2:
+# pytest.skip("Nothing to compare - just 1 node")
+#
+# def is_proper_service_for_node(_service, _node):
+# """
+# Return True if service exists on node and exists in inconsistency_rule
+# Return True if service doesn't exists on node and doesn't exists in inconsistency_rule
+# Return False otherwise
+# :param _service: string
+# :param _node: string full name of node
+# :return: bool, read description for further details
+# """
+# short_name_of_node = _node.split('.')[0]
+# if short_name_of_node not in inconsistency_rule.keys():
+# return False
+#
+# if _service in inconsistency_rule[short_name_of_node] and \
+# _service in output[_node]:
+# # Return True if service exists on node and exists in inconsistency_rule
+# return True
+#
+# if _service not in inconsistency_rule[short_name_of_node] and \
+# _service not in output[_node]:
+# # Return True if service exists on node and exists in inconsistency_rule
+# return True
+# print("return False for {} in {}".format(_service, _node))
+# # error_text = ""
+# return False
+#
+# errors = list()
+# for node, expected_services in inconsistency_rule.items():
+# print("Check {} , {} ".format(node, expected_services))
+# # Skip if there is no proper node. Find nodes that contains node_title (like 'kvm03') in their titles
+# if not any([node in node_name for node_name in output.keys()]):
+# continue
+# for expected_service in expected_services:
+# service_on_nodes = {_node: expected_service if expected_service in _service else None
+# for _node, _service
+# in output.items()}
+# print([is_proper_service_for_node(expected_service, _node)
+# for _node
+# in output.keys()])
+# if not all([is_proper_service_for_node(expected_service, _node)
+# for _node
+# in output.keys()]):
+# errors.append(service_on_nodes)
+#
+# assert errors.__len__() == 0, json.dumps(errors, indent=4)
+# assert False