From 568cca3e5fd4e936a1459c2a090998295be76da6 Mon Sep 17 00:00:00 2001 From: Muhammad Umair Zafar Date: Tue, 19 Nov 2024 07:44:23 +0000 Subject: [PATCH 1/5] update SOL002 OAS as per version 5.2.1 --- src/SOL002/APIVersion/APIVersion.yaml | 4 +- .../General_Definitions/SOL002_def.yaml | 29 +++++- .../VNFConfiguration/VNFConfiguration.yaml | 4 +- .../VNFFaultManagement.yaml | 4 +- .../VNFFaultManagementNotification.yaml | 4 +- src/SOL002/VNFIndicator/VNFIndicator.yaml | 4 +- .../VNFIndicatorNotification.yaml | 4 +- .../VNFLifecycleCoordination.yaml | 4 +- .../VNFLifecycleManagement.yaml | 6 +- .../SOL002VNFLifecycleManagement_def.yaml | 95 ++++++++++++++++--- .../VNFLifecycleManagementNotification.yaml | 4 +- .../VNFPerformanceManagement.yaml | 4 +- .../VNFPerformanceManagementNotification.yaml | 4 +- 13 files changed, 129 insertions(+), 41 deletions(-) diff --git a/src/SOL002/APIVersion/APIVersion.yaml b/src/SOL002/APIVersion/APIVersion.yaml index cd7d50bc..a792d68a 100644 --- a/src/SOL002/APIVersion/APIVersion.yaml +++ b/src/SOL002/APIVersion/APIVersion.yaml @@ -19,8 +19,8 @@ info: version: 1.3.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 002 V5.1.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/05.01.01_60/gs_NFV-SOL002v050101p.pdf + description: ETSI GS NFV-SOL 002 V5.2.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/05.02.01_60/gs_NFV-SOL002v050201p.pdf paths: /vnfconfig/api_versions: diff --git a/src/SOL002/General_Definitions/SOL002_def.yaml b/src/SOL002/General_Definitions/SOL002_def.yaml index 8a6d6ed3..53879872 100644 --- a/src/SOL002/General_Definitions/SOL002_def.yaml +++ b/src/SOL002/General_Definitions/SOL002_def.yaml @@ -681,6 +681,7 @@ definitions: type: object required: - cpdId + - cpConfig properties: cpdId: description: > @@ -694,6 +695,7 @@ definitions: and is managed by the NFVO. The entries shall be applied by the VNFM according to the rules of JSON Merge Patch (see IETF RFC 7396). See notes 2, 3, 4, 5 and 6. + In case of deleting an external CP, the list of instances to be deleted. type: object additionalProperties: $ref: "#/definitions/VnfExtCpConfig" @@ -750,6 +752,8 @@ definitions: trunk. Reference to the "VnfExtCpConfig" entry that corresponds to the parent port of the trunk. Only present in "VnfExtCpConfig" structures that provide configuration information for a CP which represents a sub-port in a trunk, and if parent ports are supported. + In case of deletion of an external CP, the identifier of the external CP instance to delete. + Shall be present if this instance has already been created. $ref: "#/definitions/IdentifierInVnf" linkPortId: @@ -769,8 +773,8 @@ definitions: cpProtocolData: description: > - Parameters for configuring the network protocols on the - link port that connects the CP to a VL. See notes 1 and 2. + Parameters for configuring the network protocols on the link port that connects the CP to a VL and the domain + names for the external CP. See notes 1 and 2. type: array items: $ref: "#/definitions/CpProtocolData" @@ -826,6 +830,15 @@ definitions: instance exposes a virtual CP and shall not be present otherwise. $ref: "#/definitions/VirtualCpAddressData" + fullyQualifiedDomainNames: + description: > + Specifies the fully qualified domain names (FQDN) to apply to the CP. + type: string + relativeDomainNames: + description: > + Specifies values of relative domain names to be considered when setting + the fully qualified domain names. + type: string IpOverEthernetAddressData: description: > @@ -1013,11 +1026,12 @@ definitions: * NOTE 3: An example of the network attachment definition resource when the container infrastructure service management is a Kubernetes® instance is a network attachment definition (NAD). + + * NOTE 4: Either "extCps" or “extCpsDeletion" shall be present, but not both. type: object required: - id - resourceId - - extCps properties: id: description: > @@ -1047,7 +1061,7 @@ definitions: description: > 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. + of a request or response that modifies the external connectivity.See note 4. type: array items: $ref: "#/definitions/VnfExtCpData" @@ -1072,6 +1086,13 @@ definitions: type: array items: $ref: "#/definitions/NetAttDefResourceData" + extCpsDeletion: + description: > + External CPs of the VNF to be disconnected from this + external VL and to be deleted. See note 4. + type: array + items: + $ref: "#/definitions/VnfExtCpData" ScaleInfo: description: > diff --git a/src/SOL002/VNFConfiguration/VNFConfiguration.yaml b/src/SOL002/VNFConfiguration/VNFConfiguration.yaml index e83c89ff..9d1c851b 100644 --- a/src/SOL002/VNFConfiguration/VNFConfiguration.yaml +++ b/src/SOL002/VNFConfiguration/VNFConfiguration.yaml @@ -19,8 +19,8 @@ info: version: 1.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 002 V5.1.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/05.01.01_60/gs_NFV-SOL002v050101p.pdf + description: ETSI GS NFV-SOL 002 V5.2.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/05.02.01_60/gs_NFV-SOL002v050201p.pdf servers: - url: http://127.0.0.1/vnfconfig/v1 diff --git a/src/SOL002/VNFFaultManagement/VNFFaultManagement.yaml b/src/SOL002/VNFFaultManagement/VNFFaultManagement.yaml index 53c31f15..6c5037c2 100644 --- a/src/SOL002/VNFFaultManagement/VNFFaultManagement.yaml +++ b/src/SOL002/VNFFaultManagement/VNFFaultManagement.yaml @@ -19,8 +19,8 @@ info: version: 1.14.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 002 V5.1.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/05.01.01_60/gs_NFV-SOL002v050101p.pdf + description: ETSI GS NFV-SOL 002 V5.2.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/05.02.01_60/gs_NFV-SOL002v050201p.pdf servers: - url: http://127.0.0.1/vnffm/v1 diff --git a/src/SOL002/VNFFaultManagementNotification/VNFFaultManagementNotification.yaml b/src/SOL002/VNFFaultManagementNotification/VNFFaultManagementNotification.yaml index c70155cb..4909cb90 100644 --- a/src/SOL002/VNFFaultManagementNotification/VNFFaultManagementNotification.yaml +++ b/src/SOL002/VNFFaultManagementNotification/VNFFaultManagementNotification.yaml @@ -19,8 +19,8 @@ info: version: 1.14.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 002 V5.1.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/05.01.01_60/gs_NFV-SOL002v050101p.pdf + description: ETSI GS NFV-SOL 002 V5.2.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/05.02.01_60/gs_NFV-SOL002v050201p.pdf servers: - url: http://127.0.0.1/callback/v1 diff --git a/src/SOL002/VNFIndicator/VNFIndicator.yaml b/src/SOL002/VNFIndicator/VNFIndicator.yaml index 2dbba70b..300e7c5b 100644 --- a/src/SOL002/VNFIndicator/VNFIndicator.yaml +++ b/src/SOL002/VNFIndicator/VNFIndicator.yaml @@ -19,8 +19,8 @@ info: version: 1.13.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 002 V5.1.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/05.01.01_60/gs_NFV-SOL002v050101p.pdf + description: ETSI GS NFV-SOL 002 V5.2.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/05.02.01_60/gs_NFV-SOL002v050201p.pdf servers: - url: http://127.0.0.1/vnfind/v1 diff --git a/src/SOL002/VNFIndicatorNotification/VNFIndicatorNotification.yaml b/src/SOL002/VNFIndicatorNotification/VNFIndicatorNotification.yaml index 4ce485b1..09a3393b 100644 --- a/src/SOL002/VNFIndicatorNotification/VNFIndicatorNotification.yaml +++ b/src/SOL002/VNFIndicatorNotification/VNFIndicatorNotification.yaml @@ -19,8 +19,8 @@ info: version: 1.13.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 002 V5.1.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/05.01.01_60/gs_NFV-SOL002v050101p.pdf + description: ETSI GS NFV-SOL 002 V5.2.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/05.02.01_60/gs_NFV-SOL002v050201p.pdf servers: - url: http://127.0.0.1/callback/v1 diff --git a/src/SOL002/VNFLifecycleCoordination/VNFLifecycleCoordination.yaml b/src/SOL002/VNFLifecycleCoordination/VNFLifecycleCoordination.yaml index f6d0fb8a..9b8163db 100644 --- a/src/SOL002/VNFLifecycleCoordination/VNFLifecycleCoordination.yaml +++ b/src/SOL002/VNFLifecycleCoordination/VNFLifecycleCoordination.yaml @@ -19,8 +19,8 @@ info: version: 1.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 002 V5.1.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/05.01.01_60/gs_NFV-SOL002v050101p.pdf + description: ETSI GS NFV-SOL 002 V5.2.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/05.02.01_60/gs_NFV-SOL002v050201p.pdf servers: - url: http://127.0.0.1/lcmcoord/v1 diff --git a/src/SOL002/VNFLifecycleManagement/VNFLifecycleManagement.yaml b/src/SOL002/VNFLifecycleManagement/VNFLifecycleManagement.yaml index e036a9f3..896bf346 100644 --- a/src/SOL002/VNFLifecycleManagement/VNFLifecycleManagement.yaml +++ b/src/SOL002/VNFLifecycleManagement/VNFLifecycleManagement.yaml @@ -16,11 +16,11 @@ info: license: name: ETSI Forge copyright notice url: https://forge.etsi.org/etsi-forge-copyright-notice.txt - version: 2.14.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 + version: 2.15.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 002 V5.1.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/05.01.01_60/gs_NFV-SOL002v050101p.pdf + description: ETSI GS NFV-SOL 002 V5.2.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/05.02.01_60/gs_NFV-SOL002v050201p.pdf servers: - url: http://127.0.0.1/vnflcm/v2 diff --git a/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml b/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml index 64dacb0d..060e72b1 100644 --- a/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml +++ b/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml @@ -297,9 +297,11 @@ definitions: Modifying the values of these attributes has no effect on the VNF instance, it only affects the information represented in the VnfInstance structure. - Metadata that VNF provider foresees shall be declared in the VNFD. The declaration of metadata in - the VNFD can optionally contain the specification of initial values. See note 2 and note 4. The VNFM shall - accept requests to write metadata that are not are declared in the VNFD. + Metadata that the VNF provider foresees are expected to be declared in the VNFD. (clause + 6.2.35 in ETSI GS NFV-SOL 001 [12]), like information about supported protocols and data + models for configuring the VNF. The declaration of metadata in the VNFD can optionally contain the + specification of initial values. See notes 2 and 4. The VNFM shall accept requests to write metadata + that are not declared in the VNFD. These attributes can be initialized with default values from VNFD (see note 4) and/or with values passed in the CreateVnfRequest structure (see clause 5.5.2.3). @@ -807,6 +809,47 @@ definitions: This type represents request parameters for the "Change external VNF connectivity" operation to modify the external connectivity of a VNF instance. + The following behaviour applies for the changes that can be performed with this operation: + To change the connection of external CP instances based on certain external CPDs from a "source" external + VL to a different "target" external VL, the identifier of the "target" external VL shall be sent in the + "extVirtualLinkId" attribute of the "extVirtualLinks" parameter, and the "extCps" attributes of that parameter + shall refer via the "cpdId" attribute to the external CPDs of the corresponding external connection point + instances that are to be reconnected to the target external VL. + * NOTE 1: For CP instances that are not part of a trunk this means that all CP instances based on a given external + CPD will be reconnected. See clause B.3.3 for an illustration. Likewise, for CP instances that are part of a + trunk and have the same segmentationId, all CP instances (subports) based on a given external CPD will + be connected, disconnected or reconnected. + + To change the connectivity parameters of the external CPs connected to a particular external VL, including + changing addresses, the identifier of that external VL shall be sent in the "extVirtualLinkId" attribute of the + "extVirtualLinks" parameter, and the "extCps" attribute of that parameter shall contain at least those entries + with modified parameters. + + To create a new external CP instance, this shall be based on a certain external CPD that is referenced by at + least a VDU from which the VNF instance has at least one VNFC instantiated. The newly external CP instance + connects to the same external VL as other CP instances created based on the same CPD. For creating a new + external CP instance: + The "extVirtualLinkId" attribute of the "extVirtualLinks" parameter indicates the identifier of the + external VL instance to which the new external CP instance is requested to be connected (refer to + above behavior). + + The "extCps" attribute shall refer via the "cpdId" attribute to the external CPDs from which a new + instance is to be created. + + * NOTE 2: For the capability to connect to different external VLs, refer to the use of subports. + To delete an existing external CP instance: + The "extVirtualLinkId" attribute of the "extVirtualLinks" parameter indicates the identifier of the + external VL instance from which the existing external CP instance is requested to be disconnected. + + The "extCpsDeletion" attribute shall refer via the "cpdId" attribute to the external CPD from which a + corresponding CP instance will be deleted. + + The " parentCpConfigId" of the contained "cpConfig" in the "extCps" shall refer to the particular + external CP instance to be deleted. + + * NOTE 3: If external CPs are requested to be created and connected, and disconnected and deleted in a same + operation request, the consumer can provide respective "extVirtualLinks", e.g., one for the external CPs + to be created and connected, and one for the external CPs to disconnect and delete. type: object required: - extVirtualLinks @@ -1276,6 +1319,8 @@ definitions: ExtManagedVirtualLinkInfo: description: > This type provides information about an externally-managed virtual link. + *NOTE: Both vnfLinkPort and vnfNetAttDefResource can be present in an ExtManagedVirtualLinkInfo to indicate that + a single internal virtual link is providing connectivity for both VM-based and container-based VNFCs. type: object required: - id @@ -1305,7 +1350,7 @@ definitions: $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/ResourceHandle" vnfLinkPorts: description: > - Link ports of this VL. + Link ports of this VL.See note. type: array items: $ref: "#/definitions/VnfLinkPortInfo" @@ -1316,6 +1361,13 @@ definitions: type: array items: $ref: "#/definitions/NetAttDefResourceInfo" + routingResource: + description: > + Network resources that provide the forwarding/routing capabilities associated to the + network resource realizing this VL. + type: array + items: + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/ResourceHandle" VnfcResourceInfo: description: > @@ -1439,11 +1491,12 @@ definitions: $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" certificateContentId: description: > - Identifier of the "CertificateContent" structure that provides the information of the certificate that this VNFC + Identifier(s) of the "CertificateContent" structure that provides the information of the certificate(s) that this VNFC CP instance uses. Shall be present when using in delegation-mode. Otherwise shall not be present. This attribute shall be supported when delegation mode in certificate management is applicable. - type: string - $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" + type: array + items: + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" metadata: description: > Metadata about this CP. @@ -1454,11 +1507,12 @@ definitions: $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/KeyValuePairs" certificateContentId: description: > - Identifier of the "CertificateContent" structure that provides the information of the certificate that this VNFC + Identifier(s) of the "CertificateContent" structure that provides the information of the certificate(s) that this VNFC CP instance uses. Shall be present when using in delegation-mode. Otherwise shall not be present. This attribute shall be supported when delegation mode in certificate management is applicable. - type: string - $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" + type: array + items: + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" VnfVirtualLinkResourceInfo: description: > @@ -2472,6 +2526,12 @@ definitions: type: array items: $ref: "#/definitions/NetAttDefResourceInfo" + routingResource: + description: > + Network resources that provide the forwarding/routing capabilities associated to the network resource realizing this VL. + type: array + items: + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/ResourceHandle" VnfLinkPortInfo: description: > @@ -2618,6 +2678,13 @@ definitions: layerProtocol is equal to “IP_FOR_VIRTUAL_CP” and the external CP instance exposes a virtual CP and shall not be present otherwise. $ref: "#/definitions/VirtualCpAddressInfo" + fullyQualifiedDomainNames: + description: > + Fully qualified domain names that have been configured (statically or dynamically) and been + associated to the CP. + type: array + items: + type: string IpOverEthernetAddressInfo: description: > @@ -2909,10 +2976,10 @@ definitions: $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" certificateContentId: description: > - Identifier of the "CertificateContent" structure that provides the information of the certificate that this VNF + Identifier(s) of the "CertificateContent" structure that provides the information of the certificate(s) that this VNF CP instance uses. Shall be present when using in delegation-mode. Otherwise shall not be present. This attribute shall be supported when delegation mode in certificate management is applicable. - type: string + type: array $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" CertificateInfo: @@ -3510,7 +3577,7 @@ definitions: Number of available MCIO instances. type: integer additionalInfo: - decription: > + description: > Additional information which is specific to the MCIO, its type, and which is available from the CISM. See note 2. @@ -3520,7 +3587,7 @@ definitions: Identifier of the "CertificateContent" structure that provides the information of the certificate that this VNFC CP instance uses. Shall be present when using in delegation-mode. Otherwise shall not be present. This attribute shall be supported when delegation mode in certificate management is applicable. - type: string + type: array $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" VirtualCpInfo: diff --git a/src/SOL002/VNFLifecycleManagementNotification/VNFLifecycleManagementNotification.yaml b/src/SOL002/VNFLifecycleManagementNotification/VNFLifecycleManagementNotification.yaml index efea25a0..7a61e5b6 100644 --- a/src/SOL002/VNFLifecycleManagementNotification/VNFLifecycleManagementNotification.yaml +++ b/src/SOL002/VNFLifecycleManagementNotification/VNFLifecycleManagementNotification.yaml @@ -19,8 +19,8 @@ info: version: 2.14.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 002 V5.1.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/05.01.01_60/gs_NFV-SOL002v050101p.pdf + description: ETSI GS NFV-SOL 002 V5.2.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/05.02.01_60/gs_NFV-SOL002v050201p.pdf servers: - url: http://127.0.0.1/callback/v2 diff --git a/src/SOL002/VNFPerformanceManagement/VNFPerformanceManagement.yaml b/src/SOL002/VNFPerformanceManagement/VNFPerformanceManagement.yaml index 3ac65852..9f5372aa 100644 --- a/src/SOL002/VNFPerformanceManagement/VNFPerformanceManagement.yaml +++ b/src/SOL002/VNFPerformanceManagement/VNFPerformanceManagement.yaml @@ -19,8 +19,8 @@ info: version: 2.13.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 002 V5.1.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/05.01.01_60/gs_NFV-SOL002v050101p.pdf + description: ETSI GS NFV-SOL 002 V5.2.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/05.02.01_60/gs_NFV-SOL002v050201p.pdf servers: - url: http://127.0.0.1/vnfpm/v2 diff --git a/src/SOL002/VNFPerformanceManagementNotification/VNFPerformanceManagementNotification.yaml b/src/SOL002/VNFPerformanceManagementNotification/VNFPerformanceManagementNotification.yaml index 2d63cdd4..a41622e7 100644 --- a/src/SOL002/VNFPerformanceManagementNotification/VNFPerformanceManagementNotification.yaml +++ b/src/SOL002/VNFPerformanceManagementNotification/VNFPerformanceManagementNotification.yaml @@ -19,8 +19,8 @@ info: version: 2.13.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 002 V5.1.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/05.01.01_60/gs_NFV-SOL002v050101p.pdf + description: ETSI GS NFV-SOL 002 V5.2.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/05.02.01_60/gs_NFV-SOL002v050201p.pdf servers: - url: http://127.0.0.1/callback/v2 -- GitLab From 716f68de33b36ae878d0926fa147f2f8f1b2f021 Mon Sep 17 00:00:00 2001 From: Muhammad Umair Zafar Date: Tue, 19 Nov 2024 07:44:59 +0000 Subject: [PATCH 2/5] update SOL003 OAS as per version 5.2.1 --- src/SOL003/APIVersion/APIVersion.yaml | 4 +- .../General_Definitions/SOL003_def.yaml | 35 +++++- .../VNFFaultManagement.yaml | 4 +- .../VNFFaultManagementNotification.yaml | 4 +- src/SOL003/VNFIndicator/VNFIndicator.yaml | 4 +- .../VNFIndicatorNotification.yaml | 4 +- .../VNFLifecycleManagement.yaml | 6 +- .../SOL003VNFLifecycleManagement_def.yaml | 109 +++++++++++++++--- .../VNFLifecycleManagementNotification.yaml | 6 +- .../VNFLifecycleOperationGranting.yaml | 6 +- ...L003VNFLifecycleOperationGranting_def.yaml | 19 +++ .../VNFPackageManagement.yaml | 4 +- .../VNFPackageManagementNotification.yaml | 4 +- .../VNFPerformanceManagement.yaml | 4 +- .../VNFPerformanceManagementNotification.yaml | 4 +- .../VNFSnapshotPackageManagement.yaml | 4 +- ...edResourcesQuotaAvailableNotification.yaml | 4 +- 17 files changed, 174 insertions(+), 51 deletions(-) diff --git a/src/SOL003/APIVersion/APIVersion.yaml b/src/SOL003/APIVersion/APIVersion.yaml index 3343da37..2b3e5523 100644 --- a/src/SOL003/APIVersion/APIVersion.yaml +++ b/src/SOL003/APIVersion/APIVersion.yaml @@ -20,8 +20,8 @@ info: version: "1.0.0-impl:etsi.org:ETSI_NFV_OpenAPI:1" externalDocs: - description: ETSI GS NFV-SOL 003 V5.1.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/05.01.01_60/gs_NFV-SOL003v050101p.pdf + description: ETSI GS NFV-SOL 003 V5.2.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/05.02.01_60/gs_NFV-SOL003v050201p.pdf paths: /vrqan/api_versions: diff --git a/src/SOL003/General_Definitions/SOL003_def.yaml b/src/SOL003/General_Definitions/SOL003_def.yaml index 8d1a5d48..56fab7b4 100644 --- a/src/SOL003/General_Definitions/SOL003_def.yaml +++ b/src/SOL003/General_Definitions/SOL003_def.yaml @@ -384,6 +384,7 @@ definitions: type: object required: - cpdId + - cpConfig properties: cpdId: description: > @@ -393,10 +394,13 @@ definitions: description: > Map of instance data that need to be configured on the CP instances created from the respective CPD. + The key of the map which identifies the individual VnfExtCpConfig entries is of type "IdentifierInVnf" and is managed by the NFVO. + The entries shall be applied by the VNFM according to the rules of JSON Merge Patch (see IETF RFC 7396). See notes 2, 3, 4, 5, 6. + In case of deleting an external CP, the list of instances to be deleted. type: object additionalProperties: $ref: "#/definitions/VnfExtCpConfig" @@ -452,7 +456,8 @@ definitions: Value of the key that identifies the "VnfExtCpConfig" map entry which corresponds to the parent port of the trunk. Reference to the "VnfExtCpConfig" entry that corresponds to the parent port of the trunk. Only present in "VnfExtCpConfig" structures that provide configuration information for a CP which represents a sub-port in - a trunk, and if parent ports are supported. + a trunk, and if parent ports are supported. In case of deletion of an external CP, the identifier of the + external CP instance to delete. $ref: "#/definitions/IdentifierInVnf" linkPortId: @@ -488,7 +493,8 @@ definitions: cpProtocolData: description: > Parameters for configuring the network protocols on the - link port that connects the CP to a VL. See notes 1 and 2. + link port that connects the CP to a VL and the domain + names for the external CP. See notes 1 and 2. type: array items: $ref: "#/definitions/CpProtocolData" @@ -529,6 +535,20 @@ definitions: instance exposes a virtual CP and shall not be present otherwise. $ref: "#/definitions/VirtualCpAddressData" + fullyQualifiedDomainNames: + description: > + Specifies the fully qualified domain names (FQDN) to apply to the CP. + type: array + items: + type: string + relativeDomainNames: + description: > + Specifies values of relative domain names to + be considered when setting the fully qualified + domain names. + type: array + items: + type: string IpOverEthernetAddressData: description: > @@ -716,11 +736,11 @@ definitions: * NOTE 2: An example of the network attachment definition resource when the container infrastructure service management is a Kubernetes® instance is a network attachment definition (NAD). + * NOTE 3: Either "extCps" or “extCpsDeletion" shall be present, but not both. type: object required: - id - resourceId - - extCps properties: id: description: > @@ -750,7 +770,7 @@ definitions: description: > 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. + of a request or response that modifies the external connectivity. See note 3. type: array items: $ref: "#/definitions/VnfExtCpData" @@ -775,6 +795,13 @@ definitions: type: array items: $ref: "#/definitions/NetAttDefResourceData" + extCpsDeletion: + description: > + External CPs of the VNF to be disconnected from this + external VL and to be deleted. See note 3. + type: array + items: + $ref: "#/definitions/VnfExtCpData" PaasServiceHandle: description: > diff --git a/src/SOL003/VNFFaultManagement/VNFFaultManagement.yaml b/src/SOL003/VNFFaultManagement/VNFFaultManagement.yaml index 6aba46da..045884c5 100644 --- a/src/SOL003/VNFFaultManagement/VNFFaultManagement.yaml +++ b/src/SOL003/VNFFaultManagement/VNFFaultManagement.yaml @@ -19,8 +19,8 @@ info: version: "1.14.0-impl:etsi.org:ETSI_NFV_OpenAPI:1" externalDocs: - description: ETSI GS NFV-SOL 003 V5.1.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/05.01.01_60/gs_NFV-SOL003v050101p.pdf + description: ETSI GS NFV-SOL 003 V5.2.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/05.02.01_60/gs_NFV-SOL003v050201p.pdf servers: - url: http://127.0.0.1/vnffm/v1 diff --git a/src/SOL003/VNFFaultManagementNotification/VNFFaultManagementNotification.yaml b/src/SOL003/VNFFaultManagementNotification/VNFFaultManagementNotification.yaml index 06638f2e..2ea58c3a 100644 --- a/src/SOL003/VNFFaultManagementNotification/VNFFaultManagementNotification.yaml +++ b/src/SOL003/VNFFaultManagementNotification/VNFFaultManagementNotification.yaml @@ -19,8 +19,8 @@ info: version: 1.14.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 003 V5.1.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/05.01.01_60/gs_NFV-SOL003v050101p.pdf + description: ETSI GS NFV-SOL 003 V5.2.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/05.02.01_60/gs_NFV-SOL003v050201p.pdf servers: - url: http://127.0.0.1/callback/v1 diff --git a/src/SOL003/VNFIndicator/VNFIndicator.yaml b/src/SOL003/VNFIndicator/VNFIndicator.yaml index f731ec57..e3aae199 100644 --- a/src/SOL003/VNFIndicator/VNFIndicator.yaml +++ b/src/SOL003/VNFIndicator/VNFIndicator.yaml @@ -19,8 +19,8 @@ info: version: "1.13.0-impl:etsi.org:ETSI_NFV_OpenAPI:1" externalDocs: - description: ETSI GS NFV-SOL 003 V5.1.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/05.01.01_60/gs_NFV-SOL003v050101p.pdf + description: ETSI GS NFV-SOL 003 V5.2.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/05.02.01_60/gs_NFV-SOL003v050201p.pdf servers: - url: http://127.0.0.1/vnfind/v1 diff --git a/src/SOL003/VNFIndicatorNotification/VNFIndicatorNotification.yaml b/src/SOL003/VNFIndicatorNotification/VNFIndicatorNotification.yaml index 70f452be..cc7775ba 100644 --- a/src/SOL003/VNFIndicatorNotification/VNFIndicatorNotification.yaml +++ b/src/SOL003/VNFIndicatorNotification/VNFIndicatorNotification.yaml @@ -19,8 +19,8 @@ info: version: "1.13.0-impl:etsi.org:ETSI_NFV_OpenAPI:1" externalDocs: - description: ETSI GS NFV-SOL 003 V5.1.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/05.01.01_60/gs_NFV-SOL003v050101p.pdf + description: ETSI GS NFV-SOL 003 V5.2.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/05.02.01_60/gs_NFV-SOL003v050201p.pdf servers: - url: http://127.0.0.1/callback/v1 diff --git a/src/SOL003/VNFLifecycleManagement/VNFLifecycleManagement.yaml b/src/SOL003/VNFLifecycleManagement/VNFLifecycleManagement.yaml index 1fec46b8..42746fed 100644 --- a/src/SOL003/VNFLifecycleManagement/VNFLifecycleManagement.yaml +++ b/src/SOL003/VNFLifecycleManagement/VNFLifecycleManagement.yaml @@ -16,11 +16,11 @@ info: license: name: ETSI Forge copyright notice url: https://forge.etsi.org/etsi-forge-copyright-notice.txt - version: "2.14.0-impl:etsi.org:ETSI_NFV_OpenAPI:1" + version: "2.15.0-impl:etsi.org:ETSI_NFV_OpenAPI:1" externalDocs: - description: ETSI GS NFV-SOL 003 V5.1.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/05.01.01_60/gs_NFV-SOL003v050101p.pdf + description: ETSI GS NFV-SOL 003 V5.2.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/05.02.01_60/gs_NFV-SOL003v050201p.pdf servers: - url: http://127.0.0.1/vnflcm/v2 diff --git a/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml b/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml index 68b91fa5..1da90b1d 100644 --- a/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml +++ b/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml @@ -158,6 +158,8 @@ definitions: information. It is sufficient to include one intCp for the related CPD. The case of using, for a scalable VDU, a cloud native template in the MCIOP that describes one single VNFC instance is not specified in the present document version + * NOTE 5: Both "vnfLinkPort" and "netAttDefResource" attributes can be provided in a "ExtManagedVirtualLinkData" to indicate + that a single internal virtual link is providing connectivity for both VM-based and container-based VNFCs type: object required: - id @@ -197,7 +199,7 @@ definitions: Externally provided network attachment definition resource(s) that provide the specification of the interface to attach VNFC connection points to this externallymanaged VL. - See notes 1 and 3. + See notes 1, 3 and 5. type: array items: $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/NetAttDefResourceData" @@ -212,7 +214,7 @@ definitions: description: > Externally provided link ports to be used to connect VNFC connection points to this externally-managed VL on this network resource. If this attribute is not present, the VNFM shall create the link ports on the - externally-managed VL. See note 2. + externally-managed VL. See notes 2 and 5. type: array items: $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/VnfLinkPortData" @@ -481,6 +483,48 @@ definitions: This type represents request parameters for the "Change external VNF connectivity" operation to modify the external connectivity of a VNF instance. + The following behaviour applies for the changes that can be performed with this operation: + To change the connection of external CP instances based on certain external CPDs from a "source" external + VL to a different "target" external VL, the identifier of the "target" external VL shall be sent in the + "extVirtualLinkId" attribute of the "extVirtualLinks" parameter, and the "extCps" attributes of that parameter + shall refer via the "cpdId" attribute to the external CPDs of the corresponding external connection point + instances that are to be reconnected to the target external VL. + + * NOTE 1: For CP instances that are not part of a trunk this means that all CP instances based on a given external + CPD will be reconnected. See clause B.3.3 for an illustration. Likewise, for CP instances that are part of a + trunk and have the same segmentationId, all CP instances (subports) based on a given external CPD will + be connected, disconnected or reconnected. + + To change the connectivity parameters of the external CPs connected to a particular external VL, including + changing addresses, the identifier of that external VL shall be sent in the "extVirtualLinkId" attribute of the + "extVirtualLinks" parameter, and the "extCps" attribute of that parameter shall contain at least those entries + with modified parameters. + + To create a new external CP instance, this shall be based on a certain external CPD that is referenced by at + least a VDU from which the VNF instance has at least one VNFC instantiated. The newly external CP instance + connects to the same external VL as other CP instances created based on the same CPD. For creating a new + external CP instance: + The "extVirtualLinkId" attribute of the "extVirtualLinks" parameter indicates the identifier of the + external VL instance to which the new external CP instance is requested to be connected (refer to + above behavior). + + The "extCps" attribute shall refer via the "cpdId" attribute to the external CPDs from which a new + instance is to be created. + + * NOTE 2: For the capability to connect to different external VLs, refer to the use of subports. + To delete an existing external CP instance: + The "extVirtualLinkId" attribute of the "extVirtualLinks" parameter indicates the identifier of the + external VL instance from which the existing external CP instance is requested to be disconnected. + + The "extCpsDeletion" attribute shall refer via the "cpdId" attribute to the external CPD from which a + corresponding CP instance will be deleted. + + The " parentCpConfigId" of the contained "cpConfig" in the "extCps" shall refer to the particular + external CP instance to be deleted. + + * NOTE 3: If external CPs are requested to be created and connected, and disconnected and deleted in a same + operation request, the consumer can provide respective "extVirtualLinks", e.g., one for the external CPs + to be created and connected, and one for the external CPs to disconnect and delete. type: object required: - extVirtualLinks @@ -1277,9 +1321,10 @@ definitions: Modifying the values of these attributes has no effect on the VNF instance, it only affects the information represented in the VnfInstance structure. - Metadata that the VNF provider foresees are expected to be declared in the VNFD. The declaration - of metadata in the VNFD can optionally contain the specification of initial values. See notes 2 and 4. - The VNFM shall accept requests to write metadata that are not declared in the VNFD. + Metadata that the VNF provider foresees are expected to be declared in the VNFD (clause 6.2.35 in + ETSI GS NFV-SOL 001 [14]), like information about supported protocols and data models for configuring the + VNF. The declaration of metadata in the VNFD can optionally contain the specification of initial values. + See notes 2 and 4. The VNFM shall accept requests to write metadata that are not declared in the VNFD. These attributes can be initialized with default values from the VNFD (see note 4) or with values passed in the CreateVnfRequest structure (see clause 5.4.2.3.1). @@ -1399,6 +1444,11 @@ definitions: $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Link" ExtManagedVirtualLinkInfo: + description: > + This type provides information about an externally-managed virtual link. + Note: Both "vnfLinkPort" and "vnfNetAttDefResource" attributes can be present in an "ExtManagedVirtualLinkInfo" to + indicate that a single internal virtual link is providing connectivity for both VM-based and container-based + VNFCs. type: object required: - id @@ -1428,14 +1478,14 @@ definitions: $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/ResourceHandle" vnfLinkPorts: description: > - Link ports of this VL. + Link ports of this VL. See note. type: array items: $ref: "#/definitions/VnfLinkPortInfo" vnfNetAttDefResource: description: > Network attachment definition resources that provide the specification of the interface to attach connection - points to this VL. + points to this VL. See note. type: array items: $ref: "#/definitions/NetAttDefResourceInfo" @@ -1447,6 +1497,12 @@ definitions: All externally-managed internal VL instances corresponding to an internal VL created based on the same virtualLinkDescId shall refer to the same extManagedMultisiteVirtualLinkId. $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" + routingResource: + description: > + Network resources that provide the forwarding/routing capabilities associated to the + network resource realizing this VL. + type: array + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/ResourceHandle" VirtualStorageResourceInfo: description: > @@ -1632,20 +1688,24 @@ definitions: $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/KeyValuePairs" certificateContentId: description: > - Identifier of the "CertificateContent" structure that provides the information of the certificate that this VNFC + Identifier(s) of the "CertificateContent" structure that provides the information of the certificate(s) that this VNFC CP instance uses. Shall be present when using in delegation-mode. Otherwise shall not be present. This attribute shall be supported when delegation mode in certificate management is applicable - $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" + type: array + items: + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" metadata: description: > Metadata about this resource. $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/KeyValuePairs" certificateContentId: description: > - Identifier of the "CertificateContent" structure that provides the information of the certificate that this VNFC + Identifier(s) of the "CertificateContent" structure that provides the information of the certificate(s) that this VNFC instance uses. Shall be present when using in delegation-mode. Otherwise shall not be present. This attribute shall be supported when delegation mode in certificate management is applicable. - $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" + type: array + items: + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" VnfSnapshotInfo: description: > This type represents an "Individual VNF snapshot" resource. @@ -3443,6 +3503,12 @@ definitions: type: array items: $ref: "#/definitions/NetAttDefResourceInfo" + fullyQualifiedDomainNames: + description: > + Fully qualified domain names that have been configured (statically or dynamically) and been associated to the CP. + type: array + items: + type: string VnfLinkPortInfo: description: > @@ -3589,6 +3655,13 @@ definitions: layerProtocol is equal to “IP_FOR_VIRTUAL_CP” and the external CP instance exposes a virtual CP and shall not be present otherwise. $ref: "#/definitions/VirtualCpAddressInfo" + fullyQualifiedDomainNames: + description: > + Fully qualified domain names that have been configured (statically or dynamically) and been + associated to the CP. + type: array + items: + type: string IpOverEthernetAddressInfo: description: > @@ -3883,10 +3956,12 @@ definitions: $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" certificateContentId: description: > - Identifier of the "CertificateContent" structure that provides the information of the certificate that this + Identifier(s) of the "CertificateContent" structure that provides the information of the certificate(s) that this VNF CP instance uses. Shall be present when using in delegation-mode. Otherwise shall not be present. This attribute shall be supported when delegation mode in certificate management is applicable. - $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" + type: array + items: + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" VnfOperationalStateType: description: > STARTED: The VNF instance is up and running. @@ -4412,17 +4487,19 @@ definitions: Number of available MCIO instances. type: integer additionalInfo: - decription: > + description: > Additional information which is specific to the MCIO, its type, and which is available from the CISM. See note 2. $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/KeyValuePairs" certificateContentId: description: > - Identifier of the "CertificateContent" structure that provides the information of the certificate that this + Identifier(s) of the "CertificateContent" structure that provides the information of the certificate(s) that this MCIO instance uses. Shall be present when using in delegation mode. Otherwise shall not be present. This attribute shall be supported when delegation mode in certificate management is applicable. - $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" + type: array + items: + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" VirtualCpInfo: description: > This type provides information related to a virtual CP instance of a VNF. diff --git a/src/SOL003/VNFLifecycleManagementNotification/VNFLifecycleManagementNotification.yaml b/src/SOL003/VNFLifecycleManagementNotification/VNFLifecycleManagementNotification.yaml index aba43c0b..4b0d443c 100644 --- a/src/SOL003/VNFLifecycleManagementNotification/VNFLifecycleManagementNotification.yaml +++ b/src/SOL003/VNFLifecycleManagementNotification/VNFLifecycleManagementNotification.yaml @@ -16,11 +16,11 @@ info: license: name: "ETSI Forge copyright notice" url: https://forge.etsi.org/etsi-forge-copyright-notice.txt - version: "2.14.0-impl:etsi.org:ETSI_NFV_OpenAPI:1" + version: "2.15.0-impl:etsi.org:ETSI_NFV_OpenAPI:1" externalDocs: - description: ETSI GS NFV-SOL 003 V5.1.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/05.01.01_60/gs_NFV-SOL003v050101p.pdf + description: ETSI GS NFV-SOL 003 V5.2.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/05.02.01_60/gs_NFV-SOL003v050201p.pdf servers: - url: http://127.0.0.1/callback/v2 diff --git a/src/SOL003/VNFLifecycleOperationGranting/VNFLifecycleOperationGranting.yaml b/src/SOL003/VNFLifecycleOperationGranting/VNFLifecycleOperationGranting.yaml index 0eedbe7c..3d76f1c5 100644 --- a/src/SOL003/VNFLifecycleOperationGranting/VNFLifecycleOperationGranting.yaml +++ b/src/SOL003/VNFLifecycleOperationGranting/VNFLifecycleOperationGranting.yaml @@ -16,11 +16,11 @@ info: license: name: ETSI Forge copyright notice url: https://forge.etsi.org/etsi-forge-copyright-notice.txt - version: "1.13.0-impl:etsi.org:ETSI_NFV_OpenAPI:1" + version: "1.14.0-impl:etsi.org:ETSI_NFV_OpenAPI:1" externalDocs: - description: ETSI GS NFV-SOL 003 V5.1.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/05.01.01_60/gs_NFV-SOL003v050101p.pdf + description: ETSI GS NFV-SOL 003 V5.2.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/05.02.01_60/gs_NFV-SOL003v050201p.pdf servers: - url: http://127.0.0.1/grant/v1 diff --git a/src/SOL003/VNFLifecycleOperationGranting/definitions/SOL003VNFLifecycleOperationGranting_def.yaml b/src/SOL003/VNFLifecycleOperationGranting/definitions/SOL003VNFLifecycleOperationGranting_def.yaml index e8192b61..57328f63 100644 --- a/src/SOL003/VNFLifecycleOperationGranting/definitions/SOL003VNFLifecycleOperationGranting_def.yaml +++ b/src/SOL003/VNFLifecycleOperationGranting/definitions/SOL003VNFLifecycleOperationGranting_def.yaml @@ -591,11 +591,25 @@ definitions: operation to be granted concerns to creating a VNF snapshot from the VNF or to reverting the VNF to a VNF snapshot. $ref: "#/definitions/SnapshotResourceDefinition" + resourceUsageRequirement: + description: > + The type of resource usage requirement. A resource can be + shared among VNF instances or dedicated to a single VNF + instance. + Permitted values: + DEDICATED + SHARED + Default value is "DEDICATED". + type: string + enum: + - DEDICATED + - SHARED GrantInfo: description: > This type contains information about a Compute, storage or network resource whose addition/update/deletion was granted. It enables also referencing to a PaaS Service request definition which has been granted. + NOTE: If a "sharedResource" is provided, the "reservationId" and "resourceProviderId" shall not be set. type: object required: - resourceDefinitionId @@ -675,6 +689,11 @@ definitions: type: array items: $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/KeyValuePairs" + sharedResource: + description: > + Resource information for an existing resource. Shall be set when an existing allocated resource is approved + to be shared and reused for the resource defined by ResourceDefinition. See note. + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/ResourceHandle" ZoneInfo: description: > This type provides information regarding a resource zone. diff --git a/src/SOL003/VNFPackageManagement/VNFPackageManagement.yaml b/src/SOL003/VNFPackageManagement/VNFPackageManagement.yaml index 8f8bf692..5e7b0453 100644 --- a/src/SOL003/VNFPackageManagement/VNFPackageManagement.yaml +++ b/src/SOL003/VNFPackageManagement/VNFPackageManagement.yaml @@ -19,8 +19,8 @@ info: version: "2.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1" externalDocs: - description: ETSI GS NFV-SOL 003 V5.1.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/05.01.01_60/gs_NFV-SOL003v050101p.pdf + description: ETSI GS NFV-SOL 003 V5.2.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/05.02.01_60/gs_NFV-SOL003v050201p.pdf servers: - url: http://127.0.0.1/vnfpkgm/v2 diff --git a/src/SOL003/VNFPackageManagementNotification/VNFPackageManagementNotification.yaml b/src/SOL003/VNFPackageManagementNotification/VNFPackageManagementNotification.yaml index 18e34990..a3741db2 100644 --- a/src/SOL003/VNFPackageManagementNotification/VNFPackageManagementNotification.yaml +++ b/src/SOL003/VNFPackageManagementNotification/VNFPackageManagementNotification.yaml @@ -19,8 +19,8 @@ info: version: 2.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 003 V5.1.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/05.01.01_60/gs_NFV-SOL003v050101p.pdf + description: ETSI GS NFV-SOL 003 V5.2.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/05.02.01_60/gs_NFV-SOL003v050201p.pdf servers: - url: http://127.0.0.1/callback/v2 diff --git a/src/SOL003/VNFPerformanceManagement/VNFPerformanceManagement.yaml b/src/SOL003/VNFPerformanceManagement/VNFPerformanceManagement.yaml index 731e6a12..18dce358 100644 --- a/src/SOL003/VNFPerformanceManagement/VNFPerformanceManagement.yaml +++ b/src/SOL003/VNFPerformanceManagement/VNFPerformanceManagement.yaml @@ -19,8 +19,8 @@ info: version: 2.13.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 003 V5.1.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/05.01.01_60/gs_NFV-SOL003v050101p.pdf + description: ETSI GS NFV-SOL 003 V5.2.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/05.02.01_60/gs_NFV-SOL003v050201p.pdf servers: - url: http://127.0.0.1/vnfpm/v2 diff --git a/src/SOL003/VNFPerformanceManagementNotification/VNFPerformanceManagementNotification.yaml b/src/SOL003/VNFPerformanceManagementNotification/VNFPerformanceManagementNotification.yaml index 3bd0b78e..a7c720ea 100644 --- a/src/SOL003/VNFPerformanceManagementNotification/VNFPerformanceManagementNotification.yaml +++ b/src/SOL003/VNFPerformanceManagementNotification/VNFPerformanceManagementNotification.yaml @@ -19,8 +19,8 @@ info: version: 2.13.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 003 V5.1.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/05.01.01_60/gs_NFV-SOL003v050101p.pdf + description: ETSI GS NFV-SOL 003 V5.2.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/05.02.01_60/gs_NFV-SOL003v050201p.pdf servers: - url: http://127.0.0.1/callback/v2 diff --git a/src/SOL003/VNFSnapshotPackageManagement/VNFSnapshotPackageManagement.yaml b/src/SOL003/VNFSnapshotPackageManagement/VNFSnapshotPackageManagement.yaml index 8f715db9..9b84ddbc 100644 --- a/src/SOL003/VNFSnapshotPackageManagement/VNFSnapshotPackageManagement.yaml +++ b/src/SOL003/VNFSnapshotPackageManagement/VNFSnapshotPackageManagement.yaml @@ -19,8 +19,8 @@ info: version: 1.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 003 V5.1.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/05.01.01_60/gs_NFV-SOL003v050101p.pdf + description: ETSI GS NFV-SOL 003 V5.2.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/05.02.01_60/gs_NFV-SOL003v050201p.pdf servers: - url: http://127.0.0.1/vnfsnapshotpkgm/v1 diff --git a/src/SOL003/VirtualisedResourcesQuotaAvailableNotification/VirtualisedResourcesQuotaAvailableNotification.yaml b/src/SOL003/VirtualisedResourcesQuotaAvailableNotification/VirtualisedResourcesQuotaAvailableNotification.yaml index f4243caf..935806ad 100644 --- a/src/SOL003/VirtualisedResourcesQuotaAvailableNotification/VirtualisedResourcesQuotaAvailableNotification.yaml +++ b/src/SOL003/VirtualisedResourcesQuotaAvailableNotification/VirtualisedResourcesQuotaAvailableNotification.yaml @@ -19,8 +19,8 @@ info: version: "1.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1" externalDocs: - description: ETSI GS NFV-SOL 003 V5.1.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/05.01.01_60/gs_NFV-SOL003v050101p.pdf + description: ETSI GS NFV-SOL 003 V5.2.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/05.02.01_60/gs_NFV-SOL003v050201p.pdf servers: - url: http://127.0.0.1/vrqan/v1 -- GitLab From 414583879b103918e48c4242a6b4f51d445caa49 Mon Sep 17 00:00:00 2001 From: Muhammad Umair Zafar Date: Mon, 9 Dec 2024 11:35:33 +0000 Subject: [PATCH 3/5] update the version of Readme file from 5.1.1 to 5.2.1 --- Readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Readme.md b/Readme.md index 1ee9a32f..b87803ad 100644 --- a/Readme.md +++ b/Readme.md @@ -1,7 +1,7 @@ # NFV SOL002 and SOL003 APIs This repository hosts the [OpenAPI](https://www.openapis.org/) specificatons and other documentation -for the APIs defined in ETSI NFV GSs SOL002 and SOL003 v5.1.1. +for the APIs defined in ETSI NFV GSs SOL002 and SOL003 v5.2.1. The APIs described in this repository are defined for the following reference points: -- GitLab From d09fd8cc756205606032d0ddde8945b07bfcfce8 Mon Sep 17 00:00:00 2001 From: Muhammad Umair Zafar Date: Wed, 11 Dec 2024 10:41:05 +0000 Subject: [PATCH 4/5] remove resourceTemplateId from oneOf section of OsContainerDescData --- src/SOL002/General_Definitions/SOL002_def.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/SOL002/General_Definitions/SOL002_def.yaml b/src/SOL002/General_Definitions/SOL002_def.yaml index 53879872..531e8af1 100644 --- a/src/SOL002/General_Definitions/SOL002_def.yaml +++ b/src/SOL002/General_Definitions/SOL002_def.yaml @@ -198,8 +198,6 @@ definitions: required: - resourceTemplateId oneOf: - - required: - - resourceTemplateId - required: - requestedCpuResources - required: -- GitLab From 749af5d3c3d10172da4c9814a7fd2e37d475e0ba Mon Sep 17 00:00:00 2001 From: Muhammad Umair Zafar Date: Wed, 11 Dec 2024 11:59:51 +0000 Subject: [PATCH 5/5] resolve issue # 22 as per SOL 002 v5.2.1 --- .../definitions/SOL002VNFFaultManagement_def.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SOL002/VNFFaultManagement/definitions/SOL002VNFFaultManagement_def.yaml b/src/SOL002/VNFFaultManagement/definitions/SOL002VNFFaultManagement_def.yaml index 1989bef2..b230f470 100644 --- a/src/SOL002/VNFFaultManagement/definitions/SOL002VNFFaultManagement_def.yaml +++ b/src/SOL002/VNFFaultManagement/definitions/SOL002VNFFaultManagement_def.yaml @@ -288,7 +288,7 @@ definitions: description: > The URI of the endpoint to send the notification to. $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Uri" - pmJobConnection: + fmConnection: description: > An access information and interface information to monitor the FM of VNF instance by the VNFM. This can include for instance certain interface endpoint URI together with necessary credentials to access it. -- GitLab