Commit ba407cb9 authored by Yann Garcia's avatar Yann Garcia
Browse files

Resolve issues after merging STF678_Task3 into STF678_Task4

parent 7f03c695

AdvantEDGE.code-workspace→etsi-mec-sandbox.code-workspace

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
			"path": "."

		},

		{

			"path": "../mec-sandbox"

			"path": "../etsi-mec-sandbox-frontend"

		}

	],

	"extensions": {

scripts/K99advantedge→scripts/K99etsi-mec-sandbox

+1 −1
Original line number Diff line number Diff line 
#!/bin/sh -e



DESC="AdvantEDGE platform"

DESC="etsi-mec-sandbox platform"

TIMEOUT=7

IS_RUNNING=`kubectl get pods --all-namespaces | grep "meep-virt-engine" | awk '{print $2}'`

start_advantedge() {

scripts/build_all.sh

+6 −6
Original line number Diff line number Diff line
@@ -2,13 +2,13 @@ 


#set -vx



DESC="AdvantEDGE platform"

DESC="etsi-mec-sandbox platform"

TIMEOUT=7

IS_RUNNING=`kubectl get pods --all-namespaces | grep "meep-virt-engine" | awk '{print $2}'`

ADV_PATH=~/AdvantEDGE

ADV_PATH=~/etsi-mec-sandbox

DO_NOT_BUILD_EX=$1



stop_advantedge() {

stop_etsi_mec_sandbox() {

    if [ -n $IS_RUNNING ]; then

    	meepctl delete core

	sleep $TIMEOUT
@@ -20,7 +20,7 @@ stop_advantedge() { 
    fi

}



build_advantedge() {

build_etsi_mec_sandbox() {

    meepctl deploy dep

    sleep $TIMEOUT

    rm -fr $ADV_PATH/bin/meep-*
@@ -59,9 +59,9 @@ if [ "$DO_NOT_BUILD_EX" != "" ]; then 
        usage

    fi

fi

stop_advantedge

stop_etsi_mec_sandbox

sleep $TIMEOUT

build_advantedge

build_etsi_mec_sandbox

docker image prune -f



exit 0