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

fixed loc-serv + rnis ut

parent df2e730a

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

+3 −1
Original line number Diff line number Diff line
@@ -36,6 +36,8 @@ const postgisPwd string = "pwd" 
type SbiCfg struct {

	SandboxName    string

	RedisAddr      string

	PostgisHost    string

	PostgisPort    string

	UserInfoCb     func(string, string, string, *float32, *float32)

	ZoneInfoCb     func(string, int, int, int)

	ApInfoCb       func(string, string, string, string, int, *float32, *float32)
@@ -94,7 +96,7 @@ func Init(cfg SbiCfg) (err error) { 
	log.Info("Active Scenario Model created")



	// Connect to Postgis DB

	sbi.pc, err = postgis.NewConnector(geModuleName, sbi.sandboxName, postgisUser, postgisPwd, "", "")

	sbi.pc, err = postgis.NewConnector(geModuleName, sbi.sandboxName, postgisUser, postgisPwd, cfg.PostgisHost, cfg.PostgisPort)

	if err != nil {

		log.Error("Failed to create postgis connector with error: ", err.Error())

		return err

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

+4 −0
Original line number Diff line number Diff line
@@ -93,6 +93,8 @@ var currentStoreName = "" 


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

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

var postgisHost string = "meep-postgis.default.svc.cluster.local"

var postgisPort string = "5432"



var rc *redis.Connector

var hostUrl *url.URL
@@ -143,6 +145,8 @@ func Init() (err error) { 
	sbiCfg := sbi.SbiCfg{

		SandboxName:    sandboxName,

		RedisAddr:      redisAddr,

		PostgisHost:    postgisHost,

		PostgisPort:    postgisPort,

		UserInfoCb:     updateUserInfo,

		ZoneInfoCb:     updateZoneInfo,

		ApInfoCb:       updateAccessPointInfo,

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

+25 −56
Original line number Diff line number Diff line
@@ -509,6 +509,8 @@ const testScenario string = ` 


const redisTestAddr = "localhost:30380"

const influxTestAddr = "http://localhost:30986"

const postgisTestHost = "localhost"

const postgisTestPort = "30432"

const testScenarioName = "testScenario"



var m *mod.Model
@@ -518,10 +520,7 @@ func TestZonalSuccessSubscription(t *testing.T) { 
	fmt.Println("--- ", t.Name())

	log.MeepTextLogInit(t.Name())



	mod.DbAddress = redisTestAddr

	redisAddr = redisTestAddr

	influxAddr = influxTestAddr

	sandboxName = testScenarioName

	initializeVars()



	err := Init()

	if err != nil {
@@ -557,10 +556,7 @@ func TestFailZonalSubscription(t *testing.T) { 
	fmt.Println("--- ", t.Name())

	log.MeepTextLogInit(t.Name())



	mod.DbAddress = redisTestAddr

	redisAddr = redisTestAddr

	influxAddr = influxTestAddr

	sandboxName = testScenarioName

	initializeVars()



	err := Init()

	if err != nil {
@@ -590,10 +586,7 @@ func TestZonalSubscriptionsListGet(t *testing.T) { 
	fmt.Println("--- ", t.Name())

	log.MeepTextLogInit(t.Name())



	mod.DbAddress = redisTestAddr

	redisAddr = redisTestAddr

	influxAddr = influxTestAddr

	sandboxName = testScenarioName

	initializeVars()



	err := Init()

	if err != nil {
@@ -862,10 +855,7 @@ func TestUserSuccessSubscription(t *testing.T) { 
	fmt.Println("--- ", t.Name())

	log.MeepTextLogInit(t.Name())



	mod.DbAddress = redisTestAddr

	redisAddr = redisTestAddr

	influxAddr = influxTestAddr

	sandboxName = testScenarioName

	initializeVars()



	err := Init()

	if err != nil {
@@ -901,10 +891,7 @@ func TestFailUserSubscription(t *testing.T) { 
	fmt.Println("--- ", t.Name())

	log.MeepTextLogInit(t.Name())



	mod.DbAddress = redisTestAddr

	redisAddr = redisTestAddr

	influxAddr = influxTestAddr

	sandboxName = testScenarioName

	initializeVars()



	err := Init()

	if err != nil {
@@ -934,10 +921,7 @@ func TestUserSubscriptionsListGet(t *testing.T) { 
	fmt.Println("--- ", t.Name())

	log.MeepTextLogInit(t.Name())



	mod.DbAddress = redisTestAddr

	redisAddr = redisTestAddr

	influxAddr = influxTestAddr

	sandboxName = testScenarioName

	initializeVars()



	err := Init()

	if err != nil {
@@ -1204,10 +1188,7 @@ func TestZoneStatusSuccessSubscription(t *testing.T) { 
	fmt.Println("--- ", t.Name())

	log.MeepTextLogInit(t.Name())



	mod.DbAddress = redisTestAddr

	redisAddr = redisTestAddr

	influxAddr = influxTestAddr

	sandboxName = testScenarioName

	initializeVars()



	err := Init()

	if err != nil {
@@ -1243,10 +1224,7 @@ func TestFailZoneStatusSubscription(t *testing.T) { 
	fmt.Println("--- ", t.Name())

	log.MeepTextLogInit(t.Name())



	mod.DbAddress = redisTestAddr

	redisAddr = redisTestAddr

	influxAddr = influxTestAddr

	sandboxName = testScenarioName

	initializeVars()



	err := Init()

	if err != nil {
@@ -1276,10 +1254,7 @@ func TestZoneStatusSubscriptionsListGet(t *testing.T) { 
	fmt.Println("--- ", t.Name())

	log.MeepTextLogInit(t.Name())



	mod.DbAddress = redisTestAddr

	redisAddr = redisTestAddr

	influxAddr = influxTestAddr

	sandboxName = testScenarioName

	initializeVars()



	err := Init()

	if err != nil {
@@ -1550,10 +1525,7 @@ func TestUserInfo(t *testing.T) { 
	fmt.Println("--- ", t.Name())

	log.MeepTextLogInit(t.Name())



	mod.DbAddress = redisTestAddr

	redisAddr = redisTestAddr

	influxAddr = influxTestAddr

	sandboxName = testScenarioName

	initializeVars()



	err := Init()

	if err != nil {
@@ -1646,10 +1618,7 @@ func TestZoneInfo(t *testing.T) { 
	fmt.Println("--- ", t.Name())

	log.MeepTextLogInit(t.Name())



	mod.DbAddress = redisTestAddr

	redisAddr = redisTestAddr

	influxAddr = influxTestAddr

	sandboxName = testScenarioName

	initializeVars()



	err := Init()

	if err != nil {
@@ -1742,10 +1711,7 @@ func TestAPInfo(t *testing.T) { 
	fmt.Println("--- ", t.Name())

	log.MeepTextLogInit(t.Name())



	mod.DbAddress = redisTestAddr

	redisAddr = redisTestAddr

	influxAddr = influxTestAddr

	sandboxName = testScenarioName

	initializeVars()



	err := Init()

	if err != nil {
@@ -1842,10 +1808,7 @@ func TestUserSubscriptionNotification(t *testing.T) { 
	fmt.Println("--- ", t.Name())

	log.MeepTextLogInit(t.Name())



	mod.DbAddress = redisTestAddr

	redisAddr = redisTestAddr

	influxAddr = influxTestAddr

	sandboxName = testScenarioName

	initializeVars()



	err := Init()

	if err != nil {
@@ -1944,10 +1907,7 @@ func TestZoneSubscriptionNotification(t *testing.T) { 
	fmt.Println("--- ", t.Name())

	log.MeepTextLogInit(t.Name())



	mod.DbAddress = redisTestAddr

	redisAddr = redisTestAddr

	influxAddr = influxTestAddr

	sandboxName = testScenarioName

	initializeVars()



	err := Init()

	if err != nil {
@@ -2159,6 +2119,15 @@ func updateScenario(testUpdate string) { 
	time.Sleep(100 * time.Millisecond)

}



func initializeVars() {

	mod.DbAddress = redisTestAddr

	redisAddr = redisTestAddr

	influxAddr = influxTestAddr

	postgisHost = postgisTestHost

	postgisPort = postgisTestPort

	sandboxName = testScenarioName

}



func initialiseScenario(testScenario string) {



	//clear DB

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

+3 −1
Original line number Diff line number Diff line
@@ -32,6 +32,8 @@ const postgisPwd string = "pwd" 
type SbiCfg struct {

	SandboxName    string

	RedisAddr      string

	PostgisHost    string

	PostgisPort    string

	UeEcgiInfoCb   func(string, string, string, string)

	AppEcgiInfoCb  func(string, string, string, string)

	ScenarioNameCb func(string)
@@ -89,7 +91,7 @@ func Init(cfg SbiCfg) (err error) { 
	}



	// Connect to Postgis DB

	sbi.pc, err = postgis.NewConnector(geModuleName, sbi.sandboxName, postgisUser, postgisPwd, "", "")

	sbi.pc, err = postgis.NewConnector(geModuleName, sbi.sandboxName, postgisUser, postgisPwd, cfg.PostgisHost, cfg.PostgisPort)

	if err != nil {

		log.Error("Failed to create postgis connector with error: ", err.Error())

		return err

go-apps/meep-rnis/server/rnis.go

+4 −0
Original line number Diff line number Diff line
@@ -44,6 +44,8 @@ const logModuleRNIS string = "meep-rnis" 
//const module string = "rnis"

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

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

var postgisHost string = "meep-postgis.default.svc.cluster.local"

var postgisPort string = "5432"



const cellChangeSubscriptionType = "cell_change"
@@ -117,6 +119,8 @@ func Init() (err error) { 
	sbiCfg := sbi.SbiCfg{

		SandboxName:    sandboxName,

		RedisAddr:      redisAddr,

		PostgisHost:    postgisHost,

		PostgisPort:    postgisPort,

		UeEcgiInfoCb:   updateUeEcgiInfo,

		AppEcgiInfoCb:  updateAppEcgiInfo,

		ScenarioNameCb: updateStoreName,