Commit 49386149 authored by Yann Garcia's avatar Yann Garcia
Browse files

Add MQTT over WSS to meep-federation

parent 802e8661

go-apps/meep-cloud-mosquitto/mosquitto.conf

+1 −1
Original line number Diff line number Diff line
@@ -5,6 +5,6 @@ persistence true 
persistence_location /mosquitto/data/

log_dest file /mosquitto/log/mosquitto.log



log_type debug

log_type all



include_dir /mosquitto/config/conf.d

go-apps/meep-federation/entrypoint.sh

+4 −17
Original line number Diff line number Diff line
@@ -5,22 +5,7 @@ echo "MEEP_HOST_URL: ${MEEP_HOST_URL}" 
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_IP_MEEP_CLOUD_MOSQUITTO=$(curl -sSk \

#  -H "Authorization: Bearer $TOKEN" \

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

#  | jq -r '.spec.clusterIP')

#echo "Internal IP exposed for service [$SERVICE_NAME] in namespace [$NAMESPACE] is: $NODE_IP_MEEP_CLOUD_MOSQUITTO"

#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].targetPort')

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

#MEEP_BROCKER=mqtt://$${NODE_IP_MEEP_CLOUD_MOSQUITTO:-meep-cloud-mosquitto}:${NODE_PORT_MEEP_CLOUD_MOSQUITTO:-1883}

#echo "MEEP_BROCKER: ${MEEP_BROCKER}"

echo "WEBSOCK_ETPATH: ${WEBSOCK_ETPATH}"



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

    svcPath="${MEEP_SANDBOX_NAME}/${MEEP_MEP_NAME}"
@@ -28,6 +13,9 @@ else 
    svcPath="${MEEP_SANDBOX_NAME}"

fi



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

MEEP_BROKER="wss://mec-platform.etsi.org:443$WEBSOCK_ETPATH"



# Update API yaml basepaths to enable "Try-it-out" feature

# OAS2: Set relative path to sandbox name + endpoint path (origin will be derived from browser URL)

# OAS3: Set full path to provided Host URL + sandbox name + endpoint path
@@ -58,7 +46,6 @@ echo "Environment variables set:" 
echo "MEEP_HOST_URL: ${MEEP_HOST_URL}"

echo "MEEP_SANDBOX_NAME: ${MEEP_SANDBOX_NAME}"

echo "MEEP_MEP_NAME: ${MEEP_MEP_NAME}"

echo "MEEP_CODECOV: ${MEEP_CODECOV}"

echo "MEEP_INSTANCE_ID: ${MEEP_INSTANCE_ID}"

echo "MEEP_BROKER: ${MEEP_BROKER}"

echo "MEEP_TOPIC: ${MEEP_TOPIC}"

go-apps/meep-federation/go.mod

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ require ( 
	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-subscriptions v0.0.0

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-swagger-api-mgr v0.0.0

	github.com/antihax/optional v1.0.0 // indirect

	github.com/google/uuid v1.2.0

	github.com/google/uuid v1.6.0

	github.com/gorilla/handlers v1.5.1

	github.com/gorilla/mux v1.8.0

	github.com/prometheus/client_golang v1.9.0

go-apps/meep-federation/go.sum

+2 −0
Original line number Diff line number Diff line
@@ -120,6 +120,8 @@ github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm4 
github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=

github.com/google/uuid v1.2.0 h1:qJYtXnJRWmpe7m/3XlyhrsLrEURqHRM2kxzoxXqyUDs=

github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=

github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=

github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=

github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=

github.com/gorilla/context v1.1.1 h1:AWwleXJkX/nhcU9bZSnZoi3h/qGYqQAGhq6zZe/aQW8=

github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=

go-apps/meep-mosquitto/mosquitto.conf

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
persistence true

persistence_location /mosquitto/data/

log_dest file /mosquitto/log/mosquitto.log



log_type all



include_dir /mosquitto/config/conf.d