From a53de635ee773435f8a789844b484a35441e6862 Mon Sep 17 00:00:00 2001 From: Dan Radez Date: Wed, 12 Apr 2017 10:04:55 -0400 Subject: update check_os.sh admin port seds to match public If there's not a / on the end of the admin url then port is not found public already handled this correctly. updating admin to match public JIRA: FUNCTEST-793 Change-Id: I01d654dfe247c6102a90ba7ea3921a9f15991789 Signed-off-by: Dan Radez --- functest/ci/check_os.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/functest/ci/check_os.sh b/functest/ci/check_os.sh index 3920b7ac..83f9f476 100755 --- a/functest/ci/check_os.sh +++ b/functest/ci/check_os.sh @@ -69,7 +69,7 @@ fi echo "Checking OpenStack endpoints:" publicURL=$(openstack catalog show identity |awk '/public/ {print $4}') publicIP=$(echo $publicURL|sed 's/^.*http.*\:\/\///'|sed 's/.[^:]*$//') -publicPort=$(echo $publicURL|sed 's/^.*://'|sed 's/\/.*$//') +publicPort=$(echo $publicURL|grep -Po '(?<=:)\d+') https_enabled=$(echo $publicURL | grep 'https') if [[ -n $https_enabled ]]; then echo ">>Verifying SSL connectivity to the public endpoint $publicIP:$publicPort..." @@ -93,7 +93,7 @@ if [ -z ${adminURL} ]; then exit 1 fi adminIP=$(echo $adminURL|sed 's/^.*http.*\:\/\///'|sed 's/.[^:]*$//') -adminPort=$(echo $adminURL|sed 's/^.*://'|sed 's/.[^\/]*$//') +adminPort=$(echo $adminURL|grep -Po '(?<=:)\d+') https_enabled=$(echo $adminURL | grep 'https') if [[ -n $https_enabled ]]; then echo ">>Verifying SSL connectivity to the admin endpoint $adminIP:$adminPort..." -- cgit 1.2.3-korg