From 11100b0781e56cbf08237a71595944544481f6e0 Mon Sep 17 00:00:00 2001 From: zulfiqar Date: Mon, 31 May 2021 13:30:35 +0200 Subject: [PATCH] Added changes for SOL002 v337 --- .../VNFLifecycleCoordination.yaml | 9 +++- .../VNFLifecycleManagement.yaml | 2 +- .../SOL002VNFLifecycleManagement_def.yaml | 50 +++++++++++++++++-- src/definitions/SOL002SOL003_def.yaml | 4 +- 4 files changed, 57 insertions(+), 8 deletions(-) diff --git a/src/SOL002/VNFLifecycleCoordination/VNFLifecycleCoordination.yaml b/src/SOL002/VNFLifecycleCoordination/VNFLifecycleCoordination.yaml index 1fefbbc9..649a450e 100644 --- a/src/SOL002/VNFLifecycleCoordination/VNFLifecycleCoordination.yaml +++ b/src/SOL002/VNFLifecycleCoordination/VNFLifecycleCoordination.yaml @@ -174,8 +174,8 @@ components: responses: Coordination.Post: description: | - Shall be returned when the API producer has chosen the synchronous mode, - which may be chosen for coordination actions that finish within the time + Shall be returned returned to indicate a finished coordination action when the API producer has + chosen the synchronous mode, which may be selected for coordination actions that finish within the time frame in which an HTTP response is expected. The response body shall contain an LcmCoord data structure that represents the result of the coordination action. @@ -226,6 +226,11 @@ components: The HTTP response shall include a "Location" HTTP header that indicates the URI of the "Individual coordination action" resource that will be created once the coordination operation has finished successfully. + Further, the HTTP response may include a "Retry-After" HTTP header that indicates the + time to wait before sending the next GET request to the "individual coordination" resource + indicated in the "Location" header. If the header is provided, the VNFM shall record the signalled + delay value in the "delay" attribute of the applicable entry in the "lcmCoordinations" array in the + "VnfLcmOpOcc" structure. headers: Version: description: | diff --git a/src/SOL002/VNFLifecycleManagement/VNFLifecycleManagement.yaml b/src/SOL002/VNFLifecycleManagement/VNFLifecycleManagement.yaml index f394a6d8..180a8ff3 100644 --- a/src/SOL002/VNFLifecycleManagement/VNFLifecycleManagement.yaml +++ b/src/SOL002/VNFLifecycleManagement/VNFLifecycleManagement.yaml @@ -16,7 +16,7 @@ info: license: name: ETSI Forge copyright notice url: https://forge.etsi.org/etsi-forge-copyright-notice.txt - version: 2.0.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 + version: 2.1.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: description: ETSI GS NFV-SOL 002 V3.5.1 diff --git a/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml b/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml index 49817600..5d130425 100644 --- a/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml +++ b/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml @@ -1442,6 +1442,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: @@ -1629,13 +1631,14 @@ definitions: $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/LcmCoordResultType" startTime: description: > - The time when the coordination action has been started. + The time when the VNFM has received the confirmation that the coordination action has been started. $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" endTime: description: > - 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. + The end time when the VNFM has received the confirmation thatof the coordination action + has finished or has been cancelled, or the time when a coordination action has timed out. + 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" endpointType: description: > @@ -1647,6 +1650,45 @@ definitions: enum: - MGMT - VNF + 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" + rejectedLcmCoordinations: + description: > + Information about LCM coordination actions (see clause 10) that were rejected by 503 error which + means they will be tried again after a delay. See note 5. + 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" + 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 + delay: + description: > + The end of the delay period, as calculated from the startTime and "Retry-After" header. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" warnings: description: > Warning messages that were generated while the operation was executing. diff --git a/src/definitions/SOL002SOL003_def.yaml b/src/definitions/SOL002SOL003_def.yaml index 0ce395f4..eec13361 100644 --- a/src/definitions/SOL002SOL003_def.yaml +++ b/src/definitions/SOL002SOL003_def.yaml @@ -565,7 +565,9 @@ definitions: $ref: "#/definitions/IdentifierInVim" extCps: description: > - External CPs of the VNF to be connected to this external VL. + External CPs of the VNF to be connected to this external VL. Entries in the list of external + CP data that are unchanged need not be supplied if the ExtVirtualLinkData structure is part + of a request or response that modifies the external connectivity. type: array items: $ref: "#/definitions/VnfExtCpData" -- GitLab