Commit 9291182d authored by Yann Garcia's avatar Yann Garcia
Browse files

Enhance entrypoint for ACME xN-CSE

parent a77263fa

go-apps/meep-federation/entrypoint.sh

+10 −10
Original line number Diff line number Diff line
@@ -6,16 +6,16 @@ echo "MEEP_SANDBOX_NAME: ${MEEP_SANDBOX_NAME}" 
echo "MEEP_MEP_NAME: ${MEEP_MEP_NAME}"

echo "MEEP_CODECOV: ${MEEP_CODECOV}"



#SERVICE_NAME="meep-cloud-mosquitto"

#NAMESPACE=$(cat /var/run/secrets/kubernetes.io/serviceaccount/namespace)

#TOKEN=$(cat /var/run/secrets/kubernetes.io/serviceaccount/token)

#NODE_PORT_MEEP_CLOUD_MOSQUITTO=$(curl -sSk \

#  -H "Authorization: Bearer $TOKEN" \

#  https://kubernetes.default.svc/api/v1/namespaces/$NAMESPACE/services/$SERVICE_NAME \

#  | jq -r '.spec.ports[0].nodePort')

#echo "External NodePort exposed for service [$SERVICE_NAME] in namespace [$NAMESPACE] is: $NODE_PORT_MEEP_CLOUD_MOSQUITTO"

#MEEP_BROCKER=mqtt://$SERVER_IP:$NODE_PORT_MEEP_CLOUD_MOSQUITTO

#echo "MEEP_BROCKER: ${MEEP_BROCKER}"

SERVICE_NAME="meep-cloud-mosquitto"

NAMESPACE=$(cat /var/run/secrets/kubernetes.io/serviceaccount/namespace)

TOKEN=$(cat /var/run/secrets/kubernetes.io/serviceaccount/token)

NODE_PORT_MEEP_CLOUD_MOSQUITTO=$(curl -sSk \

  -H "Authorization: Bearer $TOKEN" \

  https://kubernetes.default.svc/api/v1/namespaces/$NAMESPACE/services/$SERVICE_NAME \

  | jq -r '.spec.ports[0].nodePort')

echo "External NodePort exposed for service [$SERVICE_NAME] in namespace [$NAMESPACE] is: $NODE_PORT_MEEP_CLOUD_MOSQUITTO"

MEEP_BROCKER=mqtt://$SERVICE_NAME:${NODE_PORT_MEEP_CLOUD_MOSQUITTO:-1883}

echo "MEEP_BROCKER: ${MEEP_BROCKER}"



if [[ ! -z "${MEEP_MEP_NAME}" ]]; then

    svcPath="${MEEP_SANDBOX_NAME}/${MEEP_MEP_NAME}"

go-apps/meep-iot-pltf/meep-acme-in-cse/entrypoint.sh

+1 −2
Original line number Diff line number Diff line
@@ -44,9 +44,8 @@ fi 


sleep 5 # Wait for ETSI MEC Platform up and stable



MQTT_ENABLE=${MQTT_ENABLE:-true}

SERVER_IP=`echo $SERVER_IP | sed -e "s/https:\/\///g"` # Remove https://MQTT_ENABLE=${MQTT_ENABLE:-true}

MQTT_HOST=${SERVER_IP:- "meep-mosquitto"}

#MQTT_PORT=${NODE_PORT_MEEP_MOSQUITTO}

SERVER_PORT=${SERVER_PORT:-3003}

CSE_BASE_NAME=${CSE_BASE_NAME:-"laboai-cse-in"}

CSE_BASE_RI=${CSE_BASE_RI:-"laboai-id-in"}

go-apps/meep-iot-pltf/meep-acme-mn-cse/entrypoint.sh

+1 −1
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ fi 


sleep 5 # Wait for ETSI MEC Platform up and stable



SERVER_IP=`echo $SERVER_IP | sed -e "s/https:\/\///g"` # Remove https://

MQTT_ENABLE=${MQTT_ENABLE:-true}

MQTT_HOST=${SERVER_IP:-"test.mosquitto.org"}

MQTT_PORT=${MOSQUITTO_NODE_PORT:-1883}
@@ -51,7 +52,6 @@ SERVER_IP="${SERVER_IP:-"meep-acme-mn-cse"}" 
SERVER_PORT=${SERVER_PORT:-3004}

CSE_BASE_NAME=${CSE_BASE_NAME:-"mep-cse-mn"}

CSE_BASE_RI=${CSE_BASE_RI:-"acme-mep-id-mn-cse"}

# REMOTE_CSE_HOST=${REMOTE_CSE_HOST:-"meep-acme-in-cse"}

REMOTE_CSE_HOST="${SERVER_IP:-"meep-acme-in-cse"}"

REMOTE_CSE_PORT=${NODE_PORT_IN_CSE:-3003}

REMOTE_CSE_ID=${REMOTE_CSE_ID:-"laboai-id-in"}

go-apps/meep-sandbox-ctrl/server/app-ctrl.go

+1 −0
Original line number Diff line number Diff line
@@ -778,5 +778,6 @@ func stopMECFederationDiscovery() { 
		log.Info("stopMECFederationDiscovery: Stopping MEC Federation ticker")

		fed_timer.Stop()

		fed_timer = nil

		fed_list = make(map[string]bool)

	}

}

go-apps/meep-vis/entrypoint.sh

+2 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ echo "MEEP_MEP_NAME: ${MEEP_MEP_NAME}" 
echo "MEEP_CODECOV: ${MEEP_CODECOV}"

echo "MEEP_POA_LIST: ${MEEP_POA_LIST}" # E.g. poa-5g1;poa-5g2



#SERVICE_NAME="meep-cloud-mosquitto"

#SERVICE_NAME="meep-mosquitto"

#NAMESPACE=$(cat /var/run/secrets/kubernetes.io/serviceaccount/namespace)

#TOKEN=$(cat /var/run/secrets/kubernetes.io/serviceaccount/token)

#NODE_PORT_MEEP_CLOUD_MOSQUITTO=$(curl -sSk \
@@ -15,7 +15,7 @@ echo "MEEP_POA_LIST: ${MEEP_POA_LIST}" # E.g. poa-5g1;poa-5g2 
#  https://kubernetes.default.svc/api/v1/namespaces/$NAMESPACE/services/$SERVICE_NAME \

#  | jq -r '.spec.ports[0].nodePort')

#echo "External NodePort exposed for service [$SERVICE_NAME] in namespace [$NAMESPACE] is: $NODE_PORT_MEEP_CLOUD_MOSQUITTO"

#MEEP_BROCKER=mqtt://$SERVER_IP:$NODE_PORT_MEEP_CLOUD_MOSQUITTO

#MEEP_BROCKER=mqtt://$SERVICE_NAME:${NODE_PORT_MEEP_CLOUD_MOSQUITTO:-1883}

#echo "MEEP_BROCKER: ${MEEP_BROCKER}"



if [[ ! -z "${MEEP_MEP_NAME}" ]]; then