diff --git a/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml b/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml index f6db8575d9e5b29fd54d87b335c689ec27a7739e..85e61b14ca95a569bdb6e0ac3bace92a1092fe7d 100644 --- a/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml +++ b/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml @@ -1594,6 +1594,8 @@ definitions: "Individual coordination action" resource within a timeout interval after requesting the coordination to be started or to be cancelled. The length of the timeout interval is defined by means outside the scope of the present document. + NOTE 5: The list of rejected coordinations may be garbage collected if the LCM operation + occurrence has reached a terminal state, i.e. one of "COMPLETED", "FAILED" and "ROLLED_BACK". type: object oneOf: - required: @@ -1790,6 +1792,47 @@ definitions: The end time of the coordination action. Shall be present for a coordination action that has finished or timed out (see note 4) and shall be absent if the coordination is ongoing. $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" + delay: + description: > + The end of the delay period. + This attribute shall be present if the last known HTTP response related to this coordination has + contained a "Retry-After" header, and shall be absent otherwise. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" + endpointType: + description: > + The endpoint type used by this coordination action. + Valid values: + • MGMT: coordination with other operation supporting management systems (e.g. EM) + • VNF: coordination with the VNF instance + type: string + enum: + - MGMT + - VNF + rejectedLcmCoordinations: + description: > + Information about LCM coordination actions (see clause 10 in ETSI GS NFV-SOL002) that were rejected + by 503 error which means they can be tried again after a delay. See note 5. + type: array + items: + type: object + required: + - coordinationActionName + - rejectionTime + - endpointType + - delay + properties: + coordinationActionName: + description: > + Indicator of the actual coordination action. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + rejectionTime: + description: > + The time when the VNFM has received the 503 response that rejects the actual coordination. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" + delay: + description: > + The end of the delay period, as calculated from the startTime and "Retry-After" header. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" endpointType: description: > The endpoint type used by this coordination action. diff --git a/src/SOL003/VNFLifecycleOperationGranting/VNFLifecycleOperationGranting.yaml b/src/SOL003/VNFLifecycleOperationGranting/VNFLifecycleOperationGranting.yaml index 0a208949ca86133a20fca76b4ea57d436684e96e..566ea46f5f0c1ed3e6484ddc96a29f96aed8505c 100644 --- a/src/SOL003/VNFLifecycleOperationGranting/VNFLifecycleOperationGranting.yaml +++ b/src/SOL003/VNFLifecycleOperationGranting/VNFLifecycleOperationGranting.yaml @@ -16,7 +16,7 @@ info: license: name: ETSI Forge copyright notice url: https://forge.etsi.org/etsi-forge-copyright-notice.txt - version: "1.4.0-impl:etsi.org:ETSI_NFV_OpenAPI:1" + version: "1.5.0-impl:etsi.org:ETSI_NFV_OpenAPI:1" externalDocs: description: ETSI GS NFV-SOL 003 V3.5.1 diff --git a/src/SOL003/VNFPackageManagement/VNFPackageManagement.yaml b/src/SOL003/VNFPackageManagement/VNFPackageManagement.yaml index d85c90712988b59f154c161ee5061a018f779bff..08f502f5b2d71c8c8498d313b2398f6f95506a5a 100644 --- a/src/SOL003/VNFPackageManagement/VNFPackageManagement.yaml +++ b/src/SOL003/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.1.0-impl:etsi.org:ETSI_NFV_OpenAPI:1" + version: "2.2.0-impl:etsi.org:ETSI_NFV_OpenAPI:1" externalDocs: description: ETSI GS NFV-SOL 003 V3.5.1 diff --git a/src/SOL003/VNFSnapshotPackageManagement/VNFSnapshotPackageManagement.yaml b/src/SOL003/VNFSnapshotPackageManagement/VNFSnapshotPackageManagement.yaml index 2bb0f9ac1317d92dd1213bf8891d196d1ee6238a..4d7359f0be7ff66ec68c143d6cc3b7771e535a13 100644 --- a/src/SOL003/VNFSnapshotPackageManagement/VNFSnapshotPackageManagement.yaml +++ b/src/SOL003/VNFSnapshotPackageManagement/VNFSnapshotPackageManagement.yaml @@ -16,15 +16,15 @@ 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 003 V3.5.1 url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/03.05.01_60/gs_NFV-SOL003v030501p.pdf servers: - - url: http://0.0.0.1/vnfsnapshotpkgm/v1 - - url: https://0.0.0.1/vnfsnapshotpkgm/v1 + - url: http://127.0.0.1/vnfsnapshotpkgm/v1 + - url: https://127.0.0.1/vnfsnapshotpkgm/v1 paths: ############################################################################### diff --git a/src/components/SOL002SOL003_params.yaml b/src/components/SOL002SOL003_params.yaml index 2211c23c42ca3de0eb569b07cd96b89bb17e2313..6870d98c3335580db75bb14f1cb9b8977b1a5d16 100644 --- a/src/components/SOL002SOL003_params.yaml +++ b/src/components/SOL002SOL003_params.yaml @@ -40,7 +40,7 @@ components: name: filter description: > Attribute-based filtering expression according to clause 5.2 of ETSI - GS NFV-SOL 013. The NFV-MANO functional entity shall support + GS NFV-SOL 013. The VNFM shall support receiving this parameter as part of the URI query string. The API consumer may supply this parameter. All attribute names that appear in the FmSubscription and in data types referenced from it shall be @@ -89,7 +89,18 @@ components: in: query description: >- Indicates to exclude the following complex attributes from the response. See clause 5.3 of ETSI GS NFV-SOL 013 - for details. The NFV-MANO functional entity shall support this parameter. + for details. The VNFM shall support this parameter. + The following attributes shall be excluded from the VnfLcmOpOcc structure in the response + body if this parameter is provided, or none of the parameters "all_fields," "fields", + "exclude_fields", "exclude_default" are provided: + - operationParams + - error + - resourceChanges + - changedInfo + - changedExtConnectivity. + - lcmCoordinations + - modificationsTriggeredByVnfPkgChange + - warnings required: false schema: type: string @@ -98,7 +109,7 @@ components: name: nextpage_opaque_marker description: > Marker to obtain the next page of a paged response. Shall be supported by - the NFV-MANO functional entity if the entity supports alternative 2 (paging) + the VNFM if the entity supports alternative 2 (paging) according to clause 5.4.2.1 of ETSI GS NFV-SOL 013 for this resource. in: query required: false