AMS integration fixes (19dfb711) · Commits · MEC - Multi-access Edge Computing / ETSI MEC Sandbox

go-apps/meep-ams/go.mod

+1 −1

Original line number	Diff line number	Diff line
		@@ -15,7 +15,7 @@ require (
		github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-redis v0.0.0
		github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-sandbox-ctrl-client v0.0.0
		github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-service-mgmt-client v0.0.0
		github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-swagger-api-mgr v0.0.0 // indirect
		github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-swagger-api-mgr v0.0.0
		github.com/antihax/optional v1.0.0 // indirect
		github.com/gorilla/handlers v1.4.0
		github.com/gorilla/mux v1.8.0

go-apps/meep-ams/server/ams.go

+59 −8

Original line number	Diff line number	Diff line
		@@ -37,9 +37,11 @@ import (
		httpLog "github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-http-logger"
		log "github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-logger"
		met "github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-metrics"
		mq "github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-mq"
		redis "github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-redis"
		scc "github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-sandbox-ctrl-client"
		smc "github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-service-mgmt-client"
		sam "github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-swagger-api-mgr"

		"github.com/gorilla/mux"
		)
		@@ -117,6 +119,9 @@ var sbxCtrlClient *scc.APIClient

		var registrationTicker *time.Ticker

		var amsMqLocal *mq.MsgQueue
		var amsApiMgr *sam.SwaggerApiMgr

		/func notImplemented(w http.ResponseWriter, r http.Request) {
		w.Header().Set("Content-Type", "application/json; charset=UTF-8")
		w.WriteHeader(http.StatusNotImplemented)
		@@ -232,6 +237,26 @@ func Init() (err error) {
		}
		}()

		// Create message queue
		amsMqLocal, err = mq.NewMsgQueue(mq.GetLocalName(sandboxName), moduleName, sandboxName, redisAddr)
		if err != nil {
		log.Error("Failed to create Message Queue with error: ", err)
		return err
		}
		log.Info("Message Queue created")

		// Create Swagger API Manager
		var apiMgrMepName = ""
		if mepName != defaultMepName {
		apiMgrMepName = mepName
		}
		amsApiMgr, err = sam.NewSwaggerApiMgr(moduleName, sandboxName, apiMgrMepName, amsMqLocal)
		if err != nil {
		log.Error("Failed to create Swagger API Manager. Error: ", err)
		return err
		}
		log.Info("Swagger API Manager created")

		// Initialize SBI
		/*sbiCfg := sbi.SbiCfg{
		ModuleName: moduleName,
		@@ -305,6 +330,23 @@ func reInit() {

		// Run - Start App Mobility service
		func Run() (err error) {

		// Start Swagger API Manager (provider)
		err = amsApiMgr.Start(true, false)
		if err != nil {
		log.Error("Failed to start Swagger API Manager with error: ", err.Error())
		return err
		}
		log.Info("Swagger API Manager started")

		// Add module Swagger APIs
		err = amsApiMgr.AddApis()
		if err != nil {
		log.Error("Failed to add Swagger APIs with error: ", err.Error())
		return err
		}
		log.Info("Swagger APIs successfully added")

		// Start MEC Service registration ticker
		if appEnablementEnabled {
		startRegistrationTicker()
		@@ -318,6 +360,16 @@ func Stop() (err error) {
		if appEnablementEnabled {
		stopRegistrationTicker()
		}

		if amsApiMgr != nil {
		// Remove APIs
		err = amsApiMgr.RemoveApis()
		if err != nil {
		log.Error("Failed to remove APIs with err: ", err.Error())
		return err
		}
		}

		return nil //sbi.Stop()
		}

		@@ -419,7 +471,7 @@ func getAppInstanceId() (id string, err error) {
		}

		func deregisterService(appInstanceId string, serviceId string) error {
		_, err := svcMgmtClient.AppServicesApi.AppServicesServiceIdDELETE(context.TODO(), appInstanceId, serviceId)
		_, err := svcMgmtClient.MecServiceMgmtApi.AppServicesServiceIdDELETE(context.TODO(), appInstanceId, serviceId)
		if err != nil {
		log.Error("Failed to unregister the service to app enablement registry: ", err)
		return err
		@@ -469,7 +521,7 @@ func registerService(appInstanceId string) error {
		//consumedLocalOnly
		srvInfo.ConsumedLocalOnly = consumedLocalOnly

		appServicesPostResponse, _, err := svcMgmtClient.AppServicesApi.AppServicesPOST(context.TODO(), srvInfo, appInstanceId)
		appServicesPostResponse, _, err := svcMgmtClient.MecServiceMgmtApi.AppServicesPOST(context.TODO(), srvInfo, appInstanceId)
		if err != nil {
		log.Error("Failed to register the service to app enablement registry: ", err)
		return err
		@@ -481,9 +533,8 @@ func registerService(appInstanceId string) error {

		func sendReadyConfirmation(appInstanceId string) error {
		var appReady asc.AppReadyConfirmation
		indication := asc.READY_ReadyIndicationType
		appReady.Indication = &indication
		_, err := appSupportClient.AppConfirmReadyApi.ApplicationsConfirmReadyPOST(context.TODO(), appReady, appInstanceId)
		appReady.Indication = "READY"
		_, err := appSupportClient.MecAppSupportApi.ApplicationsConfirmReadyPOST(context.TODO(), appReady, appInstanceId)
		if err != nil {
		log.Error("Failed to send a ready confirm acknowlegement: ", err)
		return err
		@@ -495,7 +546,7 @@ func sendTerminationConfirmation(appInstanceId string) error {
		var appTermination asc.AppTerminationConfirmation
		operationAction := asc.TERMINATING_OperationActionType
		appTermination.OperationAction = &operationAction
		_, err := appSupportClient.AppConfirmTerminationApi.ApplicationsConfirmTerminationPOST(context.TODO(), appTermination, appInstanceId)
		_, err := appSupportClient.MecAppSupportApi.ApplicationsConfirmTerminationPOST(context.TODO(), appTermination, appInstanceId)
		if err != nil {
		log.Error("Failed to send a confirm termination acknowlegement: ", err)
		return err
		@@ -508,7 +559,7 @@ func subscribeAppTermination(appInstanceId string) error {
		subscription.SubscriptionType = "AppTerminationNotificationSubscription"
		subscription.AppInstanceId = appInstanceId
		subscription.CallbackReference = "http://" + mepName + "-" + moduleName + "/" + amsBasePath + appTerminationPath
		_, _, err := appSupportClient.AppSubscriptionsApi.ApplicationsSubscriptionsPOST(context.TODO(), subscription, appInstanceId)
		_, _, err := appSupportClient.MecAppSupportApi.ApplicationsSubscriptionsPOST(context.TODO(), subscription, appInstanceId)
		if err != nil {
		log.Error("Failed to register to App Support subscription: ", err)
		return err
		@@ -519,7 +570,7 @@ func subscribeAppTermination(appInstanceId string) error {
		/*
		func unsubscribeAppTermination(appInstanceId string) error {
		//only subscribe to one subscription, so we force number to be one, couldn't be anything else
		_, err := appSupportClient.AppSubscriptionsApi.ApplicationsSubscriptionDELETE(context.TODO(), appInstanceId, "1")
		_, err := appSupportClient.MecAppSupportApi.ApplicationsSubscriptionDELETE(context.TODO(), appInstanceId, "1")
		if err != nil {
		log.Error("Failed to unregister to App Support subscription: ", err)
		return err

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

deleted100644 → 0

+0 −32

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2020 InterDigital Communications, Inc
		*
		* Licensed under the Apache License, Version 2.0 (the \"License\");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an \"AS IS\" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*
		* AdvantEDGE MEC Application Support API
		*
		* The ETSI MEC ISG MEC011 MEC Application Support API described using OpenAPI
		*
		* API version: 2.1.1
		* Contact: cti_support@etsi.org
		* Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
		*/
		package server

		// ReadyIndicationType : Indication about the MEC application instance.
		type ReadyIndicationType string

		// List of ReadyIndicationType
		const (
		READY ReadyIndicationType = "READY"
		)

go-packages/meep-app-support-client/model_ready_indication_type.go

deleted100644 → 0

+0 −33

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2020 InterDigital Communications, Inc
		*
		* Licensed under the Apache License, Version 2.0 (the \"License\");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an \"AS IS\" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*
		* AdvantEDGE MEC Application Support API
		*
		* The ETSI MEC ISG MEC011 MEC Application Support API described using OpenAPI
		*
		* API version: 2.1.1
		* Contact: cti_support@etsi.org
		* Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
		*/

		package client

		// ReadyIndicationType : Indication about the MEC application instance.
		type ReadyIndicationType string

		// List of ReadyIndicationType
		const (
		READY_ReadyIndicationType ReadyIndicationType = "READY"
		)

go-packages/meep-swagger-api-mgr/swagger-api-mgr.go

+1 −1

Original line number	Diff line number	Diff line
		@@ -14,7 +14,7 @@
		* limitations under the License.
		*/

		package giscache
		package swaggerapimgr

		import (
		"encoding/json"