From 14faeca8fd2f5bf77ff14ba6301e43ca77c01abe Mon Sep 17 00:00:00 2001
From: Umair Khan <umair.anwar@xflowresearch.com>
Date: Wed, 18 Dec 2024 05:59:43 +0000
Subject: [PATCH 1/4] add query parameter filtering to MEC 021 Mobility Service
 GET request

---
 go-apps/meep-ams/server/ams.go | 328 +++++++++++++++++++++++++++++++--
 1 file changed, 313 insertions(+), 15 deletions(-)

diff --git a/go-apps/meep-ams/server/ams.go b/go-apps/meep-ams/server/ams.go
index e6e04c7dd..fd9d98c8f 100644
--- a/go-apps/meep-ams/server/ams.go
+++ b/go-apps/meep-ams/server/ams.go
@@ -148,6 +148,19 @@ func notImplemented(w http.ResponseWriter, r *http.Request) {
 	w.WriteHeader(http.StatusNotImplemented)
 }
 
+type RegisterationInfoList struct {
+	Registrations []RegistrationInfo
+	Filters       *FilterParameters
+}
+
+type FilterParameters struct {
+	filter          string
+	all_fields      string
+	fields          string
+	exclude_fields  string
+	exclude_default string
+}
+
 // Init - App Mobility Service initialization
 func Init() (err error) {
 
@@ -1205,8 +1218,10 @@ func subscriptionLinkListSubscriptionsGet(w http.ResponseWriter, r *http.Request
 	u, _ := url.Parse(r.URL.String())
 	q := u.Query()
 	validQueryParams := []string{"subscriptionType"}
-	if !validateQueryParams(q, validQueryParams) {
-		w.WriteHeader(http.StatusBadRequest)
+	err := validateQueryParams(q, validQueryParams)
+	if err != nil {
+
+		errHandlerProblemDetails(w, err.Error(), http.StatusBadRequest)
 		return
 	}
 
@@ -1475,18 +1490,46 @@ func appMobilityServiceByIdDELETE(w http.ResponseWriter, r *http.Request) {
 func appMobilityServiceGET(w http.ResponseWriter, r *http.Request) {
 	w.Header().Set("Content-Type", "application/json; charset=UTF-8")
 
+	// Validate query parameters
+	u, _ := url.Parse(r.URL.String())
+	q := u.Query()
+	validParams := []string{"filter", "All_fields", "Fields", "Exclude_fields", "Exclude_default"}
+	err := validateQueryParams(q, validParams)
+	if err != nil {
+		print("Query Parameter error")
+		errHandlerProblemDetails(w, err.Error(), http.StatusBadRequest)
+		return
+	}
+
+	// Parse query parameters
+	filters := q.Get("filter")
+	allFields := q.Get("all_fields")
+	// field := q["fields"]
+	// excludeFields := q["exclude_fields"]
+	// excludeDefault := q.Get("exclude_default")
+
+	regInfoList := &RegisterationInfoList{
+		Filters: &FilterParameters{
+			filter:     filters,
+			all_fields: allFields,
+		},
+		Registrations: make([]RegistrationInfo, 0),
+	}
+
 	// Get all AMS Registration Info
-	regInfoList := make([]RegistrationInfo, 0)
+	//regInfoList := make([]RegistrationInfo, 0)
 	key := baseKey + "svc:*:info"
-	err := rc.ForEachJSONEntry(key, populateRegInfoList, &regInfoList)
+
+	err = rc.ForEachJSONEntry(key, populateRegInfoList, regInfoList)
+
 	if err != nil {
 		log.Error(err.Error())
 		errHandlerProblemDetails(w, err.Error(), http.StatusInternalServerError)
 		return
 	}
 
-	// Send response
-	jsonResponse, err := json.Marshal(regInfoList)
+	// Prepare & send response
+	jsonResponse, err := json.Marshal(regInfoList.Registrations)
 	if err != nil {
 		log.Error(err.Error())
 		errHandlerProblemDetails(w, err.Error(), http.StatusInternalServerError)
@@ -1498,21 +1541,275 @@ func appMobilityServiceGET(w http.ResponseWriter, r *http.Request) {
 }
 
 func populateRegInfoList(key string, jsonEntry string, response interface{}) error {
-	regInfoList := response.(*[]RegistrationInfo)
-	if regInfoList == nil {
-		return errors.New("Response not defined")
+	data := response.(*RegisterationInfoList)
+	if data == nil {
+		return errors.New("response not defined")
 	}
 
 	// Retrieve registration info from DB
 	var regInfo RegistrationInfo
 	err := json.Unmarshal([]byte(jsonEntry), &regInfo)
+	println("keysss", key)
 	if err != nil {
 		return err
 	}
-	*regInfoList = append(*regInfoList, regInfo)
+
+	// Filter services
+	if data.Filters != nil {
+
+		if data.Filters.filter != "" {
+
+			filterField := data.Filters.filter
+			// Split filterField into operator, attribute, and value
+			filterField = strings.Trim(filterField, "()")
+			filterParts := strings.SplitN(filterField, ",", 3)
+			if len(filterParts) != 3 {
+				return nil
+			}
+			operator := filterParts[0]
+			attribute := filterParts[1]
+			value := filterParts[2]
+
+			// Apply filters based on attribute
+			switch attribute {
+			case "appMobilityServiceId":
+				if !applyStringFilter(operator, regInfo.AppMobilityServiceId, value) {
+					return nil
+				}
+
+			case "serviceConsumerId.appInstanceId":
+				if !applyStringFilter(operator, regInfo.ServiceConsumerId.AppInstanceId, value) {
+					return nil
+				}
+
+			case "serviceConsumerId.mepId":
+				if !applyStringFilter(operator, regInfo.ServiceConsumerId.MepId, value) {
+					return nil
+				}
+
+			case "deviceInformation.associateId":
+				matched := false
+				for _, deviceInfo := range regInfo.DeviceInformation {
+					if applyStringFilter(operator, deviceInfo.AssociateId.Value, value) {
+						matched = true
+						break
+					}
+				}
+				if !matched {
+					return nil
+				}
+
+			// case "deviceInformation.contextTransferState":
+			// 	matched := false
+			// 	for _, deviceInfo := range regInfo.DeviceInformation {
+			// 		if applyEnumFilter(operator, string(deviceInfo.ContextTransferState.val), value) {
+			// 			matched = true
+			// 			break
+			// 		}
+			// 	}
+			// 	if !matched {
+			// 		return fmt.Errorf("filter mismatch: deviceInformation.contextTransferState")
+			// 	}
+
+			case "expiryTime":
+				expiryTime, err := strconv.ParseUint(value, 10, 32)
+				if err != nil {
+					return nil
+				}
+				if !applyNumericFilter(operator, uint32(regInfo.ExpiryTime), uint32(expiryTime)) {
+					return nil
+				}
+
+			default:
+				return nil
+			}
+
+		}
+
+	}
+	data.Registrations = append(data.Registrations, regInfo)
 	return nil
 }
 
+// Helper functions for applying filters
+func applyStringFilter(operator, fieldValue, filterValue string) bool {
+	switch operator {
+	case "eq":
+		return fieldValue == filterValue
+	case "neq":
+		return fieldValue != filterValue
+	case "cont":
+		return strings.Contains(fieldValue, filterValue)
+	case "ncont":
+		return !strings.Contains(fieldValue, filterValue)
+	case "in":
+		values := strings.Split(filterValue, ",")
+		for _, v := range values {
+			if fieldValue == v {
+				return true
+			}
+		}
+		return false
+	case "nin":
+		values := strings.Split(filterValue, ",")
+		for _, v := range values {
+			if fieldValue == v {
+				return false
+			}
+		}
+		return true
+	case "gt":
+		return fieldValue > filterValue
+	case "gte":
+		return fieldValue >= filterValue
+	case "lt":
+		return fieldValue < filterValue
+	case "lte":
+		return fieldValue <= filterValue
+	default:
+		return false
+	}
+}
+
+func applyEnumFilter(operator, fieldValue, filterValue string) bool {
+	return applyStringFilter(operator, fieldValue, filterValue)
+}
+
+func applyNumericFilter(operator string, fieldValue, filterValue uint32) bool {
+	switch operator {
+	case "eq":
+		return fieldValue == filterValue
+	case "neq":
+		return fieldValue != filterValue
+	case "gt":
+		return fieldValue > filterValue
+	case "gte":
+		return fieldValue >= filterValue
+	case "lt":
+		return fieldValue < filterValue
+	case "lte":
+		return fieldValue <= filterValue
+	default:
+		return false
+	}
+}
+
+// Original
+// func populateRegInfoList(key string, jsonEntry string, response interface{}) error {
+// 	data := response.(*RegisterationInfoList)
+// 	if data == nil {
+// 		return errors.New("response not defined")
+// 	}
+
+// 	// Retrieve registration info from DB
+// 	var regInfo RegistrationInfo
+// 	err := json.Unmarshal([]byte(jsonEntry), &regInfo)
+// 	println("keysss", key)
+// 	if err == nil {
+// 		return err
+// 	}
+
+// 	// Filter services
+// 	if data.Filters != nil {
+
+// 		if data.Filters.filter != "" {
+// 			filterField := data.Filters.filter
+// 			if regInfo.AppMobilityServiceId == "" || (filterField != regInfo.AppMobilityServiceId) {
+// 				return nil
+// 			}
+// 		}
+
+// 	}
+
+// 	data.Registrations = append(data.Registrations, regInfo)
+// 	return nil
+// }
+
+// filterRegistrationInfo applies filtering based on the provided filters.
+// func filterRegistrationInfo(regInfoList []RegistrationInfo, filters []string) []RegistrationInfo {
+// 	var filteredList []RegistrationInfo
+
+// 	for _, regInfo := range regInfoList {
+// 		match := true
+
+// 		// Iterate over filters to apply them one by one
+// 		for _, filter := range filters {
+// 			filterParts := strings.Split(filter, ":")
+// 			if len(filterParts) != 2 {
+// 				// Invalid filter format (e.g., "key:value")
+// 				continue
+// 			}
+// 			key := filterParts[0]
+// 			value := filterParts[1]
+
+// 			// Apply filter based on key-value pairs
+// 			switch key {
+// 			case "appMobilityServiceId":
+// 				if regInfo.AppMobilityServiceId != value {
+// 					match = false
+// 				}
+// 			case "appInstanceId":
+// 				if regInfo.ServiceConsumerId.AppInstanceId != value {
+// 					match = false
+// 				}
+// 			case "mepId":
+// 				if regInfo.ServiceConsumerId.MepId != value {
+// 					match = false
+// 				}
+// 			case "associateId":
+// 				// Check if any device has the associateId value
+// 				found := false
+// 				for _, device := range regInfo.DeviceInformation {
+// 					if device.AssociateId == value {
+// 						found = true
+// 						break
+// 					}
+// 				}
+// 				if !found {
+// 					match = false
+// 				}
+// 			case "expiryTime":
+// 				expiryTime, err := strconv.Atoi(value)
+// 				if err != nil || regInfo.ExpiryTime != uint32(expiryTime) {
+// 					match = false
+// 				}
+// 			default:
+// 				// If filter key is not recognized, skip it
+// 				continue
+// 			}
+
+// 			// If any filter condition doesn't match, we stop checking further
+// 			if !match {
+// 				break
+// 			}
+// 		}
+
+// 		// If all filters matched, add to the result list
+// 		if match {
+// 			filteredList = append(filteredList, regInfo)
+// 		}
+// 	}
+
+// 	return filteredList
+// }
+
+// func populateRegInfoList(key string, jsonEntry string, response interface{}) error {
+// 	regInfoList := response.(*[]RegistrationInfo)
+// 	if regInfoList == nil {
+// 		return errors.New("Response not defined")
+// 	}
+
+// 	// Retrieve registration info from DB
+// 	var regInfo RegistrationInfo
+// 	err := json.Unmarshal([]byte(jsonEntry), &regInfo)
+// 	if err != nil {
+// 		return err
+// 	}
+
+// 	*regInfoList = append(*regInfoList, regInfo)
+// 	return nil
+// }
+
 func cleanUp() {
 	log.Info("Terminate all")
 
@@ -2324,21 +2621,22 @@ func delTrackedDevInfo(svcId string, address string) error {
 	return nil
 }
 
-func validateQueryParams(params url.Values, validParamList []string) bool {
+func validateQueryParams(params url.Values, validParams []string) error {
 	for param := range params {
 		found := false
-		for _, validParam := range validParamList {
+		for _, validParam := range validParams {
 			if param == validParam {
 				found = true
 				break
 			}
 		}
 		if !found {
-			log.Error("Invalid query param: ", param)
-			return false
+			err := errors.New("Invalid query param: " + param)
+			log.Error(err.Error())
+			return err
 		}
 	}
-	return true
+	return nil
 }
 
 func validateQueryParamValue(val string, validValues []string) bool {
-- 
GitLab


From 7f7a8871210790c68c1d8f9680cb923851f465ee Mon Sep 17 00:00:00 2001
From: Umair Khan <umair.anwar@xflowresearch.com>
Date: Wed, 18 Dec 2024 12:52:42 +0000
Subject: [PATCH 2/4] fix issue in query parameter filtering to MEC 021
 Mobility Service GET request

---
 go-apps/meep-ams/server/ams.go | 333 +++++++++++++--------------------
 1 file changed, 126 insertions(+), 207 deletions(-)

diff --git a/go-apps/meep-ams/server/ams.go b/go-apps/meep-ams/server/ams.go
index fd9d98c8f..e6c3d2345 100644
--- a/go-apps/meep-ams/server/ams.go
+++ b/go-apps/meep-ams/server/ams.go
@@ -28,6 +28,7 @@ import (
 	"net/http"
 	"net/url"
 	"os"
+	"regexp"
 	"sort"
 	"strconv"
 	"strings"
@@ -1488,6 +1489,7 @@ func appMobilityServiceByIdDELETE(w http.ResponseWriter, r *http.Request) {
 }
 
 func appMobilityServiceGET(w http.ResponseWriter, r *http.Request) {
+
 	w.Header().Set("Content-Type", "application/json; charset=UTF-8")
 
 	// Validate query parameters
@@ -1502,16 +1504,17 @@ func appMobilityServiceGET(w http.ResponseWriter, r *http.Request) {
 	}
 
 	// Parse query parameters
-	filters := q.Get("filter")
-	allFields := q.Get("all_fields")
+	urlFilter := q.Get("filter")
+	// allFields := q.Get("all_fields")
 	// field := q["fields"]
 	// excludeFields := q["exclude_fields"]
 	// excludeDefault := q.Get("exclude_default")
-
+	if urlFilter != "" {
+		fmt.Printf("filter: %s", urlFilter)
+	}
 	regInfoList := &RegisterationInfoList{
 		Filters: &FilterParameters{
-			filter:     filters,
-			all_fields: allFields,
+			filter: urlFilter,
 		},
 		Registrations: make([]RegistrationInfo, 0),
 	}
@@ -1549,7 +1552,6 @@ func populateRegInfoList(key string, jsonEntry string, response interface{}) err
 	// Retrieve registration info from DB
 	var regInfo RegistrationInfo
 	err := json.Unmarshal([]byte(jsonEntry), &regInfo)
-	println("keysss", key)
 	if err != nil {
 		return err
 	}
@@ -1557,18 +1559,25 @@ func populateRegInfoList(key string, jsonEntry string, response interface{}) err
 	// Filter services
 	if data.Filters != nil {
 
+		// Filter Paramter
 		if data.Filters.filter != "" {
 
 			filterField := data.Filters.filter
+			fmt.Printf("Filter Field: %s", filterField)
 			// Split filterField into operator, attribute, and value
-			filterField = strings.Trim(filterField, "()")
-			filterParts := strings.SplitN(filterField, ",", 3)
-			if len(filterParts) != 3 {
-				return nil
-			}
-			operator := filterParts[0]
-			attribute := filterParts[1]
-			value := filterParts[2]
+			operator, attribute, value, _ := parseFilter(string(filterField))
+
+			fmt.Printf("operator: %s", operator)
+			fmt.Printf("attribute: %s", attribute)
+			fmt.Printf("value: %s", value)
+			// filterField = strings.Trim(filterField, "()")
+			// filterParts := strings.SplitN(filterField, ",", 3)
+			// if len(filterParts) != 3 {
+			// 	return nil
+			// }
+			// operator := filterParts[0]
+			// attribute := filterParts[1]
+			// value := filterParts[2]
 
 			// Apply filters based on attribute
 			switch attribute {
@@ -1577,17 +1586,17 @@ func populateRegInfoList(key string, jsonEntry string, response interface{}) err
 					return nil
 				}
 
-			case "serviceConsumerId.appInstanceId":
+			case "serviceConsumerId/appInstanceId":
 				if !applyStringFilter(operator, regInfo.ServiceConsumerId.AppInstanceId, value) {
 					return nil
 				}
 
-			case "serviceConsumerId.mepId":
+			case "serviceConsumerId/mepId":
 				if !applyStringFilter(operator, regInfo.ServiceConsumerId.MepId, value) {
 					return nil
 				}
 
-			case "deviceInformation.associateId":
+			case "deviceInformation/associateId":
 				matched := false
 				for _, deviceInfo := range regInfo.DeviceInformation {
 					if applyStringFilter(operator, deviceInfo.AssociateId.Value, value) {
@@ -1599,17 +1608,17 @@ func populateRegInfoList(key string, jsonEntry string, response interface{}) err
 					return nil
 				}
 
-			// case "deviceInformation.contextTransferState":
-			// 	matched := false
-			// 	for _, deviceInfo := range regInfo.DeviceInformation {
-			// 		if applyEnumFilter(operator, string(deviceInfo.ContextTransferState.val), value) {
-			// 			matched = true
-			// 			break
-			// 		}
-			// 	}
-			// 	if !matched {
-			// 		return fmt.Errorf("filter mismatch: deviceInformation.contextTransferState")
-			// 	}
+			case "deviceInformation/contextTransferState":
+				matched := false
+				for _, deviceInfo := range regInfo.DeviceInformation {
+					if applyEnumFilter(operator, string(*deviceInfo.ContextTransferState), value) {
+						matched = true
+						break
+					}
+				}
+				if !matched {
+					return nil
+				}
 
 			case "expiryTime":
 				expiryTime, err := strconv.ParseUint(value, 10, 32)
@@ -1631,185 +1640,6 @@ func populateRegInfoList(key string, jsonEntry string, response interface{}) err
 	return nil
 }
 
-// Helper functions for applying filters
-func applyStringFilter(operator, fieldValue, filterValue string) bool {
-	switch operator {
-	case "eq":
-		return fieldValue == filterValue
-	case "neq":
-		return fieldValue != filterValue
-	case "cont":
-		return strings.Contains(fieldValue, filterValue)
-	case "ncont":
-		return !strings.Contains(fieldValue, filterValue)
-	case "in":
-		values := strings.Split(filterValue, ",")
-		for _, v := range values {
-			if fieldValue == v {
-				return true
-			}
-		}
-		return false
-	case "nin":
-		values := strings.Split(filterValue, ",")
-		for _, v := range values {
-			if fieldValue == v {
-				return false
-			}
-		}
-		return true
-	case "gt":
-		return fieldValue > filterValue
-	case "gte":
-		return fieldValue >= filterValue
-	case "lt":
-		return fieldValue < filterValue
-	case "lte":
-		return fieldValue <= filterValue
-	default:
-		return false
-	}
-}
-
-func applyEnumFilter(operator, fieldValue, filterValue string) bool {
-	return applyStringFilter(operator, fieldValue, filterValue)
-}
-
-func applyNumericFilter(operator string, fieldValue, filterValue uint32) bool {
-	switch operator {
-	case "eq":
-		return fieldValue == filterValue
-	case "neq":
-		return fieldValue != filterValue
-	case "gt":
-		return fieldValue > filterValue
-	case "gte":
-		return fieldValue >= filterValue
-	case "lt":
-		return fieldValue < filterValue
-	case "lte":
-		return fieldValue <= filterValue
-	default:
-		return false
-	}
-}
-
-// Original
-// func populateRegInfoList(key string, jsonEntry string, response interface{}) error {
-// 	data := response.(*RegisterationInfoList)
-// 	if data == nil {
-// 		return errors.New("response not defined")
-// 	}
-
-// 	// Retrieve registration info from DB
-// 	var regInfo RegistrationInfo
-// 	err := json.Unmarshal([]byte(jsonEntry), &regInfo)
-// 	println("keysss", key)
-// 	if err == nil {
-// 		return err
-// 	}
-
-// 	// Filter services
-// 	if data.Filters != nil {
-
-// 		if data.Filters.filter != "" {
-// 			filterField := data.Filters.filter
-// 			if regInfo.AppMobilityServiceId == "" || (filterField != regInfo.AppMobilityServiceId) {
-// 				return nil
-// 			}
-// 		}
-
-// 	}
-
-// 	data.Registrations = append(data.Registrations, regInfo)
-// 	return nil
-// }
-
-// filterRegistrationInfo applies filtering based on the provided filters.
-// func filterRegistrationInfo(regInfoList []RegistrationInfo, filters []string) []RegistrationInfo {
-// 	var filteredList []RegistrationInfo
-
-// 	for _, regInfo := range regInfoList {
-// 		match := true
-
-// 		// Iterate over filters to apply them one by one
-// 		for _, filter := range filters {
-// 			filterParts := strings.Split(filter, ":")
-// 			if len(filterParts) != 2 {
-// 				// Invalid filter format (e.g., "key:value")
-// 				continue
-// 			}
-// 			key := filterParts[0]
-// 			value := filterParts[1]
-
-// 			// Apply filter based on key-value pairs
-// 			switch key {
-// 			case "appMobilityServiceId":
-// 				if regInfo.AppMobilityServiceId != value {
-// 					match = false
-// 				}
-// 			case "appInstanceId":
-// 				if regInfo.ServiceConsumerId.AppInstanceId != value {
-// 					match = false
-// 				}
-// 			case "mepId":
-// 				if regInfo.ServiceConsumerId.MepId != value {
-// 					match = false
-// 				}
-// 			case "associateId":
-// 				// Check if any device has the associateId value
-// 				found := false
-// 				for _, device := range regInfo.DeviceInformation {
-// 					if device.AssociateId == value {
-// 						found = true
-// 						break
-// 					}
-// 				}
-// 				if !found {
-// 					match = false
-// 				}
-// 			case "expiryTime":
-// 				expiryTime, err := strconv.Atoi(value)
-// 				if err != nil || regInfo.ExpiryTime != uint32(expiryTime) {
-// 					match = false
-// 				}
-// 			default:
-// 				// If filter key is not recognized, skip it
-// 				continue
-// 			}
-
-// 			// If any filter condition doesn't match, we stop checking further
-// 			if !match {
-// 				break
-// 			}
-// 		}
-
-// 		// If all filters matched, add to the result list
-// 		if match {
-// 			filteredList = append(filteredList, regInfo)
-// 		}
-// 	}
-
-// 	return filteredList
-// }
-
-// func populateRegInfoList(key string, jsonEntry string, response interface{}) error {
-// 	regInfoList := response.(*[]RegistrationInfo)
-// 	if regInfoList == nil {
-// 		return errors.New("Response not defined")
-// 	}
-
-// 	// Retrieve registration info from DB
-// 	var regInfo RegistrationInfo
-// 	err := json.Unmarshal([]byte(jsonEntry), &regInfo)
-// 	if err != nil {
-// 		return err
-// 	}
-
-// 	*regInfoList = append(*regInfoList, regInfo)
-// 	return nil
-// }
-
 func cleanUp() {
 	log.Info("Terminate all")
 
@@ -2668,3 +2498,92 @@ func errHandlerProblemDetails(w http.ResponseWriter, error string, code int) {
 	w.WriteHeader(code)
 	fmt.Fprint(w, jsonResponse)
 }
+
+func parseFilter(filterField string) (string, string, string, error) {
+	// Regular expression to match the filter format
+	re := regexp.MustCompile(`^(eq|neq|gt|lt|gte|lte|in|nin|cont|ncont),([a-zA-Z0-9/]+),([^,]+)(?:,([^,]+))?$`)
+
+	// Trim any surrounding parentheses
+	filterField = strings.Trim(filterField, "()")
+
+	// Match the filterField against the regular expression
+	matches := re.FindStringSubmatch(filterField)
+	if len(matches) < 3 {
+		return "", "", "", nil
+	}
+
+	// Extract the operator, attribute, and value(s)
+	operator := matches[1]
+	attribute := matches[2]
+	value := matches[3]
+
+	// If there's a second value (for operators like "in" or "nin"), handle it
+	if len(matches) > 4 && matches[4] != "" {
+		value += "," + matches[4]
+	}
+
+	return operator, attribute, value, nil
+}
+
+// Helper functions for applying filters
+func applyStringFilter(operator, fieldValue, filterValue string) bool {
+	switch operator {
+	case "eq":
+		return fieldValue == filterValue
+	case "neq":
+		return fieldValue != filterValue
+	case "cont":
+		return strings.Contains(fieldValue, filterValue)
+	case "ncont":
+		return !strings.Contains(fieldValue, filterValue)
+	case "in":
+		values := strings.Split(filterValue, ",")
+		for _, v := range values {
+			if fieldValue == v {
+				return true
+			}
+		}
+		return false
+	case "nin":
+		values := strings.Split(filterValue, ",")
+		for _, v := range values {
+			if fieldValue == v {
+				return false
+			}
+		}
+		return true
+	case "gt":
+		return fieldValue > filterValue
+	case "gte":
+		return fieldValue >= filterValue
+	case "lt":
+		return fieldValue < filterValue
+	case "lte":
+		return fieldValue <= filterValue
+	default:
+		return false
+	}
+}
+
+func applyEnumFilter(operator, fieldValue, filterValue string) bool {
+	return applyStringFilter(operator, fieldValue, filterValue)
+}
+
+func applyNumericFilter(operator string, fieldValue, filterValue uint32) bool {
+	switch operator {
+	// case "eq":
+	// 	return fieldValue == filterValue
+	// case "neq":
+	// 	return fieldValue != filterValue
+	case "gt":
+		return fieldValue > filterValue
+	case "gte":
+		return fieldValue >= filterValue
+	case "lt":
+		return fieldValue < filterValue
+	case "lte":
+		return fieldValue <= filterValue
+	default:
+		return false
+	}
+}
-- 
GitLab


From 04c28b4aba96132e4aa5a59541b46e148cc0d526 Mon Sep 17 00:00:00 2001
From: Umair Khan <umair.anwar@xflowresearch.com>
Date: Thu, 19 Dec 2024 10:48:56 +0000
Subject: [PATCH 3/4] add query paramets fields and exclude_fields to MEC 021
 Mobility Service GET request

---
 go-apps/meep-ams/server/ams.go | 156 ++++++++++++++++++++++++++++-----
 1 file changed, 133 insertions(+), 23 deletions(-)

diff --git a/go-apps/meep-ams/server/ams.go b/go-apps/meep-ams/server/ams.go
index e6c3d2345..0f7bd77a6 100644
--- a/go-apps/meep-ams/server/ams.go
+++ b/go-apps/meep-ams/server/ams.go
@@ -1495,7 +1495,7 @@ func appMobilityServiceGET(w http.ResponseWriter, r *http.Request) {
 	// Validate query parameters
 	u, _ := url.Parse(r.URL.String())
 	q := u.Query()
-	validParams := []string{"filter", "All_fields", "Fields", "Exclude_fields", "Exclude_default"}
+	validParams := []string{"filter", "all_fields", "fields", "exclude_fields", "exclude_default"}
 	err := validateQueryParams(q, validParams)
 	if err != nil {
 		print("Query Parameter error")
@@ -1504,17 +1504,18 @@ func appMobilityServiceGET(w http.ResponseWriter, r *http.Request) {
 	}
 
 	// Parse query parameters
-	urlFilter := q.Get("filter")
-	// allFields := q.Get("all_fields")
-	// field := q["fields"]
-	// excludeFields := q["exclude_fields"]
-	// excludeDefault := q.Get("exclude_default")
-	if urlFilter != "" {
-		fmt.Printf("filter: %s", urlFilter)
-	}
+	urlFilter := q.Get("Filter")
+	urlAllFields := q.Get("all_fields")
+	urlfields := q.Get("fields")
+	urlExcludeFields := q.Get("exclude_fields")
+	urlExcludeDefault := q.Get("exclude_default")
 	regInfoList := &RegisterationInfoList{
 		Filters: &FilterParameters{
-			filter: urlFilter,
+			filter:          urlFilter,
+			all_fields:      urlAllFields,
+			fields:          urlfields,
+			exclude_fields:  urlExcludeFields,
+			exclude_default: urlExcludeDefault,
 		},
 		Registrations: make([]RegistrationInfo, 0),
 	}
@@ -1565,19 +1566,7 @@ func populateRegInfoList(key string, jsonEntry string, response interface{}) err
 			filterField := data.Filters.filter
 			fmt.Printf("Filter Field: %s", filterField)
 			// Split filterField into operator, attribute, and value
-			operator, attribute, value, _ := parseFilter(string(filterField))
-
-			fmt.Printf("operator: %s", operator)
-			fmt.Printf("attribute: %s", attribute)
-			fmt.Printf("value: %s", value)
-			// filterField = strings.Trim(filterField, "()")
-			// filterParts := strings.SplitN(filterField, ",", 3)
-			// if len(filterParts) != 3 {
-			// 	return nil
-			// }
-			// operator := filterParts[0]
-			// attribute := filterParts[1]
-			// value := filterParts[2]
+			operator, attribute, value, _ := parseFilter(filterField)
 
 			// Apply filters based on attribute
 			switch attribute {
@@ -1608,6 +1597,18 @@ func populateRegInfoList(key string, jsonEntry string, response interface{}) err
 					return nil
 				}
 
+			case "deviceInformation/appMobilityServiceLevel":
+				matched := false
+				for _, deviceInfo := range regInfo.DeviceInformation {
+					if applyStringFilter(operator, string(*deviceInfo.AppMobilityServiceLevel), value) {
+						matched = true
+						break
+					}
+				}
+				if !matched {
+					return nil
+				}
+
 			case "deviceInformation/contextTransferState":
 				matched := false
 				for _, deviceInfo := range regInfo.DeviceInformation {
@@ -1635,7 +1636,116 @@ func populateRegInfoList(key string, jsonEntry string, response interface{}) err
 
 		}
 
+		// Handle Fields Parameter
+		if data.Filters.fields != "" {
+			fields := strings.Split(data.Filters.fields, ",")
+			filteredRegInfo := RegistrationInfo{}
+
+			for _, field := range fields {
+				switch field {
+				case "appMobilityServiceId":
+					filteredRegInfo.AppMobilityServiceId = regInfo.AppMobilityServiceId
+
+				case "serviceConsumerId/appInstanceId":
+					if filteredRegInfo.ServiceConsumerId == nil {
+						filteredRegInfo.ServiceConsumerId = &RegistrationInfoServiceConsumerId{}
+					}
+					if regInfo.ServiceConsumerId.AppInstanceId != "" {
+						filteredRegInfo.ServiceConsumerId.AppInstanceId = regInfo.ServiceConsumerId.AppInstanceId
+					}
+
+				case "serviceConsumerId/mepId":
+					if filteredRegInfo.ServiceConsumerId == nil {
+						filteredRegInfo.ServiceConsumerId = &RegistrationInfoServiceConsumerId{}
+					}
+					if regInfo.ServiceConsumerId.MepId != "" {
+						filteredRegInfo.ServiceConsumerId.MepId = regInfo.ServiceConsumerId.MepId
+					}
+
+				case "deviceInformation/associateId":
+					for _, deviceInfo := range regInfo.DeviceInformation {
+						if deviceInfo.AssociateId.Value != "" {
+							filteredDeviceInfo := RegistrationInfoDeviceInformation{
+								AssociateId: deviceInfo.AssociateId,
+							}
+							filteredRegInfo.DeviceInformation = append(filteredRegInfo.DeviceInformation, filteredDeviceInfo)
+						}
+					}
+
+				case "deviceInformation/appMobilityServiceLevel":
+					for _, deviceInfo := range regInfo.DeviceInformation {
+						if *deviceInfo.AppMobilityServiceLevel != "" {
+							filteredDeviceInfo := RegistrationInfoDeviceInformation{
+								AppMobilityServiceLevel: deviceInfo.AppMobilityServiceLevel,
+							}
+							filteredRegInfo.DeviceInformation = append(filteredRegInfo.DeviceInformation, filteredDeviceInfo)
+						}
+					}
+
+				case "deviceInformation/contextTransferState":
+					for _, deviceInfo := range regInfo.DeviceInformation {
+						if *deviceInfo.ContextTransferState != "" {
+							filteredDeviceInfo := RegistrationInfoDeviceInformation{
+								ContextTransferState: deviceInfo.ContextTransferState,
+							}
+							filteredRegInfo.DeviceInformation = append(filteredRegInfo.DeviceInformation, filteredDeviceInfo)
+						}
+					}
+
+				case "expiryTime":
+					//Logic
+					if string(regInfo.ExpiryTime) != "" {
+						filteredRegInfo.ExpiryTime = regInfo.ExpiryTime
+					}
+
+				}
+				// Replace regInfo with the filtered version
+
+			}
+			regInfo = filteredRegInfo
+		}
+
+		// Handle Exclude Fields Parameter (Exclude specified fields)
+		if data.Filters.exclude_fields != "" {
+			excludeFields := strings.Split(data.Filters.exclude_fields, ",")
+			filteredRegInfo := regInfo
+
+			// Exclude the listed fields
+			for _, field := range excludeFields {
+				switch field {
+				case "appMobilityServiceId":
+					filteredRegInfo.AppMobilityServiceId = "" // Exclude this field
+				case "serviceConsumerId/appInstanceId":
+					if filteredRegInfo.ServiceConsumerId != nil {
+						filteredRegInfo.ServiceConsumerId.AppInstanceId = "" // Exclude this field
+					}
+				case "serviceConsumerId/mepId":
+					if filteredRegInfo.ServiceConsumerId != nil {
+						filteredRegInfo.ServiceConsumerId.MepId = "" // Exclude this field
+					}
+				case "deviceInformation/associateId":
+					for i := range filteredRegInfo.DeviceInformation {
+						filteredRegInfo.DeviceInformation[i].AssociateId = nil // Exclude this field
+					}
+				case "deviceInformation/appMobilityServiceLevel":
+					for i := range filteredRegInfo.DeviceInformation {
+						filteredRegInfo.DeviceInformation[i].AppMobilityServiceLevel = nil // Exclude this field
+					}
+				case "deviceInformation/contextTransferState":
+					for i := range filteredRegInfo.DeviceInformation {
+						filteredRegInfo.DeviceInformation[i].ContextTransferState = nil // Exclude this field
+					}
+				case "expiryTime":
+					filteredRegInfo.ExpiryTime = 0 // Exclude this field
+				}
+			}
+
+			// Replace regInfo with the filtered version based on exclude_fields parameter
+			regInfo = filteredRegInfo
+		}
+
 	}
+	// Returning Data
 	data.Registrations = append(data.Registrations, regInfo)
 	return nil
 }
-- 
GitLab


From 7fbc85c5811e0d6f2ed098e110f512201414514e Mon Sep 17 00:00:00 2001
From: Umair Khan <umair.anwar@xflowresearch.com>
Date: Fri, 20 Dec 2024 11:52:57 +0000
Subject: [PATCH 4/4] update etsi mec sandbox mec 021 AMS back-end as per 3.1.1
 AMS document version

---
 go-apps/meep-ams/api/swagger.yaml             | 36 +++++++++----------
 go-apps/meep-ams/server/ams.go                | 33 +++++++++--------
 go-apps/meep-ams/server/api_amsi.go           |  2 +-
 go-apps/meep-ams/server/api_unsupported.go    |  2 +-
 go-apps/meep-ams/server/backup.go             |  1 +
 go-apps/meep-ams/server/logger.go             |  2 +-
 .../model_adjacent_app_info_notification.go   |  2 +-
 ...app_info_notification_adjacent_app_info.go |  2 +-
 .../model_adjacent_app_info_subscription.go   |  2 +-
 ...t_app_info_subscription_filter_criteria.go |  2 +-
 ...el_adjacent_app_info_subscription_links.go |  2 +-
 .../model_adjacent_app_instance_info.go       |  2 +-
 .../model_app_mobility_service_level.go       |  2 +-
 .../model_app_termination_notification.go     |  2 +-
 ...del_app_termination_notification__links.go |  2 +-
 go-apps/meep-ams/server/model_associate_id.go |  2 +-
 .../server/model_associate_id_type.go         |  2 +-
 .../server/model_communication_interface.go   |  2 +-
 ...el_communication_interface_ip_addresses.go |  2 +-
 .../server/model_context_transfer_state.go    |  2 +-
 .../server/model_expiry_notification.go       |  2 +-
 .../server/model_inline_notification.go       |  2 +-
 .../server/model_inline_subscription.go       |  2 +-
 go-apps/meep-ams/server/model_link.go         |  2 +-
 go-apps/meep-ams/server/model_link_type.go    |  2 +-
 .../server/model_mec_host_information.go      |  2 +-
 .../model_mobility_procedure_notification.go  |  2 +-
 ..._procedure_notification_target_app_info.go |  2 +-
 .../model_mobility_procedure_subscription.go  |  2 +-
 ..._procedure_subscription_filter_criteria.go |  2 +-
 ...l_mobility_procedure_subscription_links.go |  2 +-
 .../meep-ams/server/model_mobility_status.go  |  2 +-
 .../model_one_of_inline_notification.go       |  2 +-
 .../model_one_of_inline_subscription.go       |  2 +-
 .../server/model_operation_action_type.go     |  2 +-
 .../meep-ams/server/model_problem_details.go  |  2 +-
 .../server/model_registration_info.go         |  2 +-
 ...el_registration_info_device_information.go |  2 +-
 ...l_registration_info_service_consumer_id.go |  2 +-
 .../server/model_subscription_link_list.go    |  2 +-
 .../model_subscription_link_list_links.go     |  2 +-
 ...del_subscription_link_list_subscription.go |  2 +-
 .../server/model_subscription_type.go         |  2 +-
 .../server/model_test_notification.go         |  2 +-
 .../server/model_test_notification__links.go  |  2 +-
 go-apps/meep-ams/server/model_time_stamp.go   |  2 +-
 .../server/model_websock_notif_config.go      |  2 +-
 go-apps/meep-ams/server/routers.go            |  2 +-
 48 files changed, 83 insertions(+), 77 deletions(-)
 create mode 100644 go-apps/meep-ams/server/backup.go

diff --git a/go-apps/meep-ams/api/swagger.yaml b/go-apps/meep-ams/api/swagger.yaml
index dc17eb3c6..ab52abf35 100644
--- a/go-apps/meep-ams/api/swagger.yaml
+++ b/go-apps/meep-ams/api/swagger.yaml
@@ -1,9 +1,9 @@
 openapi: 3.0.0
 info:
   title: AdvantEDGE Application Mobility API
-  version: '2.2.1'
+  version: '3.1.1'
   description: Application Mobility Service is AdvantEDGE's implementation of [ETSI
-    MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf)
+    MEC ISG MEC021 Application Mobility API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/03.01.01_60/gs_mec021v030101p.pdf)
     <p>[Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)
     <p>**Micro-service**<br>[meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams)
     <p>**Type & Usage**<br>Edge Service used by edge applications that want to get
@@ -16,8 +16,8 @@ info:
     name: InterDigital AdvantEDGE Support
     email: AdvantEDGE@InterDigital.com
 externalDocs:
-  description: ETSI GS MEC 021 Application Mobility Service API, v2.2.1
-  url: https://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_mec021v020201p.pdf
+  description: ETSI GS MEC 021 Application Mobility Service API, v3.1.1
+  url: https://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/03.01.01_60/gs_mec021v030101p.pdf
 servers:
 - url: https://localhost/sandboxname/amsi/v1
   variables: {}
@@ -40,30 +40,30 @@ paths:
         explode: true
         schema:
           type: string
-      - name: all_fields
+      - name: All_fields
         in: query
         description: Include all complex attributes in the response.
         style: form
         explode: true
         schema:
           type: string
-      - name: fields
+      - name: Fields
         in: query
         description: Complex attributes to be included into the response. See clause 6.18 in ETSI GS MEC 009
         style: form
         explode: true
         schema:
           type: string
-      - name: exclude_fields
+      - name: Exclude_fields
         in: query
         description: Complex attributes to be excluded from the response.See clause 6.18 in ETSI GS MEC 009
         style: form
         explode: true
         schema:
           type: string
-      - name: exclude_default
+      - name: Exclude_default
         in: query
-        description: Indicates to exclude the following complex attributes from the response  See clause 6.18 in ETSI GS MEC 011 for details.
+        description: Indicates to exclude the following complex attributes from the response  See clause 6.18 in ETSI GS MEC 009 for details.
         style: form
         explode: true
         schema:
@@ -133,35 +133,35 @@ paths:
       parameters:
       - name: filter
         in: query
-        description: Attribute-based filtering parameters according to ETSI GS MEC 011
+        description: Attribute-based filtering parameters, according to ETSI GS MEC 009, use the format (op,attr,value)
         style: form
         explode: true
         schema:
           type: string
-      - name: all_fields
+      - name: All_fields
         in: query
-        description: Include all complex attributes in the response.
+        description: Include all complex attributes in the response. e.g., All_Fields.
         style: form
         explode: true
         schema:
           type: string
-      - name: fields
+      - name: Fields
         in: query
-        description: Complex attributes to be included into the response. See clause 6.18 in ETSI GS MEC 011
+        description: Complex attributes to be included in the response (see Clause 6.18 in ETSI GS MEC 009), e.g., att or att/subatt.
         style: form
         explode: true
         schema:
           type: string
-      - name: exclude_fields
+      - name: Exclude_fields
         in: query
-        description: Complex attributes to be excluded from the response.See clause 6.18 in ETSI GS MEC 011
+        description: Complex attributes to be excluded in the response (see Clause 6.18 in ETSI GS MEC 009), e.g., att or att/subatt.
         style: form
         explode: true
         schema:
           type: string
-      - name: exclude_default
+      - name: Exclude_default
         in: query
-        description: Indicates to exclude the following complex attributes from the response  See clause 6.18 in ETSI GS MEC 011 for details.
+        description: Indicates to exclude the following complex attributes from the response  See clause 6.18 in ETSI GS MEC 009 for details.
         style: form
         explode: true
         schema:
diff --git a/go-apps/meep-ams/server/ams.go b/go-apps/meep-ams/server/ams.go
index 0f7bd77a6..0123bd8b8 100644
--- a/go-apps/meep-ams/server/ams.go
+++ b/go-apps/meep-ams/server/ams.go
@@ -1495,7 +1495,7 @@ func appMobilityServiceGET(w http.ResponseWriter, r *http.Request) {
 	// Validate query parameters
 	u, _ := url.Parse(r.URL.String())
 	q := u.Query()
-	validParams := []string{"filter", "all_fields", "fields", "exclude_fields", "exclude_default"}
+	validParams := []string{"filter", "All_fields", "Fields", "Exclude_fields", "Exclude_default"}
 	err := validateQueryParams(q, validParams)
 	if err != nil {
 		print("Query Parameter error")
@@ -1504,11 +1504,11 @@ func appMobilityServiceGET(w http.ResponseWriter, r *http.Request) {
 	}
 
 	// Parse query parameters
-	urlFilter := q.Get("Filter")
-	urlAllFields := q.Get("all_fields")
-	urlfields := q.Get("fields")
-	urlExcludeFields := q.Get("exclude_fields")
-	urlExcludeDefault := q.Get("exclude_default")
+	urlFilter := q.Get("filter")
+	urlAllFields := q.Get("All_fields")
+	urlfields := q.Get("Fields")
+	urlExcludeFields := q.Get("Exclude_fields")
+	urlExcludeDefault := q.Get("Exclude_default")
 	regInfoList := &RegisterationInfoList{
 		Filters: &FilterParameters{
 			filter:          urlFilter,
@@ -1562,9 +1562,7 @@ func populateRegInfoList(key string, jsonEntry string, response interface{}) err
 
 		// Filter Paramter
 		if data.Filters.filter != "" {
-
 			filterField := data.Filters.filter
-			fmt.Printf("Filter Field: %s", filterField)
 			// Split filterField into operator, attribute, and value
 			operator, attribute, value, _ := parseFilter(filterField)
 
@@ -1636,6 +1634,11 @@ func populateRegInfoList(key string, jsonEntry string, response interface{}) err
 
 		}
 
+		// Handle Fields Parameter (Include ALL fields)
+		if data.Filters.all_fields != "" && data.Filters.all_fields != "All_fields" {
+			return nil
+		}
+
 		// Handle Fields Parameter
 		if data.Filters.fields != "" {
 			fields := strings.Split(data.Filters.fields, ",")
@@ -1647,17 +1650,17 @@ func populateRegInfoList(key string, jsonEntry string, response interface{}) err
 					filteredRegInfo.AppMobilityServiceId = regInfo.AppMobilityServiceId
 
 				case "serviceConsumerId/appInstanceId":
-					if filteredRegInfo.ServiceConsumerId == nil {
-						filteredRegInfo.ServiceConsumerId = &RegistrationInfoServiceConsumerId{}
-					}
+					// if filteredRegInfo.ServiceConsumerId == nil {
+					// 	filteredRegInfo.ServiceConsumerId = &RegistrationInfoServiceConsumerId{}
+					// }
 					if regInfo.ServiceConsumerId.AppInstanceId != "" {
 						filteredRegInfo.ServiceConsumerId.AppInstanceId = regInfo.ServiceConsumerId.AppInstanceId
 					}
 
 				case "serviceConsumerId/mepId":
-					if filteredRegInfo.ServiceConsumerId == nil {
-						filteredRegInfo.ServiceConsumerId = &RegistrationInfoServiceConsumerId{}
-					}
+					// if filteredRegInfo.ServiceConsumerId == nil {
+					// 	filteredRegInfo.ServiceConsumerId = &RegistrationInfoServiceConsumerId{}
+					// }
 					if regInfo.ServiceConsumerId.MepId != "" {
 						filteredRegInfo.ServiceConsumerId.MepId = regInfo.ServiceConsumerId.MepId
 					}
@@ -1744,6 +1747,8 @@ func populateRegInfoList(key string, jsonEntry string, response interface{}) err
 			regInfo = filteredRegInfo
 		}
 
+		// Handle Exclude Fields default Parameter (Exclude specified fields)
+
 	}
 	// Returning Data
 	data.Registrations = append(data.Registrations, regInfo)
diff --git a/go-apps/meep-ams/server/api_amsi.go b/go-apps/meep-ams/server/api_amsi.go
index 6031d67cd..e4ba29ead 100644
--- a/go-apps/meep-ams/server/api_amsi.go
+++ b/go-apps/meep-ams/server/api_amsi.go
@@ -17,7 +17,7 @@
  *
  * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf) <p>[Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt) <p>**Micro-service**<br>[meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams) <p>**Type & Usage**<br>Edge Service used by edge applications that want to get information about application mobility in the network <p>**Note**<br>AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below).
  *
- * API version: 2.2.1
+ * API version: 3.1.1
  * Contact: AdvantEDGE@InterDigital.com
  * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
  */
diff --git a/go-apps/meep-ams/server/api_unsupported.go b/go-apps/meep-ams/server/api_unsupported.go
index 8ec5a84cb..e506857b2 100644
--- a/go-apps/meep-ams/server/api_unsupported.go
+++ b/go-apps/meep-ams/server/api_unsupported.go
@@ -17,7 +17,7 @@
  *
  * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf) <p>[Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt) <p>**Micro-service**<br>[meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams) <p>**Type & Usage**<br>Edge Service used by edge applications that want to get information about application mobility in the network <p>**Note**<br>AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below).
  *
- * API version: 2.2.1
+ * API version: 3.1.1
  * Contact: AdvantEDGE@InterDigital.com
  * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
  */
diff --git a/go-apps/meep-ams/server/backup.go b/go-apps/meep-ams/server/backup.go
new file mode 100644
index 000000000..abb4e431a
--- /dev/null
+++ b/go-apps/meep-ams/server/backup.go
@@ -0,0 +1 @@
+package server
diff --git a/go-apps/meep-ams/server/logger.go b/go-apps/meep-ams/server/logger.go
index c5a73ff34..38c32dbca 100644
--- a/go-apps/meep-ams/server/logger.go
+++ b/go-apps/meep-ams/server/logger.go
@@ -17,7 +17,7 @@
  *
  * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf) <p>[Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt) <p>**Micro-service**<br>[meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams) <p>**Type & Usage**<br>Edge Service used by edge applications that want to get information about application mobility in the network <p>**Note**<br>AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below).
  *
- * API version: 2.2.1
+ * API version: 3.1.1
  * Contact: AdvantEDGE@InterDigital.com
  * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
  */
diff --git a/go-apps/meep-ams/server/model_adjacent_app_info_notification.go b/go-apps/meep-ams/server/model_adjacent_app_info_notification.go
index 0a48637f4..7bacaf62d 100644
--- a/go-apps/meep-ams/server/model_adjacent_app_info_notification.go
+++ b/go-apps/meep-ams/server/model_adjacent_app_info_notification.go
@@ -17,7 +17,7 @@
  *
  * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf) <p>[Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt) <p>**Micro-service**<br>[meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams) <p>**Type & Usage**<br>Edge Service used by edge applications that want to get information about application mobility in the network <p>**Note**<br>AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below).
  *
- * API version: 2.2.1
+ * API version: 3.1.1
  * Contact: AdvantEDGE@InterDigital.com
  * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
  */
diff --git a/go-apps/meep-ams/server/model_adjacent_app_info_notification_adjacent_app_info.go b/go-apps/meep-ams/server/model_adjacent_app_info_notification_adjacent_app_info.go
index ce78d8249..26325a4e8 100644
--- a/go-apps/meep-ams/server/model_adjacent_app_info_notification_adjacent_app_info.go
+++ b/go-apps/meep-ams/server/model_adjacent_app_info_notification_adjacent_app_info.go
@@ -17,7 +17,7 @@
  *
  * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf) <p>[Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt) <p>**Micro-service**<br>[meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams) <p>**Type & Usage**<br>Edge Service used by edge applications that want to get information about application mobility in the network <p>**Note**<br>AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below).
  *
- * API version: 2.2.1
+ * API version: 3.1.1
  * Contact: AdvantEDGE@InterDigital.com
  * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
  */
diff --git a/go-apps/meep-ams/server/model_adjacent_app_info_subscription.go b/go-apps/meep-ams/server/model_adjacent_app_info_subscription.go
index 81b575be6..b97798845 100644
--- a/go-apps/meep-ams/server/model_adjacent_app_info_subscription.go
+++ b/go-apps/meep-ams/server/model_adjacent_app_info_subscription.go
@@ -17,7 +17,7 @@
  *
  * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf) <p>[Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt) <p>**Micro-service**<br>[meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams) <p>**Type & Usage**<br>Edge Service used by edge applications that want to get information about application mobility in the network <p>**Note**<br>AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below).
  *
- * API version: 2.2.1
+ * API version: 3.1.1
  * Contact: AdvantEDGE@InterDigital.com
  * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
  */
diff --git a/go-apps/meep-ams/server/model_adjacent_app_info_subscription_filter_criteria.go b/go-apps/meep-ams/server/model_adjacent_app_info_subscription_filter_criteria.go
index 71c90e00d..ee4a1abc4 100644
--- a/go-apps/meep-ams/server/model_adjacent_app_info_subscription_filter_criteria.go
+++ b/go-apps/meep-ams/server/model_adjacent_app_info_subscription_filter_criteria.go
@@ -17,7 +17,7 @@
  *
  * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf) <p>[Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt) <p>**Micro-service**<br>[meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams) <p>**Type & Usage**<br>Edge Service used by edge applications that want to get information about application mobility in the network <p>**Note**<br>AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below).
  *
- * API version: 2.2.1
+ * API version: 3.1.1
  * Contact: AdvantEDGE@InterDigital.com
  * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
  */
diff --git a/go-apps/meep-ams/server/model_adjacent_app_info_subscription_links.go b/go-apps/meep-ams/server/model_adjacent_app_info_subscription_links.go
index 123c35744..7a1f49382 100644
--- a/go-apps/meep-ams/server/model_adjacent_app_info_subscription_links.go
+++ b/go-apps/meep-ams/server/model_adjacent_app_info_subscription_links.go
@@ -17,7 +17,7 @@
  *
  * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf) <p>[Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt) <p>**Micro-service**<br>[meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams) <p>**Type & Usage**<br>Edge Service used by edge applications that want to get information about application mobility in the network <p>**Note**<br>AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below).
  *
- * API version: 2.2.1
+ * API version: 3.1.1
  * Contact: AdvantEDGE@InterDigital.com
  * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
  */
diff --git a/go-apps/meep-ams/server/model_adjacent_app_instance_info.go b/go-apps/meep-ams/server/model_adjacent_app_instance_info.go
index 607c4702a..ec7a4ad9a 100644
--- a/go-apps/meep-ams/server/model_adjacent_app_instance_info.go
+++ b/go-apps/meep-ams/server/model_adjacent_app_instance_info.go
@@ -17,7 +17,7 @@
  *
  * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf) <p>[Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt) <p>**Micro-service**<br>[meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams) <p>**Type & Usage**<br>Edge Service used by edge applications that want to get information about application mobility in the network <p>**Note**<br>AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below).
  *
- * API version: 2.2.1
+ * API version: 3.1.1
  * Contact: AdvantEDGE@InterDigital.com
  * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
  */
diff --git a/go-apps/meep-ams/server/model_app_mobility_service_level.go b/go-apps/meep-ams/server/model_app_mobility_service_level.go
index 3bdf477dc..a59b7a275 100644
--- a/go-apps/meep-ams/server/model_app_mobility_service_level.go
+++ b/go-apps/meep-ams/server/model_app_mobility_service_level.go
@@ -17,7 +17,7 @@
  *
  * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf) <p>[Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt) <p>**Micro-service**<br>[meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams) <p>**Type & Usage**<br>Edge Service used by edge applications that want to get information about application mobility in the network <p>**Note**<br>AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below).
  *
- * API version: 2.2.1
+ * API version: 3.1.1
  * Contact: AdvantEDGE@InterDigital.com
  * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
  */
diff --git a/go-apps/meep-ams/server/model_app_termination_notification.go b/go-apps/meep-ams/server/model_app_termination_notification.go
index 9f3da6625..96b5afc52 100644
--- a/go-apps/meep-ams/server/model_app_termination_notification.go
+++ b/go-apps/meep-ams/server/model_app_termination_notification.go
@@ -17,7 +17,7 @@
  *
  * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf) <p>[Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt) <p>**Micro-service**<br>[meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams) <p>**Type & Usage**<br>Edge Service used by edge applications that want to get information about application mobility in the network <p>**Note**<br>AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below).
  *
- * API version: 2.2.1
+ * API version: 3.1.1
  * Contact: AdvantEDGE@InterDigital.com
  * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
  */
diff --git a/go-apps/meep-ams/server/model_app_termination_notification__links.go b/go-apps/meep-ams/server/model_app_termination_notification__links.go
index 7287931a3..3dbe215e0 100644
--- a/go-apps/meep-ams/server/model_app_termination_notification__links.go
+++ b/go-apps/meep-ams/server/model_app_termination_notification__links.go
@@ -17,7 +17,7 @@
  *
  * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf) <p>[Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt) <p>**Micro-service**<br>[meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams) <p>**Type & Usage**<br>Edge Service used by edge applications that want to get information about application mobility in the network <p>**Note**<br>AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below).
  *
- * API version: 2.2.1
+ * API version: 3.1.1
  * Contact: AdvantEDGE@InterDigital.com
  * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
  */
diff --git a/go-apps/meep-ams/server/model_associate_id.go b/go-apps/meep-ams/server/model_associate_id.go
index 89d553ef6..12b49c577 100644
--- a/go-apps/meep-ams/server/model_associate_id.go
+++ b/go-apps/meep-ams/server/model_associate_id.go
@@ -17,7 +17,7 @@
  *
  * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf) <p>[Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt) <p>**Micro-service**<br>[meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams) <p>**Type & Usage**<br>Edge Service used by edge applications that want to get information about application mobility in the network <p>**Note**<br>AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below).
  *
- * API version: 2.2.1
+ * API version: 3.1.1
  * Contact: AdvantEDGE@InterDigital.com
  * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
  */
diff --git a/go-apps/meep-ams/server/model_associate_id_type.go b/go-apps/meep-ams/server/model_associate_id_type.go
index 329ad9bb5..92700ce4d 100644
--- a/go-apps/meep-ams/server/model_associate_id_type.go
+++ b/go-apps/meep-ams/server/model_associate_id_type.go
@@ -17,7 +17,7 @@
  *
  * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf) <p>[Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt) <p>**Micro-service**<br>[meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams) <p>**Type & Usage**<br>Edge Service used by edge applications that want to get information about application mobility in the network <p>**Note**<br>AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below).
  *
- * API version: 2.2.1
+ * API version: 3.1.1
  * Contact: AdvantEDGE@InterDigital.com
  * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
  */
diff --git a/go-apps/meep-ams/server/model_communication_interface.go b/go-apps/meep-ams/server/model_communication_interface.go
index 028c8e138..e842c2627 100644
--- a/go-apps/meep-ams/server/model_communication_interface.go
+++ b/go-apps/meep-ams/server/model_communication_interface.go
@@ -17,7 +17,7 @@
  *
  * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf) <p>[Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt) <p>**Micro-service**<br>[meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams) <p>**Type & Usage**<br>Edge Service used by edge applications that want to get information about application mobility in the network <p>**Note**<br>AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below).
  *
- * API version: 2.2.1
+ * API version: 3.1.1
  * Contact: AdvantEDGE@InterDigital.com
  * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
  */
diff --git a/go-apps/meep-ams/server/model_communication_interface_ip_addresses.go b/go-apps/meep-ams/server/model_communication_interface_ip_addresses.go
index 38e94df10..fe0959c21 100644
--- a/go-apps/meep-ams/server/model_communication_interface_ip_addresses.go
+++ b/go-apps/meep-ams/server/model_communication_interface_ip_addresses.go
@@ -17,7 +17,7 @@
  *
  * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf) <p>[Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt) <p>**Micro-service**<br>[meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams) <p>**Type & Usage**<br>Edge Service used by edge applications that want to get information about application mobility in the network <p>**Note**<br>AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below).
  *
- * API version: 2.2.1
+ * API version: 3.1.1
  * Contact: AdvantEDGE@InterDigital.com
  * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
  */
diff --git a/go-apps/meep-ams/server/model_context_transfer_state.go b/go-apps/meep-ams/server/model_context_transfer_state.go
index 2d80ed20a..7bc47d626 100644
--- a/go-apps/meep-ams/server/model_context_transfer_state.go
+++ b/go-apps/meep-ams/server/model_context_transfer_state.go
@@ -17,7 +17,7 @@
  *
  * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf) <p>[Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt) <p>**Micro-service**<br>[meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams) <p>**Type & Usage**<br>Edge Service used by edge applications that want to get information about application mobility in the network <p>**Note**<br>AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below).
  *
- * API version: 2.2.1
+ * API version: 3.1.1
  * Contact: AdvantEDGE@InterDigital.com
  * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
  */
diff --git a/go-apps/meep-ams/server/model_expiry_notification.go b/go-apps/meep-ams/server/model_expiry_notification.go
index 11cb2d4a8..ced3ec82b 100644
--- a/go-apps/meep-ams/server/model_expiry_notification.go
+++ b/go-apps/meep-ams/server/model_expiry_notification.go
@@ -17,7 +17,7 @@
  *
  * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf) <p>[Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt) <p>**Micro-service**<br>[meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams) <p>**Type & Usage**<br>Edge Service used by edge applications that want to get information about application mobility in the network <p>**Note**<br>AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below).
  *
- * API version: 2.2.1
+ * API version: 3.1.1
  * Contact: AdvantEDGE@InterDigital.com
  * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
  */
diff --git a/go-apps/meep-ams/server/model_inline_notification.go b/go-apps/meep-ams/server/model_inline_notification.go
index efa3570bb..eb6cadfb6 100644
--- a/go-apps/meep-ams/server/model_inline_notification.go
+++ b/go-apps/meep-ams/server/model_inline_notification.go
@@ -17,7 +17,7 @@
  *
  * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf) <p>[Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt) <p>**Micro-service**<br>[meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams) <p>**Type & Usage**<br>Edge Service used by edge applications that want to get information about application mobility in the network <p>**Note**<br>AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below).
  *
- * API version: 2.2.1
+ * API version: 3.1.1
  * Contact: AdvantEDGE@InterDigital.com
  * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
  */
diff --git a/go-apps/meep-ams/server/model_inline_subscription.go b/go-apps/meep-ams/server/model_inline_subscription.go
index 95d96d07f..83b523c25 100644
--- a/go-apps/meep-ams/server/model_inline_subscription.go
+++ b/go-apps/meep-ams/server/model_inline_subscription.go
@@ -17,7 +17,7 @@
  *
  * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf) <p>[Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt) <p>**Micro-service**<br>[meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams) <p>**Type & Usage**<br>Edge Service used by edge applications that want to get information about application mobility in the network <p>**Note**<br>AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below).
  *
- * API version: 2.2.1
+ * API version: 3.1.1
  * Contact: AdvantEDGE@InterDigital.com
  * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
  */
diff --git a/go-apps/meep-ams/server/model_link.go b/go-apps/meep-ams/server/model_link.go
index e864c1989..14af44fd7 100644
--- a/go-apps/meep-ams/server/model_link.go
+++ b/go-apps/meep-ams/server/model_link.go
@@ -17,7 +17,7 @@
  *
  * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf) <p>[Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt) <p>**Micro-service**<br>[meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams) <p>**Type & Usage**<br>Edge Service used by edge applications that want to get information about application mobility in the network <p>**Note**<br>AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below).
  *
- * API version: 2.2.1
+ * API version: 3.1.1
  * Contact: AdvantEDGE@InterDigital.com
  * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
  */
diff --git a/go-apps/meep-ams/server/model_link_type.go b/go-apps/meep-ams/server/model_link_type.go
index d812ac816..a0e9f5a6f 100644
--- a/go-apps/meep-ams/server/model_link_type.go
+++ b/go-apps/meep-ams/server/model_link_type.go
@@ -17,7 +17,7 @@
  *
  * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf) <p>[Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt) <p>**Micro-service**<br>[meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams) <p>**Type & Usage**<br>Edge Service used by edge applications that want to get information about application mobility in the network <p>**Note**<br>AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below).
  *
- * API version: 2.2.1
+ * API version: 3.1.1
  * Contact: AdvantEDGE@InterDigital.com
  * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
  */
diff --git a/go-apps/meep-ams/server/model_mec_host_information.go b/go-apps/meep-ams/server/model_mec_host_information.go
index e9326dc34..a87ff97bb 100644
--- a/go-apps/meep-ams/server/model_mec_host_information.go
+++ b/go-apps/meep-ams/server/model_mec_host_information.go
@@ -17,7 +17,7 @@
  *
  * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf) <p>[Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt) <p>**Micro-service**<br>[meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams) <p>**Type & Usage**<br>Edge Service used by edge applications that want to get information about application mobility in the network <p>**Note**<br>AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below).
  *
- * API version: 2.2.1
+ * API version: 3.1.1
  * Contact: AdvantEDGE@InterDigital.com
  * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
  */
diff --git a/go-apps/meep-ams/server/model_mobility_procedure_notification.go b/go-apps/meep-ams/server/model_mobility_procedure_notification.go
index ff90a8a11..258577475 100644
--- a/go-apps/meep-ams/server/model_mobility_procedure_notification.go
+++ b/go-apps/meep-ams/server/model_mobility_procedure_notification.go
@@ -17,7 +17,7 @@
  *
  * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf) <p>[Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt) <p>**Micro-service**<br>[meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams) <p>**Type & Usage**<br>Edge Service used by edge applications that want to get information about application mobility in the network <p>**Note**<br>AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below).
  *
- * API version: 2.2.1
+ * API version: 3.1.1
  * Contact: AdvantEDGE@InterDigital.com
  * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
  */
diff --git a/go-apps/meep-ams/server/model_mobility_procedure_notification_target_app_info.go b/go-apps/meep-ams/server/model_mobility_procedure_notification_target_app_info.go
index 7515c2eef..7b19b4b10 100644
--- a/go-apps/meep-ams/server/model_mobility_procedure_notification_target_app_info.go
+++ b/go-apps/meep-ams/server/model_mobility_procedure_notification_target_app_info.go
@@ -17,7 +17,7 @@
  *
  * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf) <p>[Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt) <p>**Micro-service**<br>[meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams) <p>**Type & Usage**<br>Edge Service used by edge applications that want to get information about application mobility in the network <p>**Note**<br>AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below).
  *
- * API version: 2.2.1
+ * API version: 3.1.1
  * Contact: AdvantEDGE@InterDigital.com
  * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
  */
diff --git a/go-apps/meep-ams/server/model_mobility_procedure_subscription.go b/go-apps/meep-ams/server/model_mobility_procedure_subscription.go
index ec7828ded..5492d708b 100644
--- a/go-apps/meep-ams/server/model_mobility_procedure_subscription.go
+++ b/go-apps/meep-ams/server/model_mobility_procedure_subscription.go
@@ -17,7 +17,7 @@
  *
  * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf) <p>[Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt) <p>**Micro-service**<br>[meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams) <p>**Type & Usage**<br>Edge Service used by edge applications that want to get information about application mobility in the network <p>**Note**<br>AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below).
  *
- * API version: 2.2.1
+ * API version: 3.1.1
  * Contact: AdvantEDGE@InterDigital.com
  * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
  */
diff --git a/go-apps/meep-ams/server/model_mobility_procedure_subscription_filter_criteria.go b/go-apps/meep-ams/server/model_mobility_procedure_subscription_filter_criteria.go
index a24757e3e..3bf738c19 100644
--- a/go-apps/meep-ams/server/model_mobility_procedure_subscription_filter_criteria.go
+++ b/go-apps/meep-ams/server/model_mobility_procedure_subscription_filter_criteria.go
@@ -17,7 +17,7 @@
  *
  * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf) <p>[Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt) <p>**Micro-service**<br>[meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams) <p>**Type & Usage**<br>Edge Service used by edge applications that want to get information about application mobility in the network <p>**Note**<br>AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below).
  *
- * API version: 2.2.1
+ * API version: 3.1.1
  * Contact: AdvantEDGE@InterDigital.com
  * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
  */
diff --git a/go-apps/meep-ams/server/model_mobility_procedure_subscription_links.go b/go-apps/meep-ams/server/model_mobility_procedure_subscription_links.go
index 8cce93b4e..8d54fc712 100644
--- a/go-apps/meep-ams/server/model_mobility_procedure_subscription_links.go
+++ b/go-apps/meep-ams/server/model_mobility_procedure_subscription_links.go
@@ -17,7 +17,7 @@
  *
  * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf) <p>[Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt) <p>**Micro-service**<br>[meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams) <p>**Type & Usage**<br>Edge Service used by edge applications that want to get information about application mobility in the network <p>**Note**<br>AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below).
  *
- * API version: 2.2.1
+ * API version: 3.1.1
  * Contact: AdvantEDGE@InterDigital.com
  * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
  */
diff --git a/go-apps/meep-ams/server/model_mobility_status.go b/go-apps/meep-ams/server/model_mobility_status.go
index f78702402..9da7212f1 100644
--- a/go-apps/meep-ams/server/model_mobility_status.go
+++ b/go-apps/meep-ams/server/model_mobility_status.go
@@ -17,7 +17,7 @@
  *
  * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf) <p>[Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt) <p>**Micro-service**<br>[meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams) <p>**Type & Usage**<br>Edge Service used by edge applications that want to get information about application mobility in the network <p>**Note**<br>AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below).
  *
- * API version: 2.2.1
+ * API version: 3.1.1
  * Contact: AdvantEDGE@InterDigital.com
  * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
  */
diff --git a/go-apps/meep-ams/server/model_one_of_inline_notification.go b/go-apps/meep-ams/server/model_one_of_inline_notification.go
index c8b870189..98744a2c5 100644
--- a/go-apps/meep-ams/server/model_one_of_inline_notification.go
+++ b/go-apps/meep-ams/server/model_one_of_inline_notification.go
@@ -17,7 +17,7 @@
  *
  * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf) <p>[Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt) <p>**Micro-service**<br>[meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams) <p>**Type & Usage**<br>Edge Service used by edge applications that want to get information about application mobility in the network <p>**Note**<br>AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below).
  *
- * API version: 2.2.1
+ * API version: 3.1.1
  * Contact: AdvantEDGE@InterDigital.com
  * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
  */
diff --git a/go-apps/meep-ams/server/model_one_of_inline_subscription.go b/go-apps/meep-ams/server/model_one_of_inline_subscription.go
index a2486df2b..ac4925f2b 100644
--- a/go-apps/meep-ams/server/model_one_of_inline_subscription.go
+++ b/go-apps/meep-ams/server/model_one_of_inline_subscription.go
@@ -17,7 +17,7 @@
  *
  * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf) <p>[Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt) <p>**Micro-service**<br>[meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams) <p>**Type & Usage**<br>Edge Service used by edge applications that want to get information about application mobility in the network <p>**Note**<br>AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below).
  *
- * API version: 2.2.1
+ * API version: 3.1.1
  * Contact: AdvantEDGE@InterDigital.com
  * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
  */
diff --git a/go-apps/meep-ams/server/model_operation_action_type.go b/go-apps/meep-ams/server/model_operation_action_type.go
index 4b1880c2c..c95c033ab 100644
--- a/go-apps/meep-ams/server/model_operation_action_type.go
+++ b/go-apps/meep-ams/server/model_operation_action_type.go
@@ -17,7 +17,7 @@
  *
  * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf) <p>[Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt) <p>**Micro-service**<br>[meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams) <p>**Type & Usage**<br>Edge Service used by edge applications that want to get information about application mobility in the network <p>**Note**<br>AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below).
  *
- * API version: 2.2.1
+ * API version: 3.1.1
  * Contact: AdvantEDGE@InterDigital.com
  * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
  */
diff --git a/go-apps/meep-ams/server/model_problem_details.go b/go-apps/meep-ams/server/model_problem_details.go
index 10ca51558..f451c100a 100644
--- a/go-apps/meep-ams/server/model_problem_details.go
+++ b/go-apps/meep-ams/server/model_problem_details.go
@@ -17,7 +17,7 @@
  *
  * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf) <p>[Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt) <p>**Micro-service**<br>[meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams) <p>**Type & Usage**<br>Edge Service used by edge applications that want to get information about application mobility in the network <p>**Note**<br>AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below).
  *
- * API version: 2.2.1
+ * API version: 3.1.1
  * Contact: AdvantEDGE@InterDigital.com
  * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
  */
diff --git a/go-apps/meep-ams/server/model_registration_info.go b/go-apps/meep-ams/server/model_registration_info.go
index a172f9256..fda8ed3f0 100644
--- a/go-apps/meep-ams/server/model_registration_info.go
+++ b/go-apps/meep-ams/server/model_registration_info.go
@@ -17,7 +17,7 @@
  *
  * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf) <p>[Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt) <p>**Micro-service**<br>[meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams) <p>**Type & Usage**<br>Edge Service used by edge applications that want to get information about application mobility in the network <p>**Note**<br>AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below).
  *
- * API version: 2.2.1
+ * API version: 3.1.1
  * Contact: AdvantEDGE@InterDigital.com
  * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
  */
diff --git a/go-apps/meep-ams/server/model_registration_info_device_information.go b/go-apps/meep-ams/server/model_registration_info_device_information.go
index 2bd5c0183..3507a2aeb 100644
--- a/go-apps/meep-ams/server/model_registration_info_device_information.go
+++ b/go-apps/meep-ams/server/model_registration_info_device_information.go
@@ -17,7 +17,7 @@
  *
  * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf) <p>[Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt) <p>**Micro-service**<br>[meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams) <p>**Type & Usage**<br>Edge Service used by edge applications that want to get information about application mobility in the network <p>**Note**<br>AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below).
  *
- * API version: 2.2.1
+ * API version: 3.1.1
  * Contact: AdvantEDGE@InterDigital.com
  * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
  */
diff --git a/go-apps/meep-ams/server/model_registration_info_service_consumer_id.go b/go-apps/meep-ams/server/model_registration_info_service_consumer_id.go
index 2924164ef..eb485a72d 100644
--- a/go-apps/meep-ams/server/model_registration_info_service_consumer_id.go
+++ b/go-apps/meep-ams/server/model_registration_info_service_consumer_id.go
@@ -17,7 +17,7 @@
  *
  * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf) <p>[Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt) <p>**Micro-service**<br>[meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams) <p>**Type & Usage**<br>Edge Service used by edge applications that want to get information about application mobility in the network <p>**Note**<br>AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below).
  *
- * API version: 2.2.1
+ * API version: 3.1.1
  * Contact: AdvantEDGE@InterDigital.com
  * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
  */
diff --git a/go-apps/meep-ams/server/model_subscription_link_list.go b/go-apps/meep-ams/server/model_subscription_link_list.go
index 30c277c09..018516898 100644
--- a/go-apps/meep-ams/server/model_subscription_link_list.go
+++ b/go-apps/meep-ams/server/model_subscription_link_list.go
@@ -17,7 +17,7 @@
  *
  * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf) <p>[Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt) <p>**Micro-service**<br>[meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams) <p>**Type & Usage**<br>Edge Service used by edge applications that want to get information about application mobility in the network <p>**Note**<br>AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below).
  *
- * API version: 2.2.1
+ * API version: 3.1.1
  * Contact: AdvantEDGE@InterDigital.com
  * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
  */
diff --git a/go-apps/meep-ams/server/model_subscription_link_list_links.go b/go-apps/meep-ams/server/model_subscription_link_list_links.go
index 576ae04c8..666a5bfe2 100644
--- a/go-apps/meep-ams/server/model_subscription_link_list_links.go
+++ b/go-apps/meep-ams/server/model_subscription_link_list_links.go
@@ -17,7 +17,7 @@
  *
  * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf) <p>[Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt) <p>**Micro-service**<br>[meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams) <p>**Type & Usage**<br>Edge Service used by edge applications that want to get information about application mobility in the network <p>**Note**<br>AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below).
  *
- * API version: 2.2.1
+ * API version: 3.1.1
  * Contact: AdvantEDGE@InterDigital.com
  * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
  */
diff --git a/go-apps/meep-ams/server/model_subscription_link_list_subscription.go b/go-apps/meep-ams/server/model_subscription_link_list_subscription.go
index bd29fc4fb..89b80580e 100644
--- a/go-apps/meep-ams/server/model_subscription_link_list_subscription.go
+++ b/go-apps/meep-ams/server/model_subscription_link_list_subscription.go
@@ -17,7 +17,7 @@
  *
  * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf) <p>[Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt) <p>**Micro-service**<br>[meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams) <p>**Type & Usage**<br>Edge Service used by edge applications that want to get information about application mobility in the network <p>**Note**<br>AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below).
  *
- * API version: 2.2.1
+ * API version: 3.1.1
  * Contact: AdvantEDGE@InterDigital.com
  * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
  */
diff --git a/go-apps/meep-ams/server/model_subscription_type.go b/go-apps/meep-ams/server/model_subscription_type.go
index aa34777c8..c0c996e1a 100644
--- a/go-apps/meep-ams/server/model_subscription_type.go
+++ b/go-apps/meep-ams/server/model_subscription_type.go
@@ -17,7 +17,7 @@
  *
  * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf) <p>[Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt) <p>**Micro-service**<br>[meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams) <p>**Type & Usage**<br>Edge Service used by edge applications that want to get information about application mobility in the network <p>**Note**<br>AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below).
  *
- * API version: 2.2.1
+ * API version: 3.1.1
  * Contact: AdvantEDGE@InterDigital.com
  * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
  */
diff --git a/go-apps/meep-ams/server/model_test_notification.go b/go-apps/meep-ams/server/model_test_notification.go
index 55749ad09..3c5962328 100644
--- a/go-apps/meep-ams/server/model_test_notification.go
+++ b/go-apps/meep-ams/server/model_test_notification.go
@@ -17,7 +17,7 @@
  *
  * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf) <p>[Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt) <p>**Micro-service**<br>[meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams) <p>**Type & Usage**<br>Edge Service used by edge applications that want to get information about application mobility in the network <p>**Note**<br>AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below).
  *
- * API version: 2.2.1
+ * API version: 3.1.1
  * Contact: AdvantEDGE@InterDigital.com
  * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
  */
diff --git a/go-apps/meep-ams/server/model_test_notification__links.go b/go-apps/meep-ams/server/model_test_notification__links.go
index cef23f442..852dab996 100644
--- a/go-apps/meep-ams/server/model_test_notification__links.go
+++ b/go-apps/meep-ams/server/model_test_notification__links.go
@@ -17,7 +17,7 @@
  *
  * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf) <p>[Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt) <p>**Micro-service**<br>[meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams) <p>**Type & Usage**<br>Edge Service used by edge applications that want to get information about application mobility in the network <p>**Note**<br>AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below).
  *
- * API version: 2.2.1
+ * API version: 3.1.1
  * Contact: AdvantEDGE@InterDigital.com
  * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
  */
diff --git a/go-apps/meep-ams/server/model_time_stamp.go b/go-apps/meep-ams/server/model_time_stamp.go
index 46e31b7eb..a3a6e5f92 100644
--- a/go-apps/meep-ams/server/model_time_stamp.go
+++ b/go-apps/meep-ams/server/model_time_stamp.go
@@ -17,7 +17,7 @@
  *
  * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf) <p>[Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt) <p>**Micro-service**<br>[meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams) <p>**Type & Usage**<br>Edge Service used by edge applications that want to get information about application mobility in the network <p>**Note**<br>AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below).
  *
- * API version: 2.2.1
+ * API version: 3.1.1
  * Contact: AdvantEDGE@InterDigital.com
  * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
  */
diff --git a/go-apps/meep-ams/server/model_websock_notif_config.go b/go-apps/meep-ams/server/model_websock_notif_config.go
index 403bb1015..b5b30991d 100644
--- a/go-apps/meep-ams/server/model_websock_notif_config.go
+++ b/go-apps/meep-ams/server/model_websock_notif_config.go
@@ -17,7 +17,7 @@
  *
  * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf) <p>[Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt) <p>**Micro-service**<br>[meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams) <p>**Type & Usage**<br>Edge Service used by edge applications that want to get information about application mobility in the network <p>**Note**<br>AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below).
  *
- * API version: 2.2.1
+ * API version: 3.1.1
  * Contact: AdvantEDGE@InterDigital.com
  * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
  */
diff --git a/go-apps/meep-ams/server/routers.go b/go-apps/meep-ams/server/routers.go
index ce1eb3d9e..e99757f7b 100644
--- a/go-apps/meep-ams/server/routers.go
+++ b/go-apps/meep-ams/server/routers.go
@@ -17,7 +17,7 @@
  *
  * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf) <p>[Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt) <p>**Micro-service**<br>[meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams) <p>**Type & Usage**<br>Edge Service used by edge applications that want to get information about application mobility in the network <p>**Note**<br>AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below).
  *
- * API version: 2.2.1
+ * API version: 3.1.1
  * Contact: AdvantEDGE@InterDigital.com
  * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
  */
-- 
GitLab