Commit a26f7881 authored by Kevin Di Lallo's avatar Kevin Di Lallo
Browse files

meep-data-key-manager to standardize redis data keys + virt engine & webhook multi-scenario support

parent 560f7463

.meepctl-repocfg.yaml

+9 −0
Original line number Diff line number Diff line
@@ -182,9 +182,15 @@ repo: 
      meep-couch:

        src: go-packages/meep-couch

        lint: true

      meep-data-key-mgr:

        src: go-packages/meep-data-key-mgr

        lint: true

      meep-data-model:

        src: go-packages/meep-data-model

        lint: true

      meep-http-logger:

        src: go-packages/meep-http-logger

        lint: true

      meep-loc-serv-client:

        src: go-packages/meep-loc-serv-client

        lint: false
@@ -237,6 +243,9 @@ repo: 
      meep-sandbox-ctrl-client:

        src: go-packages/meep-sandbox-ctrl-client

        lint: false

      meep-sandbox-store:

        src: go-packages/meep-sandbox-store

        lint: true

      meep-watchdog:

        src: go-packages/meep-watchdog

        lint: true

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

+2 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ module github.com/InterDigitalInc/AdvantEDGE/go-apps/meep-loc-serv 
go 1.12



require (

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-data-key-mgr 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
@@ -16,6 +17,7 @@ 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-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

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

+11 −15
Original line number Diff line number Diff line
@@ -17,8 +17,6 @@ 
package sbi



import (

	"errors"

	"os"

	"strings"



	httpLog "github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-http-logger"
@@ -44,23 +42,15 @@ type LocServSbi struct { 
var sbi *LocServSbi



// Init - Location Service SBI initialization

func Init(updateUserInfo func(string, string, string), updateZoneInfo func(string, int, int, int),

func Init(sandboxName string, updateUserInfo func(string, string, string), updateZoneInfo func(string, int, int, int),

	updateAccessPointInfo func(string, string, string, string, int), cleanUp func()) (err error) {



	// Create new SBI instance

	sbi = new(LocServSbi)



	// Retrieve Sandbox name from environment variable

	sbi.sandboxName = strings.TrimSpace(os.Getenv("MEEP_SANDBOX_NAME"))

	if sbi.sandboxName == "" {

		err = errors.New("MEEP_SANDBOX_NAME env variable not set")

		log.Error(err.Error())

		return err

	}

	log.Info("MEEP_SANDBOX_NAME: ", sbi.sandboxName)

	sbi.sandboxName = sandboxName



	// Create message queue

	sbi.mqLocal, err = mq.NewMsgQueue(mq.GetLocalName(sbi.sandboxName), moduleName, sbi.sandboxName, redisAddr)

	sbi.mqLocal, err = mq.NewMsgQueue(mq.GetLocalName(sandboxName), moduleName, sandboxName, redisAddr)

	if err != nil {

		log.Error("Failed to create Message Queue with error: ", err)

		return err
@@ -68,7 +58,13 @@ func Init(updateUserInfo func(string, string, string), updateZoneInfo func(strin 
	log.Info("Message Queue created")



	// Create new active scenario model

	modelCfg := mod.ModelCfg{Name: "activeScenario", Module: moduleName, UpdateCb: nil, DbAddr: redisAddr}

	modelCfg := mod.ModelCfg{

		Name:      "activeScenario",

		Namespace: sbi.sandboxName,

		Module:    moduleName,

		UpdateCb:  nil,

		DbAddr:    redisAddr,

	}

	sbi.activeModel, err = mod.NewModel(modelCfg)

	if err != nil {

		log.Error("Failed to create model: ", err.Error())
@@ -139,7 +135,7 @@ func processActiveScenarioUpdate() { 
	uePerZoneMap := make(map[string]int)

	poaPerZoneMap := make(map[string]int)



	_ = httpLog.ReInit(moduleName, sbi.activeModel.GetScenarioName())

	_ = httpLog.ReInit(moduleName, sbi.sandboxName, sbi.activeModel.GetScenarioName())



	// Update UE info

	ueNameList := sbi.activeModel.GetNodeNames("UE")

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

+57 −42

File changed.

Preview size limit exceeded, changes collapsed.

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

+2 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ module github.com/InterDigitalInc/AdvantEDGE/go-apps/meep-metrics-engine 
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-http-logger v0.0.0

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-logger v0.0.0
@@ -21,6 +22,7 @@ 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-http-logger => ../../go-packages/meep-http-logger

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-logger => ../../go-packages/meep-logger