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

merge

parent 6c28f9da

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: 4s

    NR_MEAS_REP_UE_PERIODIC_TRIGGER_INTERVAL: 3s



service:

  name: meep-rnis

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

+6 −5
Original line number Diff line number Diff line
@@ -104,8 +104,6 @@ var expiryTicker *time.Ticker 


var periodicTriggerTicker *time.Ticker

var periodicNrTriggerTicker *time.Ticker

var periodicTriggerIntervals = 1

var periodicNrTriggerIntervals = 1



var nextSubscriptionIdAvailable int

var nextAvailableErabId int
@@ -248,9 +246,11 @@ func Init() (err error) { 
	periodicTriggerInterval := defaultMeasRepUePeriodicTriggerInterval

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

	if periodicTriggerIntervalEnv != "" {

		periodicTriggerInterval, _ = strconv.Atoi(periodicTriggerIntervalEnv)

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

		periodicTriggerIntervalVal := periodicTriggerIntervalEnv[:len(periodicTriggerIntervalEnv)-1]

		periodicTriggerInterval, _ = strconv.Atoi(periodicTriggerIntervalVal)

	}

	log.Info("MEAS_REP_UE_PERIODIC_TRIGGER_INTERVAL: ", periodicTriggerInterval, "---", periodicTriggerIntervalEnv)

	log.Info("MEAS_REP_UE_PERIODIC_TRIGGER_INTERVAL: ", periodicTriggerInterval)



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

	go func() {
@@ -263,7 +263,8 @@ func Init() (err error) { 
	periodicTriggerInterval = defaultNrMeasRepUePeriodicTriggerInterval

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

	if periodicTriggerIntervalEnv != "" {

		periodicTriggerInterval, _ = strconv.Atoi(periodicTriggerIntervalEnv)

		periodicTriggerIntervalVal := periodicTriggerIntervalEnv[:len(periodicTriggerIntervalEnv)-1]

		periodicTriggerInterval, _ = strconv.Atoi(periodicTriggerIntervalVal)

	}

	log.Info("NR_MEAS_REP_UE_PERIODIC_TRIGGER_INTERVAL: ", periodicTriggerInterval)