Unverified Commit 91f538b2 authored by Kevin Di Lallo's avatar Kevin Di Lallo Committed by GitHub
Browse files

Merge pull request #273 from pastorsx/sp_dev_mec011_phase1_serv_mgmt_subscribe 

MEC011 Service Management API subscriptions
parents ff85b5a7 e7102b4a

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

+0 −5
Original line number Diff line number Diff line
@@ -46,13 +46,8 @@ const APP_TERMINATION_NOTIFICATION_SUBSCRIPTION_TYPE = "AppTerminationNotificati 


var mutex *sync.Mutex



//const logModuleMSMgmt = "meep-app-enablement"

//const serviceName = "MEC Service Management"



var redisAddr string = "meep-redis-master.default.svc.cluster.local:6379"



//var influxAddr string = "http://meep-influxdb.default.svc.cluster.local:8086"



var APP_ENABLEMENT_DB = 5



var rc *redis.Connector

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

+1 −1
Original line number Diff line number Diff line
@@ -282,7 +282,7 @@ var routes = Routes{ 
	Route{

		"ApplicationsAppInstanceIdGET",

		strings.ToUpper("Get"),

		"/mec_info/v1/applications/{appInstanceId}",

		"/app_info/v1/applications/{appInstanceId}",

		appInfo.ApplicationsAppInstanceIdGET,

	},

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

+4 −8
Original line number Diff line number Diff line
@@ -28,21 +28,17 @@ import ( 
)



func ApplicationsSubscriptionDELETE(w http.ResponseWriter, r *http.Request) {

	w.Header().Set("Content-Type", "application/json; charset=UTF-8")

	w.WriteHeader(http.StatusOK)

	applicationsSubscriptionDELETE(w, r)

}



func ApplicationsSubscriptionGET(w http.ResponseWriter, r *http.Request) {

	w.Header().Set("Content-Type", "application/json; charset=UTF-8")

	w.WriteHeader(http.StatusOK)

	applicationsSubscriptionGET(w, r)

}



func ApplicationsSubscriptionsGET(w http.ResponseWriter, r *http.Request) {

	w.Header().Set("Content-Type", "application/json; charset=UTF-8")

	w.WriteHeader(http.StatusOK)

	applicationsSubscriptionsGET(w, r)

}



func ApplicationsSubscriptionsPOST(w http.ResponseWriter, r *http.Request) {

	w.Header().Set("Content-Type", "application/json; charset=UTF-8")

	w.WriteHeader(http.StatusOK)

	applicationsSubscriptionsPOST(w, r)

}

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

+22 −0
Original line number Diff line number Diff line
@@ -32,3 +32,25 @@ func ConvertServiceInfoToJson(serviceInfo *ServiceInfo) string { 


	return string(jsonInfo)

}



func convertJsonToServiceInfo(jsonInfo string) *ServiceInfo {



	var obj ServiceInfo

	err := json.Unmarshal([]byte(jsonInfo), &obj)

	if err != nil {

		log.Error(err.Error())

		return nil

	}

	return &obj

}



func convertSerAvailabilityNotificationSubscriptionToJson(sub *SerAvailabilityNotificationSubscription) string {



	jsonInfo, err := json.Marshal(*sub)

	if err != nil {

		log.Error(err.Error())

		return ""

	}



	return string(jsonInfo)

}

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

+2 −1
Original line number Diff line number Diff line
@@ -29,7 +29,8 @@ type SerAvailabilityNotificationSubscription struct { 


	CallbackReference string `json:"callbackReference"`



	Links *Self `json:"_links"`

	//change manually to optional, spec implementation error

	Links *Self `json:"_links,omitempty"`



	FilteringCriteria *SerAvailabilityNotificationSubscriptionFilteringCriteria `json:"filteringCriteria,omitempty"`

}