Merge "Remove useless odlreport2db args"

[functest.git] / ci / check_os.sh

diff --git a/ci/check_os.sh b/ci/check_os.sh
index bb13353..38fe32f 100755 (executable)
--- a/ci/check_os.sh
+++ b/ci/check_os.sh
@@ -26,7 +26,7 @@ fi
 echo "Checking OpenStack endpoints:"
 publicURL=$OS_AUTH_URL
 publicIP=$(echo $publicURL|sed 's/^.*http\:\/\///'|sed 's/.[^:]*$//')
-publicPort=$(echo $publicURL|sed 's/^.*://'|sed 's/.[^\/]*$//')
+publicPort=$(echo $publicURL|sed 's/^.*://'|sed 's/\/.*$//')
 echo ">>Verifying connectivity to the public endpoint $publicIP:$publicPort..."
 verify_connectivity $publicIP $publicPort
 RETVAL=$?
@@ -72,7 +72,7 @@ done
 echo "OpenStack services are OK."
 
 echo "Checking External network..."
-networks=($(neutron net-list | tail -n +4 | head -n -1 | awk '{print $2}'))
+networks=($(neutron net-list -F id | tail -n +4 | head -n -1 | awk '{print $2}'))
 is_external=False
 for net in "${networks[@]}"
 do