new gis cache + service updates to get location from cache (7808e107) · Commits · MEC - Multi-access Edge Computing / ETSI MEC Sandbox

go-apps/meep-gis-engine/go.mod

+3 −0

Original line number	Diff line number	Diff line
		@@ -5,10 +5,12 @@ go 1.12
		require (
		github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-data-model v0.0.0
		github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-gis-asset-mgr v0.0.0
		github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-gis-cache v0.0.0
		github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-logger 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-sandbox-ctrl-client v0.0.0
		github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-sandbox-store v0.0.0-20200703133018-94138d8210a3 // indirect
		github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-sessions v0.0.0
		github.com/gorilla/handlers v1.4.2
		github.com/gorilla/mux v1.7.4
		@@ -18,6 +20,7 @@ replace (
		github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-data-key-mgr => ../../go-packages/meep-data-key-mgr
		github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-data-model => ../../go-packages/meep-data-model
		github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-gis-asset-mgr => ../../go-packages/meep-gis-asset-mgr
		github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-gis-cache => ../../go-packages/meep-gis-cache
		github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-logger => ../../go-packages/meep-logger
		github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-model => ../../go-packages/meep-model
		github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-mq => ../../go-packages/meep-mq

go-apps/meep-gis-engine/go.sum

+3 −0

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.5.0 h1:Gv1wxW7kV31reTqxX5TflvvYEEqnxaUlKWvgoandpfI=
		github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-sandbox-store v0.0.0-20200703133018-94138d8210a3 h1:x6ku4d3G04iUxzUBnTi4D8LsoNCm2Aghb6D66ngq3Qs=
		github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-sandbox-store v0.0.0-20200703133018-94138d8210a3/go.mod h1:Q83rM8qt/cAkQKcsN5MKmvyNe/IeZMvbWPXB7oTW1Xs=
		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-gis-engine/server/gis-engine.go

+143 −48

Original line number	Diff line number	Diff line
		@@ -30,6 +30,7 @@ import (

		dataModel "github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-data-model"
		am "github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-gis-asset-mgr"
		gc "github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-gis-cache"
		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"
		@@ -85,12 +86,14 @@ type GisEngine struct {
		handlerId int
		sboxCtrlClient *sbox.APIClient
		activeModel *mod.Model
		gisCache *gc.GisCache
		sessionMgr *sm.SessionMgr
		assetMgr *am.AssetMgr
		assets map[string]*Asset
		ueInfo map[string]*UeInfo
		automation map[string]bool
		ticker *time.Ticker
		automationTicker *time.Ticker
		// cacheTicker *time.Ticker
		updateTime time.Time
		}

		@@ -103,9 +106,6 @@ func Init() (err error) {
		ge.ueInfo = make(map[string]*UeInfo)
		ge.automation = make(map[string]bool)
		resetAutomation()
		startAutomation()

		// timer := time.NewTimer(time.Second)

		// Retrieve Sandbox name from environment variable
		ge.sandboxName = strings.TrimSpace(os.Getenv("MEEP_SANDBOX_NAME"))
		@@ -156,6 +156,14 @@ func Init() (err error) {
		}
		log.Info("Connected to Session Manager")

		// Connect to GIS cache
		ge.gisCache, err = gc.NewGisCache(redisAddr)
		if err != nil {
		log.Error("Failed to GIS Cache: ", err.Error())
		return err
		}
		log.Info("Connected to GIS Cache")

		// Connect to GIS Asset Manager
		ge.assetMgr, err = am.NewAssetMgr(moduleName, ge.sandboxName, postgisUser, postgisPwd, "", "")
		if err != nil {
		@@ -200,21 +208,29 @@ func Run() (err error) {
		}
		log.Info("Registered Asset Manager listener")

		// Start automation loop
		startAutomation()

		// Start cache loop
		// startCaching()

		return nil
		}

		// Asset Manager handler
		func gisHandler(updateType string, assetName string) {
		// Create & fill gis update message
		msg := ge.mqLocal.CreateMsg(mq.MsgGeUpdate, mq.TargetAll, ge.sandboxName)
		msg.Payload[assetName] = updateType
		log.Debug("TX MSG: ", mq.PrintMsg(msg))
		runCache()

		// Send message on local Msg Queue
		err := ge.mqLocal.SendMsg(msg)
		if err != nil {
		log.Error("Failed to send message with error: ", err.Error())
		}
		// // Create & fill gis update message
		// msg := ge.mqLocal.CreateMsg(mq.MsgGeUpdate, mq.TargetAll, ge.sandboxName)
		// msg.Payload[assetName] = updateType
		// log.Debug("TX MSG: ", mq.PrintMsg(msg))

		// // Send message on local Msg Queue
		// err := ge.mqLocal.SendMsg(msg)
		// if err != nil {
		// log.Error("Failed to send message with error: ", err.Error())
		// }
		}

		// Message Queue handler
		@@ -710,6 +726,100 @@ func initWirelessType(wireless bool, wirelessType string) string {
		return wt
		}

		// func startCaching() {
		// log.Debug("Starting cache loop")
		// ge.cacheTicker = time.NewTicker(1000 * time.Millisecond)
		// go func() {
		// for range ge.cacheTicker.C {
		// runCache()
		// }
		// }()
		// }

		func runCache() {

		// Get UE asset snapshot
		ueMap, err := ge.assetMgr.GetAllUe()
		if err != nil {
		log.Error(err.Error())
		return
		}

		// Get cached UE positions
		cachedUePosMap, err := ge.gisCache.GetAllPositions(gc.TypeUe)
		if err != nil {
		log.Error(err.Error())
		return
		}

		// // Get cached UE measurements
		// cachedUeMeasMap, err :=

		// Update UE positions
		for _, ue := range ueMap {
		// Parse UE position
		longitude, latitude := parsePosition(ue.Position)
		if longitude == nil \|\| latitude == nil {
		log.Error("longitude == nil \|\| latitude == nil for UE: ", ue.Name)
		continue
		}

		// Update positions if different from cached value
		cachedUePos, found := cachedUePosMap[ue.Name]
		if !found \|\| cachedUePos.Longitude != longitude \|\| cachedUePos.Latitude != latitude {
		position := new(gc.Position)
		position.Longitude = *longitude
		position.Latitude = *latitude
		_ = ge.gisCache.SetPosition(gc.TypeUe, ue.Name, position)
		}

		for _, meas := range ue.Measurements {
		log.Info(meas.Poa)
		}
		}

		// Remove stale UEs
		for ueName := range cachedUePosMap {
		if _, found := ueMap[ueName]; !found {
		ge.gisCache.Del(gc.TypeUe, ueName)
		}
		}

		// Update UE measurements

		// Get POA asset snapshot
		_, err = ge.assetMgr.GetAllPoa()
		if err != nil {
		log.Error(err.Error())
		return
		}

		// Get cached POA positions

		// Update POA positions

		// Get Compute asset snapshot
		_, err = ge.assetMgr.GetAllCompute()
		if err != nil {
		log.Error(err.Error())
		return
		}

		// Get cached Compute positions

		// Update Compute positions

		}

		func parsePosition(position string) (longitude float32, latitude float32) {
		var point dataModel.Point
		err := json.Unmarshal([]byte(position), &point)
		if err != nil {
		return nil, nil
		}
		return &point.Coordinates[0], &point.Coordinates[1]
		}

		func resetAutomation() {
		// Stop automation if running
		_ = setAutomation(AutoTypeMovement, false)
		@@ -726,9 +836,9 @@ func resetAutomation() {

		func startAutomation() {
		log.Debug("Starting automation loop")
		ge.ticker = time.NewTicker(1000 * time.Millisecond)
		ge.automationTicker = time.NewTicker(1000 * time.Millisecond)
		go func() {
		for range ge.ticker.C {
		for range ge.automationTicker.C {
		runAutomation()
		}
		}()
		@@ -777,30 +887,15 @@ func runAutomation() {
		ge.updateTime = currentTime
		}

		// Cache asset snapshot
		// Mobility & POA In Range
		if ge.automation[AutoTypeMobility] \|\| ge.automation[AutoTypePoaInRange] {
		// Get UE geodata
		ueMap, err := ge.assetMgr.GetAllUe()
		if err != nil {
		log.Error(err.Error())
		return
		}

		// for _, ue := range ueMap {
		// ue.
		// }

		// poaMap, err := ge.assetMgr.GetAllPoa()
		// if err != nil {
		// log.Error(err.Error())
		// return
		// }
		// computeMap, err := ge.assetMgr.GetAllCompute()
		// if err != nil {
		// log.Error(err.Error())
		// return
		// }

		// Mobility & POA In Range
		if ge.automation[AutoTypeMobility] \|\| ge.automation[AutoTypePoaInRange] {
		// Loop through UEs
		for _, ue := range ueMap {
		// Get stored UE info

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -5,13 +5,13 @@ go 1.12
		require (
		github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-data-key-mgr v0.0.0
		github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-data-model v0.0.0
		github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-gis-cache v0.0.0
		github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-http-logger v0.0.0
		github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-loc-serv-notification-client v0.0.0
		github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-logger v0.0.0
		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-sessions v0.0.0
		github.com/gorilla/handlers v1.4.0
		@@ -23,13 +23,13 @@ require (
		replace (
		github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-data-key-mgr => ../../go-packages/meep-data-key-mgr
		github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-data-model => ../../go-packages/meep-data-model
		github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-gis-cache => ../../go-packages/meep-gis-cache
		github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-http-logger => ../../go-packages/meep-http-logger
		github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-loc-serv-notification-client => ../../go-packages/meep-loc-serv-notification-client
		github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-logger => ../../go-packages/meep-logger
		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-sessions => ../../go-packages/meep-sessions
		)

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

+0 −3

Original line number	Diff line number	Diff line
		@@ -16,7 +16,6 @@ github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM
		github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
		github.com/gorilla/handlers v1.4.0 h1:XulKRWSQK5uChr4pEgSE4Tc/OcmnU9GJuSwdog/tZsA=
		github.com/gorilla/handlers v1.4.0/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ=
		github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
		github.com/gorilla/mux v1.7.4 h1:VuZ8uybHlWmqV03+zRzdwKL4tUnIp1MAQtp1mIFE1bc=
		github.com/gorilla/mux v1.7.4/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
		github.com/gorilla/securecookie v1.1.1 h1:miw7JPhV+b/lAHSXz4qd/nN9jRiAFV5FwjeKyCS8BvQ=
		@@ -28,8 +27,6 @@ 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=