From 140ebcd6f93e24e8c983ba11b5a7b02e7fcf894d Mon Sep 17 00:00:00 2001 From: Walter Featherstone Date: Fri, 20 Jul 2018 09:32:13 +0100 Subject: [PATCH] Used readOnly in place of .Request/.Response Signed-off-by: Walter Featherstone --- Mp1.json | Bin 171162 -> 167882 bytes Mp1.yaml | 42 ++++-------------- ...ationNotificationSubscription.Request.yaml | 13 ------ ...pTerminationNotificationSubscription.yaml} | 0 definitions/LinkType.yaml | 1 + definitions/Self.yaml | 3 +- ...ilityNotificationSubscription.Request.yaml | 13 ------ ...AvailabilityNotificationSubscription.yaml} | 0 definitions/index.yaml | 12 ++--- ...ppTerminationNotificationSubscription.yaml | 2 +- ...rAvailabilityNotificationSubscription.yaml | 2 +- paths/ApplicationsSubscription.GET.yaml | 4 +- paths/ApplicationsSubscriptions.POST.yaml | 2 +- 13 files changed, 20 insertions(+), 74 deletions(-) delete mode 100644 definitions/AppTerminationNotificationSubscription.Request.yaml rename definitions/{AppTerminationNotificationSubscription.Response.yaml => AppTerminationNotificationSubscription.yaml} (100%) delete mode 100644 definitions/SerAvailabilityNotificationSubscription.Request.yaml rename definitions/{SerAvailabilityNotificationSubscription.Response.yaml => SerAvailabilityNotificationSubscription.yaml} (100%) diff --git a/Mp1.json b/Mp1.json index 9288d269c19f4ae85d28c896e8fa6a660c11f85c..b1dbbd77cfbc08da5a37d2aa34adbcf8cb5739c9 100644 GIT binary patch delta 299 zcmbQWlk3!ct_@RESnI}+S@;iO8$@8RzHqYXG!~&JuypQiy7LYA9 z*&x1cbIfW#j>)rb=PGRX`^P8)aqo7Z Idv8qz07FJ=4*&oF delta 339 zcmX>#pKI1mt_@XgvUx(&KXx37ngzPI z3v@G9Frr#8xp1!Z_60qRSxnmv`WYuMO$U-P+w&$ddNJ~X+zhvC`bK6Z`)MB-)utEJ zFmX(uW5y`4ovWAelk;?k>5O92tppkQwg+8g+@dtOflqF_06P=g_Lwh>9L$*3O*gp3 q=(qjUcSZ@O$p(9Pwu}4%+6!V$2eKrlNBw2|g~jUa3%)aI%>V$}kZS+{ diff --git a/Mp1.yaml b/Mp1.yaml index 352503e..6995650 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 73aa528..0000000 --- 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 cca531f..f5bebcd 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 24a6106..90ff743 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 be7d33d..0000000 --- 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 496cb04..ce8aef3 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 50d39ec..ee75f7b 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 0ad7840..0d04713 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 1043fa3..c43f3c1 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 1468caf..50eb9a1 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' -- GitLab