From 217719f07d2b08c9a645f2e448ddadaa65c58650 Mon Sep 17 00:00:00 2001 From: Gergely Csatari Date: Thu, 22 Nov 2018 17:05:08 +0100 Subject: [PATCH] Correction of bug 85 This pr is the correction of bug 85. The 202 response of the POST methods in the following resources: - /vnf_instances/{vnfInstanceId}/scale - /vnf_instances/{vnfInstanceId}/scale_to_level - /vnf_instances/{vnfInstanceId}/change_flavour - /vnf_instances/{vnfInstanceId}/terminate - /vnf_instances/{vnfInstanceId}/heal - /vnf_instances/{vnfInstanceId}/operate - /vnf_instances/{vnfInstanceId}/change_ext_conn contained a VNF instance object in their body what is not needed. Also the alarmId parameter added to the POST of /alarms/{alarmId}/escalate Signed-off-by: Gergely Csatari --- .../VNFFaultManagement.yaml | 21 ++++++++++---- .../VNFLifecycleManagement.yaml | 16 +++++----- .../VNFLifecycleManagement_resp.yaml | 29 ------------------- .../VNFLifecycleManagement.yaml | 14 ++++----- .../VNFLifecycleManagement_resp.yaml | 29 ------------------- 5 files changed, 31 insertions(+), 78 deletions(-) diff --git a/src/SOL002/VNFFaultManagement/VNFFaultManagement.yaml b/src/SOL002/VNFFaultManagement/VNFFaultManagement.yaml index 81878f42..cbad6eab 100644 --- a/src/SOL002/VNFFaultManagement/VNFFaultManagement.yaml +++ b/src/SOL002/VNFFaultManagement/VNFFaultManagement.yaml @@ -268,11 +268,22 @@ paths: The POST method enables the consumer to escalate the perceived severity of an alarm that is represented by an ndividual alarm resource. parameters: - - name: PerceivedSeverityRequest - description: The proposed "escalated perceived severity" value - in: body - schema: - $ref: "./definitions/VNFFaultManagement_def.yaml#/definitions/PerceivedSeverityRequest" + - name: alarmId + description: > + Identifier of the alarm. + This identifier can be retrieved from the "id" attribute of the + "alarm" attribute in the AlarmNotification or + AlarmClearedNotification. It can also be retrieved from the "id" + attribute of the applicable array element in the payload body of the + response to a GET request to the "Alarms" resource. + in: path + type: string + required: true + - name: PerceivedSeverityRequest + description: The proposed "escalated perceived severity" value + in: body + schema: + $ref: "./definitions/VNFFaultManagement_def.yaml#/definitions/PerceivedSeverityRequest" responses: 200: description: > diff --git a/src/SOL002/VNFLifecycleManagement/VNFLifecycleManagement.yaml b/src/SOL002/VNFLifecycleManagement/VNFLifecycleManagement.yaml index a840bbb4..339aa711 100644 --- a/src/SOL002/VNFLifecycleManagement/VNFLifecycleManagement.yaml +++ b/src/SOL002/VNFLifecycleManagement/VNFLifecycleManagement.yaml @@ -264,7 +264,7 @@ paths: $ref: "../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/VnfInfoModifications" responses: 202: - $ref: "responses/VNFLifecycleManagement_resp.yaml#/responses/202-with-Location" + $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/202-with-Location" 400: $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/400-attr-selector" 401: @@ -427,7 +427,7 @@ paths: $ref: "../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/ScaleVnfRequest" responses: 202: - $ref: "responses/VNFLifecycleManagement_resp.yaml#/responses/202-with-Location" + $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/202-with-Location" 400: $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/400" 401: @@ -476,7 +476,7 @@ paths: $ref: "../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/ScaleVnfToLevelRequest" responses: 202: - $ref: "responses/VNFLifecycleManagement_resp.yaml#/responses/202-with-Location" + $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/202-with-Location" 400: $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/400" 401: @@ -524,7 +524,7 @@ paths: $ref: "definitions/VNFLifecycleManagement_def.yaml#/definitions/ChangeVnfFlavourRequest" responses: 202: - $ref: "responses/VNFLifecycleManagement_resp.yaml#/responses/202-with-Location" + $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/202-with-Location" 400: $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/400" 401: @@ -571,7 +571,7 @@ paths: $ref: "definitions/VNFLifecycleManagement_def.yaml#/definitions/TerminateVnfRequest" responses: 202: - $ref: "responses/VNFLifecycleManagement_resp.yaml#/responses/202-with-Location" + $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/202-with-Location" 400: $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/400" 401: @@ -618,7 +618,7 @@ paths: $ref: "definitions/VNFLifecycleManagement_def.yaml#/definitions/HealVnfRequest" responses: 202: - $ref: "responses/VNFLifecycleManagement_resp.yaml#/responses/202-with-Location" + $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/202-with-Location" 400: $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/400" 401: @@ -665,7 +665,7 @@ paths: $ref: "definitions/VNFLifecycleManagement_def.yaml#/definitions/OperateVnfRequest" responses: 202: - $ref: "responses/VNFLifecycleManagement_resp.yaml#/responses/202-with-Location" + $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/202-with-Location" 400: $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/400" 401: @@ -714,7 +714,7 @@ paths: $ref: "definitions/VNFLifecycleManagement_def.yaml#/definitions/ChangeExtVnfConnectivityRequest" responses: 202: - $ref: "responses/VNFLifecycleManagement_resp.yaml#/responses/202-with-Location" + $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/202-with-Location" 400: $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/400" 401: diff --git a/src/SOL002/VNFLifecycleManagement/responses/VNFLifecycleManagement_resp.yaml b/src/SOL002/VNFLifecycleManagement/responses/VNFLifecycleManagement_resp.yaml index 92e8da02..c6359ee3 100644 --- a/src/SOL002/VNFLifecycleManagement/responses/VNFLifecycleManagement_resp.yaml +++ b/src/SOL002/VNFLifecycleManagement/responses/VNFLifecycleManagement_resp.yaml @@ -2,35 +2,6 @@ # https://forge.etsi.org/etsi-forge-copyright-notice.txt responses: - 202-with-Location: - description: > - Accepted - - The request was accepted for processing, but the processing has not - been completed. On success, the HTTP response shall include a - "Location" HTTP header that contains the URI of the newly-created - "VNF LCM operation occurrence" resource corresponding to the - operation. - headers: - Content-Type: - description: The MIME type of the body of the response. - type: string - maximum: 1 - minimum: 1 - Location: - description: The resource URI of the created VNF instance - type: string - format: url - WWW-Authenticate: - description: > - Challenge if the corresponding HTTP request has not provided - authorization, or error details if the corresponding HTTP - request has provided an invalid authorization token. - type: string - maximum: 1 - minimum: 0 - schema: - $ref: "../definitions/VNFLifecycleManagement_def.yaml#/definitions/VnfInstance" 409-another-lcm-operation-ongoing: description: > Conflict diff --git a/src/SOL003/VNFLifecycleManagement/VNFLifecycleManagement.yaml b/src/SOL003/VNFLifecycleManagement/VNFLifecycleManagement.yaml index 2d63c7af..6e0e395d 100644 --- a/src/SOL003/VNFLifecycleManagement/VNFLifecycleManagement.yaml +++ b/src/SOL003/VNFLifecycleManagement/VNFLifecycleManagement.yaml @@ -539,7 +539,7 @@ paths: type: string responses: 202: - $ref: "responses/VNFLifecycleManagement_resp.yaml#/responses/202-with-Location" + $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/202-with-Location" 400: $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/400" 401: @@ -612,7 +612,7 @@ paths: type: string responses: 202: - $ref: "responses/VNFLifecycleManagement_resp.yaml#/responses/202-with-Location" + $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/202-with-Location" 400: $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/400" 401: @@ -684,7 +684,7 @@ paths: type: string responses: 202: - $ref: "responses/VNFLifecycleManagement_resp.yaml#/responses/202-with-Location" + $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/202-with-Location" 400: $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/400" 401: @@ -755,7 +755,7 @@ paths: type: string responses: 202: - $ref: "responses/VNFLifecycleManagement_resp.yaml#/responses/202-with-Location" + $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/202-with-Location" 400: $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/400" 401: @@ -826,7 +826,7 @@ paths: type: string responses: 202: - $ref: "responses/VNFLifecycleManagement_resp.yaml#/responses/202-with-Location" + $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/202-with-Location" 400: $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/400" 401: @@ -897,7 +897,7 @@ paths: type: string responses: 202: - $ref: "responses/VNFLifecycleManagement_resp.yaml#/responses/202-with-Location" + $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/202-with-Location" 400: $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/400" 401: @@ -970,7 +970,7 @@ paths: type: string responses: 202: - $ref: "responses/VNFLifecycleManagement_resp.yaml#/responses/202-with-Location" + $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/202-with-Location" 400: $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/400" 401: diff --git a/src/SOL003/VNFLifecycleManagement/responses/VNFLifecycleManagement_resp.yaml b/src/SOL003/VNFLifecycleManagement/responses/VNFLifecycleManagement_resp.yaml index c1866e3b..3b28b22f 100644 --- a/src/SOL003/VNFLifecycleManagement/responses/VNFLifecycleManagement_resp.yaml +++ b/src/SOL003/VNFLifecycleManagement/responses/VNFLifecycleManagement_resp.yaml @@ -2,35 +2,6 @@ # https://forge.etsi.org/etsi-forge-copyright-notice.txt responses: - 202-with-Location: - description: > - Accepted - - The request was accepted for processing, but the processing has not - been completed. On success, the HTTP response shall include a - "Location" HTTP header that contains the URI of the newly-created - "VNF LCM operation occurrence" resource corresponding to the - operation. - headers: - Content-Type: - description: The MIME type of the body of the response. - type: string - maximum: 1 - minimum: 1 - Location: - description: The resource URI of the created VNF instance - type: string - format: url - WWW-Authenticate: - description: > - Challenge if the corresponding HTTP request has not provided - authorization, or error details if the corresponding HTTP - request has provided an invalid authorization token. - type: string - maximum: 1 - minimum: 0 - schema: - $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/VnfInstance" 202-with-Location-empty: description: > Accepted -- GitLab