Commit ad69f1ec authored by Simon Pastor's avatar Simon Pastor
Browse files

beta 2 fixes

parent 089145bd

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

+2 −2
Original line number Diff line number Diff line
@@ -221,8 +221,8 @@ func processActiveScenarioUpdate() { 
		}

	}



	// Update POA Cellular info

	poaNameList := sbi.activeModel.GetNodeNames(mod.NodeTypePoa4G, mod.NodeTypePoa5G)

	// Update POA Cellular and Wifi info

	poaNameList := sbi.activeModel.GetNodeNames(mod.NodeTypePoa4G, mod.NodeTypePoa5G, mod.NodeTypePoaWifi)

	for _, name := range poaNameList {

		zone, netLoc, err := getNetworkLocation(name)

		if err != nil {

go-apps/meep-rnis/api/swagger.yaml

+2 −2
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ paths: 
      - name: "app_ins_id"

        in: "query"

        description: "Application instance identifier"

        required: true

        required: false

        type: "array"

        items:

          type: "string"
@@ -4047,7 +4047,7 @@ parameters: 
    name: "app_ins_id"

    in: "query"

    description: "Application instance identifier"

    required: true

    required: false

    type: "array"

    items:

      type: "string"

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

+19 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ type SbiCfg struct { 
	PostgisPort    string

	UeDataCb       func(string, string, string, string, bool)

	AppEcgiInfoCb  func(string, string, string, string)

	DomainDataCb   func(string, string, string, string)

	ScenarioNameCb func(string)

	CleanUpCb      func()

}
@@ -48,6 +49,7 @@ type RnisSbi struct { 
	pc                   *postgis.Connector

	updateUeDataCB       func(string, string, string, string, bool)

	updateAppEcgiInfoCB  func(string, string, string, string)

	updateDomainDataCB   func(string, string, string, string)

	updateScenarioNameCB func(string)

	cleanUpCB            func()

}
@@ -65,6 +67,7 @@ func Init(cfg SbiCfg) (err error) { 
	sbi.sandboxName = cfg.SandboxName

	sbi.updateUeDataCB = cfg.UeDataCb

	sbi.updateAppEcgiInfoCB = cfg.AppEcgiInfoCb

	sbi.updateDomainDataCB = cfg.DomainDataCb

	sbi.updateScenarioNameCB = cfg.ScenarioNameCb

	sbi.cleanUpCB = cfg.CleanUpCb
@@ -177,6 +180,22 @@ func processActiveScenarioUpdate() { 
	scenarioName := sbi.activeModel.GetScenarioName()

	sbi.updateScenarioNameCB(scenarioName)



	// Update DOMAIN info

	domainNameList := sbi.activeModel.GetNodeNames("OPERATOR-CELLULAR")



	for _, name := range domainNameList {

		node := sbi.activeModel.GetNode(name)

		if node != nil {

			domain := node.(*dataModel.Domain)

			if domain.CellularDomainConfig != nil {

				mnc := domain.CellularDomainConfig.Mnc

				mcc := domain.CellularDomainConfig.Mcc

				cellId := domain.CellularDomainConfig.DefaultCellId

				sbi.updateDomainDataCB(name, mnc, mcc, cellId)

			}

		}

	}



	// Update UE info

	ueNames := []string{}

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

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

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ To see how to make this your own, look here: 
[README](https://github.com/swagger-api/swagger-codegen/blob/master/README.md)



- API version: 1.1.1

- Build date: 2020-09-25T11:33:31.932-04:00

- Build date: 2020-10-01T11:00:47.023-04:00





### Running the server

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

+22 −0
Original line number Diff line number Diff line
@@ -66,6 +66,28 @@ func convertUeDataToJson(obj *UeData) string { 
	return string(jsonData)

}



func convertJsonToDomainData(jsonData string) *DomainData {



	var obj DomainData

	err := json.Unmarshal([]byte(jsonData), &obj)

	if err != nil {

		log.Error(err.Error())

		return nil

	}

	return &obj

}



func convertDomainDataToJson(obj *DomainData) string {



	jsonData, err := json.Marshal(*obj)

	if err != nil {

		log.Error(err.Error())

		return ""

	}



	return string(jsonData)

}



func convertJsonToCellChangeSubscription(jsonInfo string) *CellChangeSubscription {



	var obj CellChangeSubscription