Merge pull request #263 from pastorsx/sp_dev_mec028_periodic (f2d0572b) · Commits · MEC - Multi-access Edge Computing / ETSI MEC Sandbox

go-apps/meep-wais/server/wais.go

+263 −39

Original line number	Diff line number	Diff line
		@@ -65,8 +65,8 @@ const ASSOC_STA_NOTIFICATION = "AssocStaNotification"
		const STA_DATA_RATE_NOTIFICATION = "StaDataRateNotification"
		const TEST_NOTIFICATION = "TestNotification"

		var assocStaSubscriptionMap = map[int]*AssocStaSubscription{}
		var staDataRateSubscriptionMap = map[int]*StaDataRateSubscription{}
		var assocStaSubscriptionInfoMap = map[int]*AssocStaSubscriptionInfo{}
		var staDataRateSubscriptionInfoMap = map[int]*StaDataRateSubscriptionInfo{}

		var subscriptionExpiryMap = map[int][]int{}

		@@ -89,6 +89,24 @@ type ApInfoComplete struct {
		StaMacIds []string
		}

		type ApInfoCompleteResp struct {
		ApInfoCompleteList []ApInfoComplete
		}

		type StaDataRateSubscriptionInfo struct {
		NextTts int32 //next time to send, derived from notificationPeriod
		NotificationCheckReady bool
		Subscription *StaDataRateSubscription
		Triggered bool
		}

		type AssocStaSubscriptionInfo struct {
		NextTts int32 //next time to send, derived from notificationPeriod
		NotificationCheckReady bool
		Subscription *AssocStaSubscription
		Triggered bool
		}

		type StaData struct {
		StaInfo *StaInfo `json:"staInfo"`
		}
		@@ -151,6 +169,8 @@ func Init() (err error) {
		go func() {
		for range expiryTicker.C {
		checkForExpiredSubscriptions()
		checkAssocStaPeriodTrigger()
		checkStaDataRatePeriodTrigger()
		}
		}()

		@@ -247,7 +267,7 @@ func updateStaInfo(name string, ownMacId string, apMacId string, rssi *int32, su
		_ = rc.JSONSetEntry(baseKey+"UE:"+name, ".", convertStaDataToJson(staData))
		}

		checkStaDataRateNotificationRegisteredSubscriptions(staData.StaInfo.StaId, dataRate.StaLastDataDownlinkRate, dataRate.StaLastDataUplinkRate, false)
		checkStaDataRateNotificationRegisteredSubscriptions(staData.StaInfo.StaId, dataRate.StaLastDataDownlinkRate, dataRate.StaLastDataUplinkRate, false, true)

		}

		@@ -357,7 +377,90 @@ func updateApInfo(name string, apMacId string, longitude float32, latitude flo
		apId.Bssid = apMacId
		apInfoComplete.ApId = apId
		_ = rc.JSONSetEntry(baseKey+"AP:"+name, ".", convertApInfoCompleteToJson(&apInfoComplete))
		checkAssocStaNotificationRegisteredSubscriptions(staMacIds, apMacId, false)
		checkAssocStaNotificationRegisteredSubscriptions(staMacIds, apMacId, false, true)
		}
		}

		func checkAssocStaPeriodTrigger() {

		//loop through every subscriptions, lower period by one and invoke the notification if a check is warranted
		mutex.Lock()
		defer mutex.Unlock()

		if len(assocStaSubscriptionInfoMap) < 1 {
		return
		}

		//decrease all subscriptions
		//check all that applies
		for _, subInfo := range assocStaSubscriptionInfoMap {
		if subInfo != nil {
		subInfo.NextTts--
		//if no periodic check is needed, value is negative
		if subInfo.NextTts != 0 {
		subInfo.NotificationCheckReady = false
		continue
		} else { //restart the nextTts and continue processing to send notification or not
		subInfo.NextTts = subInfo.Subscription.NotificationPeriod
		subInfo.NotificationCheckReady = true
		}
		}
		}
		//find every AP info and reuse a function to store them all
		var apInfoCompleteResp ApInfoCompleteResp
		apInfoCompleteResp.ApInfoCompleteList = make([]ApInfoComplete, 0)
		keyName := baseKey + "AP:*"
		err := rc.ForEachJSONEntry(keyName, populateApInfoCompleteList, &apInfoCompleteResp)
		if err != nil {
		log.Error(err.Error())
		return
		}

		//loop through the response for each AP and check subscription with no need for mutex (already used)
		for _, apInfoComplete := range apInfoCompleteResp.ApInfoCompleteList {
		checkAssocStaNotificationRegisteredSubscriptions(apInfoComplete.StaMacIds, apInfoComplete.ApId.Bssid, true, false)
		}
		}

		func checkStaDataRatePeriodTrigger() {

		//loop through every subscriptions, lower period by one and invoke the notification if a check is warranted
		mutex.Lock()
		defer mutex.Unlock()

		if len(staDataRateSubscriptionInfoMap) < 1 {
		return
		}

		//decrease all subscriptions
		//check all that applies
		for _, subInfo := range staDataRateSubscriptionInfoMap {
		if subInfo != nil {
		subInfo.NextTts--
		//if no periodic check is needed, value is negative
		if subInfo.NextTts != 0 {
		subInfo.NotificationCheckReady = false
		continue
		} else { //restart the nextTts and continue processing to send notification or not
		subInfo.NextTts = subInfo.Subscription.NotificationPeriod
		subInfo.NotificationCheckReady = true
		}
		}
		}
		//find every AP info and reuse a function to store them all
		var staInfoResp StaInfoResp
		staInfoResp.StaInfoList = make([]StaInfo, 0)
		keyName := baseKey + "UE:*"
		err := rc.ForEachJSONEntry(keyName, populateStaData, &staInfoResp)
		if err != nil {
		log.Error(err.Error())
		return
		}

		//loop through the response for each AP and check subscription with no need for mutex (already used)
		for _, staInfo := range staInfoResp.StaInfoList {
		dataRate := staInfo.StaDataRate
		checkStaDataRateNotificationRegisteredSubscriptions(dataRate.StaId, dataRate.StaLastDataDownlinkRate, dataRate.StaLastDataDownlinkRate, true, false)
		}
		}

		@@ -370,7 +473,7 @@ func checkForExpiredSubscriptions() {
		if expiryTime <= nowTime {
		subscriptionExpiryMap[expiryTime] = nil
		for _, subsId := range subsIndexList {
		if assocStaSubscriptionMap[subsId] != nil {
		if assocStaSubscriptionInfoMap[subsId] != nil {

		subsIdStr := strconv.Itoa(subsId)

		@@ -381,7 +484,7 @@ func checkForExpiredSubscriptions() {

		link := new(ExpiryNotificationLinks)
		linkType := new(LinkType)
		linkType.Href = assocStaSubscriptionMap[subsId].CallbackReference
		linkType.Href = assocStaSubscriptionInfoMap[subsId].Subscription.CallbackReference
		link.Subscription = linkType
		notif.Links = link

		@@ -390,7 +493,7 @@ func checkForExpiredSubscriptions() {
		sendExpiryNotification(link.Subscription.Href, notif)
		_ = delSubscription(baseKey+"subscriptions", subsIdStr, true)
		}
		if staDataRateSubscriptionMap[subsId] != nil {
		if staDataRateSubscriptionInfoMap[subsId] != nil {

		subsIdStr := strconv.Itoa(subsId)

		@@ -401,7 +504,7 @@ func checkForExpiredSubscriptions() {

		link := new(ExpiryNotificationLinks)
		linkType := new(LinkType)
		linkType.Href = staDataRateSubscriptionMap[subsId].CallbackReference
		linkType.Href = staDataRateSubscriptionInfoMap[subsId].Subscription.CallbackReference
		link.Subscription = linkType
		notif.Links = link

		@@ -434,7 +537,9 @@ func repopulateAssocStaSubscriptionMap(key string, jsonInfo string, userData int
		mutex.Lock()
		defer mutex.Unlock()

		assocStaSubscriptionMap[subsId] = &subscription
		assocStaSubscriptionInfoMap[subsId].Subscription = &subscription
		assocStaSubscriptionInfoMap[subsId].NextTts = subscription.NotificationPeriod
		assocStaSubscriptionInfoMap[subsId].NotificationCheckReady = false //do not send right away, immediateCheck flag for that
		if subscription.ExpiryDeadline != nil {
		intList := subscriptionExpiryMap[int(subscription.ExpiryDeadline.Seconds)]
		intList = append(intList, subsId)
		@@ -466,7 +571,9 @@ func repopulateStaDataRateSubscriptionMap(key string, jsonInfo string, userData
		mutex.Lock()
		defer mutex.Unlock()

		staDataRateSubscriptionMap[subsId] = &subscription
		staDataRateSubscriptionInfoMap[subsId].Subscription = &subscription
		staDataRateSubscriptionInfoMap[subsId].NextTts = subscription.NotificationPeriod
		staDataRateSubscriptionInfoMap[subsId].NotificationCheckReady = false //do not send right away, immediateCheck flag for that
		if subscription.ExpiryDeadline != nil {
		intList := subscriptionExpiryMap[int(subscription.ExpiryDeadline.Seconds)]
		intList = append(intList, subsId)
		@@ -481,19 +588,30 @@ func repopulateStaDataRateSubscriptionMap(key string, jsonInfo string, userData
		return nil
		}

		func checkAssocStaNotificationRegisteredSubscriptions(staMacIds []string, apMacId string, isPeriodicInvoked bool) {
		func checkAssocStaNotificationRegisteredSubscriptions(staMacIds []string, apMacId string, isPeriodicInvoked bool, needMutex bool) {

		if needMutex {
		mutex.Lock()
		defer mutex.Unlock()
		}
		//check all that applies
		for subsId, sub := range assocStaSubscriptionMap {
		for subsId, subInfo := range assocStaSubscriptionInfoMap {
		if subInfo == nil {
		break
		}
		sub := subInfo.Subscription
		match := false
		sendingNotificationAllowed := true

		if sub != nil {
		//if notification is periodic, only trigger on period expiry
		//if notification is triggered by events but that periodic notification is registered, skip
		if sub.NotificationPeriod != 0 && !isPeriodicInvoked {
		continue
		}
		//if notification is periodic, only trigger on NotificationCheckReady flag false (period not expired)
		if !subInfo.NotificationCheckReady && isPeriodicInvoked {
		continue
		}

		if sub.ApId.Bssid == apMacId {
		match = true
		@@ -513,10 +631,23 @@ func checkAssocStaNotificationRegisteredSubscriptions(staMacIds []string, apMacI
		}
		default:
		}

		//if the notification already triggered, do not send it again unless its a periodic event
		if match {
		if !isPeriodicInvoked {
		if !subInfo.Triggered {
		assocStaSubscriptionInfoMap[subsId].Triggered = true
		} else {
		sendingNotificationAllowed = false
		}
		}
		} else {
		assocStaSubscriptionInfoMap[subsId].Triggered = false
		}
		}
		}

		if match {
		if match && sendingNotificationAllowed {
		subsIdStr := strconv.Itoa(subsId)
		log.Info("Sending WAIS notification ", sub.CallbackReference)

		@@ -546,18 +677,29 @@ func checkAssocStaNotificationRegisteredSubscriptions(staMacIds []string, apMacI
		}
		}

		func checkStaDataRateNotificationRegisteredSubscriptions(staId *StaIdentity, dataRateDl int32, dataRateUl int32, isPeriodicInvoked bool) {
		func checkStaDataRateNotificationRegisteredSubscriptions(staId *StaIdentity, dataRateDl int32, dataRateUl int32, isPeriodicInvoked bool, needMutex bool) {

		if needMutex {
		mutex.Lock()
		defer mutex.Unlock()
		}
		//check all that applies
		for subsId, sub := range staDataRateSubscriptionMap {
		for subsId, subInfo := range staDataRateSubscriptionInfoMap {
		if subInfo == nil {
		break
		}
		sub := subInfo.Subscription
		match := false
		if sub != nil {
		//if notification is periodic, only trigger on period expiry
		//if notification is triggered by events but that periodic notification is registered, skip
		if sub.NotificationPeriod != 0 && !isPeriodicInvoked {
		continue
		}
		//if notification is periodic, only trigger on NotificationCheckReady flag false (period not expired)
		if !subInfo.NotificationCheckReady && isPeriodicInvoked {
		continue
		}

		notifToSend := false
		var staDataRateList []StaDataRate
		for _, subStaId := range sub.StaId {
		@@ -569,6 +711,7 @@ func checkStaDataRateNotificationRegisteredSubscriptions(staId *StaIdentity, dat
		continue
		}
		match = true
		sendingNotificationAllowed := true
		for _, ssid := range subStaId.Ssid {
		match = false
		//can only have one ssid at a time
		@@ -605,7 +748,7 @@ func checkStaDataRateNotificationRegisteredSubscriptions(staId *StaIdentity, dat
		match = true
		}
		case "4":
		if dataRateUl >= sub.NotificationEvent.UplinkRateThreshold {
		if dataRateUl <= sub.NotificationEvent.UplinkRateThreshold {
		match = true
		}
		case "5":
		@@ -626,10 +769,23 @@ func checkStaDataRateNotificationRegisteredSubscriptions(staId *StaIdentity, dat
		}
		default:
		}
		//if the notification already triggered, do not send it again unless its a periodic event
		if match {
		if !isPeriodicInvoked {
		if !subInfo.Triggered {
		staDataRateSubscriptionInfoMap[subsId].Triggered = true
		} else {
		sendingNotificationAllowed = false
		}
		}
		} else {
		staDataRateSubscriptionInfoMap[subsId].Triggered = false
		}

		if match {
		}
		}

		if match && sendingNotificationAllowed {
		var staDataRate StaDataRate
		staDataRate.StaId = staId
		staDataRate.StaLastDataDownlinkRate = dataRateDl
		@@ -805,7 +961,7 @@ func isSubscriptionIdRegisteredAssocSta(subsIdStr string) bool {
		subsId, _ := strconv.Atoi(subsIdStr)
		mutex.Lock()
		defer mutex.Unlock()
		if assocStaSubscriptionMap[subsId] != nil {
		if assocStaSubscriptionInfoMap[subsId] != nil {
		return true
		} else {
		return false
		@@ -816,7 +972,7 @@ func isSubscriptionIdRegisteredStaDataRate(subsIdStr string) bool {
		subsId, _ := strconv.Atoi(subsIdStr)
		mutex.Lock()
		defer mutex.Unlock()
		if staDataRateSubscriptionMap[subsId] != nil {
		if staDataRateSubscriptionInfoMap[subsId] != nil {
		return true
		} else {
		return false
		@@ -828,7 +984,8 @@ func registerAssocSta(subscription *AssocStaSubscription, subsIdStr string) {
		mutex.Lock()
		defer mutex.Unlock()

		assocStaSubscriptionMap[subsId] = subscription
		assocStaSubscriptionInfo := AssocStaSubscriptionInfo{subscription.NotificationPeriod, false, subscription, false}
		assocStaSubscriptionInfoMap[subsId] = &assocStaSubscriptionInfo
		if subscription.ExpiryDeadline != nil {
		//get current list of subscription meant to expire at this time
		intList := subscriptionExpiryMap[int(subscription.ExpiryDeadline.Seconds)]
		@@ -840,7 +997,6 @@ func registerAssocSta(subscription *AssocStaSubscription, subsIdStr string) {
		if subscription.RequestTestNotification {
		sendTestNotification(subscription.CallbackReference, subscription.Links.Self)
		}

		}

		func registerStaDataRate(subscription *StaDataRateSubscription, subsIdStr string) {
		@@ -848,7 +1004,8 @@ func registerStaDataRate(subscription *StaDataRateSubscription, subsIdStr string
		mutex.Lock()
		defer mutex.Unlock()

		staDataRateSubscriptionMap[subsId] = subscription
		staDataRateSubscriptionInfo := StaDataRateSubscriptionInfo{subscription.NotificationPeriod, false, subscription, false}
		staDataRateSubscriptionInfoMap[subsId] = &staDataRateSubscriptionInfo
		if subscription.ExpiryDeadline != nil {
		//get current list of subscription meant to expire at this time
		intList := subscriptionExpiryMap[int(subscription.ExpiryDeadline.Seconds)]
		@@ -860,7 +1017,6 @@ func registerStaDataRate(subscription *StaDataRateSubscription, subsIdStr string
		if subscription.RequestTestNotification {
		sendTestNotification(subscription.CallbackReference, subscription.Links.Self)
		}

		}

		func deregisterAssocSta(subsIdStr string, mutexTaken bool) {
		@@ -869,7 +1025,7 @@ func deregisterAssocSta(subsIdStr string, mutexTaken bool) {
		mutex.Lock()
		defer mutex.Unlock()
		}
		assocStaSubscriptionMap[subsId] = nil
		assocStaSubscriptionInfoMap[subsId] = nil
		log.Info("Deregistration: ", subsId, " type: ", assocStaSubscriptionType)
		}

		@@ -879,7 +1035,7 @@ func deregisterStaDataRate(subsIdStr string, mutexTaken bool) {
		mutex.Lock()
		defer mutex.Unlock()
		}
		staDataRateSubscriptionMap[subsId] = nil
		staDataRateSubscriptionInfoMap[subsId] = nil
		log.Info("Deregistration: ", subsId, " type: ", staDataRateSubscriptionType)
		}

		@@ -928,6 +1084,27 @@ func subscriptionsPOST(w http.ResponseWriter, r *http.Request) {

		subscription.Links = link

		//make sure subscription is valid for mandatory parameters
		//make sure subscription is valid for mandatory parameters
		if subscription.NotificationPeriod == 0 && subscription.NotificationEvent == nil {
		log.Error("Either or Both NotificationPeriod or NotificationEvent shall be present")
		http.Error(w, "Either or Both NotificationPeriod or NotificationEvent shall be present", http.StatusBadRequest)
		return
		}

		if subscription.NotificationEvent != nil {
		integerVal, err := strconv.Atoi(subscription.NotificationEvent.Trigger)
		if err != nil \|\| (integerVal <= 0 && integerVal > 2) {
		log.Error("Mandatory Notification Event Trigger not valid")
		http.Error(w, "Mandatory Notification Event Trigger not valid", http.StatusBadRequest)
		return
		}
		}
		if subscription.ApId == nil {
		log.Error("Mandatory ApId missing")
		http.Error(w, "Mandatory ApId missing", http.StatusBadRequest)
		return
		}
		//registration
		_ = rc.JSONSetEntry(baseKey+"subscriptions:"+subsIdStr, ".", convertAssocStaSubscriptionToJson(&subscription))
		registerAssocSta(&subscription, subsIdStr)
		@@ -944,6 +1121,27 @@ func subscriptionsPOST(w http.ResponseWriter, r *http.Request) {

		subscription.Links = link

		//make sure subscription is valid for mandatory parameters
		//make sure subscription is valid for mandatory parameters
		if subscription.NotificationPeriod == 0 && subscription.NotificationEvent == nil {
		log.Error("Either or Both NotificationPeriod or NotificationEvent shall be present")
		http.Error(w, "Either or Both NotificationPeriod or NotificationEvent shall be present", http.StatusBadRequest)
		return
		}

		if subscription.NotificationEvent != nil {
		integerVal, err := strconv.Atoi(subscription.NotificationEvent.Trigger)
		if err != nil \|\| (integerVal <= 0 && integerVal > 8) {
		log.Error("Mandatory Notification Event Trigger not valid")
		http.Error(w, "Mandatory Notification Event Trigger not valid", http.StatusBadRequest)
		return
		}
		}
		if subscription.StaId == nil {
		log.Error("Mandatory StaId missing")
		http.Error(w, "Mandatory StaId missing", http.StatusBadRequest)
		return
		}
		//registration
		_ = rc.JSONSetEntry(baseKey+"subscriptions:"+subsIdStr, ".", convertStaDataRateSubscriptionToJson(&subscription))
		registerStaDataRate(&subscription, subsIdStr)
		@@ -1133,6 +1331,19 @@ func populateApInfo(key string, jsonInfo string, response interface{}) error {
		return nil
		}

		func populateApInfoCompleteList(key string, jsonInfo string, response interface{}) error {
		resp := response.(*ApInfoCompleteResp)
		// Retrieve ap info from DB
		var apInfoComplete ApInfoComplete
		err := json.Unmarshal([]byte(jsonInfo), &apInfoComplete)
		if err != nil {
		return err
		}

		resp.ApInfoCompleteList = append(resp.ApInfoCompleteList, apInfoComplete)
		return nil
		}

		func apInfoGET(w http.ResponseWriter, r *http.Request) {

		w.Header().Set("Content-Type", "application/json; charset=UTF-8")
		@@ -1182,6 +1393,19 @@ func populateStaData(key string, jsonInfo string, response interface{}) error {

		}

		/*
		func populateStaDataList(key string, jsonInfo string, response interface{}) error {
		resp := response.(*StaDataList)
		var staData StaData
		err := json.Unmarshal([]byte(jsonInfo), &staData)
		if err != nil {
		return err
		}

		resp.StaDataList = append(resp.StaDataList, staData)
		return nil
		}
		*/
		func staInfoGET(w http.ResponseWriter, r *http.Request) {
		w.Header().Set("Content-Type", "application/json; charset=UTF-8")
		var response StaInfoResp
		@@ -1225,10 +1449,10 @@ func createSubscriptionLinkList(subType string) *SubscriptionLinkList {

		if subType == "" \|\| subType == assocStaSubscriptionType {
		//loop through assocSta map
		for _, assocStaSubscription := range assocStaSubscriptionMap {
		if assocStaSubscription != nil {
		for _, assocStaSubscriptionInfo := range assocStaSubscriptionInfoMap {
		if assocStaSubscriptionInfo != nil {
		var subscription SubscriptionLinkListSubscription
		subscription.Href = assocStaSubscription.Links.Self.Href
		subscription.Href = assocStaSubscriptionInfo.Subscription.Links.Self.Href
		subscription.SubscriptionType = ASSOC_STA_SUBSCRIPTION
		subscriptionLinkList.Subscription = append(subscriptionLinkList.Subscription, subscription)
		}
		@@ -1236,10 +1460,10 @@ func createSubscriptionLinkList(subType string) *SubscriptionLinkList {
		}
		if subType == "" \|\| subType == staDataRateSubscriptionType {
		//loop through assocSta map
		for _, staDataRateSubscription := range staDataRateSubscriptionMap {
		if staDataRateSubscription != nil {
		for _, staDataRateSubscriptionInfo := range staDataRateSubscriptionInfoMap {
		if staDataRateSubscriptionInfo != nil {
		var subscription SubscriptionLinkListSubscription
		subscription.Href = staDataRateSubscription.Links.Self.Href
		subscription.Href = staDataRateSubscriptionInfo.Subscription.Links.Self.Href
		subscription.SubscriptionType = STA_DATA_RATE_SUBSCRIPTION
		subscriptionLinkList.Subscription = append(subscriptionLinkList.Subscription, subscription)
		}
		@@ -1275,8 +1499,8 @@ func cleanUp() {
		mutex.Lock()
		defer mutex.Unlock()

		assocStaSubscriptionMap = map[int]*AssocStaSubscription{}
		staDataRateSubscriptionMap = map[int]*StaDataRateSubscription{}
		assocStaSubscriptionInfoMap = map[int]*AssocStaSubscriptionInfo{}
		staDataRateSubscriptionInfoMap = map[int]*StaDataRateSubscriptionInfo{}

		subscriptionExpiryMap = map[int][]int{}
		updateStoreName("")

go-apps/meep-wais/server/wais_test.go

+10 −6

Original line number	Diff line number	Diff line
		@@ -6035,7 +6035,8 @@ func testSubscriptionAssocStaPost(t *testing.T) string {
		expectedCallBackRef := "myCallbakRef"
		expectedLinkType := LinkType{"/" + testSandboxName + "/wai/v2/subscriptions/" + strconv.Itoa(nextSubscriptionIdAvailable)}
		//expectedExpiry := TimeStamp{0, 1988599770}
		expectedResponse := AssocStaSubscription{&AssocStaSubscriptionLinks{&expectedLinkType}, &expectedApId, expectedCallBackRef, nil /&expectedExpiry/, nil, 0, false, ASSOC_STA_SUBSCRIPTION, nil}
		expectedTrigger := AssocStaSubscriptionNotificationEvent{1, "1"}
		expectedResponse := AssocStaSubscription{&AssocStaSubscriptionLinks{&expectedLinkType}, &expectedApId, expectedCallBackRef, nil /&expectedExpiry/, &expectedTrigger, 0, false, ASSOC_STA_SUBSCRIPTION, nil}

		expectedResponseStr, err := json.Marshal(expectedResponse)
		if err != nil {
		@@ -6050,7 +6051,7 @@ func testSubscriptionAssocStaPost(t *testing.T) string {
		* request body section
		******************************/

		subscriptionPost1 := AssocStaSubscription{nil, &expectedApId, expectedCallBackRef, nil /&expectedExpiry/, nil, 0, false, ASSOC_STA_SUBSCRIPTION, nil}
		subscriptionPost1 := AssocStaSubscription{nil, &expectedApId, expectedCallBackRef, nil /&expectedExpiry/, &expectedTrigger, 0, false, ASSOC_STA_SUBSCRIPTION, nil}

		body, err := json.Marshal(subscriptionPost1)
		if err != nil {
		@@ -6090,7 +6091,8 @@ func testSubscriptionAssocStaPut(t *testing.T, subscriptionId string, expectSucc
		expectedCallBackRef := "myCallbakRef"
		expectedLinkType := LinkType{"/" + testSandboxName + "/wai/v2/subscriptions/" + subscriptionId}
		expectedExpiry := TimeStamp{0, 1988599770}
		expectedResponse := AssocStaSubscription{&AssocStaSubscriptionLinks{&expectedLinkType}, &expectedApId, expectedCallBackRef, &expectedExpiry, nil, 0, false, ASSOC_STA_SUBSCRIPTION, nil}
		expectedTrigger := AssocStaSubscriptionNotificationEvent{1, "1"}
		expectedResponse := AssocStaSubscription{&AssocStaSubscriptionLinks{&expectedLinkType}, &expectedApId, expectedCallBackRef, &expectedExpiry, &expectedTrigger, 0, false, ASSOC_STA_SUBSCRIPTION, nil}

		expectedResponseStr, err := json.Marshal(expectedResponse)
		if err != nil {
		@@ -6106,7 +6108,7 @@ func testSubscriptionAssocStaPut(t *testing.T, subscriptionId string, expectSucc
		/******************************
		* request body section
		******************************/
		subscription1 := AssocStaSubscription{&AssocStaSubscriptionLinks{&expectedLinkType}, &expectedApId, expectedCallBackRef, &expectedExpiry, nil, 0, false, ASSOC_STA_SUBSCRIPTION, nil}
		subscription1 := AssocStaSubscription{&AssocStaSubscriptionLinks{&expectedLinkType}, &expectedApId, expectedCallBackRef, &expectedExpiry, &expectedTrigger, 0, false, ASSOC_STA_SUBSCRIPTION, nil}

		body, err := json.Marshal(subscription1)
		if err != nil {
		@@ -6249,6 +6251,7 @@ func TestExpiryNotification(t *testing.T) {
		expectedApId := ApIdentity{"myMacId", []string{"myIp"}, []string{"mySSid"}}
		expectedCallBackRef := "myCallbakRef"
		expectedExpiry := TimeStamp{0, 12321}
		expectedTrigger := AssocStaSubscriptionNotificationEvent{1, "1"}

		/******************************
		* request vars section
		@@ -6258,7 +6261,7 @@ func TestExpiryNotification(t *testing.T) {
		* request body section
		******************************/

		subscriptionPost1 := AssocStaSubscription{nil, &expectedApId, expectedCallBackRef, &expectedExpiry, nil, 0, false, ASSOC_STA_SUBSCRIPTION, nil}
		subscriptionPost1 := AssocStaSubscription{nil, &expectedApId, expectedCallBackRef, &expectedExpiry, &expectedTrigger, 0, false, ASSOC_STA_SUBSCRIPTION, nil}

		body, err := json.Marshal(subscriptionPost1)
		if err != nil {
		@@ -6337,6 +6340,7 @@ func TestSubscriptionAssocStaNotification(t *testing.T) {
		expectedApId := ApIdentity{"0050C272800A", nil, nil}
		expectedApIdMacIdStr := "{\"bssid\":\"0050C272800A\"}"
		expectedStaIdMacIdStr := "[{\"macId\":\"101002000000\"}]"
		expectedTrigger := AssocStaSubscriptionNotificationEvent{1, "1"}

		/******************************
		* request vars section
		@@ -6346,7 +6350,7 @@ func TestSubscriptionAssocStaNotification(t *testing.T) {
		* request body section
		******************************/

		subscriptionPost1 := AssocStaSubscription{nil, &expectedApId, expectedCallBackRef, &expectedExpiry, nil, 0, false, ASSOC_STA_SUBSCRIPTION, nil}
		subscriptionPost1 := AssocStaSubscription{nil, &expectedApId, expectedCallBackRef, &expectedExpiry, &expectedTrigger, 0, false, ASSOC_STA_SUBSCRIPTION, nil}

		body, err := json.Marshal(subscriptionPost1)
		if err != nil {

go-packages/meep-wais-client/model_all_of_notification_event.go

0 → 100644

+37 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2020 InterDigital Communications, Inc
		*
		* Licensed under the Apache License, Version 2.0 (the \"License\");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an \"AS IS\" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*
		* AdvantEDGE WLAN Access Information API
		*
		* WLAN Access Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC028 WAI API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/028/02.02.01_60/gs_MEC028v020201p.pdf) <p>[Copyright (c) ETSI 2020](https://forge.etsi.org/etsi-forge-copyright-notice.txt) <p>Micro-service<br>[meep-wais](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-wais) <p>Type & Usage<br>Edge Service used by edge applications that want to get information about WLAN access information in the network <p>Details<br>API details available at _your-AdvantEDGE-ip-address/api_ <p>AdvantEDGE supports a selected subset of WAI API subscription types. <p>Supported subscriptions: <p> - AssocStaSubscription <p> - StaDataRateSubscription
		*
		* API version: 2.2.1
		* Contact: AdvantEDGE@InterDigital.com
		* Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
		*/

		package client

		// Set for trigger-based event notification reporting.
		type AllOfNotificationEvent struct {
		// Downlink data rate threshold for StaDataRate reporting.
		DownlinkRateThreshold int32 `json:"downlinkRateThreshold,omitempty"`
		// Number of connected stations threshold for trigger-based event reporting.
		Threshold int32 `json:"threshold,omitempty"`
		// Trigger event for the notification: 1 = Notification issued when the STA’s downlink data rate is greater than or equal to the downlink threshold 2 = Notification issued when the STA’s downlink data rate is less than or equal to the downlink threshold 3 = Notification issued when the STA’s uplink data rate is greater than or equal to the uplink threshold 4 = Notification issued when the STA’s uplink data rate is less than or equal to the uplink threshold 5 = Notification issued when the STA’s downlink and uplink data rate is greater than or equal to their thresholds 6 = Notification issued when the STA’s downlink and uplink data rate is less than or equal to their thresholds 7 = Notification issued when the STA’s downlink or uplink data rate is greater than or equal to their thresholds 8 = Notification issued when the STA’s downlink or uplink data rate is less than or equal to their thresholds
		Trigger string `json:"trigger"`
		// Uplink data rate threshold for StaDataRate reporting.
		UplinkRateThreshold int32 `json:"uplinkRateThreshold,omitempty"`
		}

go-packages/meep-wais-client/model_inline_subscription.go

+12 −10

File changed.

Preview size limit exceeded, changes collapsed.

test/system/rnis_test.go

+21 −21

File changed.

Preview size limit exceeded, changes collapsed.