From d86608ec8dbdc10610f70b7c036a50f5231989cd Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Wed, 2 Nov 2022 18:18:49 +0100 Subject: [PATCH 01/10] SOL005_01, SOL005_03, SOL005_24 to SOL SOL005_30 --- .../NFVICapacityInformation.yaml | 2 +- .../NFVICapacityInformationNotification.yaml | 2 +- src/SOL005/NSDManagement/NSDManagement.yaml | 29 +++++++++++++++---- .../NSDManagementNotification.yaml | 2 +- .../NSFaultManagement/NSFaultManagement.yaml | 2 +- .../NSFaultManagementNotification.yaml | 2 +- .../NSLCMCoordination/NSLCMCoordination.yaml | 2 +- .../NSLifecycleManagement.yaml | 2 +- .../NSLifecycleManagementNotification.yaml | 2 +- .../NSPerformanceManagement.yaml | 2 +- .../NSPerformanceManagementNotification.yaml | 2 +- .../VNFSnapshotPackageManagement.yaml | 2 +- 12 files changed, 34 insertions(+), 17 deletions(-) diff --git a/src/SOL005/NFVICapacityInformation/NFVICapacityInformation.yaml b/src/SOL005/NFVICapacityInformation/NFVICapacityInformation.yaml index a8c0da6..da11c92 100644 --- a/src/SOL005/NFVICapacityInformation/NFVICapacityInformation.yaml +++ b/src/SOL005/NFVICapacityInformation/NFVICapacityInformation.yaml @@ -16,7 +16,7 @@ info: license: name: ETSI Forge copyright notice url: https://forge.etsi.org/etsi-forge-copyright-notice.txt - version: 1.0.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 + version: 1.1.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: description: ETSI GS NFV-SOL 005 V3.6.1 diff --git a/src/SOL005/NFVICapacityInformationNotification/NFVICapacityInformationNotification.yaml b/src/SOL005/NFVICapacityInformationNotification/NFVICapacityInformationNotification.yaml index 38aaad7..e699290 100644 --- a/src/SOL005/NFVICapacityInformationNotification/NFVICapacityInformationNotification.yaml +++ b/src/SOL005/NFVICapacityInformationNotification/NFVICapacityInformationNotification.yaml @@ -16,7 +16,7 @@ info: license: name: ETSI Forge copyright notice url: https://forge.etsi.org/etsi-forge-copyright-notice.txt - version: 1.0.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 + version: 1.1.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: description: ETSI GS NFV-SOL 005 V3.6.1 diff --git a/src/SOL005/NSDManagement/NSDManagement.yaml b/src/SOL005/NSDManagement/NSDManagement.yaml index 91038d4..d029c00 100644 --- a/src/SOL005/NSDManagement/NSDManagement.yaml +++ b/src/SOL005/NSDManagement/NSDManagement.yaml @@ -16,7 +16,7 @@ info: license: name: ETSI Forge copyright notice url: https://forge.etsi.org/etsi-forge-copyright-notice.txt - version: 2.2.1-impl:etsi.org:ETSI_NFV_OpenAPI:1 + version: 2.3.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: description: ETSI GS NFV-SOL 005 V3.6.1 @@ -128,7 +128,12 @@ paths: # Individual NS Descriptor # ############################################################################### /ns_descriptors/{nsdInfoId}: - #ETSI GS NFV-SOL 005 V2.4.1 location: 5.4.3 + #ETSI GS NFV-SOL 005 V3.7.1 location: 5.4.3 + description: | + This identifier can be retrieved from the resource referenced by the "Location" HTTP header in + the response to a POST request creating a new NS descriptor resource. It can also be retrieved + from the "id" attribute in the message content of that response. + parameters: - $ref: '#/components/parameters/NsdInfoId' - $ref: ../components/SOL005_params.yaml#/components/parameters/Authorization @@ -225,6 +230,10 @@ paths: ############################################################################### /ns_descriptors/{nsdInfoId}/nsd_content: #ETSI GS NFV-SOL 005 V2.4.1 location: 5.4.4 + description: | + This identifier can be retrieved from the resource referenced by the "Location" HTTP header in + the response to a POST request creating a new NS descriptor resource. It can also be retrieved + from the "id" attribute in the message content of that response. parameters: - $ref: '#/components/parameters/NsdInfoId' - $ref: ../components/SOL005_params.yaml#/components/parameters/Authorization @@ -298,6 +307,10 @@ paths: ############################################################################### /ns_descriptors/{nsdInfoId}/nsd: #ETSI GS NFV-SOL 005 V2.4.1 location: 5.4.4a + description: | + This identifier can be retrieved from the resource referenced by the "Location" HTTP header in + the response to a POST request creating a new NS descriptor resource. It can also be retrieved + from the "id" attribute in the message content of that response. parameters: - $ref: '#/components/parameters/NsdInfoId' - $ref: ../components/SOL005_params.yaml#/components/parameters/Authorization @@ -338,6 +351,10 @@ paths: ############################################################################### /ns_descriptors/{nsdInfoId}/manifest: #ETSI GS NFV-SOL 005 V2.4.1 location: 5.4.4b + description: | + This identifier can be retrieved from the resource referenced by the "Location" HTTP header in + the response to a POST request creating a new NS descriptor resource. It can also be retrieved + from the "id" attribute in the message content of that response. parameters: - $ref: '#/components/parameters/NsdInfoId' - $ref: ../components/SOL005_params.yaml#/components/parameters/Authorization @@ -1039,7 +1056,7 @@ components: ContentTypeZip: name: Content-Type description: | - The payload body contains a ZIP file that represents the NSD archive, as specified above. + The message content contains a ZIP file that represents the NSD archive, as specified above. The request shall set the "Content-Type" HTTP header to "application/zip". in: header required: true @@ -1479,7 +1496,7 @@ components: 200 OK Shall be returned when the content of the NSD has been read successfully. - The payload body shall contain a copy of the ZIP file that contains the NSD file structure. + The message content shall contain a copy of the ZIP file that contains the NSD file structure. The "Content-Type" HTTP header shall be set to "application/zip". headers: Content-Type: @@ -1513,7 +1530,7 @@ components: shall be returned when a single consecutive byte range from the content of the NSD file has been read successfully according to the request. The response body shall contain the requested part of the NSD archive. - The "Content-Range" HTTP header shall be provided according to IETF RFC 7233 [10]. + The "Content-Range" HTTP header shall be provided according to IETF RFC 9110. The "Content-Type" HTTP header shall be set as defined above for the "200 OK" response. headers: Content-Type: @@ -1721,7 +1738,7 @@ components: 200 OK Shall be returned when the content of the NSD has been read successfully. - The payload body shall contain a copy of the file representing the NSD or + The message content shall contain a copy of the file representing the NSD or a ZIP file that contains the file or multiple files representing the NSD, as specified above. The "Content-Type" HTTP header shall be set according to the format of diff --git a/src/SOL005/NSDManagementNotification/NSDManagementNotification.yaml b/src/SOL005/NSDManagementNotification/NSDManagementNotification.yaml index 198a39f..e80c809 100644 --- a/src/SOL005/NSDManagementNotification/NSDManagementNotification.yaml +++ b/src/SOL005/NSDManagementNotification/NSDManagementNotification.yaml @@ -16,7 +16,7 @@ info: license: name: ETSI Forge copyright notice url: https://forge.etsi.org/etsi-forge-copyright-notice.txt - version: 2.2.1-impl:etsi.org:ETSI_NFV_OpenAPI:1 + version: 2.3.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: description: ETSI GS NFV-SOL 005 V3.6.1 diff --git a/src/SOL005/NSFaultManagement/NSFaultManagement.yaml b/src/SOL005/NSFaultManagement/NSFaultManagement.yaml index a9af456..8929942 100644 --- a/src/SOL005/NSFaultManagement/NSFaultManagement.yaml +++ b/src/SOL005/NSFaultManagement/NSFaultManagement.yaml @@ -16,7 +16,7 @@ info: license: name: ETSI Forge copyright notice url: https://forge.etsi.org/etsi-forge-copyright-notice.txt - version: 1.2.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 + version: 1.3.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: description: ETSI GS NFV-SOL 005 V3.6.1 diff --git a/src/SOL005/NSFaultManagementNotification/NSFaultManagementNotification.yaml b/src/SOL005/NSFaultManagementNotification/NSFaultManagementNotification.yaml index 79f8a9b..4ea5da1 100644 --- a/src/SOL005/NSFaultManagementNotification/NSFaultManagementNotification.yaml +++ b/src/SOL005/NSFaultManagementNotification/NSFaultManagementNotification.yaml @@ -16,7 +16,7 @@ info: license: name: ETSI Forge copyright notice url: https://forge.etsi.org/etsi-forge-copyright-notice.txt - version: 1.2.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 + version: 1.3.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: description: ETSI GS NFV-SOL 005 V3.6.1 diff --git a/src/SOL005/NSLCMCoordination/NSLCMCoordination.yaml b/src/SOL005/NSLCMCoordination/NSLCMCoordination.yaml index 9714854..17eb44a 100644 --- a/src/SOL005/NSLCMCoordination/NSLCMCoordination.yaml +++ b/src/SOL005/NSLCMCoordination/NSLCMCoordination.yaml @@ -16,7 +16,7 @@ info: license: name: ETSI Forge copyright notice url: https://forge.etsi.org/etsi-forge-copyright-notice.txt - version: 1.0.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 + version: 1.1.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: description: ETSI GS NFV-SOL 005 V3.6.1 diff --git a/src/SOL005/NSLifecycleManagement/NSLifecycleManagement.yaml b/src/SOL005/NSLifecycleManagement/NSLifecycleManagement.yaml index bd76cb8..cff7f3f 100644 --- a/src/SOL005/NSLifecycleManagement/NSLifecycleManagement.yaml +++ b/src/SOL005/NSLifecycleManagement/NSLifecycleManagement.yaml @@ -16,7 +16,7 @@ info: license: name: ETSI Forge copyright notice url: https://forge.etsi.org/etsi-forge-copyright-notice.txt - version: 2.2.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 + version: 2.3.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: description: ETSI GS NFV-SOL 005 V3.6.1 diff --git a/src/SOL005/NSLifecycleManagementNotification/NSLifecycleManagementNotification.yaml b/src/SOL005/NSLifecycleManagementNotification/NSLifecycleManagementNotification.yaml index cba8174..80327f3 100644 --- a/src/SOL005/NSLifecycleManagementNotification/NSLifecycleManagementNotification.yaml +++ b/src/SOL005/NSLifecycleManagementNotification/NSLifecycleManagementNotification.yaml @@ -14,7 +14,7 @@ info: license: name: ETSI Forge copyright notice url: https://forge.etsi.org/etsi-forge-copyright-notice.txt - version: 2.2.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 + version: 2.3.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: description: ETSI GS NFV-SOL 005 V3.6.1 diff --git a/src/SOL005/NSPerformanceManagement/NSPerformanceManagement.yaml b/src/SOL005/NSPerformanceManagement/NSPerformanceManagement.yaml index b36f713..32cab47 100644 --- a/src/SOL005/NSPerformanceManagement/NSPerformanceManagement.yaml +++ b/src/SOL005/NSPerformanceManagement/NSPerformanceManagement.yaml @@ -16,7 +16,7 @@ info: license: name: ETSI Forge copyright notice url: https://forge.etsi.org/etsi-forge-copyright-notice.txt - version: 2.2.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 + version: 2.3.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: description: ETSI GS NFV-SOL 005 V3.6.1 diff --git a/src/SOL005/NSPerformanceManagementNotification/NSPerformanceManagementNotification.yaml b/src/SOL005/NSPerformanceManagementNotification/NSPerformanceManagementNotification.yaml index a7b12b5..0608054 100644 --- a/src/SOL005/NSPerformanceManagementNotification/NSPerformanceManagementNotification.yaml +++ b/src/SOL005/NSPerformanceManagementNotification/NSPerformanceManagementNotification.yaml @@ -16,7 +16,7 @@ info: license: name: ETSI Forge copyright notice url: https://forge.etsi.org/etsi-forge-copyright-notice.txt - version: 2.2.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 + version: 2.3.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: description: ETSI GS NFV-SOL 005 V3.6.1 diff --git a/src/SOL005/VNFSnapshotPackageManagement/VNFSnapshotPackageManagement.yaml b/src/SOL005/VNFSnapshotPackageManagement/VNFSnapshotPackageManagement.yaml index adfa75e..19a3f20 100644 --- a/src/SOL005/VNFSnapshotPackageManagement/VNFSnapshotPackageManagement.yaml +++ b/src/SOL005/VNFSnapshotPackageManagement/VNFSnapshotPackageManagement.yaml @@ -16,7 +16,7 @@ info: license: name: ETSI Forge copyright notice url: https://forge.etsi.org/etsi-forge-copyright-notice.txt - version: 1.1.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 + version: 1.2.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: description: ETSI GS NFV-SOL 005 V3.6.1 -- GitLab From 5b86f34866efe64b97bd498b01d06e98dbdab3ac Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Thu, 3 Nov 2022 14:28:47 +0100 Subject: [PATCH 02/10] SOL005_31 to SOL005_46 --- src/SOL005/NSDManagement/NSDManagement.yaml | 43 ++++++++++++--------- 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/src/SOL005/NSDManagement/NSDManagement.yaml b/src/SOL005/NSDManagement/NSDManagement.yaml index d029c00..c32f44c 100644 --- a/src/SOL005/NSDManagement/NSDManagement.yaml +++ b/src/SOL005/NSDManagement/NSDManagement.yaml @@ -1070,6 +1070,10 @@ components: in: path description: | Identifier of the individual NS descriptor resource. + + This identifier can be retrieved from the resource referenced by the "Location" HTTP header in + the response to a POST request creating a new NS descriptor resource. It can also be retrieved + from the "id" attribute in the message content of that response. required: true style: simple explode: false @@ -1081,6 +1085,9 @@ components: in: path description: | Identifier of the individual PNF descriptor resource. + This identifier can be retrieved from the resource referenced by the "Location" HTTP header in + the response to a POST request creating a new PNF descriptor resource. It can also be retrieved + from the "id" attribute in the message content of that response. required: true style: simple explode: false @@ -1147,7 +1154,7 @@ components: Identifier of this subscription. This identifier can be retrieved from the resource referenced by the "Location" HTTP header in the response to a POST request creating a new subscription resource. It can also be retrieved - from the "id" attribute in the payload body of that response. + from the "id" attribute in the message content of that response. required: true style: simple explode: false @@ -1836,12 +1843,12 @@ components: If the "include_signatures" URI query parameter was absent in the request, or if the manifest file has all security-related information embedded (i.e. there is no separate - certificate file), the payload body shall contain a copy of the manifest file of the + certificate file), the message content shall contain a copy of the manifest file of the NSD archive, and the "Content-Type" HTTP header shall be set to "text/plain". If the "include_signatures" URI query parameter was present in the related request and the manifest file does not have all the security-related information embedded (i.e. there is a separate certificate file), the "Content-Type" HTTP header shall be set to "application/zip" - and the payload body shall contain a ZIP archive which includes: + and the message content shall contain a ZIP archive which includes: - a copy of the manifest file of the NSD archive; - a copy of the related individual certificate file. headers: @@ -1912,7 +1919,7 @@ components: Shall be returned when the content of the artifact file has been read successfully. If the "include_signatures" request URI parameter was not provided in the related request, - the payload body shall contain a copy of the artifact file from the NSD archive, as defined + the message content shall contain a copy of the artifact file from the NSD archive, as defined by ETSI GS NFV-SOL 007, and the "Content-Type" HTTP header shall be set according to the content type of the artifact file. If the artifact is encrypted, the header shall be set to the value "application/cms" (IETF RFC 7193). @@ -1920,7 +1927,7 @@ components: If the content type cannot be determined, the header shall be set to the value "application/octet-stream". If the "include_signatures" request URI parameter was provided in the related request, the "Content-Type" HTTP header shall be set to "application/zip" - and the payload body shall contain a ZIP archive which includes: + and the message content shall contain a ZIP archive which includes: - a copy of the artifact file from the VNF package, as defined by ETSI GS NFVSOL 007 - the related security information (individual signature file and optional related individual certificate file). @@ -1964,7 +1971,7 @@ components: If the content type cannot be determined, the header shall be set to the value "application/octet-stream". - The "Content-Range" HTTP header shall be provided according to IETF RFC 7233. + The "Content-Range" HTTP header shall be provided according to IETF RFC 9110. headers: Content-Type: description: | @@ -2303,7 +2310,7 @@ components: Shall be returned when the content of the PNFD archive has been read successfully. - The payload body shall contain a copy of the PNFD archive + The message content shall contain a copy of the PNFD archive The "Content-Type" HTTP header shall be set to "application/zip". headers: Content-Type: @@ -2337,7 +2344,7 @@ components: when a single consecutive byte range from the content of the PNFD archive has been read successfully according to the request. The response body shall contain the requested part of the PNFD archive. - The "Content-Range" HTTP header shall be provided according to IETF RFC 7233. + The "Content-Range" HTTP header shall be provided according to IETF RFC 9110. The "Content-Type" HTTP header shall be set as defined above for the "200 OK" response. headers: Content-Type: @@ -2526,7 +2533,7 @@ components: 200 OK Shall be returned when the content of the PNFD has been read successfully. - The payload body shall contain a copy of the file representing the PNFD + The message content shall contain a copy of the file representing the PNFD or a ZIP file that contains the file or multiple files representing the PNFD, as specified above. The "Content-Type" HTTP header shall be set according to the format of @@ -2625,14 +2632,14 @@ components: read successfully. If the "include_signatures" URI query parameter was absent in the request, or if the manifest file has all security-related information - embedded (i.e. there is no separate certificate file), the payload - body shall contain a copy of the manifest file of the PNFD archive, + embedded (i.e. there is no separate certificate file), the message + content shall contain a copy of the manifest file of the PNFD archive, and the "Content-Type" HTTP header shall be set to "text/plain". If the "include_signatures" URI query parameter was present in the related request and the manifest file does not have all the security-related information embedded (i.e. there is a separate certificate file), the "Content-Type" HTTP header shall be set to "application/zip" and - the payload body shall contain a ZIP archive which includes: + the message content shall contain a ZIP archive which includes: - a copy of the manifest file of the PNFD archive; - a copy of the related individual certificate file. headers: @@ -2709,7 +2716,7 @@ components: Shall be returned when the content of the artifact file has been read successfully. If the "include_signatures" request URI parameter was not provided in the related request, - the payload body shall contain a copy of the artifact file from the PNFD archive, as defined + the message content shall contain a copy of the artifact file from the PNFD archive, as defined by ETSI GS NFV-SOL 004, and the "Content-Type" HTTP header shall be set according to the content type of the artifact file. If the artifact is encrypted, the header shall be set to the value "application/cms" (IETF RFC 7193). @@ -2717,14 +2724,14 @@ components: If the content type cannot be determined, the header shall be set to the value "application/octetstream". If the "include_signatures" request URI parameter was provided in the related request, the "Content-Type" HTTP header shall be set to "application/zip" - and the payload body shall contain a ZIP archive which includes: + and the message content shall contain a ZIP archive which includes: - a copy of the artifact file from the VNF package, as defined by ETSI GS NFVSOL 004 - the related security information (individual signature file and optional related individual certificate file). headers: Content-Type: description: | - The MIME type of the body of the request. Reference: IETF RFC 7231 + The MIME type of the body of the request. Reference: IETF RFC 9110 style: simple explode: false schema: @@ -2970,10 +2977,10 @@ components: Subscriptions.Post.422: description: | - 422 Unprocessable Entity + 422 Unprocessable Content - Shall be returned upon the following error: The content type of the payload body is supported and the payload - body of a request contains syntactically correct data but the data cannot be processed. + Shall be returned upon the following error: The content type of the message content is supported and the message content + of a request contains syntactically correct data but the data cannot be processed. The general cause for this error and its handling is specified in clause 6.4 of ETSI GS NFV-SOL 013 [16], including rules for the presence of the response body. Specifically in case of this resource, the response code 422 shall also be returned if the NFVO has tested -- GitLab From ded35a71e68d1798411033c162d8666b2a0c78d8 Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Thu, 3 Nov 2022 17:57:03 +0100 Subject: [PATCH 03/10] SOL005_56 to SOL005_86 --- .../NSLifecycleManagement.yaml | 20 +++++----- .../SOL005NSLifecycleManagement_def.yaml | 29 +++++++------- .../NSPerformanceManagement.yaml | 40 +++++++++---------- 3 files changed, 45 insertions(+), 44 deletions(-) diff --git a/src/SOL005/NSLifecycleManagement/NSLifecycleManagement.yaml b/src/SOL005/NSLifecycleManagement/NSLifecycleManagement.yaml index cff7f3f..3535275 100644 --- a/src/SOL005/NSLifecycleManagement/NSLifecycleManagement.yaml +++ b/src/SOL005/NSLifecycleManagement/NSLifecycleManagement.yaml @@ -998,7 +998,7 @@ components: in: path description: | Identifier of the "Individual VNF snapshot" resource. - This identifier can be retrieved from the "id" attribute in the payload body of a response to a query to + This identifier can be retrieved from the "id" attribute in the message content of a response to a query to "VNF snapshots" resource. required: true style: simple @@ -1063,7 +1063,7 @@ components: NsLcmOpOccCancelRequest: description: | - The POST request to this resource shall include a CancelMode structure in the payload body to choose between + The POST request to this resource shall include a CancelMode structure in the message content to choose between "graceful" and "forceful" cancellation. content: application/json: @@ -1152,7 +1152,7 @@ components: type: string Content-Type: description: | - The MIME type of the body of the response.This header field shall be present if the response has a + The MIME type of the body of the response. This header field shall be present if the response has a non-empty message body. style: simple explode: false @@ -1715,7 +1715,7 @@ components: 202 ACCEPTED Shall be returned when the request has been accepted for processing, but processing has not been completed. - The response shall have an empty payload body. + The response shall have an empty message content. headers: Version: description: | @@ -1828,7 +1828,7 @@ components: 202 ACCEPTED Shall be returned when the request has been accepted for processing, but processing has not been completed. - The response shall have an empty payload body. + The response shall have an empty message content. headers: Version: description: | @@ -1941,7 +1941,7 @@ components: 202 ACCEPTED Shall be returned when the request has been accepted for processing, but processing has not been completed. - The response shall have an empty payload body. + The response shall have an empty message content. headers: Version: @@ -2241,7 +2241,7 @@ components: Shall be returned upon the following error: The operation cannot be executed currently, due to a conflict with the state of the NS LCM operation occurrence resource. - Typically, this is due to the fact that the operation occurrence is not in STARTING, PROCESSING or ROLLING_BACK state. + Typically, this is due to the fact that the operation occurrence is not in PROCESSING or ROLLING_BACK state. The response body shall contain a ProblemDetails structure, in which the "detail" attribute shall convey more information about the error. headers: @@ -2383,10 +2383,10 @@ components: NsLcmSubscriptions.Post.422: description: | - 422 Unprocessable Entity + 422 Unprocessable Content - Shall be returned upon the following error: The content type of the payload body is supported and the - payload body of a request contains syntactically correct data but the data cannot be processed. + Shall be returned upon the following error: The content type of the message content is supported and the + message content of a request contains syntactically correct data but the data cannot be processed. The general cause for this error and its handling is specified in clause 6.4 of ETSI GS NFV-SOL 013 [16], including rules for the presence of the response body. Specifically in case of this resource, the response code 422 shall also be returned if the NFVO has tested diff --git a/src/SOL005/NSLifecycleManagement/definitions/SOL005NSLifecycleManagement_def.yaml b/src/SOL005/NSLifecycleManagement/definitions/SOL005NSLifecycleManagement_def.yaml index e2e6917..da0f0e2 100644 --- a/src/SOL005/NSLifecycleManagement/definitions/SOL005NSLifecycleManagement_def.yaml +++ b/src/SOL005/NSLifecycleManagement/definitions/SOL005NSLifecycleManagement_def.yaml @@ -176,13 +176,15 @@ definitions: description: > Cancellation mode. - The NFVO shall not start any new VNF lifecycle management and resource + If the NS LCM operation occurrence is in "PROCESSING" or "ROLLING_BACK" state, + the NFVO shall not start any new VNF lifecycle management and resource management operation, and shall wait for the ongoing VNF lifecycle management and resource management operations in the underlying system, typically the VNFM and VIM, to finish execution or to time out. After that, the NFVO shall put the operation occurrence into the FAILED_TEMP state. - The NFVO shall not start any new VNF lifecycle management and resource + If the NS LCM operation occurrence is in "PROCESSING" or "ROLLING_BACK" state, + the NFVO shall not start any new VNF lifecycle management and resource management operation, shall cancel the ongoing VNF lifecycle management and resource management operations in the underlying system, typically the VNFM and VIM, and shall wait for the cancellation to finish or to time out. After that, the NFVO @@ -197,7 +199,7 @@ definitions: This type represents a response for Query NS operation. It shall comply with the provisions defined in Table 6.5.2.10-1. - NOTE 1: If the "nsState" attribute is INSTANTIATED, at least either one + NOTE 1: Void. "vnfInstance" attribute or one "nestedNsInstanceId" attribute shall be present. NOTE 2: The “priority” attribute of the NS instance is configured in the NSD in the NsDf structure. The mapping from application-specific priority values to a value in the NsDf is under OSS/BSS responsibility. @@ -250,7 +252,6 @@ definitions: vnfInstance: description: > Information on constituent VNF(s) of the NS instance. - See note 1. type: array items: $ref: "#/definitions/VnfInstance" @@ -284,7 +285,6 @@ definitions: nestedNsInstanceId: description: > Identifier of the nested NS(s) of the NS instance. - See note. type: array items: $ref: "../../definitions/SOL005_def.yaml#/definitions/Identifier" @@ -402,7 +402,7 @@ definitions: This type represents a VNF instance. It shall comply with the provisions defined in table 6.5.3.57-1. NOTE: Clause B.3.2 of ETSI GS NFV-SOL 003 provides examples illustrating the relationship among the - different run-time information elements (CP, VL and link ports) used to represent the connectivity + different run-time idata types (CP, VL and link ports) used to represent the connectivity of a VNF. NOTE 1: Modifying the value of this attribute shall not be performed when conflicts exist between the @@ -1521,6 +1521,7 @@ definitions: $ref: "#/definitions/IdentifierInVim" ExtManagedVirtualLinkInfo: + description: This type provides information about an externally-managed internal virtual link for VNFs. type: object required: - id @@ -4344,13 +4345,13 @@ definitions: description: > Value | Description ------|------------ - PROCESSING | The LCM operation is currently in execution. - COMPLETED | The LCM operation has been completed successfully. - PARTIALLY_COMPLETED | The LCM operation has been partially completed with accepTable errors. - FAILED_TEMP | The LCM operation has failed and execution has stopped, but the execution of the operation is not considered to be closed. - FAILED | The LCM operation has failed and it cannot be retried or rolled back, as it is determined that such action will not succeed. - OLLING_BACK | The LCM operation is currently being rolled back. - ROLLED_BACK | The LCM operation has been successfully rolled back, i.e. The state of the NS prior to the original operation invocation has been restored as closely as possible. + PROCESSING | The NS LCM operation is currently in execution. + COMPLETED | The NS LCM operation has been completed successfully. + PARTIALLY_COMPLETED | The NS LCM operation has been partially completed with accepTable errors. + FAILED_TEMP | The NS LCM operation has failed and execution has stopped, but the execution of the operation is not considered to be closed. + FAILED | The NS LCM operation has failed and it cannot be retried or rolled back, as it is determined that such action will not succeed. + ROLLING_BACK | The NS LCM operation is currently being rolled back. + ROLLED_BACK | The NS LCM operation has been successfully rolled back, i.e. The state of the NS prior to the original operation invocation has been restored as closely as possible. type: string enum: - PROCESSING @@ -6635,7 +6636,7 @@ definitions: properties: cpInstanceId: description: > - Identifier of this VIP CP instance and of this VipCpInfo information element. + Identifier of this VIP CP instance and of this VipCpInfo structure. $ref: "#/definitions/IdentifierInVnf" cpdId: description: > diff --git a/src/SOL005/NSPerformanceManagement/NSPerformanceManagement.yaml b/src/SOL005/NSPerformanceManagement/NSPerformanceManagement.yaml index 32cab47..3fcddbb 100644 --- a/src/SOL005/NSPerformanceManagement/NSPerformanceManagement.yaml +++ b/src/SOL005/NSPerformanceManagement/NSPerformanceManagement.yaml @@ -127,8 +127,8 @@ paths: #ETSI GS NFV-SOL 005 V2.4.1 location: 7.4.3 parameters: - $ref: '#/components/parameters/PmJobId' - - $ref: ../components/SOL005_params.yaml#/components/parameters/Authorization - - $ref: ../components/SOL005_params.yaml#/components/parameters/Version + - $ref: '../components/SOL005_params.yaml#/components/parameters/Authorization' + - $ref: '../components/SOL005_params.yaml#/components/parameters/Version' get: description: | @@ -328,8 +328,8 @@ paths: #ETSI GS NFV-SOL 005 V2.4.1 location: 7.4.6 parameters: - $ref: '#/components/parameters/ThresholdId' - - $ref: ../components/SOL005_params.yaml#/components/parameters/Authorization - - $ref: ../components/SOL005_params.yaml#/components/parameters/Version + - $ref: '../components/SOL005_params.yaml#/components/parameters/Authorization' + - $ref: '../components/SOL005_params.yaml#/components/parameters/Version' get: description: | @@ -798,7 +798,7 @@ components: Identifier of the PM job. This identifier can be retrieved from the resource referenced by the "Location" HTTP header in the response to a POST request creating a new PM job resource. It can also be retrieved from the "id" attribute in the - payload body of that response. + message content of that response. required: true style: simple explode: false @@ -824,7 +824,7 @@ components: This identifier can be retrieved from the resource referenced by the "Location" HTTP header in the response to a POST request creating a new threshold resource. It can also be retrieved from the "id" - attribute in the payload body of that response. + attribute in the message content of that response. required: true style: simple explode: false @@ -906,10 +906,10 @@ components: PmJobs.Post.422: description: | - 422 Unprocessable Entity + 422 Unprocessable Content - content type of the payload body is supported and the payload body of a request contains syntactically correct - data but the data cannot be processed. + Shall be returned upon the following error: The content type of the message content is supported and the + message content of a request contains syntactically correct data but the data cannot be processed. The general cause for this error and its handling is specified in clause 6.4 of ETSI GS NFV-SOL 013 [16], including rules for the presence of the response body. Specifically in case of this resource, the response code 422 shall also be returned if the NFVO has tested @@ -1090,10 +1090,10 @@ components: IndividualPmJob.Patch.422: description: | - 422 Unprocessable entity + 422 Unprocessable Content - Shall be returned upon the following error: The content type of the payload body is supported and the payload - body of a request contains syntactically correct data but the data cannot be processed. + Shall be returned upon the following error: The content type of the message content is supported and the + message content of a request contains syntactically correct data but the data cannot be processed. The general cause for this error and its handling is specified in clause 6.4 of ETSI GS NFV-SOL 013 [16], including rules for the presence of the response body. Specifically in case of this resource, the response code 422 shall also be returned if the NFVO has tested @@ -1222,11 +1222,11 @@ components: Thresholds.Post.422: description: | - 422 Unprocessable entity + 422 Unprocessable Content - Shall be returned upon the following error: The content type of the payload body is supported and the payload - body of a request contains syntactically correct data but the data cannot be processed. - The general cause for this error and its handling is specified in clause 6.4 of ETSI GS NFV-SOL 013 [16], + Shall be returned upon the following error: The content type of the message content is supported and the + message content of a request contains syntactically correct data but the data cannot be processed. + The general cause for this error and its handling is specified in clause 6.4 of ETSI GS NFV-SOL 013, including rules for the presence of the response body. Specifically in case of this resource, the response code 422 shall also be returned if the NFVO has tested the Notification endpoint as described in clause 7.4.9.3.2 and the test has failed. @@ -1403,11 +1403,11 @@ components: IndividualThreshold.Patch.422: description: | - 422 Unprocessable Entity + 422 Unprocessable Content - Shall be returned upon the following error: The content type of the payload body is supported and the payload - body of a request contains syntactically correct data but the data cannot be processed. - The general cause for this error and its handling is specified in clause 6.4 of ETSI GS NFV-SOL 013 [16], + Shall be returned upon the following error: The content type of the message content is supported and the + message content of a request contains syntactically correct data but the data cannot be processed. + The general cause for this error and its handling is specified in clause 6.4 of ETSI GS NFV-SOL 013, including rules for the presence of the response body. Specifically in case of this resource, the response code 422 shall also be returned if the NFVO has tested the Notification endpoint as described in clause 7.4.9.3.2 and the test has failed. -- GitLab From c89bca812a74bd2e71c8cb55b835bf3df239cf76 Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Thu, 3 Nov 2022 20:59:32 +0100 Subject: [PATCH 04/10] SOL005_87 to SOL005_123 --- .../NSFaultManagement/NSFaultManagement.yaml | 16 +++--- .../SOL005NSFaultManagement_def.yaml | 2 +- .../VNFPackageManagement.yaml | 51 ++++++++++--------- .../SOL005VNFPackageManagement_def.yaml | 42 ++++++--------- src/SOL005/components/SOL005_params.yaml | 6 +-- 5 files changed, 54 insertions(+), 63 deletions(-) diff --git a/src/SOL005/NSFaultManagement/NSFaultManagement.yaml b/src/SOL005/NSFaultManagement/NSFaultManagement.yaml index 8929942..aed2bac 100644 --- a/src/SOL005/NSFaultManagement/NSFaultManagement.yaml +++ b/src/SOL005/NSFaultManagement/NSFaultManagement.yaml @@ -85,8 +85,8 @@ paths: /alarms/{alarmId}: parameters: - $ref: '#/components/parameters/AlarmId' - - $ref: ../components/SOL005_params.yaml#/components/parameters/Version - - $ref: ../components/SOL005_params.yaml#/components/parameters/Authorization + - $ref: '../components/SOL005_params.yaml#/components/parameters/Version' + - $ref: '../components/SOL005_params.yaml#/components/parameters/Authorization' get: description: | The API consumer can use this method to read an individual alarm. See clause 8.4.3.3.2. @@ -296,7 +296,7 @@ components: 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. + the applicable array element in the message content of the response to a GET request to the "Alarms" resource. required: true style: simple explode: false @@ -309,7 +309,7 @@ components: description: | Identifier of this subscription. This identifier can be retrieved from the resource referenced by the "Location" HTTP header in the response to a POST request creating a new subscription resource. It can also - be retrieved from the "id" attribute in the payload body of that response. + be retrieved from the "id" attribute in the message content of that response. required: true style: simple explode: false @@ -627,11 +627,11 @@ components: FmSubscriptions.Post.422: description: | - 422 Unprocessable Entity + 422 Unprocessable Content - Shall be returned upon the following error: The content type of the payload body is supported and the payload - body of a request contains syntactically correct data but the data cannot be processed. - The general cause for this error and its handling is specified in clause 6.4 of ETSI GS NFV-SOL 013 [16], + Shall be returned upon the following error: The content type of the message content is supported and the + message content of a request contains syntactically correct data but the data cannot be processed. + The general cause for this error and its handling is specified in clause 6.4 of ETSI GS NFV-SOL 013, including rules for the presence of the response body. Specifically in case of this resource, the response code 422 shall also be returned if the NFVO has tested the Notification endpoint as described in clause 8.4.6.3.2 and the test has failed. diff --git a/src/SOL005/NSFaultManagement/definitions/SOL005NSFaultManagement_def.yaml b/src/SOL005/NSFaultManagement/definitions/SOL005NSFaultManagement_def.yaml index 3c3e86c..8d992aa 100644 --- a/src/SOL005/NSFaultManagement/definitions/SOL005NSFaultManagement_def.yaml +++ b/src/SOL005/NSFaultManagement/definitions/SOL005NSFaultManagement_def.yaml @@ -20,7 +20,7 @@ definitions: properties: id: description: > - Identifier of this Alarm information element. + Identifier of this Alarm structure. $ref: "../../definitions/SOL005_def.yaml#/definitions/Identifier" managedObjectId: description: > diff --git a/src/SOL005/VNFPackageManagement/VNFPackageManagement.yaml b/src/SOL005/VNFPackageManagement/VNFPackageManagement.yaml index d220354..5c4f8c1 100644 --- a/src/SOL005/VNFPackageManagement/VNFPackageManagement.yaml +++ b/src/SOL005/VNFPackageManagement/VNFPackageManagement.yaml @@ -16,7 +16,7 @@ info: license: name: ETSI Forge copyright notice url: https://forge.etsi.org/etsi-forge-copyright-notice.txt - version: 2.3.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 + version: 2.4.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: description: ETSI GS NFV-SOL 005 V3.6.1 @@ -756,7 +756,7 @@ components: description: | Identifier of this subscription. This identifier can be retrieved from the resource referenced by the "Location" HTTP header in the response to a POST request creating a new "Individual subscription" resource. It can also be retrieved - from the "id" attribute in the payload body of that response. + from the "id" attribute in the message content of that response. required: true style: simple explode: false @@ -784,7 +784,7 @@ components: VnfPackageExtArtifactsRequest: description: | - The payload body contains the access configuration information based on which the NFVO can obtain the + The message content contains the access configuration information based on which the NFVO can obtain the external VNF package artifact files. content: application/json: @@ -800,18 +800,19 @@ components: file: type: string description: | - The payload body contains a ZIP file that represents the VNF package. The "Content-Type" HTTP header shall + The message content contains a ZIP file that represents the VNF package. The "Content-Type" HTTP header shall be set according to the type of the file, i.e. to "application/zip" for a VNF Package as defined in ETSI GS NFV-SOL 004. format: binary required: true VnfPackageUploadFromUriRequest: description: | - The payload body contains the address information based on which the NFVO can obtain the content of the VNF package. + The message content contains the address information based on which the NFVO can obtain the content of the VNF package. + The message content contains the address information based on which the NFVO can obtain the content of the VNF package. content: application/json: schema: - $ref: ./definitions/SOL005VNFPackageManagement_def.yaml#/definitions/UploadVnfPkgFromUriRequest + $ref: ./definitions/SOL005VNFPackageManagement_def.yaml#/definitions/UploadVnfPackageFromUriRequest required: true VnfPkgSubscriptionRequest: @@ -1059,7 +1060,7 @@ components: IndividualVnfPackageVnfd.Get.200: description: | 200 OK - Shall be returned when the content of the VNFD has been read successfully. The payload body shall contain a + Shall be returned when the content of the VNFD has been read successfully. The message content shall contain a copy of the file representing the VNFD or a ZIP file that contains the file or multiple files representing the VNFD, as specified above. The "Content-Type" HTTP header shall be set according to the format of the returned file, i.e. to "text/plain" for a YAML file or to "application/zip" for a ZIP file. @@ -1270,14 +1271,16 @@ components: IndividualVnfPackageManifest.Get.200: description: | 200 OK - Shall be returned when the content of the manifest has been read successfully. If the "include_signatures" URI - query parameter was absent in the request, or if the manifest file has all security-related information embedded - (i.e. there is no separate certificate file), the payload body shall contain a copy of the manifest file of the - VNF package, and the "Content-Type" HTTP header shall be set to "text/plain". If the "include_signatures" URI - query parameter was present in the related request and the manifest file does not have all the security-related - information embedded (i.e. there is a separate certificate file), the "Content-Type" HTTP header shall be set to - "application/zip and the payload body shall contain a ZIP archive which includes: - a copy of the manifest file - of the VNF package - a copy of the related individual certificate file. + + Shall be returned when the content of the manifest has been read successfully. If the "include_signatures" URI query + parameter was absent in the request, or if the manifest file has all security-related information embedded (i.e. + there is no separate certificate file), the message content shall contain a copy of the manifest file of the VNF + package, and the "Content-Type" HTTP header shall be set to "text/plain". + If the "include_signatures" URI query parameter was present in the related request and the manifest file does + not have all the security-related information embedded (i.e. there is a separate certificate file), the + "Content-Type" HTTP header shall be set to "application/zip" and the message content shall contain a ZIP + archive which includes: + - a copy of the manifest file of the VNF package headers: Version: description: | @@ -1406,7 +1409,7 @@ components: If the NFVO supports range requests, this response shall be returned when a single consecutive byte range from the content of the VNF package file has been read successfully according to the request. The response body shall contain the requested part of the VNF package file. - The "Content-Range" HTTP header shall be provided according to IETF RFC 7233 [10]. + The "Content-Range" HTTP header shall be provided according to IETF RFC 9110. The "Content-Type" HTTP header shall be set as defined above for the "200 OK" response. headers: Version: @@ -1560,7 +1563,7 @@ components: description: | 200 OK Shall be returned when the whole content of the archive containing the artifact files has been read successfully. - The payload body shall be a ZIP archive containing the requested set of artifacts selected according to the provisions + The message content shall be a ZIP archive containing the requested set of artifacts selected according to the provisions specified above in this clause, and, if the flag "include_signatures" was provided in the related request, the applicable signature files and, if available, the separate certificate files from the VNF package. The "Content-Type" HTTP header shall be set to "application/zip". @@ -1597,7 +1600,7 @@ components: read successfully according to the request. The response body shall contain the requested part of the archive. The "Content-Type" HTTP header shall be set to "application/zip". - The "Content-Range" HTTP header shall be provided according to IETF RFC 7233 [10]. + The "Content-Range" HTTP header shall be provided according to IETF RFC 9110. headers: Version: description: | @@ -1748,13 +1751,13 @@ components: IndividualVnfPackageArtifact.Get.200: description: | 200 OK Shall be returned when the whole content of the artifact file has been read successfully. If the - "include_signatures" request URI parameter was not provided in the related request, the payload body shall + "include_signatures" request URI parameter was not provided in the related request, the message content shall contain a copy of the artifact file from the VNF package, as defined by ETSI GS NFV-SOL 004 [5], and the "Content-Type" HTTP header shall be set according to the content type of the artifact file. If the artifact is encrypted, the header shall be set to the value "application/cms" (IETF RFC 7193 [17]). If the content type cannot be determined, the header shall be set to the value "application/octet-stream". If the "include_signatures" request URI parameter was provided in the related request, the "ContentType" - HTTP header shall be set to "application/zip" and the payload body shall contain a ZIP archive which includes: + HTTP header shall be set to "application/zip" and the message content shall contain a ZIP archive which includes: - a copy of the artifact file from the VNF package, as defined by ETSI GS NFV-SOL 004 [5]; - the related security information (individual signature file and optional related individual certificate file). headers: @@ -1791,7 +1794,7 @@ components: requested part of the artifact file from the VNF package, as defined by ETSI GS NFV-SOL 004 [5]. The "Content-Type" HTTP header shall be set according to the content type of the artifact file. If the content type cannot be determined, the header shall be set to the value "application/octet-stream". - The "Content-Range" HTTP header shall be provided according to IETF RFC 7233 [10]. + The "Content-Range" HTTP header shall be provided according to IETF RFC 9110. headers: Version: @@ -2033,10 +2036,10 @@ components: VnfPkgSubscriptions.Post.422: description: | - 422 Unprocessable Entity + 422 Unprocessable Content - Shall be returned upon the following error: The content type of the payload body is supported and the payload - body of a request contains syntactically correct data but the data cannot be processed. + Shall be returned upon the following error: The content type of the message content is supported and the message + content of a request contains syntactically correct data but the data cannot be processed. The general cause for this error and its handling is specified in clause 6.4 of ETSI GS NFV-SOL 013 [16], including rules for the presence of the response body. Specifically in case of this resource, the response code 422 shall also be returned if the NFVO has tested diff --git a/src/SOL005/VNFPackageManagement/definitions/SOL005VNFPackageManagement_def.yaml b/src/SOL005/VNFPackageManagement/definitions/SOL005VNFPackageManagement_def.yaml index 2309271..edb972e 100644 --- a/src/SOL005/VNFPackageManagement/definitions/SOL005VNFPackageManagement_def.yaml +++ b/src/SOL005/VNFPackageManagement/definitions/SOL005VNFPackageManagement_def.yaml @@ -203,13 +203,20 @@ definitions: synthesize this path in a manner that avoids any collision of the synthesized artifact path with the paths and names of artifacts included in the package. + + The attribute name "artifactURI" does not comply with the naming + convention defined in clause 4.3 of ETSI GS NFV-SOL 015. + This is to maintain the backward compatibility. $ref: "../../definitions/SOL005_def.yaml#/definitions/String" artifactURI: description: > URI of the artifact as defined in the VNF package manifest. Shall be present if the artifact is external to the package and shall be absent otherwise. - EXAMPLE: https://example.com/m%40ster.sh + + EXAMPLE: https://example.com/m%40ster.sh + See note. + $ref: "../../definitions/SOL005_def.yaml#/definitions/Uri" checksum: description: > @@ -498,7 +505,7 @@ definitions: User defined data to be updated. For existing keys, the value is replaced. See note. $ref: "../../definitions/SOL005_def.yaml#/definitions/KeyValuePairs" - UploadVnfPkgFromUriRequest: + UploadVnfPackageFromUriRequest: description: > This type represents the request parameters for uploading the content of a VNF package. The NFVO can obtain the VNF package content through the information provided in the request parameters. It shall comply with the provisions @@ -515,19 +522,10 @@ definitions: $ref: "../../definitions/SOL005_def.yaml#/definitions/Uri" authType: description: > - Defines the type of authentication / - authorization for downloading the VNF - package. + Defines the type of authentication/authorization for downloading the VNF package. Permitted values: - - BASIC: Only the "username" and - "password" attributes shall be - present. - - OAUTH2_CLIENT_CREDENTIAL - S: Only the - "paramsOauth2ClientCredentials" - attribute shall be present. - This attribute shall not be present if no - credentials are provided for the artifact. + - OAUTH2_CLIENT_CREDENTIALS: Only the "paramsOauth2ClientCredentials" attribute shall be present. + This attribute shall not be present if the credentials were provisioned out of band type: string enum: - BASIC @@ -821,20 +819,10 @@ definitions: $ref: "../../definitions/SOL005_def.yaml#/definitions/Uri" authType: description: > - Defines the type of authentication / - authorization for downloading the VNF - package. + Defines the type of authentication/authorization for downloading the VNF package. Permitted values: - - BASIC: Only the "username" and - "password" attributes shall be - present. - - OAUTH2_CLIENT_CREDENTIAL - S: Only the - "paramsOauth2ClientCredentials" - attribute shall be present. - This attribute shall not be present if no - credentials are provided for the artifact. - type: string + - OAUTH2_CLIENT_CREDENTIALS: Only the "paramsOauth2ClientCredentials" attribute shall be present. + This attribute shall not be present if no credentials are provided for the artifact.type: string enum: - BASIC - OAUTH2_CLIENT_CREDENTIALS diff --git a/src/SOL005/components/SOL005_params.yaml b/src/SOL005/components/SOL005_params.yaml index 58220e1..b17c2e7 100644 --- a/src/SOL005/components/SOL005_params.yaml +++ b/src/SOL005/components/SOL005_params.yaml @@ -105,7 +105,7 @@ components: in: query description: | Flag (i.e. parameter without value) that instructs the NFVO to exclude the set of additional MANO artifacts - (i.e. those that are not images) from the response payload body. The NFVO shall support this parameter. + (i.e. those that are not images) from the response message content. The NFVO shall support this parameter. The OSS/BSS may supply this parameter. required: false style: form @@ -118,7 +118,7 @@ components: in: query description: | Flag (i.e. parameter without value) that instructs the NFVO to exclude the set of non-MANO artifacts from the - response payload body. The NFVO shall support this parameter. The OSS/BSS may supply this parameter. + response message content. The NFVO shall support this parameter. The OSS/BSS may supply this parameter. required: false style: form explode: true @@ -143,7 +143,7 @@ components: in: query description: | Flag (i.e. parameter without value) that instructs the NFVO to include external artifacts in the response - payload body. It shall not be treated as an error if this flag is provided but there is no external artifact + message content. It shall not be treated as an error if this flag is provided but there is no external artifact to include in the result. If this parameter is missing, no external artifacts shall be included. The NFVO shall support this parameter. The OSS/BSS may supply this parameter. required: false -- GitLab From f8244a6d5e34707b9d22bfdb4b6ea73fbdc8b0bd Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Fri, 4 Nov 2022 09:44:43 +0100 Subject: [PATCH 05/10] SOL005_124 to SOL005_161 --- .../NFVICapacityInformation.yaml | 16 +++++++------- .../NFVICapacityInformation_def.yaml | 2 +- .../NSLCMCoordination/NSLCMCoordination.yaml | 4 ++-- .../VNFSnapshotPackageManagement.yaml | 21 +++++++++++-------- ...OL005VNFSnapshotPackageManagement_def.yaml | 18 +++++++--------- 5 files changed, 31 insertions(+), 30 deletions(-) diff --git a/src/SOL005/NFVICapacityInformation/NFVICapacityInformation.yaml b/src/SOL005/NFVICapacityInformation/NFVICapacityInformation.yaml index da11c92..440a5cd 100644 --- a/src/SOL005/NFVICapacityInformation/NFVICapacityInformation.yaml +++ b/src/SOL005/NFVICapacityInformation/NFVICapacityInformation.yaml @@ -315,7 +315,7 @@ components: description: | Identifier of the VIM with associated NFVI capacity information. This identifier can be retrieved from the "vimId" attribute in the CapacityShortageNotification. - It can also be retrieved from the "vimId" attribute in the payload body of the response. + It can also be retrieved from the "vimId" attribute in the message content of the response. required: true style: simple explode: false @@ -329,7 +329,7 @@ components: Identifier of the capacity threshold. This identifier can be retrieved from the resource referenced by the "Location" HTTP header in the response to a POST request creating a new "Individual capacity threshold" resource. It can also be retrieved from the "id" - attribute in the payload body of that response. + attribute in the message content of that response. required: true style: simple explode: false @@ -498,11 +498,11 @@ components: CapacityThresholds.Post.422: description: | - 422 UNPROCESSABLE ENTITY + 422 Unprocessable Content - Shall be returned upon the following error: The content type of the payload body is supported and the payload - body of a request contains syntactically correct data but the data cannot be processed. - The general cause for this error and its handling is specified in clause 6.4 of ETSI GS NFV-SOL 013 [16], + Shall be returned upon the following error: The content type of the message content is supported and the message + content of a request contains syntactically correct data but the data cannot be processed. + The general cause for this error and its handling is specified in clause 6.4 of ETSI GS NFV-SOL 013, including rules for the presence of the response body. Specifically in case of this resource, the response code 422 shall also be returned if the NFVO has tested the Notification endpoint as described in clause 10.4.6.3.2 and the test has failed. @@ -630,9 +630,9 @@ components: IndividualCapacityThreshold.Patch.422: description: | - 422 UNPROCESSABLE ENTITY + 422 Unprocessable Content - content type of the payload body is supported and the payload body of a request contains syntactically + The content type of the message content is supported and the message content of a request contains syntactically correct data but the data cannot be processed. The general cause for this error and its handling is specified in clause 6.4 of ETSI GS NFV-SOL 013 [16], including rules for the presence of the response body. diff --git a/src/SOL005/NFVICapacityInformation/definitions/NFVICapacityInformation_def.yaml b/src/SOL005/NFVICapacityInformation/definitions/NFVICapacityInformation_def.yaml index 0416e51..a7ae401 100644 --- a/src/SOL005/NFVICapacityInformation/definitions/NFVICapacityInformation_def.yaml +++ b/src/SOL005/NFVICapacityInformation/definitions/NFVICapacityInformation_def.yaml @@ -227,7 +227,7 @@ components: type: object description: | This type defines the format of a time interval. The type shall comply with the provisions defined in table 10.5.2.7-1. - NOTE: When only the startTime is present, there is no time interval being defined, and therefore the provided timing + NOTE: When only the aTime is present, there is no time interval being defined, and therefore the provided timing information refers to a specific point in time. required: - aTime diff --git a/src/SOL005/NSLCMCoordination/NSLCMCoordination.yaml b/src/SOL005/NSLCMCoordination/NSLCMCoordination.yaml index 17eb44a..9acbd09 100644 --- a/src/SOL005/NSLCMCoordination/NSLCMCoordination.yaml +++ b/src/SOL005/NSLCMCoordination/NSLCMCoordination.yaml @@ -350,8 +350,8 @@ components: 202 ACCEPTED Shall be returned when the cancellation request has been accepted for processing. - - The response shall have an empty payload body. + + The response shall have an empty message content. headers: Version: description: The used API version. diff --git a/src/SOL005/VNFSnapshotPackageManagement/VNFSnapshotPackageManagement.yaml b/src/SOL005/VNFSnapshotPackageManagement/VNFSnapshotPackageManagement.yaml index 19a3f20..aafb202 100644 --- a/src/SOL005/VNFSnapshotPackageManagement/VNFSnapshotPackageManagement.yaml +++ b/src/SOL005/VNFSnapshotPackageManagement/VNFSnapshotPackageManagement.yaml @@ -319,7 +319,7 @@ paths: post: description: | The POST method provides the information for the NFVO to get the content of - a VNF snapshot package. See clause 11.4.5.3.1. + a VNF snapshot package. parameters: - $ref: ../components/SOL005_params.yaml#/components/parameters/ContentType requestBody: @@ -656,7 +656,8 @@ components: UploadVnfSnapshotPkgFromUriRequest: description: | - Request parameters for uploading the content of a VNF snapshot package, as defined in clause 11.5.2.5. + The message content contains the address information based on which the NFVO can obtain the content + of the VNF snapshot package. content: application/json: schema: @@ -665,7 +666,8 @@ components: BuildVnfSnapshotPkgRequest: description: | - Request parameters for building the content of a VNF snapshot package, as defined in clause 11.5.2.6. + The message content contains the information based on which the NFVO can + build the content of the VNF snapshot package. content: application/json: schema: @@ -674,7 +676,7 @@ components: ExtractVnfSnapshotPkgRequest: description: | - Request parameters for extracting the content of a VNF snapshot package, as defined in clause 11.5.2.7. + The message content contains the information based on which the NFVO can extract the content of the VNF snapshot package. content: application/json: schema: @@ -683,8 +685,7 @@ components: CancelVnfSnapshotPkgOperationRequest: description: | - Request parameters for cancelling an ongoing operation related to the content of a VNF snapshot package, - as defined in clause 11.5.2.8. + The message content contains the information based on which the NFVO can proceed with the cancellation. content: application/json: schema: @@ -692,7 +693,9 @@ components: required: true VnfSnapshotPkgExtArtifactsAccessConfig: - description: VOID + description: | + The message content contains the access configuration information based on which the NFVO can obtain the external + VNF snapshot package artifact files content: application/json: schema: @@ -1006,7 +1009,7 @@ components: The response body shall contain the requested part of the VNF snapshot package file. - The "Content-Range" HTTP header shall be provided according to IETF RFC 7233. + The "Content-Range" HTTP header shall be provided according to IETF RFC 9110. The "Content-Type" HTTP header shall be set as defined for the "200 OK" response. headers: @@ -1574,7 +1577,7 @@ components: type of the artifact file. If the content type cannot be determined, the header shall be set to the value "application/octet-stream". - The "Content-Range" HTTP header shall be provided according to IETF RFC 7233. + The "Content-Range" HTTP header shall be provided according to IETF RFC 9110. headers: Version: description: The used API version. diff --git a/src/SOL005/VNFSnapshotPackageManagement/definitions/SOL005VNFSnapshotPackageManagement_def.yaml b/src/SOL005/VNFSnapshotPackageManagement/definitions/SOL005VNFSnapshotPackageManagement_def.yaml index 7bbb2ef..d1c482e 100644 --- a/src/SOL005/VNFSnapshotPackageManagement/definitions/SOL005VNFSnapshotPackageManagement_def.yaml +++ b/src/SOL005/VNFSnapshotPackageManagement/definitions/SOL005VNFSnapshotPackageManagement_def.yaml @@ -258,13 +258,13 @@ definitions: $ref: "../../definitions/SOL005_def.yaml#/definitions/Uri" authType: description: > - Defines the type of authentication / authorization for downloading the VNF snapshot package. - + Defines the type of authentication/authorization for downloading the VNF snapshot package. + Permitted values: - - BASIC: Only the "username" and "password" attributes shall be present. - - OAUTH2_CLIENT_CREDENTIALS: Only the "paramsOauth2ClientCredentials" attribute shall be present. - + - OAUTH2_CLIENT_CREDENTIALS: Only the "paramsOauth2ClientCredentials" attribute shall be present. + This attribute shall not be present if the credentials were provisioned out of band. + type: string enum: - BASIC @@ -427,14 +427,12 @@ definitions: $ref: "../../definitions/SOL005_def.yaml#/definitions/Uri" authType: description: > - Defines the type of authentication / authorization for downloading the VNF package. + Defines the type of authentication/authorization for downloading the VNF package. Permitted values: - - BASIC: Only the "username" and "password" attributes shall be present. - - OAUTH2_CLIENT_CREDENTIALS: Only the "paramsOauth2ClientCredentials" attribute shall - be present. + - OAUTH2_CLIENT_CREDENTIALS: Only the "paramsOauth2ClientCredentials" attribute shall be present. - This attribute shall not be present if no credentials are provided for the artifact. + This attribute shall not be present if no credentials are provided for the artifact type: string enum: - BASIC -- GitLab From 32972ccc6e829421c5450cd8a20954a0fd846223 Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Fri, 4 Nov 2022 10:42:31 +0100 Subject: [PATCH 06/10] SOL005_2 --- .../NFVICapacityInformation.yaml | 34 +++++ src/SOL005/NSDManagement/NSDManagement.yaml | 137 ++++++++++++++++++ .../NSPerformanceManagement.yaml | 34 +++++ .../VNFPackageManagement.yaml | 68 +++++++++ .../VNFSnapshotPackageManagement.yaml | 68 +++++++++ 5 files changed, 341 insertions(+) diff --git a/src/SOL005/NFVICapacityInformation/NFVICapacityInformation.yaml b/src/SOL005/NFVICapacityInformation/NFVICapacityInformation.yaml index 440a5cd..212b4a1 100644 --- a/src/SOL005/NFVICapacityInformation/NFVICapacityInformation.yaml +++ b/src/SOL005/NFVICapacityInformation/NFVICapacityInformation.yaml @@ -592,6 +592,40 @@ components: explode: false schema: type: string + ETag: + description: | + Etag used in the header response. + style: simple + explode: false + schema: + type: string + Last-Modified: + description: | + Last-modified used in the header response. + style: simple + explode: false + schema: + type: string + If-Unmodified-Since: + description: | + Response header available in case the related "Last-Modified" or "ETag" headers + have been received in previous responses related to the target resource. + The API consumer should provide the "If-Unmodified-Since" or the "If-Match" header fields + as conditions (see sections 3.1 and 3.4 of IETF RFC 9110). + style: simple + explode: false + schema: + type: string + If-Match: + description: | + Response header available in case the related "Last-Modified" or "ETag" headers + have been received in previous responses related to the target resource. + The API consumer should provide the "If-Unmodified-Since" or the "If-Match" header fields + as conditions (see sections 3.1 and 3.4 of IETF RFC 9110). + style: simple + explode: false + schema: + type: string content: application/json: schema: diff --git a/src/SOL005/NSDManagement/NSDManagement.yaml b/src/SOL005/NSDManagement/NSDManagement.yaml index c32f44c..3986873 100644 --- a/src/SOL005/NSDManagement/NSDManagement.yaml +++ b/src/SOL005/NSDManagement/NSDManagement.yaml @@ -1368,6 +1368,41 @@ components: explode: false schema: type: string + ETag: + description: | + Etag used in the header response. + style: simple + explode: false + schema: + type: string + Last-Modified: + description: | + Last-modified used in the header response. + style: simple + explode: false + schema: + type: string + If-Unmodified-Since: + description: | + Response header available in case the related "Last-Modified" or "ETag" headers + have been received in previous responses related to the target resource. + The API consumer should provide the "If-Unmodified-Since" or the "If-Match" header fields + as conditions (see sections 3.1 and 3.4 of IETF RFC 9110). + style: simple + explode: false + schema: + type: string + If-Match: + description: | + Response header available in case the related "Last-Modified" or "ETag" headers + have been received in previous responses related to the target resource. + The API consumer should provide the "If-Unmodified-Since" or the "If-Match" header fields + as conditions (see sections 3.1 and 3.4 of IETF RFC 9110). + style: simple + explode: false + schema: + type: string + content: application/json: schema: @@ -1702,6 +1737,40 @@ components: explode: false schema: type: string + ETag: + description: | + Etag used in the header response. + style: simple + explode: false + schema: + type: string + Last-Modified: + description: | + Last-modified used in the header response. + style: simple + explode: false + schema: + type: string + If-Unmodified-Since: + description: | + Response header available in case the related "Last-Modified" or "ETag" headers + have been received in previous responses related to the target resource. + The API consumer should provide the "If-Unmodified-Since" or the "If-Match" header fields + as conditions (see sections 3.1 and 3.4 of IETF RFC 9110). + style: simple + explode: false + schema: + type: string + If-Match: + description: | + Response header available in case the related "Last-Modified" or "ETag" headers + have been received in previous responses related to the target resource. + The API consumer should provide the "If-Unmodified-Since" or the "If-Match" header fields + as conditions (see sections 3.1 and 3.4 of IETF RFC 9110). + style: simple + explode: false + schema: + type: string NsdArchiveContent.Put.409: description: | @@ -2250,6 +2319,40 @@ components: explode: false schema: type: string + ETag: + description: | + Etag used in the header response. + style: simple + explode: false + schema: + type: string + Last-Modified: + description: | + Last-modified used in the header response. + style: simple + explode: false + schema: + type: string + If-Unmodified-Since: + description: | + Response header available in case the related "Last-Modified" or "ETag" headers + have been received in previous responses related to the target resource. + The API consumer should provide the "If-Unmodified-Since" or the "If-Match" header fields + as conditions (see sections 3.1 and 3.4 of IETF RFC 9110). + style: simple + explode: false + schema: + type: string + If-Match: + description: | + Response header available in case the related "Last-Modified" or "ETag" headers + have been received in previous responses related to the target resource. + The API consumer should provide the "If-Unmodified-Since" or the "If-Match" header fields + as conditions (see sections 3.1 and 3.4 of IETF RFC 9110). + style: simple + explode: false + schema: + type: string content: application/json: schema: @@ -2490,6 +2593,40 @@ components: explode: false schema: type: string + ETag: + description: | + Etag used in the header response. + style: simple + explode: false + schema: + type: string + Last-Modified: + description: | + Last-modified used in the header response. + style: simple + explode: false + schema: + type: string + If-Unmodified-Since: + description: | + Response header available in case the related "Last-Modified" or "ETag" headers + have been received in previous responses related to the target resource. + The API consumer should provide the "If-Unmodified-Since" or the "If-Match" header fields + as conditions (see sections 3.1 and 3.4 of IETF RFC 9110). + style: simple + explode: false + schema: + type: string + If-Match: + description: | + Response header available in case the related "Last-Modified" or "ETag" headers + have been received in previous responses related to the target resource. + The API consumer should provide the "If-Unmodified-Since" or the "If-Match" header fields + as conditions (see sections 3.1 and 3.4 of IETF RFC 9110). + style: simple + explode: false + schema: + type: string PnfdArchiveContent.Put.409: description: | diff --git a/src/SOL005/NSPerformanceManagement/NSPerformanceManagement.yaml b/src/SOL005/NSPerformanceManagement/NSPerformanceManagement.yaml index 3fcddbb..15cd938 100644 --- a/src/SOL005/NSPerformanceManagement/NSPerformanceManagement.yaml +++ b/src/SOL005/NSPerformanceManagement/NSPerformanceManagement.yaml @@ -1058,6 +1058,40 @@ components: explode: false schema: type: string + ETag: + description: | + Etag used in the header response. + style: simple + explode: false + schema: + type: string + Last-Modified: + description: | + Last-modified used in the header response. + style: simple + explode: false + schema: + type: string + If-Unmodified-Since: + description: | + Response header available in case the related "Last-Modified" or "ETag" headers + have been received in previous responses related to the target resource. + The API consumer should provide the "If-Unmodified-Since" or the "If-Match" header fields + as conditions (see sections 3.1 and 3.4 of IETF RFC 9110). + style: simple + explode: false + schema: + type: string + If-Match: + description: | + Response header available in case the related "Last-Modified" or "ETag" headers + have been received in previous responses related to the target resource. + The API consumer should provide the "If-Unmodified-Since" or the "If-Match" header fields + as conditions (see sections 3.1 and 3.4 of IETF RFC 9110). + style: simple + explode: false + schema: + type: string content: application/json: schema: diff --git a/src/SOL005/VNFPackageManagement/VNFPackageManagement.yaml b/src/SOL005/VNFPackageManagement/VNFPackageManagement.yaml index 5c4f8c1..bd07ff5 100644 --- a/src/SOL005/VNFPackageManagement/VNFPackageManagement.yaml +++ b/src/SOL005/VNFPackageManagement/VNFPackageManagement.yaml @@ -1014,6 +1014,40 @@ components: explode: false schema: type: string + ETag: + description: | + Etag used in the header response. + style: simple + explode: false + schema: + type: string + Last-Modified: + description: | + Last-modified used in the header response. + style: simple + explode: false + schema: + type: string + If-Unmodified-Since: + description: | + Response header available in case the related "Last-Modified" or "ETag" headers + have been received in previous responses related to the target resource. + The API consumer should provide the "If-Unmodified-Since" or the "If-Match" header fields + as conditions (see sections 3.1 and 3.4 of IETF RFC 9110). + style: simple + explode: false + schema: + type: string + If-Match: + description: | + Response header available in case the related "Last-Modified" or "ETag" headers + have been received in previous responses related to the target resource. + The API consumer should provide the "If-Unmodified-Since" or the "If-Match" header fields + as conditions (see sections 3.1 and 3.4 of IETF RFC 9110). + style: simple + explode: false + schema: + type: string content: application/json: schema: @@ -1185,6 +1219,40 @@ components: explode: false schema: type: string + ETag: + description: | + Etag used in the header response. + style: simple + explode: false + schema: + type: string + Last-Modified: + description: | + Last-modified used in the header response. + style: simple + explode: false + schema: + type: string + If-Unmodified-Since: + description: | + Response header available in case the related "Last-Modified" or "ETag" headers + have been received in previous responses related to the target resource. + The API consumer should provide the "If-Unmodified-Since" or the "If-Match" header fields + as conditions (see sections 3.1 and 3.4 of IETF RFC 9110). + style: simple + explode: false + schema: + type: string + If-Match: + description: | + Response header available in case the related "Last-Modified" or "ETag" headers + have been received in previous responses related to the target resource. + The API consumer should provide the "If-Unmodified-Since" or the "If-Match" header fields + as conditions (see sections 3.1 and 3.4 of IETF RFC 9110). + style: simple + explode: false + schema: + type: string content: application/json: schema: diff --git a/src/SOL005/VNFSnapshotPackageManagement/VNFSnapshotPackageManagement.yaml b/src/SOL005/VNFSnapshotPackageManagement/VNFSnapshotPackageManagement.yaml index aafb202..39d33b8 100644 --- a/src/SOL005/VNFSnapshotPackageManagement/VNFSnapshotPackageManagement.yaml +++ b/src/SOL005/VNFSnapshotPackageManagement/VNFSnapshotPackageManagement.yaml @@ -859,6 +859,40 @@ components: explode: false schema: type: string + ETag: + description: | + Etag used in the header response. + style: simple + explode: false + schema: + type: string + Last-Modified: + description: | + Last-modified used in the header response. + style: simple + explode: false + schema: + type: string + If-Unmodified-Since: + description: | + Response header available in case the related "Last-Modified" or "ETag" headers + have been received in previous responses related to the target resource. + The API consumer should provide the "If-Unmodified-Since" or the "If-Match" header fields + as conditions (see sections 3.1 and 3.4 of IETF RFC 9110). + style: simple + explode: false + schema: + type: string + If-Match: + description: | + Response header available in case the related "Last-Modified" or "ETag" headers + have been received in previous responses related to the target resource. + The API consumer should provide the "If-Unmodified-Since" or the "If-Match" header fields + as conditions (see sections 3.1 and 3.4 of IETF RFC 9110). + style: simple + explode: false + schema: + type: string content: application/json: schema: @@ -1483,6 +1517,40 @@ components: explode: false schema: type: string + ETag: + description: | + Etag used in the header response. + style: simple + explode: false + schema: + type: string + Last-Modified: + description: | + Last-modified used in the header response. + style: simple + explode: false + schema: + type: string + If-Unmodified-Since: + description: | + Response header available in case the related "Last-Modified" or "ETag" headers + have been received in previous responses related to the target resource. + The API consumer should provide the "If-Unmodified-Since" or the "If-Match" header fields + as conditions (see sections 3.1 and 3.4 of IETF RFC 9110). + style: simple + explode: false + schema: + type: string + If-Match: + description: | + Response header available in case the related "Last-Modified" or "ETag" headers + have been received in previous responses related to the target resource. + The API consumer should provide the "If-Unmodified-Since" or the "If-Match" header fields + as conditions (see sections 3.1 and 3.4 of IETF RFC 9110). + style: simple + explode: false + schema: + type: string content: application/json: schema: -- GitLab From d39e2fb875a63334d034ed9fb1b8a37e73244019 Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Fri, 4 Nov 2022 11:05:43 +0100 Subject: [PATCH 07/10] Updated version to 3.7.1 --- src/SOL005/APIVersion/APIVersion.yaml | 4 +-- .../NFVICapacityInformation.yaml | 4 +-- .../NFVICapacityInformationNotification.yaml | 4 +-- src/SOL005/NSDManagement/NSDManagement.yaml | 30 +++++++++---------- .../NSDManagementNotification.yaml | 4 +-- .../NSFaultManagement/NSFaultManagement.yaml | 4 +-- .../NSFaultManagementNotification.yaml | 4 +-- .../NSLCMCoordination/NSLCMCoordination.yaml | 4 +-- .../NSLifecycleManagement.yaml | 4 +-- .../NSLifecycleManagementNotification.yaml | 4 +-- .../NSPerformanceManagement.yaml | 14 ++++----- .../NSPerformanceManagementNotification.yaml | 4 +-- .../VNFPackageManagement.yaml | 4 +-- .../VNFPackageManagementNotification.yaml | 4 +-- .../VNFSnapshotPackageManagement.yaml | 4 +-- 15 files changed, 48 insertions(+), 48 deletions(-) diff --git a/src/SOL005/APIVersion/APIVersion.yaml b/src/SOL005/APIVersion/APIVersion.yaml index 3c27bff..d78d124 100644 --- a/src/SOL005/APIVersion/APIVersion.yaml +++ b/src/SOL005/APIVersion/APIVersion.yaml @@ -19,8 +19,8 @@ info: version: 1.0.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 005 V3.6.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/03.06.01_60/gs_nfv-sol005v030601p.pdf + description: ETSI GS NFV-SOL 005 V3.7.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/03.07.01_60/gs_nfv-sol005v030701p.pdf servers: - url: http://127.0.0.1/ diff --git a/src/SOL005/NFVICapacityInformation/NFVICapacityInformation.yaml b/src/SOL005/NFVICapacityInformation/NFVICapacityInformation.yaml index 212b4a1..fdaed01 100644 --- a/src/SOL005/NFVICapacityInformation/NFVICapacityInformation.yaml +++ b/src/SOL005/NFVICapacityInformation/NFVICapacityInformation.yaml @@ -19,8 +19,8 @@ info: version: 1.1.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 005 V3.6.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/03.06.01_60/gs_nfv-sol005v030601p.pdf + description: ETSI GS NFV-SOL 005 V3.7.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/03.07.01_60/gs_nfv-sol005v030701p.pdf servers: - url: http://127.0.0.1/nfvici/v1 diff --git a/src/SOL005/NFVICapacityInformationNotification/NFVICapacityInformationNotification.yaml b/src/SOL005/NFVICapacityInformationNotification/NFVICapacityInformationNotification.yaml index e699290..b716dd7 100644 --- a/src/SOL005/NFVICapacityInformationNotification/NFVICapacityInformationNotification.yaml +++ b/src/SOL005/NFVICapacityInformationNotification/NFVICapacityInformationNotification.yaml @@ -19,8 +19,8 @@ info: version: 1.1.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 005 V3.6.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/03.06.01_60/gs_nfv-sol005v030601p.pdf + description: ETSI GS NFV-SOL 005 V3.7.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/03.07.01_60/gs_nfv-sol005v030701p.pdf servers: - url: http://127.0.0.1/callback/v1 diff --git a/src/SOL005/NSDManagement/NSDManagement.yaml b/src/SOL005/NSDManagement/NSDManagement.yaml index 3986873..123b97d 100644 --- a/src/SOL005/NSDManagement/NSDManagement.yaml +++ b/src/SOL005/NSDManagement/NSDManagement.yaml @@ -19,8 +19,8 @@ info: version: 2.3.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 005 V3.6.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/03.06.01_60/gs_nfv-sol005v030601p.pdf + description: ETSI GS NFV-SOL 005 V3.7.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/03.07.01_60/gs_nfv-sol005v030701p.pdf servers: - url: http://127.0.0.1/nsd/v2 @@ -37,7 +37,7 @@ paths: # NS Descriptors # ############################################################################### /ns_descriptors: - #ETSI GS NFV-SOL 005 V2.4.1 location: 5.4.2 + #ETSI GS NFV-SOL 005 V3.7.1 location: 5.4.2 parameters: - $ref: ../components/SOL005_params.yaml#/components/parameters/Authorization - $ref: ../components/SOL005_params.yaml#/components/parameters/Version @@ -229,7 +229,7 @@ paths: # NSD Archive Content # ############################################################################### /ns_descriptors/{nsdInfoId}/nsd_content: - #ETSI GS NFV-SOL 005 V2.4.1 location: 5.4.4 + #ETSI GS NFV-SOL 005 V3.7.1 location: 5.4.4 description: | This identifier can be retrieved from the resource referenced by the "Location" HTTP header in the response to a POST request creating a new NS descriptor resource. It can also be retrieved @@ -306,7 +306,7 @@ paths: # NSD # ############################################################################### /ns_descriptors/{nsdInfoId}/nsd: - #ETSI GS NFV-SOL 005 V2.4.1 location: 5.4.4a + #ETSI GS NFV-SOL 005 V3.7.1 location: 5.4.4a description: | This identifier can be retrieved from the resource referenced by the "Location" HTTP header in the response to a POST request creating a new NS descriptor resource. It can also be retrieved @@ -350,7 +350,7 @@ paths: # NSD Archive Manifest # ############################################################################### /ns_descriptors/{nsdInfoId}/manifest: - #ETSI GS NFV-SOL 005 V2.4.1 location: 5.4.4b + #ETSI GS NFV-SOL 005 V3.7.1 location: 5.4.4b description: | This identifier can be retrieved from the resource referenced by the "Location" HTTP header in the response to a POST request creating a new NS descriptor resource. It can also be retrieved @@ -404,7 +404,7 @@ paths: # Individual NSD Archive Artifact # ############################################################################### /ns_descriptors/{nsdInfoId}/artifacts/{artifactPath}: - #ETSI GS NFV-SOL 005 V3.5.1 location: 5.4.4c + #ETSI GS NFV-SOL 005 V3.7.1 location: 5.4.4c parameters: - $ref: '#/components/parameters/NsdInfoId' - $ref: '#/components/parameters/ArtifactPathInNSD' @@ -456,7 +456,7 @@ paths: # PNF Descriptors # ############################################################################### /pnf_descriptors: - #ETSI GS NFV-SOL 005 V2.4.1 location: 5.4.5 + #ETSI GS NFV-SOL 005 V3.7.1 location: 5.4.5 parameters: - $ref: ../components/SOL005_params.yaml#/components/parameters/Authorization - $ref: ../components/SOL005_params.yaml#/components/parameters/Version @@ -547,7 +547,7 @@ paths: # Individual PNF Descriptor # ############################################################################### /pnf_descriptors/{pnfdInfoId}: - #ETSI GS NFV-SOL 005 V2.4.1 location: 5.4.6 + #ETSI GS NFV-SOL 005 V3.7.1 location: 5.4.6 parameters: - $ref: '#/components/parameters/PnfdInfoId' @@ -641,7 +641,7 @@ paths: # PNFD Archive Content # ############################################################################### /pnf_descriptors/{pnfdInfoId}/pnfd_content: - #ETSI GS NFV-SOL 005 V2.4.1 location: 5.4.7 + #ETSI GS NFV-SOL 005 V3.7.1 location: 5.4.7 parameters: - $ref: '#/components/parameters/PnfdInfoId' - $ref: ../components/SOL005_params.yaml#/components/parameters/Authorization @@ -715,7 +715,7 @@ paths: # PNFD # ############################################################################### /pnf_descriptors/{pnfdInfoId}/pnfd: - #ETSI GS NFV-SOL 005 V2.4.1 location: 5.4.7a + #ETSI GS NFV-SOL 005 V3.7.1 location: 5.4.7a parameters: - $ref: '#/components/parameters/PnfdInfoId' - $ref: ../components/SOL005_params.yaml#/components/parameters/Authorization @@ -756,7 +756,7 @@ paths: # PNFD Archive Manifest # ############################################################################### /pnf_descriptors/{pnfdInfoId}/manifest: - #ETSI GS NFV-SOL 005 V2.4.1 location: 5.4.7b + #ETSI GS NFV-SOL 005 V3.7.1 location: 5.4.7b parameters: - $ref: '#/components/parameters/PnfdInfoId' - $ref: ../components/SOL005_params.yaml#/components/parameters/Authorization @@ -808,7 +808,7 @@ paths: # Individual PNFD Archive Artifact # ############################################################################### /pnf_descriptors/{pnfdInfoId}/artifacts/{artifactPath}: - #ETSI GS NFV-SOL 005 V3.5.1 location: 5.4.7c + #ETSI GS NFV-SOL 005 V3.7.1 location: 5.4.7c parameters: - $ref: '#/components/parameters/PnfdInfoId' - $ref: '#/components/parameters/ArtifactPathInPNFD' @@ -859,7 +859,7 @@ paths: # Subscriptions # ############################################################################### /subscriptions: - #ETSI GS NFV-SOL 005 V2.4.1 location: 5.4.8 + #ETSI GS NFV-SOL 005 V3.7.1 location: 5.4.8 parameters: - $ref: ../components/SOL005_params.yaml#/components/parameters/Authorization - $ref: ../components/SOL005_params.yaml#/components/parameters/Version @@ -941,7 +941,7 @@ paths: # Individual Subscription # ############################################################################### /subscriptions/{subscriptionId}: - #ETSI GS NFV-SOL 005 V2.4.1 location: 5.4.9 + #ETSI GS NFV-SOL 005 V3.7.1 location: 5.4.9 parameters: - $ref: '#/components/parameters/SubscriptionId' - $ref: ../components/SOL005_params.yaml#/components/parameters/Authorization diff --git a/src/SOL005/NSDManagementNotification/NSDManagementNotification.yaml b/src/SOL005/NSDManagementNotification/NSDManagementNotification.yaml index e80c809..fd99cc9 100644 --- a/src/SOL005/NSDManagementNotification/NSDManagementNotification.yaml +++ b/src/SOL005/NSDManagementNotification/NSDManagementNotification.yaml @@ -19,8 +19,8 @@ info: version: 2.3.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 005 V3.6.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/03.06.01_60/gs_nfv-sol005v030601p.pdf + description: ETSI GS NFV-SOL 005 V3.7.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/03.07.01_60/gs_nfv-sol005v030701p.pdf servers: - url: http://127.0.0.1/callback/v2 diff --git a/src/SOL005/NSFaultManagement/NSFaultManagement.yaml b/src/SOL005/NSFaultManagement/NSFaultManagement.yaml index aed2bac..210d9d0 100644 --- a/src/SOL005/NSFaultManagement/NSFaultManagement.yaml +++ b/src/SOL005/NSFaultManagement/NSFaultManagement.yaml @@ -19,8 +19,8 @@ info: version: 1.3.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 005 V3.6.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/03.06.01_60/gs_nfv-sol005v030601p.pdf + description: ETSI GS NFV-SOL 005 V3.7.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/03.07.01_60/gs_nfv-sol005v030701p.pdf servers: - url: http://127.0.0.1/nsfm/v1 diff --git a/src/SOL005/NSFaultManagementNotification/NSFaultManagementNotification.yaml b/src/SOL005/NSFaultManagementNotification/NSFaultManagementNotification.yaml index 4ea5da1..34576a5 100644 --- a/src/SOL005/NSFaultManagementNotification/NSFaultManagementNotification.yaml +++ b/src/SOL005/NSFaultManagementNotification/NSFaultManagementNotification.yaml @@ -19,8 +19,8 @@ info: version: 1.3.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 005 V3.6.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/03.06.01_60/gs_nfv-sol005v030601p.pdf + description: ETSI GS NFV-SOL 005 V3.7.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/03.07.01_60/gs_nfv-sol005v030701p.pdf servers: - url: http://127.0.0.1/callback/v1 diff --git a/src/SOL005/NSLCMCoordination/NSLCMCoordination.yaml b/src/SOL005/NSLCMCoordination/NSLCMCoordination.yaml index 9acbd09..ad5931c 100644 --- a/src/SOL005/NSLCMCoordination/NSLCMCoordination.yaml +++ b/src/SOL005/NSLCMCoordination/NSLCMCoordination.yaml @@ -19,8 +19,8 @@ info: version: 1.1.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 005 V3.6.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/03.06.01_60/gs_nfv-sol005v030601p.pdf + description: ETSI GS NFV-SOL 005 V3.7.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/03.07.01_60/gs_nfv-sol005v030701p.pdf servers: - url: http://127.0.0.1/lcmcoord/v1 diff --git a/src/SOL005/NSLifecycleManagement/NSLifecycleManagement.yaml b/src/SOL005/NSLifecycleManagement/NSLifecycleManagement.yaml index 3535275..f9fe8d9 100644 --- a/src/SOL005/NSLifecycleManagement/NSLifecycleManagement.yaml +++ b/src/SOL005/NSLifecycleManagement/NSLifecycleManagement.yaml @@ -19,8 +19,8 @@ info: version: 2.3.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 005 V3.6.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/03.06.01_60/gs_nfv-sol005v030601p.pdf + description: ETSI GS NFV-SOL 005 V3.7.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/03.07.01_60/gs_nfv-sol005v030701p.pdf servers: - url: http://127.0.0.1/nslcm/v2 diff --git a/src/SOL005/NSLifecycleManagementNotification/NSLifecycleManagementNotification.yaml b/src/SOL005/NSLifecycleManagementNotification/NSLifecycleManagementNotification.yaml index 80327f3..07c15a9 100644 --- a/src/SOL005/NSLifecycleManagementNotification/NSLifecycleManagementNotification.yaml +++ b/src/SOL005/NSLifecycleManagementNotification/NSLifecycleManagementNotification.yaml @@ -17,8 +17,8 @@ info: version: 2.3.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 005 V3.6.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/03.06.01_60/gs_nfv-sol005v030601p.pdf + description: ETSI GS NFV-SOL 005 V3.7.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/03.07.01_60/gs_nfv-sol005v030701p.pdf servers: - url: http://127.0.0.1/callback/v2 diff --git a/src/SOL005/NSPerformanceManagement/NSPerformanceManagement.yaml b/src/SOL005/NSPerformanceManagement/NSPerformanceManagement.yaml index 15cd938..50b84e8 100644 --- a/src/SOL005/NSPerformanceManagement/NSPerformanceManagement.yaml +++ b/src/SOL005/NSPerformanceManagement/NSPerformanceManagement.yaml @@ -19,8 +19,8 @@ info: version: 2.3.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 005 V3.6.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/03.06.01_60/gs_nfv-sol005v030601p.pdf + description: ETSI GS NFV-SOL 005 V3.7.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/03.07.01_60/gs_nfv-sol005v030701p.pdf servers: - url: http://127.0.0.1/nspm/v2 @@ -37,7 +37,7 @@ paths: # PM Jobs # ############################################################################### /pm_jobs: - #ETSI GS NFV-SOL 005 V2.4.1 location: 7.4.2 + #ETSI GS NFV-SOL 005 V3.7.1 location: 7.4.2 parameters: - $ref: ../components/SOL005_params.yaml#/components/parameters/Authorization - $ref: ../components/SOL005_params.yaml#/components/parameters/Version @@ -124,7 +124,7 @@ paths: # Individual PM job # ############################################################################### /pm_jobs/{pmJobId}: - #ETSI GS NFV-SOL 005 V2.4.1 location: 7.4.3 + #ETSI GS NFV-SOL 005 V3.7.1 location: 7.4.3 parameters: - $ref: '#/components/parameters/PmJobId' - $ref: '../components/SOL005_params.yaml#/components/parameters/Authorization' @@ -213,7 +213,7 @@ paths: # Individual performance report # ############################################################################### /pm_jobs/{pmJobId}/reports/{reportId}: - #ETSI GS NFV-SOL 005 V2.4.1 location: 7.4.4 + #ETSI GS NFV-SOL 005 V3.7.1 location: 7.4.4 parameters: - $ref: '#/components/parameters/PmJobId' - $ref: '#/components/parameters/ReportId' @@ -250,7 +250,7 @@ paths: # Thresholds # ############################################################################### /thresholds: - #ETSI GS NFV-SOL 005 V2.4.1 location: 7.4.5 + #ETSI GS NFV-SOL 005 V3.7.1 location: 7.4.5 parameters: - $ref: ../components/SOL005_params.yaml#/components/parameters/Authorization - $ref: ../components/SOL005_params.yaml#/components/parameters/Version @@ -325,7 +325,7 @@ paths: # Individual threshold # ############################################################################### /thresholds/{thresholdId}: - #ETSI GS NFV-SOL 005 V2.4.1 location: 7.4.6 + #ETSI GS NFV-SOL 005 V3.7.1 location: 7.4.6 parameters: - $ref: '#/components/parameters/ThresholdId' - $ref: '../components/SOL005_params.yaml#/components/parameters/Authorization' diff --git a/src/SOL005/NSPerformanceManagementNotification/NSPerformanceManagementNotification.yaml b/src/SOL005/NSPerformanceManagementNotification/NSPerformanceManagementNotification.yaml index 0608054..a8f0df7 100644 --- a/src/SOL005/NSPerformanceManagementNotification/NSPerformanceManagementNotification.yaml +++ b/src/SOL005/NSPerformanceManagementNotification/NSPerformanceManagementNotification.yaml @@ -19,8 +19,8 @@ info: version: 2.3.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 005 V3.6.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/03.06.01_60/gs_nfv-sol005v030601p.pdf + description: ETSI GS NFV-SOL 005 V3.7.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/03.07.01_60/gs_nfv-sol005v030701p.pdf servers: - url: http://127.0.0.1/callback/v2 diff --git a/src/SOL005/VNFPackageManagement/VNFPackageManagement.yaml b/src/SOL005/VNFPackageManagement/VNFPackageManagement.yaml index bd07ff5..0e1c603 100644 --- a/src/SOL005/VNFPackageManagement/VNFPackageManagement.yaml +++ b/src/SOL005/VNFPackageManagement/VNFPackageManagement.yaml @@ -19,8 +19,8 @@ info: version: 2.4.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 005 V3.6.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/03.06.01_60/gs_nfv-sol005v030601p.pdf + description: ETSI GS NFV-SOL 005 V3.7.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/03.07.01_60/gs_nfv-sol005v030701p.pdf servers: - url: http://127.0.0.1/vnfpkgm/v2 diff --git a/src/SOL005/VNFPackageManagementNotification/VNFPackageManagementNotification.yaml b/src/SOL005/VNFPackageManagementNotification/VNFPackageManagementNotification.yaml index 342cae4..90c5218 100644 --- a/src/SOL005/VNFPackageManagementNotification/VNFPackageManagementNotification.yaml +++ b/src/SOL005/VNFPackageManagementNotification/VNFPackageManagementNotification.yaml @@ -19,8 +19,8 @@ info: version: 2.3.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 005 V3.6.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/03.06.01_60/gs_nfv-sol005v030601p.pdf + description: ETSI GS NFV-SOL 005 V3.7.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/03.07.01_60/gs_nfv-sol005v030701p.pdf servers: - url: http://127.0.0.1/callback/v2 diff --git a/src/SOL005/VNFSnapshotPackageManagement/VNFSnapshotPackageManagement.yaml b/src/SOL005/VNFSnapshotPackageManagement/VNFSnapshotPackageManagement.yaml index 39d33b8..35ec4f1 100644 --- a/src/SOL005/VNFSnapshotPackageManagement/VNFSnapshotPackageManagement.yaml +++ b/src/SOL005/VNFSnapshotPackageManagement/VNFSnapshotPackageManagement.yaml @@ -19,8 +19,8 @@ info: version: 1.2.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 005 V3.6.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/03.06.01_60/gs_nfv-sol005v030601p.pdf + description: ETSI GS NFV-SOL 005 V3.7.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/03.07.01_60/gs_nfv-sol005v030701p.pdf servers: - url: http://127.0.0.1/vnfsnapshotpkgm/v1 -- GitLab From 8199a708f9154c21056de3df7dd40dbee485e03f Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Fri, 4 Nov 2022 12:09:52 +0100 Subject: [PATCH 08/10] Minor fix --- src/SOL005/NSDManagement/NSDManagement.yaml | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/src/SOL005/NSDManagement/NSDManagement.yaml b/src/SOL005/NSDManagement/NSDManagement.yaml index 123b97d..22af705 100644 --- a/src/SOL005/NSDManagement/NSDManagement.yaml +++ b/src/SOL005/NSDManagement/NSDManagement.yaml @@ -129,11 +129,6 @@ paths: ############################################################################### /ns_descriptors/{nsdInfoId}: #ETSI GS NFV-SOL 005 V3.7.1 location: 5.4.3 - description: | - This identifier can be retrieved from the resource referenced by the "Location" HTTP header in - the response to a POST request creating a new NS descriptor resource. It can also be retrieved - from the "id" attribute in the message content of that response. - parameters: - $ref: '#/components/parameters/NsdInfoId' - $ref: ../components/SOL005_params.yaml#/components/parameters/Authorization @@ -230,10 +225,6 @@ paths: ############################################################################### /ns_descriptors/{nsdInfoId}/nsd_content: #ETSI GS NFV-SOL 005 V3.7.1 location: 5.4.4 - description: | - This identifier can be retrieved from the resource referenced by the "Location" HTTP header in - the response to a POST request creating a new NS descriptor resource. It can also be retrieved - from the "id" attribute in the message content of that response. parameters: - $ref: '#/components/parameters/NsdInfoId' - $ref: ../components/SOL005_params.yaml#/components/parameters/Authorization @@ -307,10 +298,6 @@ paths: ############################################################################### /ns_descriptors/{nsdInfoId}/nsd: #ETSI GS NFV-SOL 005 V3.7.1 location: 5.4.4a - description: | - This identifier can be retrieved from the resource referenced by the "Location" HTTP header in - the response to a POST request creating a new NS descriptor resource. It can also be retrieved - from the "id" attribute in the message content of that response. parameters: - $ref: '#/components/parameters/NsdInfoId' - $ref: ../components/SOL005_params.yaml#/components/parameters/Authorization @@ -351,10 +338,6 @@ paths: ############################################################################### /ns_descriptors/{nsdInfoId}/manifest: #ETSI GS NFV-SOL 005 V3.7.1 location: 5.4.4b - description: | - This identifier can be retrieved from the resource referenced by the "Location" HTTP header in - the response to a POST request creating a new NS descriptor resource. It can also be retrieved - from the "id" attribute in the message content of that response. parameters: - $ref: '#/components/parameters/NsdInfoId' - $ref: ../components/SOL005_params.yaml#/components/parameters/Authorization -- GitLab From 193ad4a8cc2ba922337499dfaf3bb1b88bb15b51 Mon Sep 17 00:00:00 2001 From: "g.bernini" Date: Fri, 18 Nov 2022 11:50:55 +0100 Subject: [PATCH 09/10] addressed comments from SOL WG review --- .../NFVICapacityInformation.yaml | 2 +- .../NFVICapacityInformationNotification.yaml | 2 +- src/SOL005/NSDManagement/NSDManagement.yaml | 86 +++++++++---------- .../NSDManagementNotification.yaml | 2 +- .../NSFaultManagement/NSFaultManagement.yaml | 4 +- .../NSFaultManagementNotification.yaml | 2 +- .../NSLCMCoordination/NSLCMCoordination.yaml | 2 +- .../NSLifecycleManagement.yaml | 2 +- .../SOL005NSLifecycleManagement_def.yaml | 11 +-- .../NSLifecycleManagementNotification.yaml | 2 +- .../NSPerformanceManagement.yaml | 24 +++--- .../NSPerformanceManagementNotification.yaml | 2 +- .../VNFPackageManagement.yaml | 2 +- .../SOL005VNFPackageManagement_def.yaml | 30 ++----- .../VNFPackageManagementNotification.yaml | 2 +- .../VNFSnapshotPackageManagement.yaml | 2 +- ...OL005VNFSnapshotPackageManagement_def.yaml | 20 ----- src/SOL005/components/SOL005_params.yaml | 6 +- src/SOL005/definitions/SOL005_def.yaml | 4 +- src/SOL005/responses/SOL005_resp.yaml | 18 ++-- 20 files changed, 94 insertions(+), 131 deletions(-) diff --git a/src/SOL005/NFVICapacityInformation/NFVICapacityInformation.yaml b/src/SOL005/NFVICapacityInformation/NFVICapacityInformation.yaml index fdaed01..98e5c8d 100644 --- a/src/SOL005/NFVICapacityInformation/NFVICapacityInformation.yaml +++ b/src/SOL005/NFVICapacityInformation/NFVICapacityInformation.yaml @@ -20,7 +20,7 @@ info: externalDocs: description: ETSI GS NFV-SOL 005 V3.7.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/03.07.01_60/gs_nfv-sol005v030701p.pdf + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/03.07.01_60/gs_NFV-SOL005v030701p.pdf servers: - url: http://127.0.0.1/nfvici/v1 diff --git a/src/SOL005/NFVICapacityInformationNotification/NFVICapacityInformationNotification.yaml b/src/SOL005/NFVICapacityInformationNotification/NFVICapacityInformationNotification.yaml index b716dd7..dfadf7e 100644 --- a/src/SOL005/NFVICapacityInformationNotification/NFVICapacityInformationNotification.yaml +++ b/src/SOL005/NFVICapacityInformationNotification/NFVICapacityInformationNotification.yaml @@ -20,7 +20,7 @@ info: externalDocs: description: ETSI GS NFV-SOL 005 V3.7.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/03.07.01_60/gs_nfv-sol005v030701p.pdf + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/03.07.01_60/gs_NFV-SOL005v030701p.pdf servers: - url: http://127.0.0.1/callback/v1 diff --git a/src/SOL005/NSDManagement/NSDManagement.yaml b/src/SOL005/NSDManagement/NSDManagement.yaml index 22af705..bdd9448 100644 --- a/src/SOL005/NSDManagement/NSDManagement.yaml +++ b/src/SOL005/NSDManagement/NSDManagement.yaml @@ -20,7 +20,7 @@ info: externalDocs: description: ETSI GS NFV-SOL 005 V3.7.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/03.07.01_60/gs_nfv-sol005v030701p.pdf + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/03.07.01_60/gs_NFV-SOL005v030701p.pdf servers: - url: http://127.0.0.1/nsd/v2 @@ -1208,7 +1208,7 @@ components: headers: Content-Type: description: | - The MIME type of the body of the request. Reference: IETF RFC 7231 + The MIME type of the body of the request. Reference: IETF RFC 9110 style: simple explode: false schema: @@ -1250,7 +1250,7 @@ components: headers: Content-Type: description: | - The MIME type of the body of the request. Reference: IETF RFC 7231 + The MIME type of the body of the request. Reference: IETF RFC 9110 style: simple explode: false schema: @@ -1296,7 +1296,7 @@ components: headers: Content-Type: description: | - The MIME type of the body of the request. Reference: IETF RFC 7231 + The MIME type of the body of the request. Reference: IETF RFC 9110 style: simple explode: false schema: @@ -1331,7 +1331,7 @@ components: headers: Content-Type: description: | - The MIME type of the body of the request. Reference: IETF RFC 7231 + The MIME type of the body of the request. Reference: IETF RFC 9110 style: simple explode: false schema: @@ -1404,7 +1404,7 @@ components: headers: Content-Type: description: | - The MIME type of the body of the request. Reference: IETF RFC 7231 + The MIME type of the body of the request. Reference: IETF RFC 9110 style: simple explode: false schema: @@ -1491,7 +1491,7 @@ components: headers: Content-Type: description: | - The MIME type of the body of the request. Reference: IETF RFC 7231 + The MIME type of the body of the request. Reference: IETF RFC 9110 style: simple explode: false schema: @@ -1526,7 +1526,7 @@ components: headers: Content-Type: description: | - The MIME type of the body of the request. Reference: IETF RFC 7231 + The MIME type of the body of the request. Reference: IETF RFC 9110 style: simple explode: false schema: @@ -1560,7 +1560,7 @@ components: headers: Content-Type: description: | - The MIME type of the body of the request. Reference: IETF RFC 7231 + The MIME type of the body of the request. Reference: IETF RFC 9110 style: simple explode: false schema: @@ -1599,7 +1599,7 @@ components: headers: Content-Type: description: | - The MIME type of the body of the request. Reference: IETF RFC 7231 + The MIME type of the body of the request. Reference: IETF RFC 9110 style: simple explode: false schema: @@ -1634,7 +1634,7 @@ components: headers: Content-Type: description: | - The MIME type of the body of the request. Reference: IETF RFC 7231 + The MIME type of the body of the request. Reference: IETF RFC 9110 style: simple explode: false schema: @@ -1676,7 +1676,7 @@ components: headers: Content-Type: description: | - The MIME type of the body of the request. Reference: IETF RFC 7231 + The MIME type of the body of the request. Reference: IETF RFC 9110 style: simple explode: false schema: @@ -1782,7 +1782,7 @@ components: type: string Content-Type: description: | - The MIME type of the body of the request. Reference: IETF RFC 7231 + The MIME type of the body of the request. Reference: IETF RFC 9110 style: simple explode: false schema: @@ -1805,7 +1805,7 @@ components: headers: Content-Type: description: | - The MIME type of the body of the request. Reference: IETF RFC 7231 + The MIME type of the body of the request. Reference: IETF RFC 9110 style: simple explode: false schema: @@ -1877,7 +1877,7 @@ components: type: string Content-Type: description: | - The MIME type of the body of the request. Reference: IETF RFC 7231 + The MIME type of the body of the request. Reference: IETF RFC 9110 style: simple explode: false schema: @@ -1906,7 +1906,7 @@ components: headers: Content-Type: description: | - The MIME type of the body of the request. Reference: IETF RFC 7231 + The MIME type of the body of the request. Reference: IETF RFC 9110 style: simple explode: false schema: @@ -1939,7 +1939,7 @@ components: headers: Content-Type: description: | - The MIME type of the body of the request. Reference: IETF RFC 7231 + The MIME type of the body of the request. Reference: IETF RFC 9110 style: simple explode: false schema: @@ -1986,7 +1986,7 @@ components: headers: Content-Type: description: | - The MIME type of the body of the request. Reference: IETF RFC 7231 + The MIME type of the body of the request. Reference: IETF RFC 9110 style: simple explode: false schema: @@ -2027,7 +2027,7 @@ components: headers: Content-Type: description: | - The MIME type of the body of the request. Reference: IETF RFC 7231 + The MIME type of the body of the request. Reference: IETF RFC 9110 style: simple explode: false schema: @@ -2060,7 +2060,7 @@ components: headers: Content-Type: description: | - The MIME type of the body of the request. Reference: IETF RFC 7231 + The MIME type of the body of the request. Reference: IETF RFC 9110 style: simple explode: false schema: @@ -2096,7 +2096,7 @@ components: headers: Content-Type: description: | - The MIME type of the body of the request. Reference: IETF RFC 7231 + The MIME type of the body of the request. Reference: IETF RFC 9110 style: simple explode: false schema: @@ -2156,7 +2156,7 @@ components: headers: Content-Type: description: | - The MIME type of the body of the request. Reference: IETF RFC 7231 + The MIME type of the body of the request. Reference: IETF RFC 9110 style: simple explode: false schema: @@ -2195,7 +2195,7 @@ components: headers: Content-Type: description: | - The MIME type of the body of the request. Reference: IETF RFC 7231 + The MIME type of the body of the request. Reference: IETF RFC 9110 style: simple explode: false schema: @@ -2246,7 +2246,7 @@ components: headers: Content-Type: description: | - The MIME type of the body of the request. Reference: IETF RFC 7231 + The MIME type of the body of the request. Reference: IETF RFC 9110 style: simple explode: false schema: @@ -2282,7 +2282,7 @@ components: headers: Content-Type: description: | - The MIME type of the body of the request. Reference: IETF RFC 7231 + The MIME type of the body of the request. Reference: IETF RFC 9110 style: simple explode: false schema: @@ -2401,7 +2401,7 @@ components: headers: Content-Type: description: | - The MIME type of the body of the request. Reference: IETF RFC 7231 + The MIME type of the body of the request. Reference: IETF RFC 9110 style: simple explode: false schema: @@ -2435,7 +2435,7 @@ components: headers: Content-Type: description: | - The MIME type of the body of the request. Reference: IETF RFC 7231 + The MIME type of the body of the request. Reference: IETF RFC 9110 style: simple explode: false schema: @@ -2474,7 +2474,7 @@ components: headers: Content-Type: description: | - The MIME type of the body of the request. Reference: IETF RFC 7231 + The MIME type of the body of the request. Reference: IETF RFC 9110 style: simple explode: false schema: @@ -2638,7 +2638,7 @@ components: type: string Content-Type: description: | - The MIME type of the body of the request. Reference: IETF RFC 7231 + The MIME type of the body of the request. Reference: IETF RFC 9110 style: simple explode: false schema: @@ -2661,7 +2661,7 @@ components: headers: Content-Type: description: | - The MIME type of the body of the request. Reference: IETF RFC 7231 + The MIME type of the body of the request. Reference: IETF RFC 9110 style: simple explode: false schema: @@ -2719,7 +2719,7 @@ components: headers: Content-Type: description: | - The MIME type of the body of the request. Reference: IETF RFC 7231 + The MIME type of the body of the request. Reference: IETF RFC 9110 style: simple explode: false schema: @@ -2765,7 +2765,7 @@ components: headers: Content-Type: description: | - The MIME type of the body of the request. Reference: IETF RFC 7231 + The MIME type of the body of the request. Reference: IETF RFC 9110 style: simple explode: false schema: @@ -2801,7 +2801,7 @@ components: headers: Content-Type: description: | - The MIME type of the body of the request. Reference: IETF RFC 7231 + The MIME type of the body of the request. Reference: IETF RFC 9110 style: simple explode: false schema: @@ -2888,11 +2888,11 @@ components: If the content type cannot be determined, the header shall be set to the value "application/octet-stream". - The "Content-Range" HTTP header shall be provided according to IETF RFC 7233. + The "Content-Range" HTTP header shall be provided according to IETF RFC 9110. headers: Content-Type: description: | - The MIME type of the body of the request. Reference: IETF RFC 7231 + The MIME type of the body of the request. Reference: IETF RFC 9110 style: simple explode: false schema: @@ -2924,7 +2924,7 @@ components: headers: Content-Type: description: | - The MIME type of the body of the request. Reference: IETF RFC 7231 + The MIME type of the body of the request. Reference: IETF RFC 9110 style: simple explode: false schema: @@ -2957,7 +2957,7 @@ components: headers: Content-Type: description: | - The MIME type of the body of the request. Reference: IETF RFC 7231 + The MIME type of the body of the request. Reference: IETF RFC 9110 style: simple explode: false schema: @@ -2992,7 +2992,7 @@ components: headers: Content-Type: description: | - The MIME type of the body of the request. Reference: IETF RFC 7231 + The MIME type of the body of the request. Reference: IETF RFC 9110 style: simple explode: false schema: @@ -3025,7 +3025,7 @@ components: headers: Content-Type: description: | - The MIME type of the body of the request. Reference: IETF RFC 7231 + The MIME type of the body of the request. Reference: IETF RFC 9110 style: simple explode: false schema: @@ -3068,7 +3068,7 @@ components: headers: Content-Type: description: | - The MIME type of the body of the request. Reference: IETF RFC 7231 + The MIME type of the body of the request. Reference: IETF RFC 9110 style: simple explode: false schema: @@ -3110,7 +3110,7 @@ components: headers: Content-Type: description: | - The MIME type of the body of the request. Reference: IETF RFC 7231 + The MIME type of the body of the request. Reference: IETF RFC 9110 style: simple explode: false schema: @@ -3152,7 +3152,7 @@ components: headers: Content-Type: description: | - The MIME type of the body of the request. Reference: IETF RFC 7231 + The MIME type of the body of the request. Reference: IETF RFC 9110 style: simple explode: false schema: @@ -3202,7 +3202,7 @@ components: headers: Content-Type: description: | - The MIME type of the body of the request. Reference: IETF RFC 7231 + The MIME type of the body of the request. Reference: IETF RFC 9110 style: simple explode: false schema: diff --git a/src/SOL005/NSDManagementNotification/NSDManagementNotification.yaml b/src/SOL005/NSDManagementNotification/NSDManagementNotification.yaml index fd99cc9..41757cc 100644 --- a/src/SOL005/NSDManagementNotification/NSDManagementNotification.yaml +++ b/src/SOL005/NSDManagementNotification/NSDManagementNotification.yaml @@ -20,7 +20,7 @@ info: externalDocs: description: ETSI GS NFV-SOL 005 V3.7.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/03.07.01_60/gs_nfv-sol005v030701p.pdf + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/03.07.01_60/gs_NFV-SOL005v030701p.pdf servers: - url: http://127.0.0.1/callback/v2 diff --git a/src/SOL005/NSFaultManagement/NSFaultManagement.yaml b/src/SOL005/NSFaultManagement/NSFaultManagement.yaml index 210d9d0..b4ed7f8 100644 --- a/src/SOL005/NSFaultManagement/NSFaultManagement.yaml +++ b/src/SOL005/NSFaultManagement/NSFaultManagement.yaml @@ -20,7 +20,7 @@ info: externalDocs: description: ETSI GS NFV-SOL 005 V3.7.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/03.07.01_60/gs_nfv-sol005v030701p.pdf + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/03.07.01_60/gs_NFV-SOL005v030701p.pdf servers: - url: http://127.0.0.1/nsfm/v1 @@ -689,7 +689,7 @@ components: type: string Content-Type: description: | - The MIME type of the body of the request. Reference: IETF RFC 7231 + The MIME type of the body of the request. Reference: IETF RFC 9110 style: simple explode: false schema: diff --git a/src/SOL005/NSFaultManagementNotification/NSFaultManagementNotification.yaml b/src/SOL005/NSFaultManagementNotification/NSFaultManagementNotification.yaml index 34576a5..519171c 100644 --- a/src/SOL005/NSFaultManagementNotification/NSFaultManagementNotification.yaml +++ b/src/SOL005/NSFaultManagementNotification/NSFaultManagementNotification.yaml @@ -20,7 +20,7 @@ info: externalDocs: description: ETSI GS NFV-SOL 005 V3.7.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/03.07.01_60/gs_nfv-sol005v030701p.pdf + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/03.07.01_60/gs_NFV-SOL005v030701p.pdf servers: - url: http://127.0.0.1/callback/v1 diff --git a/src/SOL005/NSLCMCoordination/NSLCMCoordination.yaml b/src/SOL005/NSLCMCoordination/NSLCMCoordination.yaml index ad5931c..1a08a01 100644 --- a/src/SOL005/NSLCMCoordination/NSLCMCoordination.yaml +++ b/src/SOL005/NSLCMCoordination/NSLCMCoordination.yaml @@ -20,7 +20,7 @@ info: externalDocs: description: ETSI GS NFV-SOL 005 V3.7.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/03.07.01_60/gs_nfv-sol005v030701p.pdf + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/03.07.01_60/gs_NFV-SOL005v030701p.pdf servers: - url: http://127.0.0.1/lcmcoord/v1 diff --git a/src/SOL005/NSLifecycleManagement/NSLifecycleManagement.yaml b/src/SOL005/NSLifecycleManagement/NSLifecycleManagement.yaml index f9fe8d9..c5e6a18 100644 --- a/src/SOL005/NSLifecycleManagement/NSLifecycleManagement.yaml +++ b/src/SOL005/NSLifecycleManagement/NSLifecycleManagement.yaml @@ -20,7 +20,7 @@ info: externalDocs: description: ETSI GS NFV-SOL 005 V3.7.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/03.07.01_60/gs_nfv-sol005v030701p.pdf + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/03.07.01_60/gs_NFV-SOL005v030701p.pdf servers: - url: http://127.0.0.1/nslcm/v2 diff --git a/src/SOL005/NSLifecycleManagement/definitions/SOL005NSLifecycleManagement_def.yaml b/src/SOL005/NSLifecycleManagement/definitions/SOL005NSLifecycleManagement_def.yaml index da0f0e2..3908e15 100644 --- a/src/SOL005/NSLifecycleManagement/definitions/SOL005NSLifecycleManagement_def.yaml +++ b/src/SOL005/NSLifecycleManagement/definitions/SOL005NSLifecycleManagement_def.yaml @@ -402,7 +402,7 @@ definitions: This type represents a VNF instance. It shall comply with the provisions defined in table 6.5.3.57-1. NOTE: Clause B.3.2 of ETSI GS NFV-SOL 003 provides examples illustrating the relationship among the - different run-time idata types (CP, VL and link ports) used to represent the connectivity + different run-time data types (CP, VL and link ports) used to represent the connectivity of a VNF. NOTE 1: Modifying the value of this attribute shall not be performed when conflicts exist between the @@ -2646,10 +2646,10 @@ definitions: InstantiateVnfData: description: > - This type represents the information related to a SAP of a NS. The InstantiateVnfData data type specifies the - parameters that are needed for VNF instantiation. This information element is used for the bottom-up NS creation when - the OSS/BSS explicitly requests VNF instantiation for a given NS. When the NFVO invokes the Instantiate VNF - update operation, a set of these parameters are then passed by the NFVO to the VNFM. + This type represents the information that are needed for VNF instantiation. This data type is used for the + bottom-up NS creation when the OSS/BSS explicitly requests VNF instantiation for a given NS. When the NFVO + invokes the Instantiate VNF update operation, a set of these parameters are then passed by the NFVO to the VNFM. + It shall comply with the provisions defined in table 6.5.3.24-1 NOTE 1: It is possible to have several ExtManagedVirtualLinkData for the same VNF internal VL in case of a multi-site VNF spanning several VIMs. The set of ExtManagedVirtualLinkData @@ -2662,6 +2662,7 @@ definitions: may select a matching vnfProfile based on other information, such as external VL. NOTE 3: Either the attribute triple "vnfdId, vnfFlavourId and vnfInstantiationLevelId (if provided)" or the attribute "vnProfileId" shall be present, but not both. + type: object properties: vnfdId: diff --git a/src/SOL005/NSLifecycleManagementNotification/NSLifecycleManagementNotification.yaml b/src/SOL005/NSLifecycleManagementNotification/NSLifecycleManagementNotification.yaml index 07c15a9..4d72fe6 100644 --- a/src/SOL005/NSLifecycleManagementNotification/NSLifecycleManagementNotification.yaml +++ b/src/SOL005/NSLifecycleManagementNotification/NSLifecycleManagementNotification.yaml @@ -18,7 +18,7 @@ info: externalDocs: description: ETSI GS NFV-SOL 005 V3.7.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/03.07.01_60/gs_nfv-sol005v030701p.pdf + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/03.07.01_60/gs_NFV-SOL005v030701p.pdf servers: - url: http://127.0.0.1/callback/v2 diff --git a/src/SOL005/NSPerformanceManagement/NSPerformanceManagement.yaml b/src/SOL005/NSPerformanceManagement/NSPerformanceManagement.yaml index 50b84e8..55cb67a 100644 --- a/src/SOL005/NSPerformanceManagement/NSPerformanceManagement.yaml +++ b/src/SOL005/NSPerformanceManagement/NSPerformanceManagement.yaml @@ -20,7 +20,7 @@ info: externalDocs: description: ETSI GS NFV-SOL 005 V3.7.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/03.07.01_60/gs_nfv-sol005v030701p.pdf + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/03.07.01_60/gs_NFV-SOL005v030701p.pdf servers: - url: http://127.0.0.1/nspm/v2 @@ -423,7 +423,7 @@ paths: # - name: Authorization # description: | # The authorization token for the request. -# Reference: IETF RFC 7235. +# Reference: IETF RFC 9110. # in: header # required: false # type: string @@ -452,14 +452,14 @@ paths: # - name: Accept # description: | # Content-Types that are acceptable for the response. -# Reference: IETF RFC 7231. +# Reference: IETF RFC 9110. # in: header # required: true # type: string # - name: Content-Type # description: | # The MIME type of the body of the request. -# Reference: IETF RFC 7231. +# Reference: IETF RFC 9110. # in: header # required: true # type: string @@ -553,7 +553,7 @@ paths: # - name: Accept # description: | # Content-Types that are acceptable for the response. -# Reference: IETF RFC 7231. +# Reference: IETF RFC 9110. # in: header # required: true # type: string @@ -635,14 +635,14 @@ paths: # Identifier of the subscription. # This identifier can be retrieved from the resource referenced by the "Location" HTTP header in the response # to a POST request creating a new subscription resource. It can also be retrieved from the "id" attribute in the -# payload body of that response. +# message content of that response. # in: path # type: string # required: true # - name: Authorization # description: | # The authorization token for the request. -# Reference: IETF RFC 7235 +# Reference: IETF RFC 9110 # in: header # required: true # type: string @@ -664,7 +664,7 @@ paths: # - name: Accept # description: | # Content-Types that are acceptable for the response. -# Reference: IETF RFC 7231 +# Reference: IETF RFC 9110 # in: header # required: true # type: string @@ -734,7 +734,7 @@ paths: # - name: Accept # description: | # Content-Types that are acceptable for the response. -# Reference: IETF RFC 7231. +# Reference: IETF RFC 9110. # in: header # required: true # type: string @@ -784,7 +784,7 @@ components: name: Content-Type in: header description: | - The MIME type of the body of the request. Reference: IETF RFC 7231 + The MIME type of the body of the request. Reference: IETF RFC 9110 required: true schema: type: string @@ -965,7 +965,7 @@ components: headers: Content-Type: description: | - The MIME type of the body of the request. Reference: IETF RFC 7231 + The MIME type of the body of the request. Reference: IETF RFC 9110 style: simple explode: false schema: @@ -1312,7 +1312,7 @@ components: headers: Content-Type: description: | - The MIME type of the body of the request. Reference: IETF RFC 7231 + The MIME type of the body of the request. Reference: IETF RFC 9110 style: simple explode: false schema: diff --git a/src/SOL005/NSPerformanceManagementNotification/NSPerformanceManagementNotification.yaml b/src/SOL005/NSPerformanceManagementNotification/NSPerformanceManagementNotification.yaml index a8f0df7..b33fac2 100644 --- a/src/SOL005/NSPerformanceManagementNotification/NSPerformanceManagementNotification.yaml +++ b/src/SOL005/NSPerformanceManagementNotification/NSPerformanceManagementNotification.yaml @@ -20,7 +20,7 @@ info: externalDocs: description: ETSI GS NFV-SOL 005 V3.7.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/03.07.01_60/gs_nfv-sol005v030701p.pdf + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/03.07.01_60/gs_NFV-SOL005v030701p.pdf servers: - url: http://127.0.0.1/callback/v2 diff --git a/src/SOL005/VNFPackageManagement/VNFPackageManagement.yaml b/src/SOL005/VNFPackageManagement/VNFPackageManagement.yaml index 0e1c603..4d092ab 100644 --- a/src/SOL005/VNFPackageManagement/VNFPackageManagement.yaml +++ b/src/SOL005/VNFPackageManagement/VNFPackageManagement.yaml @@ -20,7 +20,7 @@ info: externalDocs: description: ETSI GS NFV-SOL 005 V3.7.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/03.07.01_60/gs_nfv-sol005v030701p.pdf + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/03.07.01_60/gs_NFV-SOL005v030701p.pdf servers: - url: http://127.0.0.1/vnfpkgm/v2 diff --git a/src/SOL005/VNFPackageManagement/definitions/SOL005VNFPackageManagement_def.yaml b/src/SOL005/VNFPackageManagement/definitions/SOL005VNFPackageManagement_def.yaml index edb972e..bd5a3da 100644 --- a/src/SOL005/VNFPackageManagement/definitions/SOL005VNFPackageManagement_def.yaml +++ b/src/SOL005/VNFPackageManagement/definitions/SOL005VNFPackageManagement_def.yaml @@ -16,7 +16,6 @@ definitions: - onboardingState - operationalState - usageState - - vnfmInfo - _links properties: id: @@ -129,9 +128,9 @@ definitions: $ref: "#/definitions/PackageUsageStateType" vnfmInfo: description: > - Specifies VNFMs compatible with the VNF. - This information is copied from the VNFD. - See note 4. + Specifies VNFMs compatible with the VNF. This information is + copied from the VNFD of the on-boarded VNF package. See note 4. + It shall be present after the VNF package content has been on-boarded and absent otherwise. type: array items: type: string @@ -178,6 +177,9 @@ definitions: description: > This type represents an artifact other than a software image which is contained in or external to a VNF package. It shall comply with provisions defined in Table 9.5.3.3-1. + + NOTE: The attribute name "artifactURI" does not comply with the naming convention defined in clause + 4.3 of ETSI GS NFV-SOL 015. This is to maintain the backward compatibility. required: - isEncrypted - checksum @@ -528,17 +530,7 @@ definitions: This attribute shall not be present if the credentials were provisioned out of band type: string enum: - - BASIC - OAUTH2_CLIENT_CREDENTIALS - username: - description: > - User name to be used for authentication. - type: string - password: - description: > - Password to be used for authentication. - Shall not be present in response bodies. - type: string paramsOauth2ClientCredentials: description: > Parameters for authentication/authorization @@ -824,17 +816,7 @@ definitions: - OAUTH2_CLIENT_CREDENTIALS: Only the "paramsOauth2ClientCredentials" attribute shall be present. This attribute shall not be present if no credentials are provided for the artifact.type: string enum: - - BASIC - OAUTH2_CLIENT_CREDENTIALS - username: - description: > - User name to be used for authentication. - type: string - password: - description: > - Password to be used for authentication. - Shall not be present in response bodies. - type: string paramsOauth2ClientCredentials: description: > Parameters for authentication/authorization diff --git a/src/SOL005/VNFPackageManagementNotification/VNFPackageManagementNotification.yaml b/src/SOL005/VNFPackageManagementNotification/VNFPackageManagementNotification.yaml index 90c5218..d54ecb6 100644 --- a/src/SOL005/VNFPackageManagementNotification/VNFPackageManagementNotification.yaml +++ b/src/SOL005/VNFPackageManagementNotification/VNFPackageManagementNotification.yaml @@ -20,7 +20,7 @@ info: externalDocs: description: ETSI GS NFV-SOL 005 V3.7.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/03.07.01_60/gs_nfv-sol005v030701p.pdf + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/03.07.01_60/gs_NFV-SOL005v030701p.pdf servers: - url: http://127.0.0.1/callback/v2 diff --git a/src/SOL005/VNFSnapshotPackageManagement/VNFSnapshotPackageManagement.yaml b/src/SOL005/VNFSnapshotPackageManagement/VNFSnapshotPackageManagement.yaml index 35ec4f1..a2da1b5 100644 --- a/src/SOL005/VNFSnapshotPackageManagement/VNFSnapshotPackageManagement.yaml +++ b/src/SOL005/VNFSnapshotPackageManagement/VNFSnapshotPackageManagement.yaml @@ -20,7 +20,7 @@ info: externalDocs: description: ETSI GS NFV-SOL 005 V3.7.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/03.07.01_60/gs_nfv-sol005v030701p.pdf + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/03.07.01_60/gs_NFV-SOL005v030701p.pdf servers: - url: http://127.0.0.1/vnfsnapshotpkgm/v1 diff --git a/src/SOL005/VNFSnapshotPackageManagement/definitions/SOL005VNFSnapshotPackageManagement_def.yaml b/src/SOL005/VNFSnapshotPackageManagement/definitions/SOL005VNFSnapshotPackageManagement_def.yaml index d1c482e..9e175d5 100644 --- a/src/SOL005/VNFSnapshotPackageManagement/definitions/SOL005VNFSnapshotPackageManagement_def.yaml +++ b/src/SOL005/VNFSnapshotPackageManagement/definitions/SOL005VNFSnapshotPackageManagement_def.yaml @@ -267,18 +267,7 @@ definitions: type: string enum: - - BASIC - OAUTH2_CLIENT_CREDENTIALS - username: - description: > - Username to be used for authentication. Shall be present if user name is needed and has - not been provisioned out of band. - type: string - password: - description: > - Password to be used for authentication. Shall be present if password is needed and has - not been provisioned out of band. - type: string paramsOauth2ClientCredentials: description: > Parameters for authentication/authorization using OAuth 2.0. @@ -435,16 +424,7 @@ definitions: This attribute shall not be present if no credentials are provided for the artifact type: string enum: - - BASIC - OAUTH2_CLIENT_CREDENTIALS - username: - description: > - Username to be used for authentication. - type: string - password: - description: > - Password to be used for authentication. Shall not be present in response bodies. - type: string paramsOauth2ClientCredentials: description: > Parameters for authentication/authorization using OAUTH2_CLIENT_CREDENTIALS. diff --git a/src/SOL005/components/SOL005_params.yaml b/src/SOL005/components/SOL005_params.yaml index b17c2e7..181fa72 100644 --- a/src/SOL005/components/SOL005_params.yaml +++ b/src/SOL005/components/SOL005_params.yaml @@ -12,7 +12,7 @@ components: Accept: name: Accept description: > - Content-Types that are acceptable for the response. Reference: IETF RFC 7231. + Content-Types that are acceptable for the response. Reference: IETF RFC 9110. in: header required: true schema: @@ -21,7 +21,7 @@ components: Authorization: name: Authorization description: > - The authorization token for the request. Reference: IETF RFC 7235. + The authorization token for the request. Reference: IETF RFC 9110. in: header required: false schema: @@ -30,7 +30,7 @@ components: ContentType: name: Content-Type description: | - The MIME type of the body of the request. Reference: IETF RFC 7231 + The MIME type of the body of the request. Reference: IETF RFC 9110 in: header required: true schema: diff --git a/src/SOL005/definitions/SOL005_def.yaml b/src/SOL005/definitions/SOL005_def.yaml index 0b9b440..8ec6e88 100644 --- a/src/SOL005/definitions/SOL005_def.yaml +++ b/src/SOL005/definitions/SOL005_def.yaml @@ -109,12 +109,12 @@ definitions: A short, human-readable summary of the problem type. It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using - proactive content negotiation; see [RFC7231], Section 3.4). + proactive content negotiation; see [RFC9110], Section 3.4). type: string status: description: > The HTTP status code for this occurrence of the problem. - The HTTP status code ([RFC7231], Section 6) generated by the origin + The HTTP status code ([RFC9110], Section 6) generated by the origin server for this occurrence of the problem. type: integer detail: diff --git a/src/SOL005/responses/SOL005_resp.yaml b/src/SOL005/responses/SOL005_resp.yaml index d9047a1..982cdc2 100644 --- a/src/SOL005/responses/SOL005_resp.yaml +++ b/src/SOL005/responses/SOL005_resp.yaml @@ -107,7 +107,7 @@ components: "ProblemDetails" structure to be returned. If the request is malformed or syntactically incorrect (e.g. if the request URI contains incorrect - query parameters or the payload body contains a syntactically incorrect data structure), + query parameters or the message content contains a syntactically incorrect data structure), the API producer shall respond with this response code. The "ProblemDetails" structure shall be provided, and should include in the "detail" attribute more information about the source of the problem. @@ -123,7 +123,7 @@ components: If the request contains a malformed access token, the API producer should respond with this response. The details of the error shall be returned in the WWW Authenticate HTTP header, as defined in IETF RFC 6750 - and IETF RFC 7235. The ProblemDetails structure may be provided. + and IETF RFC 9110. The ProblemDetails structure may be provided. The use of this HTTP error response code described above is applicable to the use of the OAuth 2.0 for the authorization of API requests and notifications, as defined in clauses 4.5.3.3 and 4.5.3.4. @@ -162,7 +162,7 @@ components: If the request contains no access token even though one is required, or if the request contains an authorization token that is invalid (e.g. expired or revoked), the API producer should respond with this response. The details of the error shall be returned in the WWW-Authenticate HTTP header, as defined in IETF RFC 6750 - and IETF RFC 7235. The ProblemDetails structure may be provided. + and IETF RFC 9110. The ProblemDetails structure may be provided. headers: Content-Type: description: The MIME type of the body of the response. @@ -239,7 +239,7 @@ components: This response code is not appropriate in case the resource addressed by the URI is a container resource which is designed to contain child resources, but does not contain any child resource at the time the request is received. For a GET request to an existing empty container resource, a typical response - contains a 200 OK response code and a payload body with an empty array. + contains a 200 OK response code and a message content with an empty array. headers: Content-Type: description: The MIME type of the body of the response. @@ -410,8 +410,8 @@ components: description: > 413 PAYLOAD TOO LARGE - If the payload body of a request is larger than the amount of data the API producer is willing or able to process, - it shall respond with this response code, following the provisions in IETF RFC 7231 for the use + If the message content of a request is larger than the amount of data the API producer is willing or able to process, + it shall respond with this response code, following the provisions in IETF RFC 9110 for the use of the "Retry-After" HTTP header and for closing the connection. The "ProblemDetails" structure may be omitted. headers: Content-Type: @@ -509,9 +509,9 @@ components: 422: description: > - 422 UNPROCESSABLE ENTITY + 422 UNPROCESSABLE CONTENT - If the payload body of a request contains syntactically correct data (e.g. well-formed JSON) but the data + If the message content of a request contains syntactically correct data (e.g. well-formed JSON) but the data cannot be processed (e.g. because it fails validation against a schema), the API producer shall respond with this response code. The "ProblemDetails" structure shall be provided, and should include in the "detail" attribute more information about the source of the problem. @@ -626,7 +626,7 @@ components: 503 SERVICE UNAVAILABLE If the API producer encounters an internal overload situation of itself or of a system it relies on, - it should respond with this response code, following the provisions in IETF RFC 7231 for the use of + it should respond with this response code, following the provisions in IETF RFC 9110 for the use of the "Retry-After" HTTP header and for the alternative to refuse the connection. The "ProblemDetails" structure may be omitted. headers: -- GitLab From f3ed247b7a3d3d922d2e01218d9c43cbc102de43 Mon Sep 17 00:00:00 2001 From: Giacomo Bernini Date: Thu, 19 Jan 2023 13:40:16 +0000 Subject: [PATCH 10/10] Update Readme.md --- Readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Readme.md b/Readme.md index 2d91c95..79f29dc 100644 --- a/Readme.md +++ b/Readme.md @@ -30,7 +30,7 @@ and the results will be stored in a `build/` directory in the project folder. ## How to raise issues -Change requests can be filed at [ETSI Forge Bugzilla](forge.etsi.org/bugzilla/buglist.cgi?component=Nfv-Openapis&list_id=62&product=NFV). Please report errors, bugs or other issues [here](https://forge.etsi.org/bugzilla/enter_bug.cgi?product=NFV). +Please report errors, bugs or other issues [here](https://forge.etsi.org/rep/nfv/SOL005/-/issues). ## How to contribute -- GitLab