diff options
| author |   jose.lausuch <jose.lausuch@ericsson.com> | 2016-02-02 10:34:06 +0100 |
|---|---|---|
| committer |   Morgan Richomme <morgan.richomme@orange.com> | 2016-02-02 09:51:45 +0000 |
| commit | 520d85bdc1ec581d26f8ebd90a7b7180ed60c431 (patch) | |
| tree | 1e7d9fc73d755c25ab11c9741691b4a6920dee21 /testcases | |
| parent | 0f2665f9eb28bb2ecaab45a5bd70c87964210ac2 (diff) | |
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)
Diffstat (limited to 'testcases')
| -rw-r--r-- | testcases/Controllers/ONOS/Teston/CI/onosfunctest.py | 2 | ||||
| -rwxr-xr-x | testcases/VIM/OpenStack/CI/libraries/check_os.sh | 12 |
2 files changed, 7 insertions, 7 deletions
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 |