Commit 672b28de authored by muhammadh's avatar muhammadh
Browse files

Merge branch 'STF625_MEC012_2.2.1' of... 

Merge branch 'STF625_MEC012_2.2.1' of https://forge.etsi.org/rep/mec/AdvantEDGE into STF625_MEC012_2.2.1
parents aa004d6f f57bac85

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

+12 −12
Original line number Diff line number Diff line
@@ -1618,7 +1618,7 @@ func checkCcNotificationRegisteredSubscriptions(appId string, assocId *Associate 
				if subscription.CallbackReference != "" {

					sendCcNotification(subscription.CallbackReference, notif)

					log.Info("Cell_change Notification" + "(" + subsIdStr + ")")

				} else if subscription.WebsockNotifConfig.RequestWebsocketUri != false {

				} else if subscription.WebsockNotifConfig.RequestWebsocketUri {

					log.Error("WebSocket functionality is not implemented currently")

					return

				}
@@ -1701,7 +1701,7 @@ func checkReNotificationRegisteredSubscriptions(appId string, assocId *Associate 
				if subscription.CallbackReference != "" {

					sendReNotification(subscription.CallbackReference, notif)

					log.Info("Rab_establishment Notification" + "(" + subsIdStr + ")")

				} else if subscription.WebsockNotifConfig.RequestWebsocketUri != false {

				} else if subscription.WebsockNotifConfig.RequestWebsocketUri {

					log.Error("WebSocket functionality is not implemented currently")

					return

				}
@@ -1785,7 +1785,7 @@ func checkRrNotificationRegisteredSubscriptions(appId string, assocId *Associate 
				if subscription.CallbackReference != "" {

					sendRrNotification(subscription.CallbackReference, notif)

					log.Info("Rab_release Notification" + "(" + subsIdStr + ")")

				} else if subscription.WebsockNotifConfig.RequestWebsocketUri != false {

				} else if subscription.WebsockNotifConfig.RequestWebsocketUri {

					log.Error("WebSocket functionality is not implemented currently")

					return

				}
@@ -1920,7 +1920,7 @@ func checkMrNotificationRegisteredSubscriptions(key string, jsonInfo string, ext 
						log.Info("Sending RNIS notification ", subscription.CallbackReference)

						go sendMrNotification(subscription.CallbackReference, notif)

						log.Info("Meas_Rep_Ue Notification" + "(" + subsIdStr + ")")

					} else if subscription.WebsockNotifConfig.RequestWebsocketUri != false {

					} else if subscription.WebsockNotifConfig.RequestWebsocketUri {

						log.Error("WebSocket functionality is not implemented currently")

						err = errors.New("WebSocket functionality is not implemented currently")

						return err
@@ -2083,7 +2083,7 @@ func checkNrMrNotificationRegisteredSubscriptions(key string, jsonInfo string, e 
						log.Info("Sending RNIS notification ", subscription.CallbackReference)

						go sendNrMrNotification(subscription.CallbackReference, notif)

						log.Info("Nr_Meas_Rep_Ue Notification" + "(" + subsIdStr + ")")

					} else if subscription.WebsockNotifConfig.RequestWebsocketUri != false {

					} else if subscription.WebsockNotifConfig.RequestWebsocketUri {

						log.Error("WebSocket functionality is not implemented currently")

						err = errors.New("WebSocket functionality is not implemented currently")

						return err
@@ -2298,7 +2298,7 @@ func subscriptionsGet(w http.ResponseWriter, r *http.Request) { 
		return

	}

	w.WriteHeader(http.StatusOK)

	fmt.Fprintf(w, string(jsonResponse))

	fmt.Fprint(w, string(jsonResponse))



}
@@ -2553,7 +2553,7 @@ func subscriptionsPost(w http.ResponseWriter, r *http.Request) { 
		return

	}

	w.WriteHeader(http.StatusCreated)

	fmt.Fprintf(w, string(jsonResponse))

	fmt.Fprint(w, string(jsonResponse))



}
@@ -2727,7 +2727,7 @@ func subscriptionsPut(w http.ResponseWriter, r *http.Request) { 
			return

		}

		w.WriteHeader(http.StatusOK)

		fmt.Fprintf(w, string(jsonResponse))

		fmt.Fprint(w, string(jsonResponse))

	} else {

		w.WriteHeader(http.StatusNotFound)

	}
@@ -3056,7 +3056,7 @@ func plmnInfoGet(w http.ResponseWriter, r *http.Request) { 
			return

		}

		w.WriteHeader(http.StatusOK)

		fmt.Fprintf(w, string(jsonResponse))

		fmt.Fprint(w, string(jsonResponse))

	} else {

		w.WriteHeader(http.StatusNotFound)

	}
@@ -3156,7 +3156,7 @@ func layer2MeasInfoGet(w http.ResponseWriter, r *http.Request) { 
		return

	}

	w.WriteHeader(http.StatusOK)

	fmt.Fprintf(w, string(jsonResponse))

	fmt.Fprint(w, string(jsonResponse))

}



func populateL2MeasPOA(key string, jsonInfo string, l2MeasData interface{}) error {
@@ -3548,7 +3548,7 @@ func rabInfoGet(w http.ResponseWriter, r *http.Request) { 
		return

	}

	w.WriteHeader(http.StatusOK)

	fmt.Fprintf(w, string(jsonResponse))

	fmt.Fprint(w, string(jsonResponse))



}
@@ -3794,7 +3794,7 @@ func subscriptionLinkListSubscriptionsGet(w http.ResponseWriter, r *http.Request 
		return

	}

	w.WriteHeader(http.StatusOK)

	fmt.Fprintf(w, string(jsonResponse))

	fmt.Fprint(w, string(jsonResponse))

}



func cleanUp() {

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

+3 −3
Original line number Diff line number Diff line
@@ -2429,10 +2429,10 @@ func TestRabInfoGet(t *testing.T) { 
	expectedCellId := "2345678"

	expectedEcgi := Ecgi{Plmn: &expectedPlmn, CellId: expectedCellId}

	expectedErabQosParameters := RabEstNotificationErabQosParameters{Qci: qci}

	expectedErabInfo := []RabInfoErabInfo{RabInfoErabInfo{ErabId: 1, ErabQosParameters: &expectedErabQosParameters}}

	expectedErabInfo := []RabInfoErabInfo{{ErabId: 1, ErabQosParameters: &expectedErabQosParameters}}

	movingUeAddr := "ue1" //based on the scenario change

	expectedAssocId := []AssociateId{AssociateId{1, movingUeAddr}}

	expectedUeInfo := []RabInfoUeInfo{RabInfoUeInfo{AssociateId: expectedAssocId, ErabInfo: expectedErabInfo}}

	expectedAssocId := []AssociateId{{1, movingUeAddr}}

	expectedUeInfo := []RabInfoUeInfo{{AssociateId: expectedAssocId, ErabInfo: expectedErabInfo}}

	expectedCellUserInfo := RabInfoCellUserInfo{Ecgi: &expectedEcgi, UeInfo: expectedUeInfo}



	j, err := json.Marshal(expectedCellUserInfo)