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

Merge pull request #240 from pastorsx/sp_dev_rnis_wais_rel_update 

Trigger in MeasRepUe forced to support periodic trigger
parents 676a54c8 51945af5

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

+24 −0
Original line number Original line Diff line number Diff line
@@ -2013,6 +2013,18 @@ func subscriptionsPost(w http.ResponseWriter, r *http.Request) { 
			}

			}

		}

		}





		//although trigger is optional, lets force it to support the only trigger that we support if it is not there already

		supportedTriggerAlreadyPresent := false

		for _, currentTrigger := range subscription.FilterCriteriaAssocTri.Trigger {

			if currentTrigger == TRIGGER_PERIODICAL_REPORT_STRONGEST_CELLS {

				//already part of the list, no update needed

				supportedTriggerAlreadyPresent = true

			}

		}

		if !supportedTriggerAlreadyPresent {

			subscription.FilterCriteriaAssocTri.Trigger = append(subscription.FilterCriteriaAssocTri.Trigger, TRIGGER_PERIODICAL_REPORT_STRONGEST_CELLS)

		}



		//registration

		//registration

		registerMr(&subscription, subsIdStr)

		registerMr(&subscription, subsIdStr)

		_ = rc.JSONSetEntry(baseKey+"subscriptions:"+subsIdStr, ".", convertMeasRepUeSubscriptionToJson(&subscription))

		_ = rc.JSONSetEntry(baseKey+"subscriptions:"+subsIdStr, ".", convertMeasRepUeSubscriptionToJson(&subscription))
@@ -2044,6 +2056,18 @@ func subscriptionsPost(w http.ResponseWriter, r *http.Request) { 
			}

			}

		}

		}





		//although trigger is optional, lets force it to support the only trigger that we support if it is not there already

		supportedTriggerAlreadyPresent := false

		for _, currentTrigger := range subscription.FilterCriteriaNrMrs.TriggerNr {

			if currentTrigger == TRIGGER_NR_NR_PERIODICAL {

				//already part of the list, no update needed

				supportedTriggerAlreadyPresent = true

			}

		}

		if !supportedTriggerAlreadyPresent {

			subscription.FilterCriteriaNrMrs.TriggerNr = append(subscription.FilterCriteriaNrMrs.TriggerNr, TRIGGER_NR_NR_PERIODICAL)

		}



		//registration

		//registration

		registerNrMr(&subscription, subsIdStr)

		registerNrMr(&subscription, subsIdStr)

		_ = rc.JSONSetEntry(baseKey+"subscriptions:"+subsIdStr, ".", convertNrMeasRepUeSubscriptionToJson(&subscription))

		_ = rc.JSONSetEntry(baseKey+"subscriptions:"+subsIdStr, ".", convertNrMeasRepUeSubscriptionToJson(&subscription))