[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_single_vip.py b/test_set/cvp-sanity/tests/test_single_vip.py
index 29bdb88..6fa0a41 100644
--- a/test_set/cvp-sanity/tests/test_single_vip.py
+++ b/test_set/cvp-sanity/tests/test_single_vip.py
@@ -1,17 +1,23 @@
-import pytest
-import utils
-import os
from collections import Counter
def test_single_vip(local_salt_client, nodes_in_group):
- local_salt_client.cmd("L@"+','.join(nodes_in_group), 'saltutil.sync_all', expr_form='compound')
+ local_salt_client.cmd(tgt="L@"+','.join(nodes_in_group),
+ fun='saltutil.sync_all',
+ expr_form='compound')
nodes_list = local_salt_client.cmd(
- "L@"+','.join(nodes_in_group), 'grains.item', ['ipv4'], expr_form='compound')
+ tgt="L@"+','.join(nodes_in_group),
+ fun='grains.item',
+ param='ipv4',
+ expr_form='compound')
ipv4_list = []
for node in nodes_list:
+ if not nodes_list.get(node):
+ # TODO: do not skip node
+ print "Node {} is skipped".format (node)
+ continue
ipv4_list.extend(nodes_list.get(node).get('ipv4'))
cnt = Counter(ipv4_list)