Use openstack client to avoid keystone deprecation warnings

Change-Id: Ib82b3f20d0c23fc67201c7159e3b3a6de5c201cf
Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
(cherry picked from commit 906b3b2f7e85f1269d009684b1a557a6c19e96bc)

3 files changed, 10 insertions, 10 deletions

diff --git a/docker/run_tests.sh b/docker/run_tests.sh
index e6b4cfea0..5dd1f872c 100755
--- a/docker/run_tests.sh
+++ b/docker/run_tests.sh
@@ -51,10 +51,10 @@ function clean_openstack(){
 }
 
 function odl_tests(){
-    keystone_ip=$(keystone catalog --service identity | grep publicURL | cut -f3 -d"/" | cut -f1 -d":")
+    keystone_ip=$(openstack catalog show identity |grep publicURL| cut -f3 -d"/" | cut -f1 -d":")
     # historically most of the installers use the same IP for neutron and keystone API
     neutron_ip=$keystone_ip
-    odl_ip=$(keystone catalog --service network | grep publicURL | cut -f3 -d"/" | cut -f1 -d":")
+    odl_ip=$(openstack catalog show network | grep publicURL | cut -f3 -d"/" | cut -f1 -d":")
     usr_name=$(env | grep OS | grep OS_USERNAME | cut -f2 -d'=')
     password=$(env | grep OS | grep OS_PASSWORD | cut -f2 -d'=')
     odl_port=8181
@@ -64,7 +64,7 @@ function odl_tests(){
         :
     elif [ $INSTALLER_TYPE == "joid" ]; then
         odl_ip=$(env | grep SDN_CONTROLLER | cut -f2 -d'=')
-        neutron_ip=$(keystone catalog --service network | grep publicURL | cut -f3 -d"/" | cut -f1 -d":")
+        neutron_ip=$(openstack catalog show network | grep publicURL | cut -f3 -d"/" | cut -f1 -d":")
         odl_port=8080
         :
     elif [ $INSTALLER_TYPE == "compass" ]; then
diff --git a/testcases/Controllers/ONOS/Teston/CI/onosfunctest.py b/testcases/Controllers/ONOS/Teston/CI/onosfunctest.py
index 4b3779410..bf031cb47 100644
--- a/testcases/Controllers/ONOS/Teston/CI/onosfunctest.py
+++ b/testcases/Controllers/ONOS/Teston/CI/onosfunctest.py
@@ -142,7 +142,7 @@ def GetResult():
     return payload
 
 def SetOnosIp():
-    cmd = "keystone catalog --service network | grep publicURL"
+    cmd = "openstack catalog show network | grep publicURL"
     cmd_output = os.popen(cmd).read()
     OC1=re.search(r"\d+\.\d+\.\d+\.\d+",cmd_output).group()
     os.environ['OC1'] = OC1
diff --git a/testcases/VIM/OpenStack/CI/libraries/check_os.sh b/testcases/VIM/OpenStack/CI/libraries/check_os.sh
index 63d4ea696..ab3d21922 100755
--- a/testcases/VIM/OpenStack/CI/libraries/check_os.sh
+++ b/testcases/VIM/OpenStack/CI/libraries/check_os.sh
@@ -37,7 +37,7 @@ if [ $RETVAL -ne 0 ]; then
 fi
 echo "  ...OK"
 
-adminURL=$(keystone catalog --service identity 2>/dev/null|grep adminURL|awk '{print $4}')
+adminURL=$(openstack catalog show  identity |grep adminURL|awk '{print $4}')
 adminIP=$(echo $adminURL|sed 's/^.*http\:\/\///'|sed 's/.[^:]*$//')
 adminPort=$(echo $adminURL|sed 's/^.*://'|sed 's/.[^\/]*$//')
 echo ">>Verifying connectivity to the admin endpoint $adminIP:$adminPort..."
@@ -52,7 +52,7 @@ echo "  ...OK"
 
 
 echo "Checking OpenStack basic services:"
-commands=('keystone endpoint-list' 'nova list' 'neutron net-list' \
+commands=('openstack endpoint list' 'nova list' 'neutron net-list' \
             'glance image-list' 'cinder list')
 for cmd in "${commands[@]}"
 do
@@ -105,9 +105,9 @@ echo "neutron router-list:"
 neutron router-list
 echo "neutron security-group-list:"
 neutron security-group-list
-echo "keystone tenant-list:"
-keystone tenant-list
-echo "keystone user-list:"
-keystone user-list
+echo "openstack project list:"
+openstack project list
+echo "openstack user list:"
+openstack user list
 
 exit 0