Commit d7e9e0a0 authored by Mudassar Khan's avatar Mudassar Khan
Browse files

update mn-cse to reflect latest changes and add flex containers

parent 610c3424

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

+6 −0
Changes for go-apps/meep-iot-pltf/meep-acme-mn-cse/Dockerfile: 6 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -85,6 +85,12 @@ ENV SERVER_TYPE="" \ 
    REMOTE_CSE_NAME="" \

    REMOTE_CSE_HOST="" \

    REMOTE_CSE_PORT="" \

    EXTERNAL_REMOTE_CSE_HOST="" \

    EXTERNAL_REMOTE_CSE_PORT="" \

    EXTERNAL_REMOTE_CSE_PROTOCOL="" \

    EXTERNAL_REMOTE_SVC_PATH="" \

    REMOTE_CSE_USER="" \

    REMOTE_CSE_PASS="" \

    MQTT_ENABLE="" \

    MQTT_HOST="" \

    MQTT_PORT="" \

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

+5 −1
Changes for go-apps/meep-iot-pltf/meep-acme-mn-cse/acme.ini.in: 5 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -44,9 +44,13 @@ allowedCSROriginators=/* 


[cse.registrar]

INCSEcseID=/$REMOTE_CSE_ID

address=https://${basic.config:registrarCseHost}:${basic.config:registrarCsePort}

address=$REMOTE_CSE_PROTOCOL://${basic.config:registrarCseHost}:${basic.config:registrarCsePort}

root=$REMOTE_SVC_PATH



[cse.registrar.security]

httpUsername=$REMOTE_CSE_USER

httpPassword=$REMOTE_CSE_PASS



[textui]

startWithTUI=false

go-apps/meep-iot-pltf/meep-acme-mn-cse/acmecse/init/mec-lc.fcp

0 → 100644
+518 −0

File added.

Preview size limit exceeded, changes collapsed.

go-apps/meep-iot-pltf/meep-acme-mn-cse/acmecse/init/resourceTypes.rtp

0 → 100644
+3645 −0

File added.

Preview size limit exceeded, changes collapsed.

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

+28 −0
Changes for go-apps/meep-iot-pltf/meep-acme-mn-cse/entrypoint.sh: 28 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -108,15 +108,37 @@ 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"}

# Append location and sandbox names (skipping empty ones) to make this CSE's ID/name unique

for suffix in "${MEEP_LOCATION_NAME}" "${MEEP_SANDBOX_NAME}"; do

    if [[ -n "${suffix}" ]]; then

        CSE_BASE_NAME="${CSE_BASE_NAME}-${suffix}"

        CSE_BASE_RI="${CSE_BASE_RI}-${suffix}"

    fi

done

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}

if [[ -n "${EXTERNAL_REMOTE_CSE_HOST}" ]]; then

    # Register with a publicly accessible (non-cluster) IN-CSE

    echo "Using external remote CSE: ${EXTERNAL_REMOTE_CSE_HOST}"

    REMOTE_CSE_HOST=${EXTERNAL_REMOTE_CSE_HOST}

    REMOTE_CSE_PORT=${EXTERNAL_REMOTE_CSE_PORT:-443}

    REMOTE_CSE_PROTOCOL=${EXTERNAL_REMOTE_CSE_PROTOCOL:-"https"}

    # Strip trailing slashes: ACME builds the registrar URL as address + root + "/", so a

    # trailing slash yields "///<cse-id>" which is parsed as an absolute ID (/_/) and rejected

    REMOTE_SVC_PATH=$(echo "${EXTERNAL_REMOTE_SVC_PATH}" | sed 's:/*$::')

else

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

    # REMOTE_CSE_PORT=443/${MEEP_SANDBOX_NAME}/${ACME_MEEP_LOCATION_NAME:-"monaco-telecom"}/meep-acme-in-cse

    REMOTE_CSE_PORT=443

    REMOTE_CSE_PROTOCOL="https"

    REMOTE_SVC_PATH=/${MEEP_SANDBOX_NAME}/${ACME_MEEP_LOCATION_NAME:-"monaco-telecom"}/meep-acme-in-cse

fi

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

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

# Credentials for a protected remote CSE (empty = no authentication)

REMOTE_CSE_USER=${REMOTE_CSE_USER:-""}

REMOTE_CSE_PASS=${REMOTE_CSE_PASS:-""}

ENABLE_COAP=${ENABLE_COAP:-false}

ENABLE_WS=${ENABLE_WS:-false}
@@ -151,6 +173,9 @@ 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 "REMOTE_CSE_PROTOCOL: ${REMOTE_CSE_PROTOCOL}"

echo "REMOTE_CSE_USER: ${REMOTE_CSE_USER}"

echo "REMOTE_CSE_PASS: ${REMOTE_CSE_PASS:+****}"

echo "CSE_EXTERNAL_IP: ${CSE_EXTERNAL_IP}"

echo "CSE_EXTERNAL_PORT: ${CSE_EXTERNAL_PORT}"

echo "MQTT_ENABLE: ${MQTT_ENABLE}"
@@ -182,6 +207,9 @@ export REMOTE_CSE_ID 
export REMOTE_CSE_NAME

export REMOTE_CSE_HOST

export REMOTE_CSE_PORT

export REMOTE_CSE_PROTOCOL

export REMOTE_CSE_USER

export REMOTE_CSE_PASS

export REMOTE_SVC_PATH

export CSE_EXTERNAL_IP

export CSE_EXTERNAL_PORT