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

rab rel-est initial merge

parent 903c89dd

go-apps/meep-loc-serv/api/swagger.yaml

+5 −5
Original line number Diff line number Diff line
@@ -353,7 +353,7 @@ paths: 
    get:

      tags:

      - "subscriptions"

      description: "This operation is used for updating an individual subscription\

      description: "This operation is used for retrieving an individual subscription\

        \ to zonal traffic change notification."

      operationId: "zonalTrafficSubGetById"

      produces:
@@ -566,8 +566,8 @@ paths: 
    delete:

      tags:

      - "subscriptions"

      description: "This operation is used for retrieving an individual subscription\

        \ to user tracking change notification."

      description: "This operation is used for cancelling a subscription and stopping\

        \ corresponding notifications."

      operationId: "userTrackingSubDelById"

      produces:

      - "application/json"
@@ -585,8 +585,8 @@ paths: 
    get:

      tags:

      - "subscriptions"

      description: "This operation is used for creating a new subscription to zone\

        \ status change notification."

      description: "This operation is used for retrieving all active subscriptions\

        \ to zone status change notifications."

      operationId: "zoneStatusGet"

      produces:

      - "application/json"

go-apps/meep-loc-serv/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-07-16T13:21:19.006-04:00

- Build date: 2020-07-27T13:41:42.509-04:00





### Running the server

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

+1 −1
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ func createClient(notifyPath string) (*clientNotifOMA.APIClient, error) { 


func deregisterZoneStatus(subsIdStr string) {

	subsId, _ := strconv.Atoi(subsIdStr)

	zonalSubscriptionMap[subsId] = ""

	zoneStatusSubscriptionMap[subsId] = nil

}



func registerZoneStatus(zoneId string, nbOfUsersZoneThreshold int32, nbOfUsersAPThreshold int32, opStatus []OperationStatus, subsIdStr string) {

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

+14 −5
Original line number Diff line number Diff line
@@ -3067,13 +3067,10 @@ definitions: 
      plmn:

        $ref: "#/definitions/Plmn"

      cellId:

        type: "array"

        type: "string"

        example: "0x800000A"

        description: "The E-UTRAN Cell Identity as a bit string (size (28)), as defined\

          \ in 3GPP TS 36.413"

        items:

          type: "string"

          format: "binary"

    description: "E-UTRAN CelI Global Identifier as defined in 3GPP TS 36.413"

  Plmn:

    type: "object"
@@ -3105,6 +3102,18 @@ definitions: 
      erabInfo:

        type: "array"

        items:

          $ref: "#/definitions/ErabInfo"

    description: "Information on UEs in the specific cell."

  ErabInfo:

    type: "object"

    required:

    - "erabId"

    properties:

      erabId:

        type: "integer"

        description: "Attribute that uniquely identifies a Radio Access bearer for\

          \ specific UE as defined in ETSI TS 136 413"

      erabQosParameters:

        $ref: "#/definitions/ErabQosParameters"

    description: "Information on UEs in the specific cell."

  AssociateId:

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

+5 −10
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ type SbiCfg struct { 
	RedisAddr      string

	PostgisHost    string

	PostgisPort    string

	UeEcgiInfoCb   func(string, string, string, string)

	UeDataCb       func(string, string, string, string, int32)

	AppEcgiInfoCb  func(string, string, string, string)

	ScenarioNameCb func(string)

	CleanUpCb      func()
@@ -46,7 +46,7 @@ type RnisSbi struct { 
	handlerId            int

	activeModel          *mod.Model

	pc                   *postgis.Connector

	updateUeEcgiInfoCB   func(string, string, string, string)

	updateUeDataCB       func(string, string, string, string, int32)

	updateAppEcgiInfoCB  func(string, string, string, string)

	updateScenarioNameCB func(string)

	cleanUpCB            func()
@@ -63,7 +63,7 @@ func Init(cfg SbiCfg) (err error) { 
	}

	sbi = new(RnisSbi)

	sbi.sandboxName = cfg.SandboxName

	sbi.updateUeEcgiInfoCB = cfg.UeEcgiInfoCb

	sbi.updateUeDataCB = cfg.UeDataCb

	sbi.updateAppEcgiInfoCB = cfg.AppEcgiInfoCb

	sbi.updateScenarioNameCB = cfg.ScenarioNameCb

	sbi.cleanUpCB = cfg.CleanUpCb
@@ -166,7 +166,6 @@ func processActiveScenarioUpdate() { 
	// Update UE info

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

	for _, name := range ueNameList {



		ueParent := sbi.activeModel.GetNodeParent(name)

		if poa, ok := ueParent.(*dataModel.NetworkLocation); ok {

			poaParent := sbi.activeModel.GetNodeParent(poa.Name)
@@ -186,12 +185,8 @@ func processActiveScenarioUpdate() { 
						} else {

							cellId = domain.CellularDomainConfig.DefaultCellId

						}

					} else {

						if domain.CellularDomainConfig != nil {

							cellId = domain.CellularDomainConfig.DefaultCellId

						}

					}

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

					sbi.updateUeDataCB(name, mnc, mcc, cellId, -1)

				}

			}

		}
@@ -207,7 +202,7 @@ func processActiveScenarioUpdate() { 
			}

		}

		if !found {

			sbi.updateUeEcgiInfoCB(oldUe, "", "", "")

			sbi.updateUeDataCB(oldUe, "", "", "", -1)

			log.Info("Ue removed : ", oldUe)

		}

	}