X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=plans%2Fusecases-pnf-sw-upgrade%2Fpnf-sw-upgrade%2Fsorch%2Fso_setup.sh;fp=plans%2Fusecases%2Fpnf-sw-upgrade%2Fso%2Fso_setup.sh;h=ed5f6f0756236def655fcb1a97af6efae11a35ce;hb=125390ba301915c0829ad4c0b7eff0c935b6956c;hp=8c94452f448ecbeff0ae1fa5fe715e7edefbdf31;hpb=9c41697bdcef2eddd9af6436f3feb5821c238b44;p=integration%2Fcsit.git diff --git a/plans/usecases/pnf-sw-upgrade/so/so_setup.sh b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/so_setup.sh similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/so_setup.sh rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/so_setup.sh index 8c94452f..ed5f6f07 100755 --- a/plans/usecases/pnf-sw-upgrade/so/so_setup.sh +++ b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/so_setup.sh @@ -140,6 +140,9 @@ git clone http://gerrit.onap.org/r/so/docker-config.git $TEST_LAB_DIR_PATH export TEST_LAB_DIR=$TEST_LAB_DIR_PATH export CONFIG_DIR_PATH=$CONFIG_DIR +echo "updating PNF ip-address in pnf.json" +sed -i "s/pnfaddr/$LOCAL_IP/g" $PNF_PAYLOAD_PATH + if [ "$DOCKER_ENVIRONMENT" == "remote" ]; then echo "Starting docker containers with remote images ..." docker-compose -f $DOCKER_COMPOSE_FILE_PATH -p $PROJECT_NAME up -d mariadb @@ -158,9 +161,6 @@ fi echo "Sleeping for 2m" sleep 2m -echo "updating PNF ip-address in pnf.json" -sed -i "s/pnfaddr/$LOCAL_IP/g" $PNF_PAYLOAD_PATH - echo "Will execute $WAIT_FOR_WORKAROUND_SCRIPT script" $WAIT_FOR_WORKAROUND_SCRIPT