[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_contrail.py b/test_set/cvp-sanity/tests/test_contrail.py
index e5722bd..035c3b3 100644
--- a/test_set/cvp-sanity/tests/test_contrail.py
+++ b/test_set/cvp-sanity/tests/test_contrail.py
@@ -1,6 +1,5 @@
import pytest
import json
-import utils
pytestmark = pytest.mark.usefixtures("contrail")
@@ -9,8 +8,8 @@
def get_contrail_status(salt_client, pillar, command, processor):
return salt_client.cmd(
- pillar, 'cmd.run',
- ['{} | {}'.format(command, processor)],
+ tgt=pillar,
+ param='{} | {}'.format(command, processor),
expr_form='pillar'
)
@@ -89,15 +88,13 @@
def test_public_ui_contrail(local_salt_client, ctl_nodes_pillar):
- IP = utils.get_monitoring_ip('cluster_public_host')
+ IP = local_salt_client.pillar_get(param='_param:cluster_public_host')
protocol = 'https'
port = '8143'
url = "{}://{}:{}".format(protocol, IP, port)
- result = local_salt_client.cmd(
- ctl_nodes_pillar,
- 'cmd.run',
- ['curl -k {}/ 2>&1 | \
- grep Contrail'.format(url)],
- expr_form='pillar')
- assert len(result[result.keys()[0]]) != 0, \
+ result = local_salt_client.cmd_any(
+ tgt=ctl_nodes_pillar,
+ param='curl -k {}/ 2>&1 | \
+ grep Contrail'.format(url))
+ assert len(result) != 0, \
'Public Contrail UI is not reachable on {} from ctl nodes'.format(url)