Commit 247bbf6d authored by M. Hamza's avatar M. Hamza
Browse files

fix minor issues in MEC015 APIs

parent 9e9cb479

go-apps/meep-tm/server/bwm/bwm.go

+14 −13
Original line number Diff line number Diff line
@@ -492,7 +492,7 @@ func bandwidthAllocationDelete(w http.ResponseWriter, r *http.Request) { 
	jsonBwInfo, err := rc.JSONGetEntry(keyName, ".")



	if err != nil {

		err = errors.New("bwInfo not found against the provided the allocationId")

		err = errors.New("bwInfo not found against the provided allocationId")

		log.Error(err.Error())

		errHandlerProblemDetails(w, err.Error(), http.StatusNotFound)

		return
@@ -642,17 +642,18 @@ func bandwidthAllocationListGet(w http.ResponseWriter, r *http.Request) { 


	u, _ := url.Parse(r.URL.String())

	q := u.Query()

	validParams := []string{"app_instance_id", "app_name", "session_id"}

	err := validateQueryParams(q, validParams)

	if err != nil {

		errHandlerProblemDetails(w, err.Error(), http.StatusBadRequest)

		return

	}



	appInstanceId := q["app_instance_id"]

	appName := q["app_name"]

	sessionId := q["session_id"]



	validQueryParams := []string{"app_instance_id", "app_name", "session_id"}

	err := validateQueryParams(q, validQueryParams)

	if err != nil {

		errHandlerProblemDetails(w, err.Error(), http.StatusBadRequest)

		return

	}



	bwInfoList := &BwAllocInfoResp{

		AppInstanceId: appInstanceId,

		AppName:       appName,
@@ -661,7 +662,7 @@ func bandwidthAllocationListGet(w http.ResponseWriter, r *http.Request) { 
	}



	// Make sure only 1 or none of the following are present: appInstanceId, appName, allocationId

	err = validateMtsSesInfoQueryParams(appInstanceId, appName, sessionId)

	err = validateBwInfoQueryParams(appInstanceId, appName, sessionId)

	if err != nil {

		errHandlerProblemDetails(w, err.Error(), http.StatusBadRequest)

		return
@@ -2047,11 +2048,11 @@ func validateQueryParams(params url.Values, validParams []string) error { 
}



/*

	* validateMtsSesInfoQueryParams check that either app_instance_id or app_name or allocation_id or

	* validateBwInfoQueryParams check that either app_instance_id or app_name or allocation_id or

		none should be provided in the request

	* @return {error} error An error will be return if occurs

*/

func validateMtsSesInfoQueryParams(appInstanceId []string, appName []string, sessionId []string) error {

func validateBwInfoQueryParams(appInstanceId []string, appName []string, sessionId []string) error {

	count := 0

	if len(appInstanceId) != 0 {

		count++
@@ -2072,13 +2073,13 @@ func validateMtsSesInfoQueryParams(appInstanceId []string, appName []string, ses 


func compareSessionFilters(key string, jsonInfo string, sessionFilterList interface{}) error {



	// Get query params & mtsSessionInfo

	// Get query params & bwInfo

	data := sessionFilterList.(*sessionFilterListCheck)

	if data == nil {

		return errors.New("mtsSessionInfo list not found")

		return errors.New("bwInfo list not found")

	}



	// Retrieve mtsSessionInfo from DB

	// Retrieve bwInfo from DB

	var sessionFilterInfo BwInfo

	err := json.Unmarshal([]byte(jsonInfo), &sessionFilterInfo)

	if err != nil {

go-apps/meep-tm/server/mts/mts.go

+7 −6
Original line number Diff line number Diff line
@@ -1210,17 +1210,18 @@ func mtsSessionsListGet(w http.ResponseWriter, r *http.Request) { 
	// Validate query parameters

	u, _ := url.Parse(r.URL.String())

	q := u.Query()

	validParams := []string{"app_instance_id", "app_name", "session_id"}

	err := validateQueryParams(q, validParams)

	if err != nil {

		errHandlerProblemDetails(w, err.Error(), http.StatusBadRequest)

		return

	}



	appInstanceId := q["app_instance_id"]

	appName := q["app_name"]

	sessionId := q["session_id"]



	validQueryParams := []string{"app_instance_id", "app_name", "session_id"}

	err := validateQueryParams(q, validQueryParams)

	if err != nil {

		errHandlerProblemDetails(w, err.Error(), http.StatusBadRequest)

		return

	}



	// MtsSessInfoList struct is passed to mtsSessionInfoList as a pointer

	// MtsSessInfoList is a struct which has four fields

	// SessionList here is the array of the MtsSessionInfo struct.