From 1c3e28ce6dcdc214d1c65bad1cb76ee295ee264f Mon Sep 17 00:00:00 2001 From: Giacomo Bernini Date: Wed, 28 Jul 2021 13:55:21 +0200 Subject: [PATCH] applied comments on SOL003 from SOL WG review --- .../VNFLifecycleManagement/VNFLifecycleManagement.yaml | 2 +- .../definitions/SOL003VNFLifecycleManagement_def.yaml | 7 ++++--- .../VNFLifecycleManagementNotification.yaml | 2 +- .../VNFPackageManagementNotification.yaml | 2 +- .../SOL002SOL003VNFLifecycleManagement_def.yaml | 2 +- src/definitions/SOL002SOL003_def.yaml | 8 +++----- 6 files changed, 11 insertions(+), 12 deletions(-) diff --git a/src/SOL003/VNFLifecycleManagement/VNFLifecycleManagement.yaml b/src/SOL003/VNFLifecycleManagement/VNFLifecycleManagement.yaml index 2e4315cc..637df4dc 100644 --- a/src/SOL003/VNFLifecycleManagement/VNFLifecycleManagement.yaml +++ b/src/SOL003/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 003 V3.5.1 diff --git a/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml b/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml index 85e61b14..a2dc06f9 100644 --- a/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml +++ b/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml @@ -1785,12 +1785,13 @@ 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 time when the VNFM has received the confirmation that 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" delay: description: > diff --git a/src/SOL003/VNFLifecycleManagementNotification/VNFLifecycleManagementNotification.yaml b/src/SOL003/VNFLifecycleManagementNotification/VNFLifecycleManagementNotification.yaml index ad3e8ab0..e016bb91 100644 --- a/src/SOL003/VNFLifecycleManagementNotification/VNFLifecycleManagementNotification.yaml +++ b/src/SOL003/VNFLifecycleManagementNotification/VNFLifecycleManagementNotification.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 003 V3.5.1 diff --git a/src/SOL003/VNFPackageManagementNotification/VNFPackageManagementNotification.yaml b/src/SOL003/VNFPackageManagementNotification/VNFPackageManagementNotification.yaml index f6202663..a1a2548a 100644 --- a/src/SOL003/VNFPackageManagementNotification/VNFPackageManagementNotification.yaml +++ b/src/SOL003/VNFPackageManagementNotification/VNFPackageManagementNotification.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/definitions/SOL002SOL003VNFLifecycleManagement_def.yaml b/src/definitions/SOL002SOL003VNFLifecycleManagement_def.yaml index 1b9508d2..9dd75f7b 100644 --- a/src/definitions/SOL002SOL003VNFLifecycleManagement_def.yaml +++ b/src/definitions/SOL002SOL003VNFLifecycleManagement_def.yaml @@ -665,7 +665,7 @@ definitions: NOTE 1: The attributes "associatedVnfcCpId", "associatedVipCpId" and "associatedVnfVirtualLinkId" are mutually exclusive. Exactly one shall be present. NOTE 2: An external CP instance is not associated to a link port in the cases indicated for the - “extLinkPorts” attribute in clause 5.5.3.2. + “extLinkPorts” attribute in clause 4.4.1.11. type: object required: - id diff --git a/src/definitions/SOL002SOL003_def.yaml b/src/definitions/SOL002SOL003_def.yaml index ede25da9..cecd0711 100644 --- a/src/definitions/SOL002SOL003_def.yaml +++ b/src/definitions/SOL002SOL003_def.yaml @@ -523,9 +523,7 @@ definitions: ExtVirtualLinkData: description: > This type represents an external VL. - * NOTE 1: The information about the VIM connection referenced by the VIM connection id is known to the VNFM. - Moreover, the identifier of the VIM connection provides scope to the resourceId. - * NOTE 2: A link port is not needed for an external CP instance that exposes a VIP CP in the following cases: + * NOTE: A link port is not needed for an external CP instance that exposes a VIP CP in the following cases: 1 For a VIP CP directly exposed as extCP: 1.1 No dedicated IP address is allocated as VIP address, as indicated in the VNFD. 1.2 A dedicated IP addresss is allocated as VIP address, but the NFVO indicates that no port @@ -548,7 +546,7 @@ definitions: description: > Identifier of the VIM connection to manage this resource. This attribute shall only be supported and present if VNF-related - resource management in direct mode is applicable. See note 1. + resource management in direct mode is applicable. $ref: "#/definitions/Identifier" resourceProviderId: description: > @@ -577,7 +575,7 @@ definitions: connection points to this external VL. If this attribute is not present, the VNFM shall create the link ports on the external VL unless the extCp exposes a VIP CP and a link port is not needed - for it based on the conditions defined below. See note 2. + for it based on the conditions defined below. See note. type: array items: $ref: "#/definitions/ExtLinkPortData" -- GitLab