Commit 2d976750 authored by supermikii's avatar supermikii
Browse files

fix query service by appid for demo3 ams

parent ccc6361e

examples/demo3/src/go.mod

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ go 1.15 
require (

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-ams-client v0.0.0

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-app-support-client v0.0.0

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-logger v0.0.0-20210505162607-cc887b7a0c0a

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-logger v0.0.0-20211012135439-29644864b026

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-service-mgmt-client v0.0.0

	github.com/gorilla/handlers v1.5.1

	github.com/gorilla/mux v1.8.0

examples/demo3/src/go.sum

+2 −0
Original line number Diff line number Diff line
@@ -44,6 +44,8 @@ github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym 
github.com/InterDigitalInc/AdvantEDGE v1.7.1 h1:XKOqcRWvlqhyFmhH0hHOAnCYNVWln6XqWLp1OQ5JwZ4=

github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-logger v0.0.0-20210505162607-cc887b7a0c0a h1:fjxPT6ITEFXPZ9LRbev8iFy1swOhe7lRCUobSd0vHQA=

github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-logger v0.0.0-20210505162607-cc887b7a0c0a/go.mod h1:Xy2Z6nc9m0DRQRj9g0+/4E6OkDlCkFYySa65JoQ2d8g=

github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-logger v0.0.0-20211012135439-29644864b026 h1:YFADWZghbg8ASHxm9Z+BN+oXEQodK+DMCBBojZUlDQ8=

github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-logger v0.0.0-20211012135439-29644864b026/go.mod h1:Xy2Z6nc9m0DRQRj9g0+/4E6OkDlCkFYySa65JoQ2d8g=

github.com/antihax/optional v1.0.0 h1:xK2lYat7ZLaVVcIuj82J8kIro4V6kDe0AUDFboUCwcg=

github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=

github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=

examples/demo3/src/server/demo3_service.go

+1 −1
Original line number Diff line number Diff line
@@ -744,7 +744,7 @@ func Run() { 
// Terminate by deleting all resources allocated on MEC platform & mec app

func Terminate() {



	// Only invoke graceful termination if terminated is false

	// Only invoke graceful termination if not terminated

	if !terminated {

		//Delete app subscriptions

		err := delAppTerminationSubscription(instanceName, terminationSubscriptionId)

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

+13 −12
Original line number Diff line number Diff line
@@ -204,17 +204,18 @@ func appServicesGET(w http.ResponseWriter, r *http.Request) { 
	defer mutex.Unlock()



	// Validate App Instance ID

	err, code, problemDetails := validateAppInstanceId(appInstanceId)

	if err != nil {

		log.Error(err.Error())

		if problemDetails != "" {

			w.WriteHeader(code)

			fmt.Fprintf(w, problemDetails)

		} else {

			http.Error(w, err.Error(), code)

		}

		return

	}

	// Do not validate app instance id in order to find url of ams service on anther mec platform

	// err, code, problemDetails := validateAppInstanceId(appInstanceId)

	// if err != nil {

	// 	log.Error(err.Error())

	// 	if problemDetails != "" {

	// 		w.WriteHeader(code)

	// 		fmt.Fprintf(w, problemDetails)

	// 	} else {

	// 		http.Error(w, err.Error(), code)

	// 	}

	// 	return

	// }



	getServices(w, r, appInstanceId)

}
@@ -911,7 +912,7 @@ func getServices(w http.ResponseWriter, r *http.Request, appInstanceId string) { 
	if appInstanceId == "" {

		key = baseKeyGlobal + ":app:*:svc:*"

	} else {

		key = baseKey + ":app:" + appInstanceId + ":svc:*"

		key = baseKeyGlobal + ":app:" + appInstanceId + ":svc:*"

	}



	err = rc.ForEachJSONEntry(key, populateServiceInfoList, &sInfoList)