[CVP] Refactor salt client class
Change-Id: I91cfffe1c8d5df0224657ce9e36be9063b56f0b3
Related-PROD: PROD-28981
Related-PROD: PROD-28729
Related-PROD: PROD-28624
Related-PROD: PROD-29286
diff --git a/test_set/cvp-sanity/tests/test_services.py b/test_set/cvp-sanity/tests/test_services.py
index 4f7f613..e25015d 100644
--- a/test_set/cvp-sanity/tests/test_services.py
+++ b/test_set/cvp-sanity/tests/test_services.py
@@ -16,7 +16,9 @@
Inconsistent services will be checked with another test case
"""
exclude_services = utils.get_configuration().get("exclude_services", [])
- services_by_nodes = local_salt_client.cmd("L@"+','.join(nodes_in_group), 'service.get_all', expr_form='compound')
+ services_by_nodes = local_salt_client.cmd(tgt="L@"+','.join(nodes_in_group),
+ fun='service.get_all',
+ expr_form='compound')
if len(services_by_nodes.keys()) < 2:
pytest.skip("Nothing to compare - only 1 node")
@@ -26,6 +28,10 @@
all_services = set()
for node in services_by_nodes:
+ if not services_by_nodes[node]:
+ # TODO: do not skip node
+ print "Node {} is skipped".format (node)
+ continue
nodes.append(node)
all_services.update(services_by_nodes[node])