update ACME configurations to connect MN and IN CSEs so that announce... (42848840) · Commits · MEC - Multi-access Edge Computing / ETSI MEC Sandbox

go-apps/meep-iot-pltf/meep-acme-in-cse/acme.ini.in

+9 −2

Original line number	Diff line number	Diff line
		@@ -29,6 +29,9 @@ databaseType=memory
		logLevel=debug
		consoleTheme=dark

		[cse]
		poa=https://$SERVER_IP:443/$SVC_PATH

		[mqtt]
		enable=$MQTT_ENABLE
		address=$MQTT_HOST
		@@ -45,7 +48,9 @@ useTLS=true

		[cse.registration]
		; Edit this to add more allowed originators.
		allowedCSROriginators=/$CSE_BASE_RI,/acme-mep-id-mn-cse,/id-in,/id-mn,/id-asn
		;allowedCSROriginators=/$CSE_BASE_RI,/acme-mep-id-mn-cse,/id-in,/id-mn,/id-asn,/mep-id-mn-cse
		allowedCSROriginators=/*
		;address=https://${basic.config:registrarCseHost}:${basic.config:registrarCsePort}

		[textui]
		startWithTUI=false
		@@ -56,11 +61,13 @@ enable=true
		[http]
		enableUpperTesterEndpoint=true
		enableStructureEndpoint=true
		;root=/$SVC_PATH/
		address=https://${basic.config:cseHost}:${basic.config:httpPort}${http:root}

		[coap]
		enable=$ENABLE_COAP
		port=5683

		[websocket]
		enable=$ENABLE_WS
		enable=false
		port=8180

+5 −0

Original line number	Diff line number	Diff line
		@@ -53,6 +53,8 @@ fi

		sleep 5 # Wait for ETSI MEC Platform up and stable

		SVC_PATH="${svcPath}/meep-acme-in-cse"

		SERVER_IP=`echo $SERVER_IP \| sed -e "s/https:\/\///g"` # Remove https://
		SERVER_PORT=${SERVER_PORT:-3003}
		MEC_SANDBOX_ID=${MEEP_SANDBOX_NAME:-"meep-sandbox"}
		@@ -85,6 +87,7 @@ echo "MQTT_PORT: ${MQTT_PORT}"
		echo "MQTT_USERNAME: ${MQTT_USERNAME}"
		echo "MQTT_PASSWORD: ${MQTT_PASSWORD}"
		echo "WEBSOCK_ETPATH: ${WEBSOCK_ETPATH}"
		echo "SVC_PATH: ${SVC_PATH}"

		export SERVER_TYPE
		export SERVER_IP
		@@ -102,6 +105,8 @@ export MQTT_USERNAME
		export MQTT_PASSWORD
		export WEBSOCK_ETPATH

		export SVC_PATH

		workdir="/usr/src/app/ACME-oneM2M-CSE"
		cd "$workdir" \|\| { echo "Directory $workdir not found"; exit 1; }
		envsubst < acme.ini.in > acme.ini

+13 −7

Original line number	Diff line number	Diff line
		@@ -34,12 +34,18 @@ databaseType=memory
		logLevel=debug
		consoleTheme=dark

		[cse]
		poa=https://SERVER_IP/SVC_PATH

		[cse.registration]
		; Edit this to add more allowed originators.
		allowedCSROriginators=/id-in,/id-mn,/id-asn
		;allowedCSROriginators=/$REMOTE_CSE_ID,/laboai-id-in,/laboai-cse-in,/acme-mep-id-mn-cse,/id-in,/id-mn,/id-asn,/mep-id-mn-cse
		allowedCSROriginators=/*

		[cse.registrar]
		INCSEcseID=/$REMOTE_CSE_ID
		address=https://${basic.config:registrarCseHost}:${basic.config:registrarCsePort}/
		root=$REMOTE_SVC_PATH

		[textui]
		startWithTUI=false
		@@ -50,13 +56,10 @@ enable=true
		[http]
		enableUpperTesterEndpoint = true
		enableStructureEndpoint = true
		enableManagementEndpoint = true
		;address=https://$SERVER_IP
		;path=$SVC_PATH
		externalPath=$SVC_PATH
		address=https://${basic.config:cseHost}:${basic.config:httpPort}${http:root}

		[webui]
		;root=$SVC_PATH/webui
		;root=/$SVC_PATH/webui

		[mqtt]
		enable=$MQTT_ENABLE
		@@ -77,9 +80,12 @@ enable=$ENABLE_COAP
		port=5683

		[websocket]
		enable=$ENABLE_WS
		enable=false
		port=8180

		[logging]
		enableBindingsLogging = true

		[etsi_mec]
		mec_enable=$MEC_ENABLE
		mec_host=$MEC_HOST_URL

+6 −2

Original line number	Diff line number	Diff line
		@@ -111,7 +111,9 @@ MN_CSE_FULL_ADDRESS="https://${SERVER_IP}/${svcPath}/meep-acme-mn-cse"
		# REMOTE_CSE_HOST="${REMOTE_CSE_IP_ADDRESS:-"meep-acme-in-cse"}"
		# REMOTE_CSE_PORT=${NODE_PORT_IN_CSE:-3003}
		REMOTE_CSE_HOST=${SERVER_IP:-"meep-acme-in-cse"}
		REMOTE_CSE_PORT=443/${MEEP_SANDBOX_NAME}/${ACME_MEEP_MEP_NAME:-"monaco-telecom"}/meep-acme-in-cse
		# REMOTE_CSE_PORT=443/${MEEP_SANDBOX_NAME}/${ACME_MEEP_MEP_NAME:-"monaco-telecom"}/meep-acme-in-cse
		REMOTE_CSE_PORT=443
		REMOTE_SVC_PATH=${MEEP_SANDBOX_NAME}/${ACME_MEEP_MEP_NAME:-"monaco-telecom"}/meep-acme-in-cse
		REMOTE_CSE_ID=${REMOTE_CSE_ID:-"laboai-id-in"}
		REMOTE_CSE_NAME=${REMOTE_CSE_NAME:-"laboai-cse-in"}
		ENABLE_COAP=${ENABLE_COAP:-false}
		@@ -136,7 +138,7 @@ MQTT_PASSWORD=${MQTT_PASSWORD:-"mqtt"}

		WEBSOCK_ETPATH="/$MEC_SANDBOX_ID"${WEBSOCK_ETPATH:-"/monaco-telecom/meep-mosquitto"}

		SVC_PATH="/${svcPath}/meep-acme-mn-cse"
		SVC_PATH="${svcPath}/meep-acme-mn-cse"

		echo "Environment variables set:"
		echo "SERVER_TYPE: ${SERVER_TYPE}"
		@@ -165,6 +167,7 @@ echo "WEBSOCK_ETPATH: ${WEBSOCK_ETPATH}"
		echo "MN_CSE_FULL_ADDRESS: ${MN_CSE_FULL_ADDRESS}"
		echo "MEC_APP_INSTANCE_ID: ${MEC_APP_INSTANCE_ID}"
		echo "SVC_PATH: ${SVC_PATH}"
		echo "REMOTE_SVC_PATH: ${REMOTE_SVC_PATH}"

		export SERVER_TYPE
		export SERVER_IP
		@@ -178,6 +181,7 @@ export REMOTE_CSE_ID
		export REMOTE_CSE_NAME
		export REMOTE_CSE_HOST
		export REMOTE_CSE_PORT
		export REMOTE_SVC_PATH
		export CSE_EXTERNAL_IP
		export CSE_EXTERNAL_PORT
		export ENABLE_COAP