commit 903d0e4bee63e4d109351e7c8961665476d9daeb
author Oleksii Zhurba <ozhurba@mirantis.com> Wed Dec 05 16:46:17 2018 -0600
committer Oleksii Zhurba <ozhurba@mirantis.com> Wed Dec 05 23:43:45 2018 +0000
tree 17944634a92882082d0ef58a41f55e9b648374f3
parent dac43843c65d7e247ca898f1aeb5591ef53d0381

Switch to keystonercv3 in OS tests

Change-Id: Ie8c7ad7e5997f5744e263b068a3c6e68694b76aa
(cherry picked from commit 5c56c24643cb32da7d8f8a0fc3f24088c2a5fe4f)

cvp_checks/tests/test_cinder_services.py

diff --git a/cvp_checks/tests/test_cinder_services.py b/cvp_checks/tests/test_cinder_services.py
index f6aaf4a..e6b8c8e 100644
--- a/cvp_checks/tests/test_cinder_services.py
+++ b/cvp_checks/tests/test_cinder_services.py
@@ -13,12 +13,12 @@
     service_down = local_salt_client.cmd(
         'keystone:server',
         'cmd.run',
-        ['. /root/keystonerc; cinder service-list | grep "down\|disabled"'],
+        ['. /root/keystonercv3; cinder service-list | grep "down\|disabled"'],
         expr_form='pillar')
     cinder_volume = local_salt_client.cmd(
         'keystone:server',
         'cmd.run',
-        ['. /root/keystonerc; cinder service-list | grep -c "volume"'],
+        ['. /root/keystonercv3; cinder service-list | grep -c "volume"'],
         expr_form='pillar')
     backends_cinder = cinder_backends_info[cinder_backends_info.keys()[0]]
     backends_num = len(backends_cinder.keys())

cvp_checks/tests/test_nova_services.py

diff --git a/cvp_checks/tests/test_nova_services.py b/cvp_checks/tests/test_nova_services.py
index 84ca19b..8fdadd6 100644
--- a/cvp_checks/tests/test_nova_services.py
+++ b/cvp_checks/tests/test_nova_services.py
@@ -5,7 +5,7 @@
     result = local_salt_client.cmd(
         'keystone:server',
         'cmd.run',
-        ['. /root/keystonerc; nova service-list | grep "down\|disabled" | grep -v "Forced down"'],
+        ['. /root/keystonercv3; nova service-list | grep "down\|disabled" | grep -v "Forced down"'],
         expr_form='pillar')
 
     if not result: