[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_nova_services.py b/test_set/cvp-sanity/tests/test_nova_services.py
index 471e5dd..6505d30 100644
--- a/test_set/cvp-sanity/tests/test_nova_services.py
+++ b/test_set/cvp-sanity/tests/test_nova_services.py
@@ -3,43 +3,33 @@
@pytest.mark.usefixtures('check_openstack')
def test_nova_services_status(local_salt_client):
- result = local_salt_client.cmd(
- 'keystone:server',
- 'cmd.run',
- ['. /root/keystonercv3;'
- 'nova service-list | grep "down\|disabled" | grep -v "Forced down"'],
- expr_form='pillar')
+ result = local_salt_client.cmd_any(
+ tgt='keystone:server',
+ param='. /root/keystonercv3;'
+ 'nova service-list | grep "down\|disabled" | grep -v "Forced down"')
- assert result[result.keys()[0]] == '', \
+ assert result == '', \
'''Some nova services are in wrong state'''
@pytest.mark.usefixtures('check_openstack')
def test_nova_hosts_consistent(local_salt_client):
- all_cmp_services = local_salt_client.cmd(
- 'keystone:server',
- 'cmd.run',
- ['. /root/keystonercv3;'
- 'nova service-list | grep "nova-compute" | wc -l'],
- expr_form='pillar').values()[0]
- enabled_cmp_services = local_salt_client.cmd(
- 'keystone:server',
- 'cmd.run',
- ['. /root/keystonercv3;'
- 'nova service-list | grep "nova-compute" | grep "enabled" | wc -l'],
- expr_form='pillar').values()[0]
- hosts = local_salt_client.cmd(
- 'keystone:server',
- 'cmd.run',
- ['. /root/keystonercv3;'
- 'openstack host list | grep "compute" | wc -l'],
- expr_form='pillar').values()[0]
- hypervisors = local_salt_client.cmd(
- 'keystone:server',
- 'cmd.run',
- ['. /root/keystonercv3;'
- 'openstack hypervisor list | egrep -v "\-----|ID" | wc -l'],
- expr_form='pillar').values()[0]
+ all_cmp_services = local_salt_client.cmd_any(
+ tgt='keystone:server',
+ param='. /root/keystonercv3;'
+ 'nova service-list | grep "nova-compute" | wc -l')
+ enabled_cmp_services = local_salt_client.cmd_any(
+ tgt='keystone:server',
+ param='. /root/keystonercv3;'
+ 'nova service-list | grep "nova-compute" | grep "enabled" | wc -l')
+ hosts = local_salt_client.cmd_any(
+ tgt='keystone:server',
+ param='. /root/keystonercv3;'
+ 'openstack host list | grep "compute" | wc -l')
+ hypervisors = local_salt_client.cmd_any(
+ tgt='keystone:server',
+ param='. /root/keystonercv3;'
+ 'openstack hypervisor list | egrep -v "\-----|ID" | wc -l')
assert all_cmp_services == hypervisors, \
"Number of nova-compute services ({}) does not match number of " \