Commit 7ef99cee authored by moscatelli's avatar moscatelli
Browse files

SOL003: general consolidation

parent d5a43886
Pipeline #1265 passed with stage
in 0 seconds
......@@ -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
......
......@@ -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"
......
......@@ -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.
......
......@@ -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"
......
......@@ -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,
......
......@@ -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"
......
......@@ -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
......
......@@ -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
......
......@@ -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,
......
......@@ -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.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment