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

Merge pull request #209 from pastorsx/sp_dev_periodicity_rnis 

Configurable periodicity in RNIS for MeasRepUe and NrMeasRepUe notifications
parents 701e3db8 feb55181

charts/meep-rnis/values-template.yaml

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ image: 
  env:

    MEEP_SANDBOX_NAME: {{ .SandboxName }}

    MEEP_HOST_URL: {{ .HostUrl }}

    MEAS_REP_UE_PERIODIC_TRIGGER_INTERVAL: 1s

    NR_MEAS_REP_UE_PERIODIC_TRIGGER_INTERVAL: 1s



service:

  name: meep-rnis

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

+31 −4
Original line number Diff line number Diff line
@@ -104,13 +104,13 @@ var expiryTicker *time.Ticker 


var periodicTriggerTicker *time.Ticker

var periodicNrTriggerTicker *time.Ticker

var periodicTriggerIntervals = 1

var periodicNrTriggerIntervals = 1



var nextSubscriptionIdAvailable int

var nextAvailableErabId int



const defaultSupportedQci = 80

const defaultMeasRepUePeriodicTriggerInterval = 1

const defaultNrMeasRepUePeriodicTriggerInterval = 1



type RabInfoData struct {

	queryErabId        int32
@@ -242,14 +242,41 @@ func Init() (err error) { 
		}

	}()



	periodicTriggerTicker = time.NewTicker(time.Duration(periodicTriggerIntervals) * time.Second)

	// Retrieve Meas rep Ue periodic trigger interval from environment variable

	periodicTriggerInterval := defaultMeasRepUePeriodicTriggerInterval

	periodicTriggerIntervalEnv := strings.TrimSpace(os.Getenv("MEAS_REP_UE_PERIODIC_TRIGGER_INTERVAL"))

	if periodicTriggerIntervalEnv != "" {

		//ignoring last parameter which is the unit, only supporting seconds for now

		periodicTriggerIntervalVal, err := time.ParseDuration(periodicTriggerIntervalEnv)

		if err == nil {

			periodicTriggerInterval = int(periodicTriggerIntervalVal.Seconds())

		} else {

			log.Error("Cannot parse MEAS_REP_UE_PERIODIC_TRIGGER_INTERVAL, using default value")

		}

	}

	log.Info("MEAS_REP_UE_PERIODIC_TRIGGER_INTERVAL: ", periodicTriggerInterval)



	periodicTriggerTicker = time.NewTicker(time.Duration(periodicTriggerInterval) * time.Second)

	go func() {

		for range periodicTriggerTicker.C {

			checkMrPeriodicTrigger(int32(TRIGGER_PERIODICAL_REPORT_STRONGEST_CELLS))

		}

	}()



	periodicNrTriggerTicker = time.NewTicker(time.Duration(periodicNrTriggerIntervals) * time.Second)

	// Retrieve Nr Meas rep Ue periodic trigger interval from environment variable

	periodicTriggerInterval = defaultNrMeasRepUePeriodicTriggerInterval

	periodicTriggerIntervalEnv = strings.TrimSpace(os.Getenv("NR_MEAS_REP_UE_PERIODIC_TRIGGER_INTERVAL"))

	if periodicTriggerIntervalEnv != "" {

		periodicTriggerIntervalVal, err := time.ParseDuration(periodicTriggerIntervalEnv)

		if err == nil {

			periodicTriggerInterval = int(periodicTriggerIntervalVal.Seconds())

		} else {

			log.Error("Cannot parse NR_MEAS_REP_UE_PERIODIC_TRIGGER_INTERVAL, using default value")

		}

	}

	log.Info("NR_MEAS_REP_UE_PERIODIC_TRIGGER_INTERVAL: ", periodicTriggerInterval)



	periodicNrTriggerTicker = time.NewTicker(time.Duration(periodicTriggerInterval) * time.Second)

	go func() {

		for range periodicNrTriggerTicker.C {

			checkNrMrPeriodicTrigger(int32(TRIGGER_NR_NR_PERIODICAL))