Seperating usecase test suite dependencies

[integration/csit.git] / plans / usecases-pnf-sw-upgrade / pnf-sw-upgrade / sorch / so_setup.sh

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 8c94452..ed5f6f0 100755 (executable)
--- 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