Commit 90972f5b authored by Simon Pastor's avatar Simon Pastor
Browse files

pr review

parent 5b506968

go-apps/meep-loc-serv/server/loc-serv.go

+25 −27
Original line number Diff line number Diff line
@@ -177,8 +177,6 @@ var sbxCtrlClient *scc.APIClient 


var registrationTicker *time.Ticker



var sandboxCtrlClient *scc.APIClient



// Init - Location Service initialization

func Init() (err error) {
@@ -567,12 +565,13 @@ func subscribeAppTermination(appInstanceId string) error { 
	var subscription asc.AppTerminationNotificationSubscription

	subscription.SubscriptionType = "AppTerminationNotificationSubscription"

	subscription.AppInstanceId = appInstanceId

	subscription.CallbackReference = hostUrl.String() + basePath + appTerminationPath

	subscription.CallbackReference = "http://" + mepName + "-" + moduleName + "/" + LocServBasePath + appTerminationPath

	_, _, err := appSupportClient.AppSubscriptionsApi.ApplicationsSubscriptionsPOST(context.TODO(), subscription, appInstanceId)

	if err != nil {

		log.Error("Failed to register to App Support subscription: ", err)

		return err

	}



	return nil

}
@@ -3853,8 +3852,8 @@ func mec011AppTerminationPost(w http.ResponseWriter, r *http.Request) { 
		return

	}



	stopRegistrationTicker()



	//using a go routine to quickly send the response to the requestor

	go func() {

		//delete any registration it made

		// cannot unsubscribe otherwise, the app-enablement server fails when receiving the confirm_terminate since it believes it never registered

		//_ = unsubscribeAppTermination(serviceAppInstanceId)
@@ -3882,8 +3881,7 @@ func mec011AppTerminationPost(w http.ResponseWriter, r *http.Request) { 
		event.EventScenarioUpdate = &eventScenarioUpdate

		event.Type_ = "SCENARIO-UPDATE"



	go func() {

		_, err := sandboxCtrlClient.EventsApi.SendEvent(context.TODO(), event.Type_, event)

		_, err := sbxCtrlClient.EventsApi.SendEvent(context.TODO(), event.Type_, event)

		if err != nil {

			log.Error(err)

		}

go-apps/meep-rnis/server/rnis.go

+22 −24
Original line number Diff line number Diff line
@@ -642,7 +642,7 @@ func subscribeAppTermination(appInstanceId string) error { 
	var subscription asc.AppTerminationNotificationSubscription

	subscription.SubscriptionType = "AppTerminationNotificationSubscription"

	subscription.AppInstanceId = appInstanceId

	subscription.CallbackReference = hostUrl.String() + basePath + appTerminationPath

	subscription.CallbackReference = "http://" + mepName + "-" + moduleName + "/" + rnisBasePath + appTerminationPath

	_, _, err := appSupportClient.AppSubscriptionsApi.ApplicationsSubscriptionsPOST(context.TODO(), subscription, appInstanceId)

	if err != nil {

		log.Error("Failed to register to App Support subscription: ", err)
@@ -681,8 +681,7 @@ func mec011AppTerminationPost(w http.ResponseWriter, r *http.Request) { 
		return

	}



	stopRegistrationTicker()



	go func() {

		//delete any registration it made

		// cannot unsubscribe otherwise, the app-enablement server fails when receiving the confirm_terminate since it believes it never registered

		//_ = unsubscribeAppTermination(serviceAppInstanceId)
@@ -710,7 +709,6 @@ func mec011AppTerminationPost(w http.ResponseWriter, r *http.Request) { 
		event.EventScenarioUpdate = &eventScenarioUpdate

		event.Type_ = "SCENARIO-UPDATE"



	go func() {

		_, err := sbxCtrlClient.EventsApi.SendEvent(context.TODO(), event.Type_, event)

		if err != nil {

			log.Error(err)

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

+15 −0
Original line number Diff line number Diff line
@@ -126,6 +126,14 @@ func applicationsPOST(w http.ResponseWriter, r *http.Request) { 
		return

	}



	// Make sure App name is unique and does not exist

	if appNameExists(appInfo.Name) {

		errStr := "App Name already exists"

		log.Error(errStr)

		http.Error(w, errStr, http.StatusBadRequest)

		return

	}



	// Obtain a new App Instance ID if none provided

	if appInfo.Id == "" {

		appInstanceId, err := getNewInstanceId()
@@ -366,6 +374,13 @@ func appInstanceExists(mepName string, appInstanceId string) bool { 
	return false

}



// Validate that App Name exists

func appNameExists(name string) bool {

	//key := appCtrl.baseKey + ":mep:*:app:*:info"

	//TODO need to check the content of each appInfo to find out

	return false

}



// Validate query params

func validateQueryParams(params url.Values, validParams []string) error {

	for param := range params {

go-apps/meep-wais/server/wais.go

+22 −24
Original line number Diff line number Diff line
@@ -530,7 +530,7 @@ func subscribeAppTermination(appInstanceId string) error { 
	var subscription asc.AppTerminationNotificationSubscription

	subscription.SubscriptionType = "AppTerminationNotificationSubscription"

	subscription.AppInstanceId = appInstanceId

	subscription.CallbackReference = hostUrl.String() + basePath + appTerminationPath

	subscription.CallbackReference = "http://" + mepName + "-" + moduleName + "/" + waisBasePath + appTerminationPath

	_, _, err := appSupportClient.AppSubscriptionsApi.ApplicationsSubscriptionsPOST(context.TODO(), subscription, appInstanceId)

	if err != nil {

		log.Error("Failed to register to App Support subscription: ", err)
@@ -569,8 +569,7 @@ func mec011AppTerminationPost(w http.ResponseWriter, r *http.Request) { 
		return

	}



	stopRegistrationTicker()



	go func() {

		//delete any registration it made

		// cannot unsubscribe otherwise, the app-enablement server fails when receiving the confirm_terminate since it believes it never registered

		//_ = unsubscribeAppTermination(serviceAppInstanceId)
@@ -598,7 +597,6 @@ func mec011AppTerminationPost(w http.ResponseWriter, r *http.Request) { 
		event.EventScenarioUpdate = &eventScenarioUpdate

		event.Type_ = "SCENARIO-UPDATE"



	go func() {

		_, err := sbxCtrlClient.EventsApi.SendEvent(context.TODO(), event.Type_, event)

		if err != nil {

			log.Error(err)