diff options
Diffstat (limited to 'utils')
| -rwxr-xr-x | utils/fetch_os_creds.sh | 8 | ||||
| -rwxr-xr-x | utils/test/testapi/run_test.sh | 14 |
2 files changed, 13 insertions, 9 deletions
diff --git a/utils/fetch_os_creds.sh b/utils/fetch_os_creds.sh index 856f69a27..c1e21f316 100755 --- a/utils/fetch_os_creds.sh +++ b/utils/fetch_os_creds.sh @@ -121,6 +121,14 @@ if [ "$installer_type" == "fuel" ]; then # but sometimes the output of endpoint-list is like this: http://172.30.9.70:8004/v1/%(tenant_id)s # Fuel virtual need a fix + #convert to v3 URL + auth_url=$(cat $dest_path|grep AUTH_URL) + if [[ -z `echo $auth_url |grep v3` ]]; then + auth_url=$(echo $auth_url |sed "s|'$|v3&|") + fi + sed -i '/AUTH_URL/d' $dest_path + echo $auth_url >> $dest_path + elif [ "$installer_type" == "apex" ]; then verify_connectivity $installer_ip diff --git a/utils/test/testapi/run_test.sh b/utils/test/testapi/run_test.sh index d1f05f201..51db09f65 100755 --- a/utils/test/testapi/run_test.sh +++ b/utils/test/testapi/run_test.sh @@ -5,20 +5,16 @@ set -o errexit # Get script directory SCRIPTDIR=`dirname $0` -# Either Workspace is set (CI) -if [ -z $WORKSPACE ] -then - WORKSPACE="." -fi - echo "Running unit tests..." # Creating virtual environment -virtualenv $WORKSPACE/testapi_venv -source $WORKSPACE/testapi_venv/bin/activate +virtualenv $SCRIPTDIR/testapi_venv +source $SCRIPTDIR/testapi_venv/bin/activate # Install requirements pip install -r $SCRIPTDIR/requirements.txt +pip install coverage +pip install nose>=1.3.1 find . -type f -name "*.pyc" -delete @@ -26,7 +22,7 @@ nosetests --with-xunit \ --with-coverage \ --cover-erase \ --cover-package=$SCRIPTDIR/opnfv_testapi/cmd \ - --cover-package=$SCRIPTDIR/opnfv_testapi/commonn \ + --cover-package=$SCRIPTDIR/opnfv_testapi/common \ --cover-package=$SCRIPTDIR/opnfv_testapi/resources \ --cover-package=$SCRIPTDIR/opnfv_testapi/router \ --cover-xml \ |