diff options
Diffstat (limited to 'testcases/VIM/OpenStack/CI/libraries')
| -rwxr-xr-x | testcases/VIM/OpenStack/CI/libraries/check_os.sh | 28 | ||||
| -rw-r--r-- | testcases/VIM/OpenStack/CI/libraries/os_defaults.yaml | 2 |
2 files changed, 26 insertions, 4 deletions
diff --git a/testcases/VIM/OpenStack/CI/libraries/check_os.sh b/testcases/VIM/OpenStack/CI/libraries/check_os.sh index 560205261..63d4ea696 100755 --- a/testcases/VIM/OpenStack/CI/libraries/check_os.sh +++ b/testcases/VIM/OpenStack/CI/libraries/check_os.sh @@ -31,7 +31,7 @@ echo ">>Verifying connectivity to the public endpoint $publicIP:$publicPort..." verify_connectivity $publicIP $publicPort RETVAL=$? if [ $RETVAL -ne 0 ]; then - echo "ERROR: Cannot talk to the public endpoint publicIP:$publicPort ." + echo "ERROR: Cannot talk to the public endpoint $publicIP:$publicPort ." echo "OS_AUTH_URL=$OS_AUTH_URL" exit 1 fi @@ -44,8 +44,8 @@ echo ">>Verifying connectivity to the admin endpoint $adminIP:$adminPort..." verify_connectivity $adminIP $adminPort RETVAL=$? if [ $RETVAL -ne 0 ]; then - echo "ERROR: Cannot talk to the admin endpoint adminIP:$adminPort ." - echo "adminURL" + echo "ERROR: Cannot talk to the admin endpoint $adminIP:$adminPort ." + echo "$adminURL" exit 1 fi echo " ...OK" @@ -88,4 +88,26 @@ if [ $is_external == "False" ]; then exit 1 fi + +# Temporary output information +# To see the initial OpenStack defaults +# in case we delete something later on. +# This is to be removed for the release +echo "nova list:" +nova list +echo "cinder list" +cinder list +echo "nova floating-ip-list:" +nova floating-ip-list +echo "neutron net-list:" +neutron net-list +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 + exit 0 diff --git a/testcases/VIM/OpenStack/CI/libraries/os_defaults.yaml b/testcases/VIM/OpenStack/CI/libraries/os_defaults.yaml index f792cda5d..c8ec15222 100644 --- a/testcases/VIM/OpenStack/CI/libraries/os_defaults.yaml +++ b/testcases/VIM/OpenStack/CI/libraries/os_defaults.yaml @@ -25,7 +25,7 @@ joid: routers: [] security_groups: ['default'] tenants: ['admin', 'services'] - users: ['admin', 'glance', 'nova', 'quantum_nova', 'quantum', 'heat-cfn_heat', 'ceilometer', 'cinder_cinderv2', 'swift'] + users: ['admin', 'glance', 'nova', 'neutron', 'heat-cfn_heat', 'ceilometer', 'cinder_cinderv2', 'swift'] common: networks: ['functest-net'] routers: ['functest-router'] |