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

Merge pull request #317 from dilallkx/kd_sp43_fix_mec 

App Enablement fixes
parents 0df55846 c3996740

go-apps/meep-app-enablement/api/app-support/swagger.yaml

+5 −3
Original line number Diff line number Diff line
@@ -518,15 +518,17 @@ components: 
                type: object

                required:

                  - href

                  - rel

                  - subscriptionType

                properties:

                  href:

                    description: URI referring to a resource

                    type: string

                    format: uri

                  rel:

                  subscriptionType:

                    description: >-

                      The values shall be set to AppTerminationNotificationSubscription.

                      Type of the subscription. The values are as defined in

                      the "subscriptionType" attribute for each different Mp1

                      event subscription data type.

                    type: string

    OperationActionType:

      description: Operation that is being performed on the MEC application instance.

go-apps/meep-app-enablement/api/service-mgmt/swagger.yaml

+6 −4
Original line number Diff line number Diff line
@@ -377,15 +377,17 @@ components: 
                type: object

                required:

                  - href

                  - rel

                  - subscriptionType

                properties:

                  href:

                    description: URI referring to a resource

                    type: string

                    format: uri

                  rel:

                  subscriptionType:

                    description: >-

                      The value shall be se to SerAvailabilityNotificationSubscription.

                      Type of the subscription. The values are as defined in

                      the "subscriptionType" attribute for each different Mp1

                      event subscription data type.

                    type: string

    ProblemDetails:

      type: object

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

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ To see how to make this your own, look here: 
[README](https://github.com/swagger-api/swagger-codegen/blob/master/README.md)



- API version: 2.1.1

- Build date: 2021-10-12T16:48:32.416941-04:00[America/Toronto]

- Build date: 2021-10-20T14:18:53.980767-04:00[America/Toronto]





### Running the server

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

+2 −1
Original line number Diff line number Diff line
@@ -370,6 +370,7 @@ func applicationsSubscriptionsPOST(w http.ResponseWriter, r *http.Request) { 
		http.Error(w, err.Error(), http.StatusInternalServerError)

		return

	}

	w.Header().Set("Location", subscription.Links.Self.Href)

	w.WriteHeader(http.StatusCreated)

	fmt.Fprintf(w, string(jsonResponse))

}
@@ -488,7 +489,7 @@ func applicationsSubscriptionsGET(w http.ResponseWriter, r *http.Request) { 
			var subscription SubscriptionLinkListLinksSubscriptions

			subscription.Href = appTermSubscription.Links.Self.Href

			//in v2.1.1 it should be SubscriptionType, but spec is expecting "rel" as per v1.1.1

			subscription.Rel = APP_TERMINATION_NOTIFICATION_SUBSCRIPTION_TYPE

			subscription.SubscriptionType = APP_TERMINATION_NOTIFICATION_SUBSCRIPTION_TYPE

			subscriptionLinkList.Links.Subscriptions = append(subscriptionLinkList.Links.Subscriptions, subscription)

		}

	}

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

+2 −2
Original line number Diff line number Diff line
@@ -27,6 +27,6 @@ package server 
type SubscriptionLinkListLinksSubscriptions struct {

	// URI referring to a resource

	Href string `json:"href"`

	// The values shall be set to AppTerminationNotificationSubscription.

	Rel string `json:"rel"`

	// Type of the subscription. The values are as defined in the \"subscriptionType\" attribute for each different Mp1 event subscription data type.

	SubscriptionType string `json:"subscriptionType"`

}