From 59eaa0cb38407447fcecbbd134b5bad18114bfee Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 19 Jan 2024 02:51:37 +0000 Subject: [PATCH 1/4] 28.532_Rel18_CR0310_Add_new_HTTP_error_response_format Update TS28532_ProvMnS.yaml --- OpenAPI/TS28532_ProvMnS.yaml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/OpenAPI/TS28532_ProvMnS.yaml b/OpenAPI/TS28532_ProvMnS.yaml index 39f10c4e5..30aa8cc2b 100755 --- a/OpenAPI/TS28532_ProvMnS.yaml +++ b/OpenAPI/TS28532_ProvMnS.yaml @@ -82,7 +82,7 @@ paths: content: application/json: schema: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponse' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponseDefault' callbacks: notifyMOICreation: '{request.body#/notificationRecipientAddress}': @@ -257,7 +257,7 @@ paths: content: application/json: schema: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponse' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponseGet' patch: summary: Patches one or multiple resources description: >- @@ -314,7 +314,9 @@ paths: content: application/json: schema: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponse' + oneOf: + - $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponseDefault' + - $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponsePatch' delete: summary: Deletes one resource description: >- @@ -331,7 +333,7 @@ paths: content: application/json: schema: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponse' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponseDefault' components: schemas: CmNotificationTypes: -- GitLab From 51665754844efcd22d67f4f8b204420de37c4346 Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 19 Jan 2024 03:47:13 +0000 Subject: [PATCH 2/4] Add new HTTP error response format, Update TS28623_ComDefs.yaml --- OpenAPI/TS28623_ComDefs.yaml | 123 +++++++++++++++++++++++++++++++++++ 1 file changed, 123 insertions(+) diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index 88dbbd989..a2f741b6c 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -277,3 +277,126 @@ components: properties: errorInfo: type: string + + ErrorResponseGet: + description: >- + Default schema for the response message body in case the Get + is not successful. + type: object + properties: + status: + type: string + type: + type: string + reason: + type: string + title: + type: string + badQueryParams: + type: array + items: + type: string + otherProblems: + type: array + items: + type: object + properties: + status: + type: string + type: + type: string + reason: + type: string + title: + type: string + badQueryParams: + type: array + items: + type: string + required: + - type + required: + - type + + ErrorResponseDefault: + type: object + properties: + status: + type: string + type: + type: string + reason: + type: string + title: + type: string + badAttributes: + type: array + items: + type: string + badObjects: + type: array + items: + type: string + otherProblems: + type: array + items: + type: object + properties: + status: + type: string + type: + type: string + reason: + type: string + title: + type: string + badAttributes: + type: array + items: + type: string + badObjects: + type: array + items: + type: string + required: + - type + required: + - type + + ErrorResponsePatch: + description: >- + Default schema for the response message body in case the patch + is not successful. + type: object + properties: + status: + type: string + type: + type: string + reason: + type: string + title: + type: string + badOP: + type: string + otherProblems: + type: array + items: + type: object + properties: + status: + type: string + type: + type: string + reason: + type: string + title: + type: string + badOp: + type: string + required: + - type + - badOp + required: + - type + - badOp -- GitLab From 6d7d89c9742f4eb9ac7ae1008299d3e12158a9a7 Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 19 Jan 2024 04:03:25 +0000 Subject: [PATCH 3/4] validation correction Update TS28623_ComDefs.yaml --- OpenAPI/TS28623_ComDefs.yaml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index a2f741b6c..7c09a0435 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -313,10 +313,10 @@ components: type: array items: type: string - required: - - type + required: + - type required: - - type + - type ErrorResponseDefault: type: object @@ -358,10 +358,10 @@ components: type: array items: type: string - required: - - type + required: + - type required: - - type + - type ErrorResponsePatch: description: >- @@ -394,9 +394,9 @@ components: type: string badOp: type: string - required: + required: + - type + - badOp + required: - type - badOp - required: - - type - - badOp -- GitLab From ccd328ab6da638ce52b2adece9d1395ee4c0e582 Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 19 Jan 2024 04:20:50 +0000 Subject: [PATCH 4/4] update XPath to Jex, Update TS28623_ComDefs.yaml --- OpenAPI/TS28623_ComDefs.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index 7c09a0435..e5da4cc47 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -232,7 +232,7 @@ components: Filter: description: >- - The filter format shall be compliant to XPath 1.0. + The filter format shall be compliant to Jex (TS 32.161). type: string SystemDN: type: string -- GitLab