From ee03dbc60b890d0ffca54c53229cc65628062dc0 Mon Sep 17 00:00:00 2001 From: zulfiqar Date: Mon, 19 Jul 2021 17:28:03 +0200 Subject: [PATCH] Bug fixed in SOL002 --- .../VNFLifecycleCoordination.yaml | 49 ++++++++++++++++++- .../SOL002VNFLifecycleManagement_def.yaml | 24 ++++----- .../VNFLifecycleManagementNotification.yaml | 2 +- src/components/SOL002SOL003_params.yaml | 2 +- ...OL002SOL003VNFLifecycleManagement_def.yaml | 4 +- src/definitions/SOL002SOL003_def.yaml | 4 +- 6 files changed, 66 insertions(+), 19 deletions(-) diff --git a/src/SOL002/VNFLifecycleCoordination/VNFLifecycleCoordination.yaml b/src/SOL002/VNFLifecycleCoordination/VNFLifecycleCoordination.yaml index 483a3016..7c554a2e 100644 --- a/src/SOL002/VNFLifecycleCoordination/VNFLifecycleCoordination.yaml +++ b/src/SOL002/VNFLifecycleCoordination/VNFLifecycleCoordination.yaml @@ -60,6 +60,8 @@ paths: $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/405 "406": $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/406 + "409": + $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/409 "422": $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/422 "429": @@ -81,7 +83,9 @@ paths: The GET method reads a coordination result. See clause 10.4.3.3.2. responses: "200": - $ref: '#/components/responses/IndividualLcmCoord.Get.200' + $ref: '#/components/responses/LcmCoord.Get.200' + "202": + $ref: '#/components/responses/LcmCoord.Get.202' "400": $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/400 "401": @@ -268,7 +272,7 @@ components: format: url content: {} - IndividualLcmCoord.Get.200: + LcmCoord.Get.200: description: | 200 OK Shall be returned when the coordination is finished and the coordination result has been read successfully. @@ -299,6 +303,47 @@ components: schema: $ref: ./definitions/SOL002VNFLifecycleCoordination_def.yaml#/definitions/LcmCoord + LcmCoord.Get.202: + description: | + 202 ACCEPTED + Shall be returned when the management operation with which coordination is requested is still ongoing or + in the process of being cancelled, i.e. no coordination result is available yet. + The response shall be empty. + headers: + Version: + description: | + The used API version. + style: simple + explode: false + schema: + type: string + WWW-Authenticate: + description: | + Challenge if the corresponding HTTP request has not provided authorization, or error details if the + corresponding HTTP request has provided an invalid authorization token. + style: simple + explode: false + schema: + type: string + Content-Type: + description: | + The MIME type of the body of the response. + style: simple + explode: false + schema: + type: string + Location: + description: | + Used in redirection, or when a new resource has been created. This header field shall be present if the + response status code is 201 or 3xx. In the present document this header field is also used if the response + status code is 202 and a new resource was created. + style: simple + explode: false + schema: + type: string + format: url + content: {} + CoordinationCancel.Post.202: description: | 202 ACCEPTED diff --git a/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml b/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml index 5d130425..010a5597 100644 --- a/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml +++ b/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml @@ -1503,8 +1503,8 @@ definitions: description: > Input parameters of the LCM operation. This attribute shall be formatted according to the request data type of the related LCM - operation. The following mapping between operationType and the - data type of this attribute shall apply: + operation. In addition, the provisions in clause 5.7 shall apply. + The following mapping between operationType and the data type of this attribute shall apply: * INSTANTIATE: InstantiateVnfRequest * SCALE: ScaleVnfRequest * SCALE_TO_LEVEL: ScaleVnfToLevelRequest @@ -1635,7 +1635,7 @@ definitions: $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" endTime: description: > - The end time when the VNFM has received the confirmation thatof the coordination action + The end 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. @@ -1800,32 +1800,34 @@ definitions: vnfInstanceName: description: > If present, this attribute signals modifications of the - "vnfInstanceName" attribute in "VnfInstance". + "vnfInstanceName" attribute in "VnfInstance" as defined in clause 5.5.2.12.. type: string vnfInstanceDescription: description: > If present, this attribute signals modifications of the - "vnfInstanceDescription" attribute in "VnfInstance". + "vnfInstanceDescription" attribute in "VnfInstance", as defined in clause 5.5.2.12.. type: string vnfConfigurableProperties: description: > If present, this attribute signals modifications of the - "vnfConfigurableProperties" attribute in "VnfInstance". + "vnfConfigurableProperties" attribute in "VnfInstance" as defined in clause 5.5.2.12. + In addition, the provisions in clause 5.7 shall apply.. $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" metadata: description: > If present, this attribute signals modifications of the "metadata" - attribute in "VnfInstance". + attribute in "VnfInstance" , as defined in clause 5.5.2.12.. $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" extensions: description: > If present, this attribute signals modifications of the "extensions" - attribute in "VnfInstance". + attribute in "VnfInstance", as defined in clause 5.5.2.12. + In addition, the provisions in clause 5.7 shall apply.. $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" vnfdId: description: > If present, this attribute signals modifications of the "vnfdId" - attribute in "VnfInstance". + attribute in "VnfInstance", as defined in clause 5.5.2.12.. $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" vnfProvider: description: > @@ -1840,7 +1842,7 @@ definitions: vnfSoftwareVersion: description: > If present, this attribute signals modifications of the - "vnfSoftwareVersion" attribute in "VnfInstance". + "vnfSoftwareVersion" attribute in "VnfInstance". See note. $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Version" vnfdVersion: description: > @@ -1852,7 +1854,7 @@ definitions: If present, this attribute signals modifications of certain entries in the "vnfcInfo" attribute array in the "instantiatedVnfInfo" attribute of "VnfInstance", as defined - in clause 5.5.2.12 + in clause 5.5.2.12. type: array items: $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/VnfcInfoModifications" \ No newline at end of file diff --git a/src/SOL002/VNFLifecycleManagementNotification/VNFLifecycleManagementNotification.yaml b/src/SOL002/VNFLifecycleManagementNotification/VNFLifecycleManagementNotification.yaml index d343e08a..dfc2f2e4 100644 --- a/src/SOL002/VNFLifecycleManagementNotification/VNFLifecycleManagementNotification.yaml +++ b/src/SOL002/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 002 V3.5.1 diff --git a/src/components/SOL002SOL003_params.yaml b/src/components/SOL002SOL003_params.yaml index 6870d98c..a277a550 100644 --- a/src/components/SOL002SOL003_params.yaml +++ b/src/components/SOL002SOL003_params.yaml @@ -97,7 +97,7 @@ components: - error - resourceChanges - changedInfo - - changedExtConnectivity. + - changedExtConnectivity - lcmCoordinations - modificationsTriggeredByVnfPkgChange - warnings diff --git a/src/definitions/SOL002SOL003VNFLifecycleManagement_def.yaml b/src/definitions/SOL002SOL003VNFLifecycleManagement_def.yaml index b4a1e577..1b9508d2 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 4.4.1.11. + “extLinkPorts” attribute in clause 5.5.3.2. type: object required: - id @@ -1064,7 +1064,7 @@ definitions: VipCpInfo: description: > - This type provides information related to virtual IP (VIP) CP. It shall comply with the provisions defined in table 5.5.3.22-1. + This type provides information related to virtual IP (VIP) CP. It shall comply with the provisions defined in table 5.5.3.28-1. NOTE: It is possible that there is no associated VnfcCp because the VIP CP is available but not associated yet. type: object diff --git a/src/definitions/SOL002SOL003_def.yaml b/src/definitions/SOL002SOL003_def.yaml index eec13361..ede25da9 100644 --- a/src/definitions/SOL002SOL003_def.yaml +++ b/src/definitions/SOL002SOL003_def.yaml @@ -372,12 +372,12 @@ definitions: $ref: "#/definitions/Identifier" createExtLinkPort: - description: Indicates to the VNFM the need to create a dedicated link port for the external CP. + description: > + Indicates to the VNFM the need to create a dedicated link port for the external CP. If set to True, the VNFM shall create a link port. If set to False, the VNFM shall not create a link port. This attribute is only applicable for external CP instances without a floating IP address that expose a VIP CP instance for which a dedicated IP address is allocated. It shall be present in that case and shall be absent otherwise. - type: boolean cpProtocolData: -- GitLab