[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_salt_master.py b/test_set/cvp-sanity/tests/test_salt_master.py
index 7649767..7ae5754 100644
--- a/test_set/cvp-sanity/tests/test_salt_master.py
+++ b/test_set/cvp-sanity/tests/test_salt_master.py
@@ -1,8 +1,7 @@
def test_uncommited_changes(local_salt_client):
git_status = local_salt_client.cmd(
- 'salt:master',
- 'cmd.run',
- ['cd /srv/salt/reclass/classes/cluster/; git status'],
+ tgt='salt:master',
+ param='cd /srv/salt/reclass/classes/cluster/; git status',
expr_form='pillar')
assert 'nothing to commit' in git_status.values()[0], 'Git status showed' \
' some unmerged changes {}'''.format(git_status.values()[0])
@@ -10,9 +9,8 @@
def test_reclass_smoke(local_salt_client):
reclass = local_salt_client.cmd(
- 'salt:master',
- 'cmd.run',
- ['reclass-salt --top; echo $?'],
+ tgt='salt:master',
+ param='reclass-salt --top; echo $?',
expr_form='pillar')
result = reclass[reclass.keys()[0]][-1]