Commit 2484dcff authored by Yann Garcia's avatar Yann Garcia
Browse files

Add MQTT over WSS to meep-vis

parent 077a7e43

go-apps/meep-vis/entrypoint.sh

+1 −10
Original line number Diff line number Diff line
@@ -7,16 +7,7 @@ echo "MEEP_MEP_NAME: ${MEEP_MEP_NAME}" 
echo "MEEP_CODECOV: ${MEEP_CODECOV}"

echo "MEEP_POA_LIST: ${MEEP_POA_LIST}" # E.g. poa-5g1;poa-5g2



#SERVICE_NAME="meep-mosquitto"

#NAMESPACE=$(cat /var/run/secrets/kubernetes.io/serviceaccount/namespace)

#TOKEN=$(cat /var/run/secrets/kubernetes.io/serviceaccount/token)

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

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

#MEEP_BROCKER=mqtt://$SERVICE_NAME:${NODE_PORT_MEEP_CLOUD_MOSQUITTO:-1883}

#echo "MEEP_BROCKER: ${MEEP_BROCKER}"

MEEP_BROKER="wss://$MEEP_HOST_URL:1883/$MEEP_SANDBOX_NAME/$MEEP_MEP_NAME/meep-mosquitto"



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

    svcPath="${MEEP_SANDBOX_NAME}/${MEEP_MEP_NAME}"

go-packages/meep-vis-traffic-mgr/mqtt.go

+7 −11
Original line number Diff line number Diff line
@@ -17,10 +17,10 @@ 
package vistrafficmgr



import (

	"crypto/tls"

	"encoding/hex"

	"errors"

	"fmt"

	"net/url"

	"strings"



	log "github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-logger"

	mqtt "github.com/eclipse/paho.mqtt.golang"
@@ -59,16 +59,10 @@ var connectLostHandler mqtt.ConnectionLostHandler = func(client mqtt.Client, err 
}



func (broker_mqtt *message_broker_mqtt) Init(tm *TrafficMgr) (err error) {

	log.Debug(">>> Init")

	log.Debug(">>> Init: ", tm.broker)



	broker_mqtt.running = false



	u, err := url.ParseRequestURI(tm.broker)

	if err != nil {

		log.Error(err.Error())

		return err

	}



	broker_mqtt.opts = mqtt.NewClientOptions()

	broker_mqtt.opts.SetDefaultPublishHandler(onMessageReceived)

	broker_mqtt.opts.SetClientID("AdvantEDGE.meep-vis-traffic-mgr")
@@ -77,8 +71,10 @@ func (broker_mqtt *message_broker_mqtt) Init(tm *TrafficMgr) (err error) { 
	broker_mqtt.opts.CleanSession = true

	broker_mqtt.opts.SetUsername("")

	broker_mqtt.opts.SetPassword("")

	log.Info("Init: Add brocker: ", fmt.Sprintf("tcp://%s:%s", u.Hostname(), u.Port()))

	broker_mqtt.opts.AddBroker(fmt.Sprintf("tcp://%s:%s", u.Hostname(), u.Port()))

	if strings.Index(tm.broker, "mqtts://") == 0 || strings.Index(tm.broker, "wss://") == 0 {

		broker_mqtt.opts.SetTLSConfig(&tls.Config{InsecureSkipVerify: true})

	}

	broker_mqtt.opts.AddBroker(tm.broker)

	broker_mqtt.client = mqtt.NewClient(broker_mqtt.opts)



	log.Info("Init: Connect to MQTT server...")