minor fixes for iot platforms (3a626e89) · Commits · MEC - Multi-access Edge Computing / ETSI MEC Sandbox

charts/meep-acme-mn-cse/values-template.yaml

+3 −3

Changes for charts/meep-acme-mn-cse/values-template.yaml: 3 added lines, 3 removed lines.
Original line number	Diff line number	Diff line
		@@ -4,7 +4,7 @@

		deployment:
		replicas: 1
		port: 3005
		port: 3004
		protocol: TCP
		dependencies:
		system:
		@@ -25,7 +25,7 @@ image:
		MEEP_SANDBOX_NAME: {{.SandboxName}}
		MEEP_SVC_PATH: /meep-acme-mn-cse
		MEEP_HOST_URL: {{.HostUrl}}
		SERVER_PORT: 3005
		SERVER_PORT: 3004
		CSE_BASE_NAME: mep-cse-mn
		CSE_BASE_RI: acme-mep-id-mn-cse
		SERVER_TYPE: MN
		@@ -55,7 +55,7 @@ image:
		service:
		name: meep-acme-mn-cse
		type: NodePort
		port: 3005
		port: 3004
		NodePort: ""

		ingress:

+12 −5

Changes for go-apps/meep-iot-pltf/meep-acme-in-cse/Dockerfile: 12 added lines, 5 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 MQTT_ENABLE=""
		ENV MQTT_HOST=""
		ENV MQTT_PORT=""
		ENV MEC_SANDBOX_SERVER=""
		ENV MQTT_USERNAME=""
		ENV MQTT_PASSWORD=""
		ENV SERVER_PORT=""
		ENV SERVER_TYPE=""
		ENV SERVER_IP=""
		ENV ENABLE_COAP=""
		ENV ENABLE_WS=""
		ENV CSE_BASE_NAME=""
		ENV CSE_BASE_RI=""
		ENV MEEP_MEP_NAME=""
		ENV MQTT_ENABLE=""
		ENV MEC_SANDBOX_SERVER=""

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

+5 −2

Changes for go-apps/meep-iot-pltf/meep-acme-in-cse/entrypoint.sh: 5 added lines, 2 removed lines.
Original line number	Diff line number	Diff line
		@@ -46,9 +46,7 @@ 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}
		SERVER_PORT=${SERVER_PORT:-3003}
		@@ -58,6 +56,11 @@ 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

+6 −1

Changes for go-apps/meep-iot-pltf/meep-acme-mn-cse/entrypoint.sh: 6 added lines, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -51,7 +51,7 @@ MQTT_HOST=${SERVER_IP}
		# MQTT_PORT=${MQTT_PORT:-1883}
		MQTT_PORT=${NODE_PORT_MEEP_MOSQUITTO}
		SERVER_IP=${SERVER_IP}
		SERVER_PORT=${SERVER_PORT:-3005}
		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"}
		@@ -71,6 +71,11 @@ 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}"