Commit 8ad0d24b authored by Simon Pastor's avatar Simon Pastor
Browse files

rebase

parent 167c37e8

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

+129 −133
Original line number Diff line number Diff line
@@ -47,8 +47,6 @@ 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"

const rabEstSubscriptionType = "rab_est"
@@ -164,8 +162,6 @@ func Init() (err error) { 
	sbiCfg := sbi.SbiCfg{

		SandboxName:    sandboxName,

		RedisAddr:      redisAddr,

		PostgisHost:    postgisHost,

		PostgisPort:    postgisPort,

		UeDataCb:       updateUeData,

		AppEcgiInfoCb:  updateAppEcgiInfo,

		DomainDataCb:   updateDomainData,

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

+32 −40
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ import ( 
	"time"



	//ms "github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-metric-store"



	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"
@@ -492,8 +491,6 @@ 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
@@ -569,7 +566,6 @@ func TestFailSubscriptionCellChange(t *testing.T) { 
	terminateScenario()

}





func TestSuccessSubscriptionRabEst(t *testing.T) {

	fmt.Println("--- ", t.Name())

	log.MeepTextLogInit(t.Name())
@@ -624,7 +620,6 @@ func TestFailSubscriptionRabEst(t *testing.T) { 


	//delete

	testSubscriptionDelete(t, strconv.Itoa(nextSubscriptionIdAvailable), false)



	terminateScenario()

}
@@ -686,7 +681,6 @@ func TestFailSubscriptionRabRel(t *testing.T) { 
	terminateScenario()

}





func TestSubscriptionsListGet(t *testing.T) {

	fmt.Println("--- ", t.Name())

	log.MeepTextLogInit(t.Name())
@@ -2025,8 +2019,6 @@ func initializeVars() { 
	mod.DbAddress = redisTestAddr

	redisAddr = redisTestAddr

	influxAddr = influxTestAddr

	postgisHost = postgisTestHost

	postgisPort = postgisTestPort

	sandboxName = testScenarioName

}

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

+2 −2

File changed.

Contains only whitespace changes.

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

+6 −6

File changed.

Contains only whitespace changes.