Editorial changes & alignment with TinyIoT (b86bb691) · Commits · MEC - Multi-access Edge Computing / ETSI MEC Sandbox

etsi-mec-sandbox.code-workspace

+3 −0

Changes for etsi-mec-sandbox.code-workspace: 3 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -8,6 +8,9 @@
		},
		{
		"path": "../mec-sandbox-scenarios"
		},
		{
		"path": "../tmp/to_be_deleted"
		}
		],
		"extensions": {

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

+41 −44

Changes for go-apps/meep-iot-pltf/meep-acme-in-cse/entrypoint.sh: 41 added lines, 44 removed lines.
Original line number	Diff line number	Diff line
		#!/bin/bash
		set -e

		# Process MEEP_HOST_URL
		SERVER_IP="${MEEP_HOST_URL#http://}"; MEEP_HOST_URL="${MEEP_HOST_URL#https://}"
		echo "MEEP_HOST_URL: ${MEEP_HOST_URL}"

		SERVICE_NAME="meep-acme-in-cse"
		# Get the namespace from the service account
		NAMESPACE=$(cat /var/run/secrets/kubernetes.io/serviceaccount/namespace)
		# Get the token from the service account
		TOKEN=$(cat /var/run/secrets/kubernetes.io/serviceaccount/token)
		# Query the Kubernetes API to get the NodePort for the service
		NODE_PORT=$(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"

		SERVICE_NAME="meep-mosquitto"
		NODE_PORT_MEEP_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_MOSQUITTO"
		# Other environment variables
		echo "SERVER_TYPE: ${SERVER_TYPE}"
		echo "SERVER_PORT: ${SERVER_PORT}"
		echo "MQTT_ENABLE: ${MQTT_ENABLE}"
		echo "CSE_BASE_NAME: ${CSE_BASE_NAME}"
		echo "CSE_BASE_RI: ${CSE_BASE_RI}"
		echo "MQTT_HOST: ${MQTT_HOST}"
		echo "MQTT_PORT: ${MQTT_PORT}"
		echo "MQTT_USERNAME: ${MQTT_USERNAME}"
		echo "MQTT_PASSWORD: ${MQTT_PASSWORD}"

		SERVICE_NAME="meep-acme-mn-cse"
		NODE_PORT_MN_CSE=$(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_MN_CSE"
		#SERVICE_NAME="meep-mosquitto"
		#NAMESPACE=$(cat /var/run/secrets/kubernetes.io/serviceaccount/namespace)
		#TOKEN=$(cat /var/run/secrets/kubernetes.io/serviceaccount/token)
		#MOSQUITTO_NODE_PORT=$(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: $MOSQUITTO_NODE_PORT"

		#SERVICE_NAME="meep-acme-in-cse"
		#NODE_PORT=$(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"
		if [[ ! -z "${MEEP_MEP_NAME}" ]]; then
		svcPath="${MEEP_SANDBOX_NAME}/${MEEP_MEP_NAME}"
		else
		@@ -46,9 +45,8 @@ fi
		sleep 5 # Wait for ETSI MEC Platform up and stable

		MQTT_ENABLE=${MQTT_ENABLE:-true}
		MQTT_HOST=${SERVER_IP}
		MQTT_PORT=${NODE_PORT_MEEP_MOSQUITTO}
		SERVER_IP=${SERVER_IP}
		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"}
		@@ -56,11 +54,6 @@ SERVER_TYPE=${SERVER_TYPE:-"IN"}
		ENABLE_COAP=${ENABLE_COAP:-false}
		ENABLE_WS=${ENABLE_WS:-false}

		if [ -z "$MQTT_ENABLE" ] \|\| [ "$MQTT_ENABLE" = "False" ] \|\| [ -z "$MQTT_PORT" ] \|\| [ "$MQTT_PORT" = "null" ]; then
		echo "MQTT_PORT is not set. Using default value 1883."
		MQTT_PORT=1883
		fi

		export MQTT_ENABLE
		export MQTT_HOST
		export MQTT_PORT
		@@ -75,27 +68,31 @@ export CSE_BASE_NAME
		export CSE_BASE_RI

		echo "Environment variables set:"
		echo "SERVER_IP: ${SERVER_IP}"
		echo "SERVER_TYPE: ${SERVER_TYPE}"
		echo "SERVER_IP: ${SERVER_IP}"
		echo "SERVER_PORT: ${SERVER_PORT}"
		echo "CSE_BASE_NAME: ${CSE_BASE_NAME}"
		echo "CSE_BASE_RI: ${CSE_BASE_RI}"
		echo "REMOTE_CSE_ID: ${REMOTE_CSE_ID}"
		echo "REMOTE_CSE_NAME: ${REMOTE_CSE_NAME}"
		echo "REMOTE_CSE_HOST: ${REMOTE_CSE_HOST}"
		echo "REMOTE_CSE_PORT: ${REMOTE_CSE_PORT}"
		echo "MQTT_HOST: ${MQTT_HOST}"
		echo "MQTT_ENABLE: ${MQTT_ENABLE}"
		echo "MQTT_HOST: ${MQTT_HOST}"
		echo "MQTT_PORT: ${MQTT_PORT}"
		echo "MQTT_USERNAME: ${MQTT_USERNAME}"
		echo "MQTT_PASSWORD: ${MQTT_PASSWORD}"
		echo "MEC_ENABLE: ${MEC_ENABLE}"
		echo "MEC_HOST_URL: ${MEC_HOST_URL}"
		echo "MEC_PLATFORM: ${MEC_PLATFORM}"
		echo "MEC_SANDBOX_ID: ${MEC_SANDBOX_ID}"
		echo "ENABLE_COAP: ${ENABLE_COAP}"
		echo "ENABLE_WS: ${ENABLE_WS}"
		echo "NODE_PORT_MN_CSE: ${NODE_PORT_MN_CSE}"

		export SERVER_TYPE
		export SERVER_IP
		export SERVER_PORT
		export CSE_BASE_NAME
		export CSE_BASE_RI
		export MQTT_ENABLE
		export MQTT_HOST
		export MQTT_PORT
		export MQTT_USERNAME
		export MQTT_PASSWORD
		export ENABLE_COAP
		export ENABLE_WS

		workdir="/usr/src/app/ACME-oneM2M-CSE"
		cd "$workdir" \|\| { echo "Directory $workdir not found"; exit 1; }

go-apps/meep-iot-pltf/meep-acme-mn-cse/Dockerfile

+20 −7

Changes for go-apps/meep-iot-pltf/meep-acme-mn-cse/Dockerfile: 20 added lines, 7 removed lines.
Original line number	Diff line number	Diff line
		FROM ubuntu:22.04
		ENV MEEP_MEP_NAME=""
		ENV HTTP_PORT=""
		ENV MQTT_SERVER=""

		ENV SERVER_TYPE=""
		ENV SERVER_IP=""
		ENV SERVER_PORT=""
		ENV CSE_BASE_NAME=""
		ENV CSE_BASE_RI=""
		ENV REMOTE_CSE_ID=""
		ENV REMOTE_CSE_NAME=""
		ENV REMOTE_CSE_HOST=""
		ENV REMOTE_CSE_PORT=""
		ENV MQTT_ENABLE=""
		ENV MQTT_HOST=""
		ENV MQTT_PORT=""
		ENV MEC_SANDBOX_SERVER=""
		ENV MEEP_MEP_NAME=""
		ENV REGISTRAR_CSE_HOST=""
		ENV REGISTRAR_CSE_PORT=""
		ENV MQTT_USERNAME=""
		ENV MQTT_PASSWORD=""
		ENV MEC_ENABLE=""
		ENV MEC_HOST_URL=""
		ENV MEC_PLATFORM=""
		ENV MEC_SANDBOX_ID=""
		ENV ENABLE_COAP=""
		ENV ENABLE_WS=""

		RUN echo "meep-acme-mn-cse" > /etc/hostname \
		&& DEBIAN_FRONTEND=noninteractive apt-get update \

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

+24 −36

Changes for go-apps/meep-iot-pltf/meep-acme-mn-cse/entrypoint.sh: 24 added lines, 36 removed lines.
Original line number	Diff line number	Diff line
		#!/bin/bash
		set -e

		# Process MEEP_HOST_URL
		echo "MEEP_HOST_URL: ${MEEP_HOST_URL}"
		SERVER_IP="${MEEP_HOST_URL#http://}"; MEEP_HOST_URL="${MEEP_HOST_URL#https://}"

		SERVICE_NAME="meep-acme-in-cse"
		# Get the namespace from the service account
		SERVICE_NAME="meep-mosquitto"
		NAMESPACE=$(cat /var/run/secrets/kubernetes.io/serviceaccount/namespace)
		# Get the token from the service account
		TOKEN=$(cat /var/run/secrets/kubernetes.io/serviceaccount/token)
		# Query the Kubernetes API to get the NodePort for the service
		NODE_PORT_IN_CSE=$(curl -sSk \
		MOSQUITTO_NODE_PORT=$(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_IN_CSE"
		echo "External NodePort exposed for service [$SERVICE_NAME] in namespace [$NAMESPACE] is: $MOSQUITTO_NODE_PORT"

		SERVICE_NAME="meep-mosquitto"
		NODE_PORT_MEEP_MOSQUITTO=$(curl -sSk \
		SERVICE_NAME="meep-acme-in-cse"
		NODE_PORT_IN_CSE=$(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_MOSQUITTO"
		echo "External NodePort exposed for service [$SERVICE_NAME] in namespace [$NAMESPACE] is: $NODE_PORT_IN_CSE"

		# Query the Kubernetes API to get the NodePort for the service
		SERVICE_NAME="meep-acme-mn-cse"
		NODE_PORT=$(curl -sSk \
		-H "Authorization: Bearer $TOKEN" \
		@@ -46,24 +42,22 @@ fi
		sleep 5 # Wait for ETSI MEC Platform up and stable

		MQTT_ENABLE=${MQTT_ENABLE:-true}
		# MQTT_HOST=${MQTT_HOST:- "meep-mosquitto"}
		MQTT_HOST=${SERVER_IP}
		# MQTT_PORT=${MQTT_PORT:-1883}
		MQTT_PORT=${NODE_PORT_MEEP_MOSQUITTO}
		SERVER_IP=${SERVER_IP}
		MQTT_HOST=${SERVER_IP:-"test.mosquitto.org"}
		MQTT_PORT=${MOSQUITTO_NODE_PORT:-1883}
		MQTT_USERNAME=${MQTT_USERNAME:-"acme-mn-cse"}
		MQTT_PASSWORD=${MQTT_PASSWORD:-"mqtt"}
		SERVER_TYPE=${SERVER_TYPE:-"MN"}
		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"}
		SERVER_TYPE=${SERVER_TYPE:-"MN"}
		MQTT_USERNAME=${MQTT_USERNAME:-"acme-mn-cse"}
		MQTT_PASSWORD=${MQTT_PASSWORD:-"mqtt"}
		ENABLE_COAP=${ENABLE_COAP:-false}
		ENABLE_WS=${ENABLE_WS:-false}
		# REMOTE_CSE_HOST=${REMOTE_CSE_HOST:-"meep-acme-in-cse"}
		REMOTE_CSE_HOST="${SERVER_IP}"
		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"}
		REMOTE_CSE_NAME=${REMOTE_CSE_NAME:-"laboai-cse-in"}
		ENABLE_COAP=${ENABLE_COAP:-false}
		ENABLE_WS=${ENABLE_WS:-false}

		# MEC Configuration
		MEC_ENABLE=${MEC_ENABLE:-true}
		@@ -71,14 +65,9 @@ MEC_HOST_URL=${SERVER_IP}
		MEC_PLATFORM=${MEC_PLATFORM:-"mep1"}
		MEC_SANDBOX_ID=${MEEP_SANDBOX_NAME:-"meep-sandbox"}

		if [ -z "$MQTT_ENABLE" ] \|\| [ "$MQTT_ENABLE" = "False" ] \|\| [ -z "$MQTT_PORT" ] \|\| [ "$MQTT_PORT" = "null" ]; then
		echo "MQTT_PORT is not set. Using default value 1883."
		MQTT_PORT=1883
		fi

		echo "Environment variables set:"
		echo "SERVER_IP: ${SERVER_IP}"
		echo "SERVER_TYPE: ${SERVER_TYPE}"
		echo "SERVER_IP: ${SERVER_IP}"
		echo "SERVER_PORT: ${SERVER_PORT}"
		echo "CSE_BASE_NAME: ${CSE_BASE_NAME}"
		echo "CSE_BASE_RI: ${CSE_BASE_RI}"
		@@ -86,8 +75,8 @@ echo "REMOTE_CSE_ID: ${REMOTE_CSE_ID}"
		echo "REMOTE_CSE_NAME: ${REMOTE_CSE_NAME}"
		echo "REMOTE_CSE_HOST: ${REMOTE_CSE_HOST}"
		echo "REMOTE_CSE_PORT: ${REMOTE_CSE_PORT}"
		echo "MQTT_HOST: ${MQTT_HOST}"
		echo "MQTT_ENABLE: ${MQTT_ENABLE}"
		echo "MQTT_HOST: ${MQTT_HOST}"
		echo "MQTT_PORT: ${MQTT_PORT}"
		echo "MQTT_USERNAME: ${MQTT_USERNAME}"
		echo "MQTT_PASSWORD: ${MQTT_PASSWORD}"
		@@ -98,21 +87,20 @@ echo "MEC_SANDBOX_ID: ${MEC_SANDBOX_ID}"
		echo "ENABLE_COAP: ${ENABLE_COAP}"
		echo "ENABLE_WS: ${ENABLE_WS}"

		export MQTT_ENABLE
		export MQTT_HOST
		export MQTT_PORT
		export MQTT_USERNAME
		export MQTT_PASSWORD
		export SERVER_PORT
		export SERVER_TYPE
		export SERVER_IP
		export ENABLE_COAP
		export SERVER_PORT
		export CSE_BASE_NAME
		export CSE_BASE_RI
		export REMOTE_CSE_ID
		export REMOTE_CSE_NAME
		export REMOTE_CSE_HOST
		export REMOTE_CSE_PORT
		export MQTT_ENABLE
		export MQTT_HOST
		export MQTT_PORT
		export MQTT_USERNAME
		export MQTT_PASSWORD
		export MEC_ENABLE
		export MEC_HOST_URL
		export MEC_PLATFORM