service-mgmnt + app-ctrl fixes (15c53c47) · Commits · MEC - Multi-access Edge Computing / ETSI MEC Sandbox

go-apps/meep-app-enablement/server/app-support/app-support.go

+4 −4

Original line number	Diff line number	Diff line
		@@ -38,7 +38,7 @@ import (
		)

		const moduleName = "meep-app-enablement"
		const mappsupportBasePath = "mec_app_support/v1/"
		const appSupportBasePath = "mec_app_support/v1/"
		const appEnablementKey = "app-enablement"
		const globalMepName = "global"
		const APP_STATE_READY = "READY"
		@@ -90,10 +90,10 @@ func Init(sandbox string, mep string, host url.URL, msgQueue mq.MsgQueue, glob

		// Set base path & base storage key
		if mepName == globalMepName {
		basePath = "/" + sandboxName + "/" + mappsupportBasePath
		basePath = "/" + sandboxName + "/" + appSupportBasePath
		baseKey = dkm.GetKeyRoot(sandboxName) + appEnablementKey + ":global:"
		} else {
		basePath = "/" + sandboxName + "/" + mepName + "/" + mappsupportBasePath
		basePath = "/" + sandboxName + "/" + mepName + "/" + appSupportBasePath
		baseKey = dkm.GetKeyRoot(sandboxName) + appEnablementKey + ":mep:" + mepName + ":"
		}

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

		// Create subscription
		// Retrieve subscription request
		var appTermNotifSub AppTerminationNotificationSubscription
		decoder := json.NewDecoder(r.Body)
		err = decoder.Decode(&appTermNotifSub)

go-apps/meep-app-enablement/server/service-mgmt/convert.go

+34 −6

Original line number	Diff line number	Diff line
		@@ -22,8 +22,8 @@ import (
		log "github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-logger"
		)

		func convertServiceInfoToJson(serviceInfo *ServiceInfo) string {
		jsonInfo, err := json.Marshal(*serviceInfo)
		func convertServiceInfoToJson(obj *ServiceInfo) string {
		jsonInfo, err := json.Marshal(*obj)
		if err != nil {
		log.Error(err.Error())
		return ""
		@@ -41,8 +41,8 @@ func convertJsonToServiceInfo(jsonInfo string) *ServiceInfo {
		return &obj
		}

		func convertSerAvailabilityNotificationSubscriptionToJson(sub *SerAvailabilityNotificationSubscription) string {
		jsonInfo, err := json.Marshal(*sub)
		func convertSerAvailabilityNotifSubToJson(obj *SerAvailabilityNotificationSubscription) string {
		jsonInfo, err := json.Marshal(*obj)
		if err != nil {
		log.Error(err.Error())
		return ""
		@@ -50,8 +50,36 @@ func convertSerAvailabilityNotificationSubscriptionToJson(sub *SerAvailabilityNo
		return string(jsonInfo)
		}

		func convertProblemDetailsToJson(problemDetails *ProblemDetails) string {
		jsonInfo, err := json.Marshal(*problemDetails)
		func convertJsonToSerAvailabilityNotifSub(jsonData string) *SerAvailabilityNotificationSubscription {
		var obj SerAvailabilityNotificationSubscription
		err := json.Unmarshal([]byte(jsonData), &obj)
		if err != nil {
		log.Error(err.Error())
		return nil
		}
		return &obj
		}

		func convertServiceAvailabilityNotifToJson(obj *ServiceAvailabilityNotification) string {
		jsonInfo, err := json.Marshal(*obj)
		if err != nil {
		log.Error(err.Error())
		return ""
		}
		return string(jsonInfo)
		}

		func convertProblemDetailsToJson(obj *ProblemDetails) string {
		jsonInfo, err := json.Marshal(*obj)
		if err != nil {
		log.Error(err.Error())
		return ""
		}
		return string(jsonInfo)
		}

		func convertSubscriptionLinkListToJson(obj *SubscriptionLinkList) string {
		jsonInfo, err := json.Marshal(*obj)
		if err != nil {
		log.Error(err.Error())
		return ""

go-apps/meep-app-enablement/server/service-mgmt/service-mgmt.go

+568 −535

File changed.

Preview size limit exceeded, changes collapsed.

go-apps/meep-sandbox-ctrl/server/app-ctrl.go

+6 −5

Original line number	Diff line number	Diff line
		@@ -32,11 +32,8 @@ import (
		"github.com/gorilla/mux"
		)

		const appEnablementModule = "meep-app-enablement"

		// MQ payload fields
		const mqFieldAppInstanceId = "id"
		const mqFieldMepName = "mep"
		const mqFieldPersist = "persist"

		type AppCtrl struct {
		@@ -229,7 +226,7 @@ func applicationsGET(w http.ResponseWriter, r *http.Request) {
		// Validate & retrieve query parameters
		u, _ := url.Parse(r.URL.String())
		q := u.Query()
		validParams := []string{"app", "mep"}
		validParams := []string{"app", "mep", "type"}
		err := validateQueryParams(q, validParams)
		if err != nil {
		http.Error(w, err.Error(), http.StatusBadRequest)
		@@ -238,6 +235,7 @@ func applicationsGET(w http.ResponseWriter, r *http.Request) {

		appName := q.Get("app")
		mepName := q.Get("mep")
		appType := q.Get("type")

		// Get application list
		appList, err := appCtrl.appStore.GetAll()
		@@ -252,7 +250,8 @@ func applicationsGET(w http.ResponseWriter, r *http.Request) {
		for _, app := range appList {
		// Filter using query params
		if (appName != "" && app.Name != appName) \|\|
		(mepName != "" && app.Mep != mepName) {
		(mepName != "" && app.Mep != mepName) \|\|
		(appType != "" && app.Type != appType) {
		continue
		}
		// Append appInfo
		@@ -344,6 +343,8 @@ func convertAppToApplicationInfo(app apps.Application) dataModel.ApplicationIn
		Id: app.Id,
		Name: app.Name,
		MepName: app.Mep,
		Type_: app.Type,
		Persist: app.Persist,
		}
		return appInfo
		}