Unverified Commit a3a27a7e authored by Kevin Di Lallo's avatar Kevin Di Lallo Committed by GitHub
Browse files

Merge pull request #83 from pastorsx/sp_dev_rnis_test 

RNIS UT testing
parents 2e690ada e60dd428

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

+2 −1
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import ( 


const moduleName string = "meep-loc-serv-sbi"

const redisAddr string = "meep-redis-master.default.svc.cluster.local:6379"

const influxAddr string = "http://meep-influxdb.default.svc.cluster.local:8086"



type LocServSbi struct {

	sandboxName             string
@@ -135,7 +136,7 @@ func processActiveScenarioUpdate() { 
	uePerZoneMap := make(map[string]int)

	poaPerZoneMap := make(map[string]int)



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

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



	// Update UE info

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

go-apps/meep-metrics-engine/server/v2/metrics-engine.go

+2 −2
Original line number Diff line number Diff line
@@ -199,7 +199,7 @@ func activateScenarioMetrics() { 
	}



	// Set new HTTP logger store name

	_ = httpLog.ReInit(moduleName, sandboxName, activeScenarioName)

	_ = httpLog.ReInit(moduleName, sandboxName, activeScenarioName, redisAddr, influxDBAddr)



	// Set Metrics Store

	err := metricStore.SetStore(activeScenarioName)
@@ -242,7 +242,7 @@ func terminateScenarioMetrics() { 
	metricStore.StopSnapshotThread()



	// Set new HTTP logger store name

	_ = httpLog.ReInit(moduleName, sandboxName, activeScenarioName)

	_ = httpLog.ReInit(moduleName, sandboxName, activeScenarioName, redisAddr, influxDBAddr)



	// Set Metrics Store

	err := metricStore.SetStore("")

go-apps/meep-mg-manager/server/mg-manager.go

+3 −1
Original line number Diff line number Diff line
@@ -44,6 +44,8 @@ const moduleTcEngine string = "meep-tc-engine" 
const mgmKey string = "mg-manager:"

const typeLb string = "lb"

const redisAddr string = "meep-redis-master.default.svc.cluster.local:6379"

const influxAddr string = "http://meep-influxdb.default.svc.cluster.local:8086"



const DEFAULT_LB_RULES_DB = 0



const eventTypeStateUpdate = "STATE-UPDATE"
@@ -249,7 +251,7 @@ func processActiveScenarioUpdate() { 
	// Sync with active scenario store

	mgm.activeModel.UpdateScenario()



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

	_ = httpLog.ReInit(moduleName, mgm.sandboxName, mgm.activeModel.GetScenarioName(), redisAddr, influxAddr)



	// Handle empty/missing scenario

	if mgm.activeModel.GetScenarioName() == "" {

go-apps/meep-rnis/go.mod

+5 −0
Original line number Diff line number Diff line
@@ -7,10 +7,13 @@ require ( 
	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

	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-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

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

	github.com/gorilla/handlers v1.4.0

	github.com/gorilla/mux v1.7.3

	golang.org/x/sys v0.0.0-20190412213103-97732733099d // indirect
@@ -26,5 +29,7 @@ replace ( 
	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-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

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ github.com/RyanCarrier/dijkstra v0.0.0-20190726134004-b51cadb5ae52 h1:trnwuu/Q8T 
github.com/RyanCarrier/dijkstra v0.0.0-20190726134004-b51cadb5ae52/go.mod h1:DdR6ymcLl8+sN/XOVNjnYO1NDYfgHskGjreZUDuQCTY=

github.com/RyanCarrier/dijkstra-1 v0.0.0-20170512020943-0e5801a26345/go.mod h1:OK4EvWJ441LQqGzed5NGB6vKBAE34n3z7iayPcEwr30=

github.com/albertorestifo/dijkstra v0.0.0-20160910063646-aba76f725f72/go.mod h1:o+JdB7VetTHjLhU0N57x18B9voDBQe0paApdEAEoEfw=

github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=

github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ=

github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=

github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=