meep-rnis handler for gis-engine updates (df2e730a) · Commits · MEC - Multi-access Edge Computing / ETSI MEC Sandbox

go-apps/meep-loc-serv/go.sum

+0 −1

Original line number	Diff line number	Diff line
		cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
		github.com/InterDigitalInc/AdvantEDGE v1.4.0 h1:MnzK3dl4hUvfhZ4wYarVmJzE5IMO2Q63dyDkcQtEv1Q=
		github.com/KromDaniel/jonson v0.0.0-20180630143114-d2f9c3c389db/go.mod h1:RU+6d0CNIRSp6yo1mXLIIrnFa/3LHhvcDVLVJyovptM=
		github.com/KromDaniel/rejonson v0.0.0-20180822072824-00b5bcf2b351 h1:1u1XrfCBnY+GijnyU6O1k4odp5TnqZQTsp5v7+n/E4Y=
		github.com/KromDaniel/rejonson v0.0.0-20180822072824-00b5bcf2b351/go.mod h1:HxwfbuElTuGf+/uKZfjJrCnv0BmmpkPJDI7gBwj1KkM=

go-apps/meep-rnis/go.mod

+2 −0

Original line number	Diff line number	Diff line
		@@ -10,6 +10,7 @@ require (
		github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-metric-store v0.0.0
		github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-model v0.0.0
		github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-mq v0.0.0
		github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-postgis v0.0.0
		github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-redis v0.0.0
		github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-rnis-client v0.0.0 // indirect
		github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-rnis-notification-client v0.0.0
		@@ -28,6 +29,7 @@ replace (
		github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-metric-store => ../../go-packages/meep-metric-store
		github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-model => ../../go-packages/meep-model
		github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-mq => ../../go-packages/meep-mq
		github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-postgis => ../../go-packages/meep-postgis
		github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-redis => ../../go-packages/meep-redis
		github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-rnis-client => ../../go-packages/meep-rnis-client
		github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-rnis-notification-client => ../../go-packages/meep-rnis-notification-client

go-apps/meep-rnis/go.sum

+2 −0

Original line number	Diff line number	Diff line
		@@ -24,6 +24,8 @@ github.com/influxdata/influxdb1-client v0.0.0-20190809212627-fc22c7df067e h1:txQ
		github.com/influxdata/influxdb1-client v0.0.0-20190809212627-fc22c7df067e/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo=
		github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=
		github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
		github.com/lib/pq v1.5.2 h1:yTSXVswvWUOQ3k1sd7vJfDrbSl8lKuscqFJRqjC0ifw=
		github.com/lib/pq v1.5.2/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
		github.com/mattomatic/dijkstra v0.0.0-20130617153013-6f6d134eb237/go.mod h1:UOnLAUmVG5paym8pD3C4B9BQylUDC2vXFJJpT7JrlEA=
		github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
		github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=

go-apps/meep-rnis/sbi/rnis-sbi.go

+42 −9

Original line number	Diff line number	Diff line
		@@ -21,9 +21,13 @@ import (
		log "github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-logger"
		mod "github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-model"
		mq "github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-mq"
		postgis "github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-postgis"
		)

		const moduleName string = "meep-rnis-sbi"
		const geModuleName string = "meep-gis-engine"
		const postgisUser string = "postgres"
		const postgisPwd string = "pwd"

		type SbiCfg struct {
		SandboxName string
		@@ -39,6 +43,7 @@ type RnisSbi struct {
		mqLocal *mq.MsgQueue
		handlerId int
		activeModel *mod.Model
		pc *postgis.Connector
		updateUeEcgiInfoCB func(string, string, string, string)
		updateAppEcgiInfoCB func(string, string, string, string)
		updateScenarioNameCB func(string)
		@@ -55,8 +60,11 @@ func Init(cfg SbiCfg) (err error) {
		sbi = nil
		}
		sbi = new(RnisSbi)

		sbi.sandboxName = cfg.SandboxName
		sbi.updateUeEcgiInfoCB = cfg.UeEcgiInfoCb
		sbi.updateAppEcgiInfoCB = cfg.AppEcgiInfoCb
		sbi.updateScenarioNameCB = cfg.ScenarioNameCb
		sbi.cleanUpCB = cfg.CleanUpCb

		// Create message queue
		sbi.mqLocal, err = mq.NewMsgQueue(mq.GetLocalName(sbi.sandboxName), moduleName, sbi.sandboxName, cfg.RedisAddr)
		@@ -80,10 +88,13 @@ func Init(cfg SbiCfg) (err error) {
		return err
		}

		sbi.updateUeEcgiInfoCB = cfg.UeEcgiInfoCb
		sbi.updateAppEcgiInfoCB = cfg.AppEcgiInfoCb
		sbi.updateScenarioNameCB = cfg.ScenarioNameCb
		sbi.cleanUpCB = cfg.CleanUpCb
		// Connect to Postgis DB
		sbi.pc, err = postgis.NewConnector(geModuleName, sbi.sandboxName, postgisUser, postgisPwd, "", "")
		if err != nil {
		log.Error("Failed to create postgis connector with error: ", err.Error())
		return err
		}
		log.Info("Postgis Connector created")

		// Initialize service
		processActiveScenarioUpdate()
		@@ -122,6 +133,9 @@ func msgHandler(msg *mq.Msg, userData interface{}) {
		case mq.MsgScenarioTerminate:
		log.Debug("RX MSG: ", mq.PrintMsg(msg))
		processActiveScenarioTerminate()
		case mq.MsgGeUpdate:
		log.Debug("RX MSG: ", mq.PrintMsg(msg))
		processGisEngineUpdate(msg.Payload)
		default:
		log.Trace("Ignoring unsupported message: ", mq.PrintMsg(msg))
		}
		@@ -182,16 +196,15 @@ func processActiveScenarioUpdate() {
		}

		//only find UEs that were removed, check that former UEs are in new UE list
		foundOldInNewList := false
		for _, oldUe := range formerUeNameList {
		foundOldInNewList = false
		found := false
		for _, newUe := range ueNameList {
		if newUe == oldUe {
		foundOldInNewList = true
		found = true
		break
		}
		}
		if !foundOldInNewList {
		if !found {
		sbi.updateUeEcgiInfoCB(oldUe, "", "", "")
		log.Info("Ue removed : ", oldUe)
		}
		@@ -239,5 +252,25 @@ func processActiveScenarioUpdate() {
		}
		}
		}
		}

		func processGisEngineUpdate(assetMap map[string]string) {
		for assetName, assetType := range assetMap {
		// Only process UE updates
		if assetType == postgis.TypeUe {
		if assetName == postgis.AllAssets {
		ueMap, err := sbi.pc.GetAllUe()
		if err == nil {
		for _, ue := range ueMap {
		log.Debug("UE[", ue.Name, "] POA [", ue.Poa, "] distance[", ue.PoaDistance, "]")
		}
		}
		} else {
		ue, err := sbi.pc.GetUe(assetName)
		if err == nil {
		log.Debug("UE[", ue.Name, "] POA [", ue.Poa, "] distance[", ue.PoaDistance, "]")
		}
		}
		}
		}
		}