diff --git a/Mp1.json b/Mp1.json index 9288d269c19f4ae85d28c896e8fa6a660c11f85c..b1dbbd77cfbc08da5a37d2aa34adbcf8cb5739c9 100644 Binary files a/Mp1.json and b/Mp1.json differ diff --git a/Mp1.yaml b/Mp1.yaml index 352503e0bbd2d3c3a7e27ce37381be253dff877c..6995650304ea96ec3e083acc6e457c6b0eaed99e 100644 --- a/Mp1.yaml +++ b/Mp1.yaml @@ -25,7 +25,7 @@ parameters: in: body required: true schema: - $ref: '#/definitions/AppTerminationNotificationSubscription.Request' + $ref: '#/definitions/AppTerminationNotificationSubscription' Body.DnsRule: name: DnsRule description: The updated state is included in the entity body of the request. @@ -39,7 +39,7 @@ parameters: in: body required: true schema: - $ref: '#/definitions/SerAvailabilityNotificationSubscription.Request' + $ref: '#/definitions/SerAvailabilityNotificationSubscription' Body.ServiceInfo: name: ServiceInfo description: New ServiceInfo with updated "state" is included as entity body of the request @@ -325,7 +325,7 @@ paths: type: object properties: AppTerminationNotificationSubscription: - $ref: '#/definitions/AppTerminationNotificationSubscription.Response' + $ref: '#/definitions/AppTerminationNotificationSubscription' '400': description: Bad Request schema: @@ -366,7 +366,7 @@ paths: type: object properties: SerAvailabilityNotificationSubscription: - $ref: '#/definitions/SerAvailabilityNotificationSubscription.Response' + $ref: '#/definitions/SerAvailabilityNotificationSubscription' '400': description: Bad Request schema: @@ -1034,21 +1034,7 @@ definitions: description: URI selected by the mobile edge application instance to receive notifications on the subscribed mobile edge application instance management information. This shall be included in both the request and the response. type: string format: uri - AppTerminationNotificationSubscription.Request: - description: This type represents the information that the mobile edge platform notifies the subscribed application instance about the corresponding application instance termination/stop. - type: object - required: - - subscriptionType - - callbackReference - - appInstanceId - properties: - subscriptionType: - $ref: '#/definitions/AppTerminationNotificationSubscription.SubscriptionType' - callbackReference: - $ref: '#/definitions/AppTerminationNotificationSubscription.CallbackReference' - appInstanceId: - $ref: '#/definitions/AppTerminationNotificationSubscription.AppInstanceId' - AppTerminationNotificationSubscription.Response: + AppTerminationNotificationSubscription: description: This type represents the information that the mobile edge platform notifies the subscribed application instance about the corresponding application instance termination/stop. type: object required: @@ -1261,6 +1247,7 @@ definitions: description: URI referring to a resource type: string format: uri + readOnly: true example: /meMp1/example Mp1SubscriptionLinkList.Links: description: Self-referring URI. @@ -1368,25 +1355,12 @@ definitions: properties: self: $ref: '#/definitions/LinkType' + readOnly: true SerAvailabilityNotificationSubscription.CallbackReference: description: URI selected by the mobile edge application instance to receive notifications on the subscribed mobile edge service availability information. This shall be included in both the request and the response. type: string format: uri - SerAvailabilityNotificationSubscription.Request: - description: This type represents a subscription to the notifications from the mobile edge platform regarding the availability of a mobile edge service or a list of mobile edge services. - type: object - required: - - subscriptionType - - callbackReference - - filteringCriteria - properties: - subscriptionType: - $ref: '#/definitions/SerAvailabilityNotificationSubscription.SubscriptionType' - callbackReference: - $ref: '#/definitions/SerAvailabilityNotificationSubscription.CallbackReference' - filteringCriteria: - $ref: '#/definitions/ServiceInfo' - SerAvailabilityNotificationSubscription.Response: + SerAvailabilityNotificationSubscription: description: This type represents a subscription to the notifications from the mobile edge platform regarding the availability of a mobile edge service or a list of mobile edge services. type: object required: diff --git a/definitions/AppTerminationNotificationSubscription.Request.yaml b/definitions/AppTerminationNotificationSubscription.Request.yaml deleted file mode 100644 index 73aa5289b44cadf751c70217d98b4fe93aec1c37..0000000000000000000000000000000000000000 --- a/definitions/AppTerminationNotificationSubscription.Request.yaml +++ /dev/null @@ -1,13 +0,0 @@ -description: This type represents the information that the mobile edge platform notifies the subscribed application instance about the corresponding application instance termination/stop. -type: object -required: - - subscriptionType - - callbackReference - - appInstanceId -properties: - subscriptionType: - $ref: '#/definitions/AppTerminationNotificationSubscription.SubscriptionType' - callbackReference: - $ref: '#/definitions/AppTerminationNotificationSubscription.CallbackReference' - appInstanceId: - $ref: '#/definitions/AppTerminationNotificationSubscription.AppInstanceId' \ No newline at end of file diff --git a/definitions/AppTerminationNotificationSubscription.Response.yaml b/definitions/AppTerminationNotificationSubscription.yaml similarity index 100% rename from definitions/AppTerminationNotificationSubscription.Response.yaml rename to definitions/AppTerminationNotificationSubscription.yaml diff --git a/definitions/LinkType.yaml b/definitions/LinkType.yaml index cca531f105988c1bb0b73f7980d203f90c4c4f90..f5bebcd618a1d97ebd22190c5f63d8c6303a2179 100644 --- a/definitions/LinkType.yaml +++ b/definitions/LinkType.yaml @@ -1,4 +1,5 @@ description: URI referring to a resource type: string format: uri +readOnly: true example: '/meMp1/example' \ No newline at end of file diff --git a/definitions/Self.yaml b/definitions/Self.yaml index 24a610644495ff1fcc8c219b1afa4c5b72b3b113..90ff743fc6a5a9e091ac07db392dcae0fdbf1c11 100644 --- a/definitions/Self.yaml +++ b/definitions/Self.yaml @@ -4,4 +4,5 @@ required: - self properties: self: - $ref: '#/definitions/LinkType' \ No newline at end of file + $ref: '#/definitions/LinkType' +readOnly: true \ No newline at end of file diff --git a/definitions/SerAvailabilityNotificationSubscription.Request.yaml b/definitions/SerAvailabilityNotificationSubscription.Request.yaml deleted file mode 100644 index be7d33daa702f59c141e8253f5702c9cfc7456d8..0000000000000000000000000000000000000000 --- a/definitions/SerAvailabilityNotificationSubscription.Request.yaml +++ /dev/null @@ -1,13 +0,0 @@ -description: This type represents a subscription to the notifications from the mobile edge platform regarding the availability of a mobile edge service or a list of mobile edge services. -type: object -required: - - subscriptionType - - callbackReference - - filteringCriteria -properties: - subscriptionType: - $ref: '#/definitions/SerAvailabilityNotificationSubscription.SubscriptionType' - callbackReference: - $ref: '#/definitions/SerAvailabilityNotificationSubscription.CallbackReference' - filteringCriteria: - $ref: '#/definitions/ServiceInfo' \ No newline at end of file diff --git a/definitions/SerAvailabilityNotificationSubscription.Response.yaml b/definitions/SerAvailabilityNotificationSubscription.yaml similarity index 100% rename from definitions/SerAvailabilityNotificationSubscription.Response.yaml rename to definitions/SerAvailabilityNotificationSubscription.yaml diff --git a/definitions/index.yaml b/definitions/index.yaml index 496cb046939b6cca41703203f98a25cdcbbca47f..ce8aef30c6556958ad8a7fff04089643e2f536e8 100644 --- a/definitions/index.yaml +++ b/definitions/index.yaml @@ -8,10 +8,8 @@ AppTerminationNotificationSubscription.AppInstanceId: $ref: ./AppTerminationNotificationSubscription.AppInstanceId.yaml AppTerminationNotificationSubscription.CallbackReference: $ref: ./AppTerminationNotificationSubscription.CallbackReference.yaml -AppTerminationNotificationSubscription.Request: - $ref: ./AppTerminationNotificationSubscription.Request.yaml -AppTerminationNotificationSubscription.Response: - $ref: ./AppTerminationNotificationSubscription.Response.yaml +AppTerminationNotificationSubscription: + $ref: ./AppTerminationNotificationSubscription.yaml AppTerminationNotificationSubscription.SubscriptionType: $ref: ./AppTerminationNotificationSubscription.SubscriptionType.yaml CategoryRef.Href: @@ -96,10 +94,8 @@ Self: $ref: ./Self.yaml SerAvailabilityNotificationSubscription.CallbackReference: $ref: ./SerAvailabilityNotificationSubscription.CallbackReference.yaml -SerAvailabilityNotificationSubscription.Request: - $ref: ./SerAvailabilityNotificationSubscription.Request.yaml -SerAvailabilityNotificationSubscription.Response: - $ref: ./SerAvailabilityNotificationSubscription.Response.yaml +SerAvailabilityNotificationSubscription: + $ref: ./SerAvailabilityNotificationSubscription.yaml SerAvailabilityNotificationSubscription.SubscriptionType: $ref: ./SerAvailabilityNotificationSubscription.SubscriptionType.yaml SerializerTypes: diff --git a/parameters/Body.AppTerminationNotificationSubscription.yaml b/parameters/Body.AppTerminationNotificationSubscription.yaml index 50d39ec1aa117678845b1cd1ef1a7879d943257e..ee75f7bcc5ea04bbcc9b0c9862e93251d9b89f45 100644 --- a/parameters/Body.AppTerminationNotificationSubscription.yaml +++ b/parameters/Body.AppTerminationNotificationSubscription.yaml @@ -3,4 +3,4 @@ description: Entity body in the request contains a subscription to the mobile ed in: body required: true schema: - $ref: '#/definitions/AppTerminationNotificationSubscription.Request' \ No newline at end of file + $ref: '#/definitions/AppTerminationNotificationSubscription' \ No newline at end of file diff --git a/parameters/Body.SerAvailabilityNotificationSubscription.yaml b/parameters/Body.SerAvailabilityNotificationSubscription.yaml index 0ad78406432883e510d29a21d471286ca7a7f2d4..0d04713a2d2103b661ad4d945b138266fc03c213 100644 --- a/parameters/Body.SerAvailabilityNotificationSubscription.yaml +++ b/parameters/Body.SerAvailabilityNotificationSubscription.yaml @@ -3,4 +3,4 @@ description: Entity body in the request contains a subscription to the mobile ed in: body required: true schema: - $ref: '#/definitions/SerAvailabilityNotificationSubscription.Request' \ No newline at end of file + $ref: '#/definitions/SerAvailabilityNotificationSubscription' \ No newline at end of file diff --git a/paths/ApplicationsSubscription.GET.yaml b/paths/ApplicationsSubscription.GET.yaml index 1043fa3786d1033a66a2e9f8beb66cbbd09f8d39..c43f3c18ca990a76e4422560efba73a2ceb5fb79 100644 --- a/paths/ApplicationsSubscription.GET.yaml +++ b/paths/ApplicationsSubscription.GET.yaml @@ -10,10 +10,10 @@ responses: type: object properties: SerAvailabilityNotificationSubscription: - $ref: '#/definitions/SerAvailabilityNotificationSubscription.Response' + $ref: '#/definitions/SerAvailabilityNotificationSubscription' # The alternative response # AppTerminationNotificationSubscription: -# $ref: '#/definitions/AppTerminationNotificationSubscription.Response' +# $ref: '#/definitions/AppTerminationNotificationSubscription' 400: description: Bad Request schema: diff --git a/paths/ApplicationsSubscriptions.POST.yaml b/paths/ApplicationsSubscriptions.POST.yaml index 1468cafca5dab298f8bfd841150920205a3c1ea1..50eb9a1609fc9c2bf1ddd78e959a41a122c4367e 100644 --- a/paths/ApplicationsSubscriptions.POST.yaml +++ b/paths/ApplicationsSubscriptions.POST.yaml @@ -14,7 +14,7 @@ responses: type: object properties: AppTerminationNotificationSubscription: - $ref: '#/definitions/AppTerminationNotificationSubscription.Response' + $ref: '#/definitions/AppTerminationNotificationSubscription' # The alternative response # SerAvailabilityNotificationSubscription: # $ref: '#/definitions/SerAvailabilityNotificationSubscription'