diff --git a/src/SOL003/APIVersion/APIVersion.yaml b/src/SOL003/APIVersion/APIVersion.yaml index e0036b3216f2a336feb0065fcb7df2f2871d0fd0..4ca4ae57cdc24e2f61bc05c5a99bca5fb546d119 100644 --- a/src/SOL003/APIVersion/APIVersion.yaml +++ b/src/SOL003/APIVersion/APIVersion.yaml @@ -15,8 +15,8 @@ info: contact: name: "NFV-SOL WG" externalDocs: - description: ETSI GS NFV-SOL 003 V2.5.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/02.05.01_60/gs_nfv-sol003v020501p.pdf + description: ETSI GS NFV-SOL 003 V2.6.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/02.06.01_60/gs_NFV-SOL003v020601p.pdf schemes: - http - https diff --git a/src/SOL003/VNFFaultManagement/VNFFaultManagement.yaml b/src/SOL003/VNFFaultManagement/VNFFaultManagement.yaml index 2d47c6a8317758dc552105eaceac23466fce6606..b5b3ec174dbbe732619bc56c6a68b002d3b7e497 100644 --- a/src/SOL003/VNFFaultManagement/VNFFaultManagement.yaml +++ b/src/SOL003/VNFFaultManagement/VNFFaultManagement.yaml @@ -138,14 +138,21 @@ paths: $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/401" 403: $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/403" + 404: + $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/404" 405: $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/405" 406: $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/406" + 422: + $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/422" 500: $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/500" 503: $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/503" + 504: + $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/504" + ############################################################################### # Individual alarm # ############################################################################### @@ -316,6 +323,8 @@ paths: $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/406" 409: description: > + 409 CONFLICT + Shall be returned upon the following error: The operation cannot be executed currently, due to a conflict with the state of the "Individual alarm" resource. Typically, this is due to the fact that the alarm is already in the state that is @@ -422,6 +431,17 @@ paths: schema: $ref: "../../definitions/SOL002SOL003VNFFaultManagement_def.yaml#/definitions/FmSubscription" 303: + description: > + 303 SEE OTHER + + Shall be returned when a subscription with the + same callbackURI and the same filter already exists + and the policy of the VNFM is to not create + redundant subscriptions. + The HTTP response shall include a "Location" + HTTP header that contains the resource URI of the + existing "Individual subscription" resource. + The response body shall be empty. $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/303" 400: $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/400" diff --git a/src/SOL003/VNFFaultManagementNotification/VNFFaultManagementNotification.yaml b/src/SOL003/VNFFaultManagementNotification/VNFFaultManagementNotification.yaml index 45b9b56e29d0102cbc8666a50029f3b53693a0f6..f99c9621524bb363d24dd4af0ea610d08300f270 100644 --- a/src/SOL003/VNFFaultManagementNotification/VNFFaultManagementNotification.yaml +++ b/src/SOL003/VNFFaultManagementNotification/VNFFaultManagementNotification.yaml @@ -58,7 +58,7 @@ paths: in: body required: true schema: - $ref: "../definitions/SOL003_def.yaml#/definitions/AlarmNotification" + $ref: "../../definitions/SOL002SOL003VNFFaultManagement_def.yaml#/definitions/AlarmNotification" - name: Authorization description: > The authorization token for the request. diff --git a/src/SOL003/VNFIndicator/VNFIndicator.yaml b/src/SOL003/VNFIndicator/VNFIndicator.yaml index f5ff58e316393f012f9675dc8fec1307674f3ef4..81b9f87eba75094759f20cbe50fd4eeaab4a84b3 100644 --- a/src/SOL003/VNFIndicator/VNFIndicator.yaml +++ b/src/SOL003/VNFIndicator/VNFIndicator.yaml @@ -490,6 +490,17 @@ paths: items: $ref: "../../definitions/SOL002SOL003VNFIndicator_def.yaml#/definitions/VnfIndicatorSubscription" 303: + description: > + 303 SEE OTHER + + Shall be returned when a subscription with the + same callbackURI and the same filter already + exists and the policy of the VNFM is to not create + redundant subscriptions. + The HTTP response shall include a "Location" + HTTP header that contains the resource URI of + the existing "Individual subscription" resource. + The response body shall be empty. $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/303" 400: $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/400" diff --git a/src/SOL003/VNFLifecycleManagement/VNFLifecycleManagement.yaml b/src/SOL003/VNFLifecycleManagement/VNFLifecycleManagement.yaml index 25e267310e3a03ed08ac8babfa0b3bc9e7771eac..e82b6f1fe40c470ede205cb213aba03633360ee5 100644 --- a/src/SOL003/VNFLifecycleManagement/VNFLifecycleManagement.yaml +++ b/src/SOL003/VNFLifecycleManagement/VNFLifecycleManagement.yaml @@ -1087,6 +1087,8 @@ paths: $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/406" 409: description: > + 409 CONFLICT + Shall be returned upon the following error: The operation cannot be executed currently, due to a conflict with the state of the resource. Typically, this is due to the fact that the VNF instance resource is in NOT_INSTANTIATED state, diff --git a/src/SOL003/VNFLifecycleOperationGranting/VNFLifecycleOperationGranting.yaml b/src/SOL003/VNFLifecycleOperationGranting/VNFLifecycleOperationGranting.yaml index fedac8d6f52f52f88b7f4391507a9c1a6974b933..e302234744870cf5eac4813dd9c039806dc49fe6 100644 --- a/src/SOL003/VNFLifecycleOperationGranting/VNFLifecycleOperationGranting.yaml +++ b/src/SOL003/VNFLifecycleOperationGranting/VNFLifecycleOperationGranting.yaml @@ -269,15 +269,15 @@ paths: type: string maximum: 1 minimum: 1 - 303: - description: > - Shall be returned upon the following error: The grant has been rejected. - $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/303" 400: $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/400" 401: $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/401" 403: + description: > + 403 FORBIDDEN + + Shall be returned upon the following error: The grant has been rejected. $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/403" 404: $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/404" diff --git a/src/SOL003/VNFPackageManagement/VNFPackageManagement.yaml b/src/SOL003/VNFPackageManagement/VNFPackageManagement.yaml index 46b84017b4acc1d10bf3ab40f055ca43c11ea4fd..c72b6c54a53b545b3f14bf6672c1abfee2af9014 100644 --- a/src/SOL003/VNFPackageManagement/VNFPackageManagement.yaml +++ b/src/SOL003/VNFPackageManagement/VNFPackageManagement.yaml @@ -494,12 +494,16 @@ paths: $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/405" 406: description: > + 406 NOT ACCEPTABLE + If the "Accept" header does not contain at least one name of a content type for which the NFVO can provide a representation of the VNFD, the NFVO shall respond with this response code. $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/406" 409: description: > + 409 CONFLICT + Shall be returned upon the following error: The operation cannot be executed currently, due to a conflict with the state of the resource. Typically, this is due to the fact that "onboardingState" of the @@ -626,12 +630,16 @@ paths: $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/405" 406: description: > + 406 NOT ACCEPTABLE + If the "Accept" header does not contain at least one name of a content type for which the NFVO can provide a representation of the VNFD, the NFVO shall respond with this response code. $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/406" 409: description: > + 409 CONFLICT + Shall be returned upon the following error: The operation cannot be executed currently, due to a conflict with the state of the resource. Typically, this is due to the fact that "onboardingState" of the diff --git a/src/SOL003/VNFPackageManagementNotification/VNFPackageManagementNotification.yaml b/src/SOL003/VNFPackageManagementNotification/VNFPackageManagementNotification.yaml index b9c9f24cde6d66d05061f24e39c816703d6247ac..89c29219afa77fcb2264406396dc5e42f1ccf505 100644 --- a/src/SOL003/VNFPackageManagementNotification/VNFPackageManagementNotification.yaml +++ b/src/SOL003/VNFPackageManagementNotification/VNFPackageManagementNotification.yaml @@ -113,6 +113,7 @@ paths: $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/500" 503: $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/503" + get: description: > The GET method allows the server to test the notification endpoint that is provided by the client @@ -245,6 +246,7 @@ paths: $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/500" 503: $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/503" + get: description: > The GET method allows the server to test the notification endpoint that is provided by the client diff --git a/src/SOL003/VNFPerformanceManagementNotification/VNFPerformanceManagementNotification.yaml b/src/SOL003/VNFPerformanceManagementNotification/VNFPerformanceManagementNotification.yaml index d06018bfc8f0e3c7c2d9b556c9313255c75ef208..19268878c098f9f7c2466fbd178737bf7fca5496 100644 --- a/src/SOL003/VNFPerformanceManagementNotification/VNFPerformanceManagementNotification.yaml +++ b/src/SOL003/VNFPerformanceManagementNotification/VNFPerformanceManagementNotification.yaml @@ -25,7 +25,7 @@ info: url: https://forge.etsi.org/etsi-forge-copyright-notice.txt externalDocs: - description: ETSI GS NFV-SOL 003 V2.5.1 + description: ETSI GS NFV-SOL 003 V2.6.1 url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/02.06.01_60/gs_NFV-SOL003v020601p.pdf basePath: "/callback/v1" @@ -115,6 +115,7 @@ paths: $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/500" 503: $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/503" + get: description: > The GET method allows the server to test the notification endpoint that is provided by the client, @@ -248,6 +249,7 @@ paths: $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/500" 503: $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/503" + get: description: > The GET method allows the server to test the notification endpoint that is provided by the client, diff --git a/src/responses/SOL002SOL003_resp.yaml b/src/responses/SOL002SOL003_resp.yaml index d42c235b37572ab454b86002b31610f9400e02c7..b0b39f8fdf3cf18f4d2bef26e03b3f7143286cab 100644 --- a/src/responses/SOL002SOL003_resp.yaml +++ b/src/responses/SOL002SOL003_resp.yaml @@ -236,12 +236,6 @@ responses: $ref: "../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" 406: - description: > - 406 NOT ACCEPTABLE - - If the "Accept" header does not contain at least one name of a content type that is acceptable - to the API producer, the API producer shall respond with this response code. - The "ProblemDetails" structure may be omitted. headers: Content-Type: description: The MIME type of the body of the response. @@ -381,8 +375,6 @@ responses: $ref: "../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" 416: - description: > - 416 RANGE NOT SATISFIABLE headers: Content-Type: description: The MIME type of the body of the response.