aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvitikkan <viktor.tikkanen@nokia.com>2016-05-11 12:48:10 +0300
committervitikkan <viktor.tikkanen@nokia.com>2016-05-11 12:50:21 +0300
commitbeeca3a0cd57e82e08b004b94723576642be1087 (patch)
tree436d76a2e4d224e5a3f17276baa84be9b2cc0665
parent31b76f41eb6566eb4bddf07fbfd5fb42fdf95594 (diff)
Removed obsolete modules
testcases/VIM/OpenStack/CI/libraries/check_os.sh testcases/VIM/OpenStack/CI/libraries/os_defaults.yaml Change-Id: I835bfbdc9aa43903ca2ad6041a38216fd68263a5 Signed-off-by: vitikkan <viktor.tikkanen@nokia.com>
-rwxr-xr-xtestcases/VIM/OpenStack/CI/libraries/check_os.sh91
-rw-r--r--testcases/VIM/OpenStack/CI/libraries/os_defaults.yaml31
2 files changed, 0 insertions, 122 deletions
diff --git a/testcases/VIM/OpenStack/CI/libraries/check_os.sh b/testcases/VIM/OpenStack/CI/libraries/check_os.sh
deleted file mode 100755
index c247d5ae2..000000000
--- a/testcases/VIM/OpenStack/CI/libraries/check_os.sh
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/bin/bash
-#
-# Simple script to check the basic OpenStack clients
-#
-# Author:
-# jose.lausuch@ericsson.com
-#
-
-verify_connectivity() {
- for i in $(seq 0 9); do
- if echo "test" | nc -v -w 10 $1 $2 &>/dev/null; then
- return 0
- fi
- sleep 1
- done
- return 1
-}
-
-
-if [ -z $OS_AUTH_URL ];then
- echo "ERROR: OS_AUTH_URL environment variable missing... Have you sourced the OpenStack credentials?"
- exit 1
-fi
-
-
-echo "Checking OpenStack endpoints:"
-publicURL=$OS_AUTH_URL
-publicIP=$(echo $publicURL|sed 's/^.*http\:\/\///'|sed 's/.[^:]*$//')
-publicPort=$(echo $publicURL|sed 's/^.*://'|sed 's/.[^\/]*$//')
-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 "OS_AUTH_URL=$OS_AUTH_URL"
- exit 1
-fi
-echo " ...OK"
-
-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..."
-verify_connectivity $adminIP $adminPort
-RETVAL=$?
-if [ $RETVAL -ne 0 ]; then
- echo "ERROR: Cannot talk to the admin endpoint $adminIP:$adminPort ."
- echo "$adminURL"
- exit 1
-fi
-echo " ...OK"
-
-
-echo "Checking OpenStack basic services:"
-commands=('openstack endpoint list' 'nova list' 'neutron net-list' \
- 'glance image-list' 'cinder list')
-for cmd in "${commands[@]}"
-do
- service=$(echo $cmd | awk '{print $1}')
- echo ">>Checking $service service..."
- $cmd &>/dev/null
- result=$?
- if [ $result -ne 0 ];
- then
-
- echo "ERROR: Failed execution $cmd. The $service does not seem to be working."
- exit 1
- else
- echo " ...OK"
- fi
-done
-
-echo "OpenStack services are OK."
-
-echo "Checking External network..."
-networks=($(neutron net-list | tail -n +4 | head -n -1 | awk '{print $2}'))
-is_external=False
-for net in "${networks[@]}"
-do
- is_external=$(neutron net-show $net|grep "router:external"|awk '{print $4}')
- if [ $is_external == "True" ]; then
- echo "External network found: $net"
- break
- fi
-done
-if [ $is_external == "False" ]; then
- echo "ERROR: There are no external networks in the deployment."
- exit 1
-fi
-
-exit 0
diff --git a/testcases/VIM/OpenStack/CI/libraries/os_defaults.yaml b/testcases/VIM/OpenStack/CI/libraries/os_defaults.yaml
deleted file mode 100644
index 55a6ae138..000000000
--- a/testcases/VIM/OpenStack/CI/libraries/os_defaults.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
-fuel:
- images: ['TestVM']
- networks: ['net04', 'net04_ext', 'admin_floating_net', 'admin_internal_net']
- routers: ['router04']
- security_groups: ['default']
- tenants: ['admin', 'services']
- users: ['heat', 'heat-cfn', 'cinder', 'nova', 'swift', 'glance', 'neutron', 'admin', 'fuel_stats_user', 'ceilometer']
-apex:
- images: []
- networks: ['internal', 'external']
- routers: []
- security_groups: ['default']
- tenants: ['admin', 'services', 'service']
- users: ['heat', 'heat-cfn', 'cinder', 'nova', 'swift', 'glance', 'neutron', 'admin', 'ceilometer', 'cinderv2', 'aodh']
-compass:
- images: []
- networks: ['ext-net']
- routers: []
- security_groups: ['default']
- tenants: ['admin', 'service', 'demo']
- users: ['heat', 'cinder', 'nova', 'glance', 'neutron', 'admin', 'ceilometer', 'demo', 'keystone']
-joid:
- images: []
- networks: ['ext-net']
- routers: []
- security_groups: ['default']
- tenants: ['admin', 'services']
- users: ['admin', 'glance', 'nova', 'neutron', 'heat-cfn_heat', 'ceilometer', 'cinder_cinderv2', 'swift']
-common:
- networks: ['functest-net']
- routers: ['functest-router']