From 7377dff67f3950139519aa0921a026ca8dacb69b Mon Sep 17 00:00:00 2001 From: Ayesha Ayub Date: Wed, 15 Jun 2022 14:17:34 +0500 Subject: [PATCH 01/41] update versions from 3.6.1 to 4.3.1 for SOL002 --- src/SOL002/APIVersion/APIVersion.yaml | 4 ++-- src/SOL002/VNFConfiguration/VNFConfiguration.yaml | 6 +++--- src/SOL002/VNFFaultManagement/VNFFaultManagement.yaml | 6 +++--- .../VNFFaultManagementNotification.yaml | 6 +++--- src/SOL002/VNFIndicator/VNFIndicator.yaml | 6 +++--- .../VNFIndicatorNotification/VNFIndicatorNotification.yaml | 6 +++--- .../VNFLifecycleCoordination/VNFLifecycleCoordination.yaml | 6 +++--- .../VNFLifecycleManagement/VNFLifecycleManagement.yaml | 6 +++--- .../VNFLifecycleManagementNotification.yaml | 6 +++--- .../VNFPerformanceManagement/VNFPerformanceManagement.yaml | 6 +++--- .../VNFPerformanceManagementNotification.yaml | 6 +++--- 11 files changed, 32 insertions(+), 32 deletions(-) diff --git a/src/SOL002/APIVersion/APIVersion.yaml b/src/SOL002/APIVersion/APIVersion.yaml index c481b196..078b5901 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 V3.6.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/03.06.01_60/gs_NFV-SOL002v030601p.pdf + description: ETSI GS NFV-SOL 002 V4.3.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/04.03.01_60/gs_NFV-SOL002v040301p.pdf paths: /vnfconfig/api_versions: diff --git a/src/SOL002/VNFConfiguration/VNFConfiguration.yaml b/src/SOL002/VNFConfiguration/VNFConfiguration.yaml index 1ae7e870..94a6ff2b 100644 --- a/src/SOL002/VNFConfiguration/VNFConfiguration.yaml +++ b/src/SOL002/VNFConfiguration/VNFConfiguration.yaml @@ -16,11 +16,11 @@ info: license: name: ETSI Forge copyright notice url: https://forge.etsi.org/etsi-forge-copyright-notice.txt - version: 1.2.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 + version: 1.10.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 002 V3.6.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/03.06.01_60/gs_NFV-SOL002v030601p.pdf + description: ETSI GS NFV-SOL 002 V4.3.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/04.03.01_60/gs_NFV-SOL002v040301p.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 2a5e496e..060c01e5 100644 --- a/src/SOL002/VNFFaultManagement/VNFFaultManagement.yaml +++ b/src/SOL002/VNFFaultManagement/VNFFaultManagement.yaml @@ -16,11 +16,11 @@ 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.10.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 002 V3.6.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/03.06.01_60/gs_NFV-SOL002v030601p.pdf + description: ETSI GS NFV-SOL 002 V4.3.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/04.03.01_60/gs_NFV-SOL002v040301p.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 60d9631e..255db4dc 100644 --- a/src/SOL002/VNFFaultManagementNotification/VNFFaultManagementNotification.yaml +++ b/src/SOL002/VNFFaultManagementNotification/VNFFaultManagementNotification.yaml @@ -16,11 +16,11 @@ 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.10.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 002 V3.6.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/03.06.01_60/gs_NFV-SOL002v030601p.pdf + description: ETSI GS NFV-SOL 002 V4.3.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/04.03.01_60/gs_NFV-SOL002v040301p.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 2fbcd440..bf58b2f7 100644 --- a/src/SOL002/VNFIndicator/VNFIndicator.yaml +++ b/src/SOL002/VNFIndicator/VNFIndicator.yaml @@ -16,11 +16,11 @@ info: license: name: ETSI Forge copyright notice url: https://forge.etsi.org/etsi-forge-copyright-notice.txt - version: 1.3.1-impl:etsi.org:ETSI_NFV_OpenAPI:1 + version: 1.10.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 002 V3.6.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/03.06.01_60/gs_NFV-SOL002v030601p.pdf + description: ETSI GS NFV-SOL 002 V4.3.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/04.03.01_60/gs_NFV-SOL002v040301p.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 be7145b9..1e004d94 100644 --- a/src/SOL002/VNFIndicatorNotification/VNFIndicatorNotification.yaml +++ b/src/SOL002/VNFIndicatorNotification/VNFIndicatorNotification.yaml @@ -16,11 +16,11 @@ info: license: name: ETSI Forge copyright notice url: https://forge.etsi.org/etsi-forge-copyright-notice.txt - version: 1.3.1-impl:etsi.org:ETSI_NFV_OpenAPI:1 + version: 1.10.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 002 V3.6.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/03.06.01_60/gs_NFV-SOL002v030601p.pdf + description: ETSI GS NFV-SOL 002 V4.3.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/04.03.01_60/gs_NFV-SOL002v040301p.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 01690249..fa7a4476 100644 --- a/src/SOL002/VNFLifecycleCoordination/VNFLifecycleCoordination.yaml +++ b/src/SOL002/VNFLifecycleCoordination/VNFLifecycleCoordination.yaml @@ -16,11 +16,11 @@ 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.10.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 002 V3.6.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/03.06.01_60/gs_NFV-SOL002v030601p.pdf + description: ETSI GS NFV-SOL 002 V4.3.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/04.03.01_60/gs_NFV-SOL002v040301p.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 dcff6e40..fc6e65d7 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.2.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 + version: 2.10.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 002 V3.6.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/03.06.01_60/gs_NFV-SOL002v030601p.pdf + description: ETSI GS NFV-SOL 002 V4.3.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/04.03.01_60/gs_NFV-SOL002v040301p.pdf servers: - url: http://127.0.0.1/vnflcm/v2 diff --git a/src/SOL002/VNFLifecycleManagementNotification/VNFLifecycleManagementNotification.yaml b/src/SOL002/VNFLifecycleManagementNotification/VNFLifecycleManagementNotification.yaml index a3a49f41..1fe73d45 100644 --- a/src/SOL002/VNFLifecycleManagementNotification/VNFLifecycleManagementNotification.yaml +++ b/src/SOL002/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.2.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 + version: 2.10.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 002 V3.6.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/03.06.01_60/gs_NFV-SOL002v030601p.pdf + description: ETSI GS NFV-SOL 002 V4.3.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/04.03.01_60/gs_NFV-SOL002v040301p.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 e72a10cc..c433bd98 100644 --- a/src/SOL002/VNFPerformanceManagement/VNFPerformanceManagement.yaml +++ b/src/SOL002/VNFPerformanceManagement/VNFPerformanceManagement.yaml @@ -16,11 +16,11 @@ 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.10.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 002 V3.6.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/03.06.01_60/gs_NFV-SOL002v030601p.pdf + description: ETSI GS NFV-SOL 002 V4.3.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/04.03.01_60/gs_NFV-SOL002v040301p.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 8c90b809..9b50eee1 100644 --- a/src/SOL002/VNFPerformanceManagementNotification/VNFPerformanceManagementNotification.yaml +++ b/src/SOL002/VNFPerformanceManagementNotification/VNFPerformanceManagementNotification.yaml @@ -16,11 +16,11 @@ 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.10.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 002 V3.6.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/03.06.01_60/gs_NFV-SOL002v030601p.pdf + description: ETSI GS NFV-SOL 002 V4.3.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/04.03.01_60/gs_NFV-SOL002v040301p.pdf servers: - url: http://127.0.0.1/callback/v2 -- GitLab From 4513bf99b554307aee66acd6e3a1b00a8dbb9db8 Mon Sep 17 00:00:00 2001 From: Ayesha Ayub Date: Thu, 16 Jun 2022 11:20:45 +0500 Subject: [PATCH 02/41] update SOL002VNFLifecycleManagement --- .../SOL002VNFLifecycleManagement_def.yaml | 60 ++++++++++++++----- ...OL002SOL003VNFLifecycleManagement_def.yaml | 4 +- src/definitions/SOL002SOL003_def.yaml | 2 +- 3 files changed, 49 insertions(+), 17 deletions(-) diff --git a/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml b/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml index b82ce06a..7ec56150 100644 --- a/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml +++ b/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml @@ -362,11 +362,18 @@ definitions: InstantiateVnfRequest: description: > This type represents request parameters for the "Instantiate VNF" operation. - * NOTE: The indication of externally-managed internal VLs is needed in case networks have been - pre-configured for use with certain VNFs, for instance to ensure that these networks have certain - properties such as security or acceleration features, or to address particular network topologies. - The present document assumes that externally-managed internal VLs are managed by the NFVO and - created towards the VIM. + * NOTE 1: The indication of externally-managed internal VLs is needed in case networks have been + pre-configured for use with certain VNFs, for instance to ensure that these networks have certain + properties such as security or acceleration features, or to address particular network topologies. + The present document assumes that externally-managed internal VLs are managed by the NFVO and + created towards the VIM. + NOTE 2: The target size for VNF instantiation may be specified in either instantiationLevelId or targetScaleLevelInfo, + but not both. If none of the two attributes (instantiationLevelId or targetScaleLevelInfo) are + present, the default instantiation level as declared in the VNFD shall be used. + NOTE 3: If targetScaleLevelInfo is specified, information provided in targetScaleLevelInfo shall be used for + instantiating scalable constituents of the VNF (e.g, VDUs/VLs). For scaling aspects not specified in + targetScaleLevelInfo or for the VNF constituents (e.g., VDUs/VLs) that are not scalable, the default + instantiation level as declared in the VNFD shall be used for instantiation. type: object required: - flavourId @@ -378,9 +385,17 @@ definitions: instantiationLevelId: description: > Identifier of the instantiation level of the deployment flavour to be - instantiated. If not present, the default instantiation level as - declared in the VNFD is instantiated. + instantiated. See note 2. $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + targetScaleLevelInfo: + description: > + This attribute is applicable if VNF supports target scale level instantiation. + For each scaling aspect of the current deployment flavour, the attribute specifies + the scale level of VNF constituents (e.g., VDU level) to be instantiated. See notes 2 + and 3. + type: array + items: + $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/ScaleInfo" extVirtualLinks: description: > Information about external VLs to connect the VNF to, including configuration information @@ -394,7 +409,7 @@ definitions: $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ExtVirtualLinkData" extManagedVirtualLinks: description: > - Information about external VLs to connect the VNF to. See note. + Information about external VLs to connect the VNF to. See note 1. type: array items: $ref: "#/definitions/ExtManagedVirtualLinkData" @@ -407,7 +422,7 @@ definitions: description: > Additional input parameters for the instantiation process, specific to the VNF being instantiated, as declared in the VNFD as part of - "InstantiateVnfOpConfig". + "InstantiateVnfOpConfig" defined in ETSI GS NFV-IFA 011 [7]. $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" extensions: description: > @@ -425,11 +440,20 @@ definitions: ChangeVnfFlavourRequest: description: > This type represents request parameters for the "Change VNF flavour" operation. - * NOTE: The indication of externally-managed internal VLs is needed in case networks have been + * NOTE 1: The indication of externally-managed internal VLs is needed in case networks have been pre-configured for use with certain VNFs, for instance to ensure that these networks have certain properties such as security or acceleration features, or to address particular network topologies. The present document assumes that externally-managed internal VLs are managed by the NFVO and created towards the VIM. + NOTE 2: The target size for VNF instantiation may be specified in either instantiationLevelId or + targetScaleLevelInfo, but not both. If none of the two attributes (instantiationLevelId + or targetScaleLevelInfo) are present, the default instantiation level as declared in the + VNFD shall be used. + NOTE 3: If targetScaleLevelInfo is specified, information provided in targetScaleLevelInfo shall + be used for instantiating scalable constituents of the VNF (e.g, VDUs/VLs). For scaling + aspects not specified in targetScaleLevelInfo or for the VNF constituents (e.g., VDUs/VLs) + that are not scalable, the default instantiation level as declared in the VNFD shall be used + for instantiation. type: object required: - newFlavourId @@ -441,9 +465,17 @@ definitions: instantiationLevelId: description: > Identifier of the instantiation level of the deployment flavour to - be instantiated. If not present, the default instantiation level as - declared in the VNFD is instantiated. + be instantiated. See note 2. $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + targetScaleLevelInfo: + description: > + This attribute is applicable if VNF supports target scale level instantiation. + For each scaling aspect of the current deployment flavour, the attribute specifies + the scale level of VNF constituents (e.g., VDU level) to be instantiated. See notes 2 + and 3. + type: array + items: + $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/ScaleInfo" extVirtualLinks: description: > Information about external VLs to connect the VNF to, including configuration information @@ -460,7 +492,7 @@ definitions: $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ExtVirtualLinkData" extManagedVirtualLinks: description: > - Information about external VLs to connect the VNF to. See note. + Information about external VLs to connect the VNF to. See note 1. type: array items: $ref: "#/definitions/ExtManagedVirtualLinkData" @@ -468,7 +500,7 @@ definitions: description: > Additional input parameters for the instantiation process, specific to the VNF being instantiated, as declared in the VNFD as part of - "InstantiateVnfOpConfig". + "InstantiateVnfOpConfig" defined in ETSI GS NFV-IFA 011 [7]. $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" extensions: description: > diff --git a/src/definitions/SOL002SOL003VNFLifecycleManagement_def.yaml b/src/definitions/SOL002SOL003VNFLifecycleManagement_def.yaml index ca61957a..6409da8b 100644 --- a/src/definitions/SOL002SOL003VNFLifecycleManagement_def.yaml +++ b/src/definitions/SOL002SOL003VNFLifecycleManagement_def.yaml @@ -60,7 +60,7 @@ definitions: description: > Additional parameters passed by the NFVO as input to the scaling process, specific to the VNF being scaled, as declared in the VNFD - as part of "ScaleVnfOpConfig". + as part of "ScaleVnfOpConfig" defined in ETSI GS NFV-IFA 011 [7]. $ref: "SOL002SOL003_def.yaml#/definitions/KeyValuePairs" ScaleVnfToLevelRequest: @@ -97,7 +97,7 @@ definitions: description: > Additional parameters passed by the NFVO as input to the scaling process, specific to the VNF being scaled, as declared in the - VNFD as part of "ScaleVnfToLevelOpConfig". + VNFD as part of "ScaleVnfToLevelOpConfig" defined in ETSI GS NFV-IFA 011 [7]. $ref: "SOL002SOL003_def.yaml#/definitions/KeyValuePairs" VnfInfoModificationRequest: diff --git a/src/definitions/SOL002SOL003_def.yaml b/src/definitions/SOL002SOL003_def.yaml index c43f8190..37254e24 100644 --- a/src/definitions/SOL002SOL003_def.yaml +++ b/src/definitions/SOL002SOL003_def.yaml @@ -653,7 +653,7 @@ definitions: IdentifierInVim: description: > - An identifier maintained by the VIM or other resource provider. It is + An identifier maintained by the VIM or the CISM or other resource provider. It is expected to be unique within the VIM instance. type: string -- GitLab From 33d512ed0ae41317d143202bfafaba4e251c6752 Mon Sep 17 00:00:00 2001 From: muhammadh Date: Thu, 16 Jun 2022 16:41:23 +0500 Subject: [PATCH 03/41] add and update common data types --- .../SOL003VNFLifecycleManagement_def.yaml | 64 ++- ...OL002SOL003VNFLifecycleManagement_def.yaml | 32 +- src/definitions/SOL002SOL003_def.yaml | 402 +++++++++++++----- 3 files changed, 370 insertions(+), 128 deletions(-) diff --git a/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml b/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml index 0537c2e1..a2b7c1c6 100644 --- a/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml +++ b/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml @@ -88,6 +88,15 @@ definitions: $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" ExtManagedVirtualLinkData: + description: > + This type represents an externally-managed internal VL. + + * NOTE 1: It is only applicable if the externally-managed VL is realized by a secondary container cluster network. It shall + not be present otherwise. + * NOTE 2: A link port is not needed for a VNFC internal connection point connected to a secondary container cluster + network. + * 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). type: object required: - id @@ -122,11 +131,27 @@ definitions: The identifier of the resource in the scope of the VIM or the resource provider. $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVim" + netAttDefResourceData: + description: > + 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. + type: array + items: + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/NetAttDefResourceData" + intCp: + description: > + Internal CPs of the VNF to be connected to this + externally-managed VL. See note 1. + type: array + items: + $ref: "#/definitions/IntVnfCpData" vnfLinkPort: 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. + externally-managed VL. See note 2. type: array items: $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/VnfLinkPortData" @@ -838,14 +863,14 @@ definitions: See clause B.2 for an explanation of VNF scaling. type: array items: - $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/ScaleInfo" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ScaleInfo" maxScaleLevels: description: > Maximum allowed scale levels of the VNF, one entry per aspect. This attribute shall be present if the VNF supports scaling. type: array items: - $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/ScaleInfo" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ScaleInfo" extCpInfo: description: > Information about the external CPs exposed by the VNF instance. When trunking is enabled, @@ -1584,8 +1609,8 @@ definitions: zoneId: description: > The identifier of the resource zone, as managed by the resource management - layer (typically, the VIM), where the referenced VirtualCompute resource is placed. - Shall be provided if this information is available from the VIM. + layer (typically, the VIM), where the referenced VirtualCompute resource is placed. + Shall be provided if this information is available from the VIM. $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" metadata: description: > @@ -2382,4 +2407,31 @@ definitions: Metadata about this resource. The content of this attribute shall be a copy of the content of the "metadata" attribute of the VirtualStorageResourceInfo structure. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" \ No newline at end of file + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + + IntVnfCpData: + description: > + This type represents input information related to one or more VNF internal CP instances + created based on the same CPD. + + NOTE: Cardinality greater than 1 is only applicable for specific cases where more than one network attachment + definition resource is needed to fulfil the connectivity requirements of the VNF internal CP, e.g. to build a link + redundant mated pair in SR-IOV cases. When more than one netAttDefResourceId is indicated, all shall + belong to the same namespace as defined by the corresponding "netAttDefResourceNamespace" attribute + in the "NetAttDefResourceData". + type: object + required: + - cpdId + - netAttDefResourceId + properties: + cpdId: + description: > + Identifier of the CPD in the VNFD. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + netAttDefResourceId: + description: > + Identifiers of the “NetAttDefResourceData” structure that + provides the specification of the interface to attach the VNF + internal CP created from the CPD identified by cpdId to a + secondary container cluster network. See note. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" \ No newline at end of file diff --git a/src/definitions/SOL002SOL003VNFLifecycleManagement_def.yaml b/src/definitions/SOL002SOL003VNFLifecycleManagement_def.yaml index 6409da8b..222f0a87 100644 --- a/src/definitions/SOL002SOL003VNFLifecycleManagement_def.yaml +++ b/src/definitions/SOL002SOL003VNFLifecycleManagement_def.yaml @@ -92,7 +92,7 @@ definitions: See note. type: array items: - $ref: "#/definitions/ScaleInfo" + $ref: "SOL002SOL003_def.yaml#/definitions/ScaleInfo" additionalParams: description: > Additional parameters passed by the NFVO as input to the scaling @@ -300,28 +300,6 @@ definitions: items: $ref: "SOL002SOL003_def.yaml#/definitions/VnfExtCpData" - ScaleInfo: - required: - - aspectId - - scaleLevel - type: object - properties: - aspectId: - description: > - Identifier of the scaling aspect. - $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" - vnfdId: - description: > - Identifier of the VNFD. - Shall be present in case the value differs from the vnfdId attribute of the VnfInstance (e.g. during a "Change - current VNF package" operation or due to its final failure). - $ref: "SOL002SOL003_def.yaml#/definitions/Identifier" - scaleLevel: - description: > - Indicates the scale level. The minimum value shall be 0 and the - maximum value shall be <= maxScaleLevel as described in the VNFD. - type: integer - VnfLinkPortInfo: description: > This type represents a link port of an internal VL of a VNF. It shall comply with the provisions @@ -998,7 +976,7 @@ definitions: type: string vnfProductName: description: > - If present, this attribute signals the new value of the "vnfProductName" attribute in "VnfInstance". See note 2. + If present, this attribute signals the new value of the "vnfProductName" attribute in "VnfInstance". See note 2. type: string vnfSoftwareVersion: description: > @@ -1022,8 +1000,8 @@ definitions: The enumeration LcmOpOccNotificationVerbosityType provides values to control the verbosity of LCM operation occurrence notifications. * FULL: This signals a full notification which contains all change details. - * SHORT: This signals a short notification which omits large-volume change details to reduce the size of data to - be sent via the notification mechanism. + * SHORT: This signals a short notification which omits large-volume change details to reduce the size of data to + be sent via the notification mechanism. type: string enum: - FULL @@ -1128,4 +1106,4 @@ definitions: Metadata about this VIP CP. type: array items: - $ref: "SOL002SOL003_def.yaml#/definitions/KeyValuePairs" \ No newline at end of file + $ref: "SOL002SOL003_def.yaml#/definitions/KeyValuePairs" \ No newline at end of file diff --git a/src/definitions/SOL002SOL003_def.yaml b/src/definitions/SOL002SOL003_def.yaml index 37254e24..89ef46c4 100644 --- a/src/definitions/SOL002SOL003_def.yaml +++ b/src/definitions/SOL002SOL003_def.yaml @@ -187,72 +187,87 @@ definitions: VimConnectionInfo: description: > - This type represents parameters to connect to a VIM for managing the - resources of a VNF instance. + This type represents parameters to connect to a VIM, a CISM, a CIR or a MCIOP repository for managing + the resources of a VNF instance. It shall comply with the provisions defined in table 4.4.1.6-1. + + This structure is used to convey VIM-related, CISM-related, CIR-related, or MCIOP-repository-relate + dparameters over the Or-Vnfm interface. Additional parameters for a VIM, a CISM, a CIR or a MCIOP + repository may be configured into the VNFM by means outside the scope of the present document and + bound to the identifier of that VIM. + * NOTE 1: If applicable, this attribute also provides information about the resourceGroupIds that are accessible using a particular set of credentials. See definition of "resourceGroupId" in clause 9.5.3.3. - * NOTE 2: Once the connectivity between VNFM and VIM is provided through a secure connection over - HTTP Secure (HTTP over SSL/TLS), and the connection might also be established through a VPN - (for example TLS-based VPN tunnelling) for site-to-site connection, the "accessInfo" JSON data - structure, and the sensitive data related information ("username"/"password" as required properties - for authentication purpose), will be transmitted as plain text through a TLS tunnel without additional - encoding/encryption before transmitting it, making the sensitive data visible to the endpoint. - The base64 encoded certificates are only used by the VNFM to verify the authenticity of the - interface endpoint of the VIM. + * NOTE 2: Once the connectivity between VNFM and VIM, CISM, CIR or MCIOP repository is provided + through a secure connection over HTTP Secure (HTTP over SSL/TLS), and the connection might also be + established through a VPN (for example TLS-based VPN tunnelling) for site-to-site connection, the + "accessInfo" JSON data structure, and the sensitive data related information ("username"/"password" as + required properties for authentication purpose), will be transmitted as plain text through a TLS tunnel + without additional encoding/encryption before transmitting it, making the sensitive data visible to the + endpoint. The base64 encoded certificates are only used by the VNFM to verify the authenticity of the + interface endpoint of the VIM., CISM, CIR or MCIOP repository. type: object required: - vimType properties: vimId: description: > - The identifier of the VIM instance. This identifier is managed by - the NFVO. - Shall be present to address additional information about the VIM if - such information has been configured into the VNFM by means outside - the scope of the present document, and should be absent otherwise. + The identifier of the VIM, CISM, CIR or MCIOP repository + instance. This identifier is managed by the NFVO. + Shall be present to address additional information about + the VIM, CISM, CIR or MCIOP repository if such + information has been configured into the VNFM by + means outside the scope of the present document and + should be absent otherwise. $ref: "#/definitions/Identifier" vimType: description: > - Discriminator for the different types of the VIM information. The - value of this attribute determines the structure of the - "interfaceInfo" and "accessInfo" attributes, based on the type of the - VIM. The set of permitted values is expected to change over time as - new types or versions of VIMs become available. - The ETSI NFV registry of VIM-related information provides access to - information about VimConnectionInfo definitions for various VIM - types. The structure of the registry is defined in Annex C of SOL003. + Discriminator for the different types of the VIM + information. + The value of this attribute determines the structure of the + "interfaceInfo" and "accessInfo" attributes, based on the + type of the VIM., CISM, CIR or MCIOP repository. + The set of permitted values is expected to change over + time as new types or versions of VIMs become available. + The ETSI NFV registry of VIM-related information [i.3] + provides access to information about VimConnectionInfo + definitions for various VIM, CISM, CIR or MCIOP + repository types. The structure of the registry is defined in + annex C. type: string interfaceInfo: description: > - Information about the interface or interfaces to the VIM, if - applicable, such as the URI of an interface endpoint to - communicate with the VIM. The applicable keys are dependent on the - content of vimType. - Alternatively, such information may have been configured into the - VNFM and bound to the vimId. + Information about the interface or interfaces to the VIM, + CISM, CIR or MCIOP repository, if applicable, such as + the URI of an interface endpoint to communicate with the + VIM, CISM, CIR or MCIOP repository. The applicable + keys are dependent on the content of vimType. + Alternatively, such information may have been configured + into the VNFM and bound to the vimId. $ref: "#/definitions/KeyValuePairs" accessInfo: description: > - Authentication credentials for accessing the VIM, and other - access-related information such as tenants or infrastructure - resource groups (see note 1). The applicable keys are dependent on the - content of vimType. - If the VimConnectionInfo structure is part of an HTTP response - payload body, sensitive attributes that are children of this attributes - (such as passwords) shall not be included. - If the VimConnectionInfo structure is part of an HTTP request payload - body, sensitive attributes that are children of this attribute (such - as passwords) shall be present if they have not been provisioned out - of band. - + Authentication credentials for accessing the VIM, CISM, + CIR or MCIOP repository and other access-related + information such as tenants or infrastructure resource + groups (see note 1). The applicable keys are dependent + on the content of vimType. + If the VimConnectionInfo structure is part of an HTTP + response payload body, sensitive attributes that are + children of this attributes (such as passwords) shall not + be included. + If the VimConnectionInfo structure is part of an HTTP + request payload body, sensitive attributes that are + children of this attribute (such as passwords) shall be + present if they have not been provisioned out of band. See note 2. $ref: "#/definitions/KeyValuePairs" extra: description: > - VIM type specific additional information. The applicable structure, - and whether or not this attribute is available, is dependent on the - content of vimType. + VIM, CISM, CIR or MCIOP repository type specific + additional information. The applicable structure, and + whether or not this attribute is available, is dependent on + the content of vimType. $ref: "#/definitions/KeyValuePairs" ResourceHandle: @@ -263,15 +278,38 @@ definitions: This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. Information about the resource is available from the VIM. + + * NOTE 1: The value set of the "vimLevelResourceType" attribute is within the scope of the VIM + or CISM or the resource provider and can be used as information that complements the + ResourceHandle. This value set is different from the value set of the "type" attribute + in the ResourceDefinition (refer to clause 9.5.3.2). When the container infrastructure + service management is a Kubernetes® instance the vimLevelResourceType is the type of + resource, as would correspond to the 'kind' field if the resource is declared in its own + Kubernetes® manifest, e.g.: Pod, PersistentVolumeClaim, NetworkAttachmentDefinition. + + * NOTE 2: When the container infrastructure service management is a Kubernetes® instance the resourceId shall be + populated in the following way: + - For a compute MCIO, it is the instance identifier that Kubernetes® assigns, which is unique cluster wide + per resource type. + - For a storage MCIO modelled as a persistent volume claim, it is the name of the persistent volume claim, + i.e. the value of the 'claimName' field in the Kubernetes® manifest, or a compound name built by + Kubernetes® if the persistent volume claim is defined inline in another template instead of in its own + manifest. + - For a network MCIO representing a NetworkAttachme. properties: vimConnectionId: description: > - Identifier of the VIM connection to manage the resource. This - attribute shall only be supported and present if VNF-related resource - management in direct mode is applicable. The applicable - "VimConnectionInfo" structure, which is referenced by - vimConnectionId, can be obtained from the "vimConnectionInfo" - attribute of the "VnfInstance" structure. + Identifier of the VIM or CISM connection to manage the + resource. + This attribute shall be supported when the resource is + managed by a CISM. + When the resource is managed by a VIM, this attribute + shall only be supported and present if VNF--related + resource management in direct mode is applicable. + The applicable "VimConnectionInfo" structure, which is + referenced by vimConnectionId, can be obtained from + the "vimConnectionInfo" attribute of the "VnfInstance" + structure. $ref: "#/definitions/Identifier" resourceProviderId: description: > @@ -282,15 +320,26 @@ definitions: $ref: "#/definitions/Identifier" resourceId: description: > - Identifier of the resource in the scope of the VIM or the resource - provider. + Identifier of the resource in the scope of the VIM or the + CISM or the resource provider. See note 2. $ref: "#/definitions/IdentifierInVim" vimLevelResourceType: description: > - The value set of the "vimLevelResourceType" attribute is within the scope - of the VIM or the resource provider and can be used as information that - complements the ResourceHandle. This value set is different from the value - set of the "type" attribute in the ResourceDefinition (refer to clause 9.5.3.2 in SOL003). + Type of the resource in the scope of the VIM or the CISM + or the resource provider. See note 1. + type: string + vimLevelAdditionalResourceInfo: + descriptions: > + Additional resource information which is specific to this + resource and its type, and which is available from the + VIM or the CISM or the resource provider. + $ref: "#/definitions/AdditionalResourceInfo" + containerNamespace: + description: > + The value of the namespace in which the MCIO + corresponding to the resource is deployed. + This attribute shall be present if the resource is managed + by a CISM and it shall be absent otherwise. type: string VnfExtCpData: @@ -330,7 +379,7 @@ definitions: 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 API consumer. + 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 and 4. type: object @@ -339,26 +388,42 @@ definitions: VnfExtCpConfig: description: > - This type represents an externally provided link port or network address - information per instance of an external connection point. In case a link - port is provided, the VNFM shall use that link port when connecting the - external CP to the external VL. In a link port is not provided, the VNFM - shall create a link port on the external VL, and use that link port to - connect the external CP to the external VL. - * NOTE: The following conditions apply to the attributes "linkPortId" and "cpProtocolData": - 1) Void. - 2) At least one of the "linkPortId" and "cpProtocolData" attributes shall be present for an external - CP instance representing a subport that is to be created, or an external CP instance that is to be - created by creating the corresponding VNFC or VNF instance during the current or a subsequent LCM - operation, or for an existing external CP instance that is to be re-configured or added to a - particular external virtual link. - 3) If the "linkPortId" attribute is absent, the VNFM shall create a link port. - 4) If the "cpProtocolData" attribute is absent, the "linkPortId" attribute shall be provided referencing - a pre created link port, and the VNFM can use means outside the scope of the present document to obtain - the pre-configured address information for the connection point from the resource representing - the link port. - 5) If both "cpProtocolData" and "linkportId" are provided, the API consumer shall ensure that the - cpProtocolData can be used with the pre-created link port referenced by "linkPortId". + This type represents an externally provided link port, or a network attachment definition resource of secondary + container cluster network, or network address information per instance of an external connection point. + In the case of VM-based deployment of the VNFC exposing the external CP: + 1. In case a link port is provided, the VNFM shall use that link port when connecting the external CP to the + external VL. + 2. In case a link port is not provided, the VNFM shall create a link port on the external VL and use that link port + to connect the external CP to the external VL. + In the case of container-based deployment of the VNFC exposing the external CP, the VNFM shall use the network + attachment definition resource of secondary container cluster network when connecting the CP to the external VL. + + * NOTE 1: The following conditions apply to the attributes "linkPortId" and "cpProtocolData" for an external CP + instance connected or to be connected to a virtual network not categorized as secondary container cluster network: + 1) Void. + 2) At least one of the "linkPortId" and "cpProtocolData" attributes shall be present for an external CP instance + representing a subport that is to be created, or an external CP instance that is to be created by creating the + corresponding VNFC or VNF instance during the current or a subsequent LCM operation, or for an existing + external CP instance that is to be re-configured or added to a particular external virtual link. + 3) If the "linkPortId" attribute is absent, the VNFM shall create a link port. + 4) If the "cpProtocolData" attribute is absent, the "linkPortId" attribute shall be provided referencing a + precreated link port, and the VNFM can use means outside the scope of the present document to obtain the + pre-configured address information for the connection point from the resource representing the link port. + 5) If both "cpProtocolData" and "linkportId" are provided, the NFVO shall ensure that the + cpProtocolData can be used with the pre-created link port referenced by "linkPortId". + + * NOTE 2: The following conditions apply to the attributes “netAttDefResourceId” and “cpProtocolData” for an external CP + instance connected or to be connected to a secondary container cluster network: + 1) The "netAttDefResourceId" and "cpProtocolData" attributes shall both be absent for the deletion of an + existing external CP instance addressed by cpInstanceId. + 2) The "netAttDefResourceId" attribute shall be present and the "cpProtocolData" attribute may be present for + a to-be-created external CP instance or an existing external CP instance. + * NOTE 3: Cardinality greater than 1 is only applicable for specific cases where more than one network attachment + definition resource is needed to fulfil the connectivity requirements of the external CP, e.g. to build a link + redundant mated pair in SR-IOV cases. When more than one netAttDefResourceId is indicated, all shall belong + to the same namespace as defined by the corresponding "netAttDefResourceNamespace" attribute in the + "NetAttDefResourceData". + * NOTE 4: Either linkPortId or netAttDefResourceId may be included, but not both. anyOf: - required: - linkPortId @@ -376,7 +441,7 @@ definitions: linkPortId: description: > Identifier of a pre-configured link port to which the external CP - will be associated. See note + will be associated. See notes 1 and 4. $ref: "#/definitions/Identifier" createExtLinkPort: @@ -388,10 +453,24 @@ definitions: instance for which a dedicated IP address is allocated. It shall be present in that case and shall be absent otherwise. type: boolean + netAttDefResourceId: + description: > + Identifier of the “NetAttDefResourceData” structure that + provides the specification of the interface to attach the + external CP to a secondary container cluster network. + It is only applicable if the external CP is connected or to + be connected to a secondary container cluster network. It + shall not be present if the external CP is related to a + virtual network not categorized as secondary container + cluster network. + See notes 2, 3 and 4. + type: array + items: + $ref: "#/definitions/Identifier" cpProtocolData: description: > - Parameters for configuring the network protocols on the link port - that connects the CP to a VL. See note. + Parameters for configuring the network protocols on the + link port that connects the CP to a VL. See notes 1 and 2. type: array items: $ref: "#/definitions/CpProtocolData" @@ -408,7 +487,11 @@ definitions: properties: layerProtocol: description: > - Identifier of layer(s) and protocol(s). See note. + Identifier of layer(s) and protocol(s). + Permitted values: + - IP_OVER_ETHERNET. + - IP_FOR_VIRTUAL_CP + See note type: string enum: - IP_OVER_ETHERNET @@ -418,6 +501,15 @@ definitions: instance. Shall be present if layerProtocol is equal to "IP_OVER_ETHERNET", and shall be absent otherwise. $ref: "#/definitions/IpOverEthernetAddressData" + virtualCpAddress: + description: > + IP address data to assign to an external CP + instance exposing a virtual CP. It shall be + present if 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/VirtualCpAddressData" IpOverEthernetAddressData: description: > @@ -528,17 +620,51 @@ definitions: a subnet will be assigned. $ref: "#/definitions/IdentifierInVim" + VirtualCpAddressData: + description: > + This type represents network address data for a virtual CP. It shall comply with the provisions defined in + table 4.4.1.10d-1. + + * NOTE 1: If the container cluster is set up to be able to configure an external load balancer this address will be used, + otherwise it will be ignored by the CISM. + + * NOTE 2: In case the cluster can configure an external load balancer but no loadBalancerIp is provided the container + cluster will assign an IP address. + type: object + required: + - type + properties: + type: + description: > + The type of the IP addresses. + Permitted values: IPV4, IPV6. + type: string + enum: + - IPV4 + - IPV6 + loadBalancerIp: + description: + Fixed address to assign to an external load balancer. + See notes 1 and 2. + $ref: "#/definitions/IpAddress" + ExtVirtualLinkData: description: > This type represents an external VL. - * 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 - is needed (createExtLinkPort in VnfExtCpconfig set to false). - 2 For a VIP CP exposed as extCP via a floating IP address: - 2.1 No dedicated IP address is allocated as VIP address, as indicated in the VNFD, and the VNFC - CP associated to the VIP CP is also exposed via a floating IP addresss. + * NOTE 1: 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 an external CP: + 1.1 No dedicated IP address is allocated as VIP address, as indicated in the VNFD. + 1.2 A dedicated IP address is allocated as VIP address, but the NFVO indicates that no port is needed + (createExtLinkPort in VnfExtCpConfig set to false). + 2 For a VIP CP exposed as an external CP via a floating IP address: + 2.1 No dedicated IP address is allocated as VIP address, as indicated in the VNFD, and the VNFC CP + associated to the VIP CP is also exposed via a floating IP address. + 3 For a VIRTUAL CP exposed as an external CP. + 4 For a VNFC CP exposed as an external CP in a secondary container cluster external network or a + secondary container cluster internal network. + + * 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). type: object required: - id @@ -579,15 +705,101 @@ definitions: $ref: "#/definitions/VnfExtCpData" extLinkPorts: description: > - Externally provided link ports to be used to connect external - 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. + Externally provided link ports to be used to connect + external connection points to this external VL. If this + attribute is not present, the VNFM shall create the link + ports on the external VL except in the cases defined + below. See note 1. type: array items: $ref: "#/definitions/ExtLinkPortData" + extNetAttDefResourceData: + description: + Externally provided network attachment definition + resource(s) that provide the specification of the interface + to attach external CPs to this external VL. See note 2. + It is only applicable if the external VL is realized by a + secondary container cluster network. It shall not be + present otherwise. + type: array + items: + $ref: "#/definitions/NetAttDefResourceData" + ScaleInfo: + description: > + This type represents the scale level of a VNF instance related to a scaling aspect. + type: object + required: + - aspectId + - scaleLevel + properties: + aspectId: + description: > + Identifier of the scaling aspect. + $ref: "#/definitions/IdentifierInVnfd" + vnfdId: + description: > + Identifier of the VNFD. + Shall be present in case the value differs from the vnfdId + attribute of the VnfInstance (e.g. during a "Change + current VNF package" operation or due to its final + failure). + $ref: "#/definitions/IdentifierInVnfd" + scaleToLevel: + description: > + Indicates the scale level. The minimum value shall be 0 + and the maximum value shall be ≤ maxScaleLevel as + described in the VNFD. + $ref: "#/definitions/Identifier" + + AdditionalResourceInfo: + description: > + This type represents additional resource information which resource and resource type + specific, and which is available from the VIM or the CISM or the resource provider. + type: object + properties: + hostName: + description: > + Name of the host where the resource is allocated. It shall + be present for compute resources in the scope of the + CISM and shall be absent otherwise. See note. + type: string + persistentVolume: + description: > + Name of the persistent volume to which the persistent + volume claim representing the storage resource is bound. + It may be present for storage resources in the scope of + the CISM and shall be absent otherwise. See note. + type: string + AdditionalResourceInfo: + description: > + Information related to other properties directly owned by + the resource and available from the VIM or CISM or the + resource provider. See note. + $ref: "#/definitions/KeyValuePairs" + + NetAttDefResourceData: + description: > + This type represents a network attachment definition resource that provides the specification of + the interface to be used to connect one or multiple connection points to a secondary container + cluster network realizing a VL. + type: object + required: + - netAttDefResourceId + - resourceHandle + properties: + netAttDefResourceId: + description: > + Identifier of this network attachment definition resource + as provided by the entity that has created it. + $ref: "#/definitions/Identifier" + resourceHandle: + description: > + Resource handle of the resource identifying the network + attachment definition resource that provides the + specification of the interface to attach the connection + points to a secondary container cluster network. + $ref: "#/definitions/ResourceHandle" Identifier: description: > An identifier with the intention of being globally unique. @@ -653,7 +865,7 @@ definitions: IdentifierInVim: description: > - An identifier maintained by the VIM or the CISM or other resource provider. It is + An identifier maintained by the VIM or the CISM or other resource provider. It is expected to be unique within the VIM instance. type: string -- GitLab From 3d9457f7e97415809ee96524c0abd2af1678f0db Mon Sep 17 00:00:00 2001 From: muhammadh Date: Thu, 16 Jun 2022 17:01:08 +0500 Subject: [PATCH 04/41] update api and sol versions for all APIs in SOL003 --- src/SOL003/APIVersion/APIVersion.yaml | 4 ++-- src/SOL003/VNFFaultManagement/VNFFaultManagement.yaml | 6 +++--- .../VNFFaultManagementNotification.yaml | 6 +++--- src/SOL003/VNFIndicator/VNFIndicator.yaml | 6 +++--- .../VNFIndicatorNotification/VNFIndicatorNotification.yaml | 6 +++--- .../VNFLifecycleManagement/VNFLifecycleManagement.yaml | 6 +++--- .../VNFLifecycleManagementNotification.yaml | 6 +++--- .../VNFLifecycleOperationGranting.yaml | 6 +++--- src/SOL003/VNFPackageManagement/VNFPackageManagement.yaml | 6 +++--- .../VNFPackageManagementNotification.yaml | 6 +++--- .../VNFPerformanceManagement/VNFPerformanceManagement.yaml | 6 +++--- .../VNFPerformanceManagementNotification.yaml | 6 +++--- .../VNFSnapshotPackageManagement.yaml | 6 +++--- .../VirtualisedResourcesQuotaAvailableNotification.yaml | 6 +++--- 14 files changed, 41 insertions(+), 41 deletions(-) diff --git a/src/SOL003/APIVersion/APIVersion.yaml b/src/SOL003/APIVersion/APIVersion.yaml index 8a6a30a5..2f1f2a24 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 V3.6.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/03.06.01_60/gs_NFV-SOL003v030601p.pdf + description: ETSI GS NFV-SOL 003 V4.3.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/04.03.01_60/gs_NFV-SOL003v040301p.pdf paths: /vrqan/api_versions: diff --git a/src/SOL003/VNFFaultManagement/VNFFaultManagement.yaml b/src/SOL003/VNFFaultManagement/VNFFaultManagement.yaml index 1df854ad..c3c6b2bb 100644 --- a/src/SOL003/VNFFaultManagement/VNFFaultManagement.yaml +++ b/src/SOL003/VNFFaultManagement/VNFFaultManagement.yaml @@ -16,11 +16,11 @@ 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.10.0-impl:etsi.org:ETSI_NFV_OpenAPI:1" externalDocs: - description: ETSI GS NFV-SOL 003 V3.6.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/03.06.01_60/gs_NFV-SOL003v030601p.pdf + description: ETSI GS NFV-SOL 003 V4.3.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/04.03.01_60/gs_NFV-SOL003v040301p.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 d097a371..e8274430 100644 --- a/src/SOL003/VNFFaultManagementNotification/VNFFaultManagementNotification.yaml +++ b/src/SOL003/VNFFaultManagementNotification/VNFFaultManagementNotification.yaml @@ -16,11 +16,11 @@ 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.10.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 003 V3.6.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/03.06.01_60/gs_NFV-SOL003v030601p.pdf + description: ETSI GS NFV-SOL 003 V4.3.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/04.03.01_60/gs_NFV-SOL003v040301p.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 8e4846ba..4e9ed43a 100644 --- a/src/SOL003/VNFIndicator/VNFIndicator.yaml +++ b/src/SOL003/VNFIndicator/VNFIndicator.yaml @@ -16,11 +16,11 @@ info: license: name: ETSI Forge copyright notice url: https://forge.etsi.org/etsi-forge-copyright-notice.txt - version: "1.3.1-impl:etsi.org:ETSI_NFV_OpenAPI:1" + version: "1.10.0-impl:etsi.org:ETSI_NFV_OpenAPI:1" externalDocs: - description: ETSI GS NFV-SOL 003 V3.6.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/03.06.01_60/gs_NFV-SOL003v030601p.pdf + description: ETSI GS NFV-SOL 003 V3.3.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/04.03.01_60/gs_NFV-SOL003v040301p.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 1a035fa7..ffc14a43 100644 --- a/src/SOL003/VNFIndicatorNotification/VNFIndicatorNotification.yaml +++ b/src/SOL003/VNFIndicatorNotification/VNFIndicatorNotification.yaml @@ -16,11 +16,11 @@ info: license: name: ETSI Forge copyright notice url: https://forge.etsi.org/etsi-forge-copyright-notice.txt - version: "1.3.1-impl:etsi.org:ETSI_NFV_OpenAPI:1" + version: "1.10.0-impl:etsi.org:ETSI_NFV_OpenAPI:1" externalDocs: - description: ETSI GS NFV-SOL 003 V3.6.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/03.06.01_60/gs_NFV-SOL003v030601p.pdf + description: ETSI GS NFV-SOL 003 V4.3.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/04.03.01_60/gs_NFV-SOL003v040301p.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 84f19fa9..25dfb160 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.2.0-impl:etsi.org:ETSI_NFV_OpenAPI:1" + version: "2.10.0-impl:etsi.org:ETSI_NFV_OpenAPI:1" externalDocs: - description: ETSI GS NFV-SOL 003 V3.6.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/03.06.01_60/gs_NFV-SOL003v030601p.pdf + description: ETSI GS NFV-SOL 003 V4.3.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/04.03.01_60/gs_NFV-SOL003v040301p.pdf servers: - url: http://127.0.0.1/vnflcm/v2 diff --git a/src/SOL003/VNFLifecycleManagementNotification/VNFLifecycleManagementNotification.yaml b/src/SOL003/VNFLifecycleManagementNotification/VNFLifecycleManagementNotification.yaml index 0c9e5d8b..9d5b3a2e 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.2.0-impl:etsi.org:ETSI_NFV_OpenAPI:1" + version: "2.10.0-impl:etsi.org:ETSI_NFV_OpenAPI:1" externalDocs: - description: ETSI GS NFV-SOL 003 V3.6.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/03.06.01_60/gs_NFV-SOL003v030601p.pdf + description: ETSI GS NFV-SOL 003 V4.3.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/04.03.01_60/gs_NFV-SOL003v040301p.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 1e170b37..2cc57e01 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.6.0-impl:etsi.org:ETSI_NFV_OpenAPI:1" + version: "1.10.0-impl:etsi.org:ETSI_NFV_OpenAPI:1" externalDocs: - description: ETSI GS NFV-SOL 003 V3.6.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/03.06.01_60/gs_NFV-SOL003v030601p.pdf + description: ETSI GS NFV-SOL 003 V4.3.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/04.03.01_60/gs_NFV-SOL003v040301p.pdf servers: - url: http://127.0.0.1/grant/v1 diff --git a/src/SOL003/VNFPackageManagement/VNFPackageManagement.yaml b/src/SOL003/VNFPackageManagement/VNFPackageManagement.yaml index 32d61a14..a1dff429 100644 --- a/src/SOL003/VNFPackageManagement/VNFPackageManagement.yaml +++ b/src/SOL003/VNFPackageManagement/VNFPackageManagement.yaml @@ -16,11 +16,11 @@ info: license: name: ETSI Forge copyright notice url: https://forge.etsi.org/etsi-forge-copyright-notice.txt - version: "2.3.0-impl:etsi.org:ETSI_NFV_OpenAPI:1" + version: "2.10.0-impl:etsi.org:ETSI_NFV_OpenAPI:1" externalDocs: - description: ETSI GS NFV-SOL 003 V3.6.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/03.06.01_60/gs_NFV-SOL003v030601p.pdf + description: ETSI GS NFV-SOL 003 V4.3.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/04.03.01_60/gs_NFV-SOL003v040301p.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 0c97ab76..56b6edee 100644 --- a/src/SOL003/VNFPackageManagementNotification/VNFPackageManagementNotification.yaml +++ b/src/SOL003/VNFPackageManagementNotification/VNFPackageManagementNotification.yaml @@ -16,11 +16,11 @@ info: license: name: ETSI Forge copyright notice url: https://forge.etsi.org/etsi-forge-copyright-notice.txt - version: 2.3.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 + version: 2.10.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 003 V3.6.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/03.06.01_60/gs_NFV-SOL003v030601p.pdf + description: ETSI GS NFV-SOL 003 V4.3.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/04.03.01_60/gs_NFV-SOL003v040301p.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 1536c79d..c1f5fa91 100644 --- a/src/SOL003/VNFPerformanceManagement/VNFPerformanceManagement.yaml +++ b/src/SOL003/VNFPerformanceManagement/VNFPerformanceManagement.yaml @@ -16,11 +16,11 @@ 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.10.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 003 V3.6.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/03.06.01_60/gs_NFV-SOL003v030601p.pdf + description: ETSI GS NFV-SOL 003 V4.3.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/04.03.01_60/gs_NFV-SOL003v040301p.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 ecae61f6..1f423b28 100644 --- a/src/SOL003/VNFPerformanceManagementNotification/VNFPerformanceManagementNotification.yaml +++ b/src/SOL003/VNFPerformanceManagementNotification/VNFPerformanceManagementNotification.yaml @@ -16,11 +16,11 @@ 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.10.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 003 V3.6.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/03.06.01_60/gs_NFV-SOL003v030601p.pdf + description: ETSI GS NFV-SOL 003 V4.3.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/04.03.01_60/gs_NFV-SOL003v040301p.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 46f7b457..6c167d7d 100644 --- a/src/SOL003/VNFSnapshotPackageManagement/VNFSnapshotPackageManagement.yaml +++ b/src/SOL003/VNFSnapshotPackageManagement/VNFSnapshotPackageManagement.yaml @@ -16,11 +16,11 @@ info: license: name: ETSI Forge copyright notice url: https://forge.etsi.org/etsi-forge-copyright-notice.txt - version: 1.1.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 + version: 1.10.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 003 V3.6.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/03.06.01_60/gs_NFV-SOL003v030601p.pdf + description: ETSI GS NFV-SOL 003 V4.3.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/04.03.01_60/gs_NFV-SOL003v040301p.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 42d907a0..8a1ef39e 100644 --- a/src/SOL003/VirtualisedResourcesQuotaAvailableNotification/VirtualisedResourcesQuotaAvailableNotification.yaml +++ b/src/SOL003/VirtualisedResourcesQuotaAvailableNotification/VirtualisedResourcesQuotaAvailableNotification.yaml @@ -16,11 +16,11 @@ info: license: name: ETSI Forge copyright notice url: https://forge.etsi.org/etsi-forge-copyright-notice.txt - version: "1.2.1-impl:etsi.org:ETSI_NFV_OpenAPI:1" + version: "1.10.0-impl:etsi.org:ETSI_NFV_OpenAPI:1" externalDocs: - description: ETSI GS NFV-SOL 003 V3.6.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/03.06.01_60/gs_NFV-SOL003v030601p.pdf + description: ETSI GS NFV-SOL 003 V4.3.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/04.03.01_60/gs_NFV-SOL003v040301p.pdf servers: - url: http://127.0.0.1/vrqan/v1 -- GitLab From 5b46cb710021f4e40dee66c1fcdb914aa46e0edf Mon Sep 17 00:00:00 2001 From: Ayesha Ayub Date: Thu, 16 Jun 2022 17:27:15 +0500 Subject: [PATCH 05/41] update VNFLCM API of SOL002 --- .../SOL002VNFLifecycleManagement_def.yaml | 39 +++++++++-------- ...NFLifecycleManagementNotification_def.yaml | 43 ++++++++++++++++++- 2 files changed, 62 insertions(+), 20 deletions(-) diff --git a/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml b/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml index 7ec56150..ce99b603 100644 --- a/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml +++ b/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml @@ -144,14 +144,14 @@ definitions: See clause B.2 for an explanation of VNF scaling. type: array items: - $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/ScaleInfo" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ScaleInfo" maxScaleLevels: description: > Maximum allowed scale levels of the VNF, one entry per aspect. This attribute shall be present if the VNF supports scaling. type: array items: - $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/ScaleInfo" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ScaleInfo" extCpInfo: description: > Information about the external CPs exposed by the VNF instance. When trunking is enabled, the list of @@ -395,7 +395,7 @@ definitions: and 3. type: array items: - $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/ScaleInfo" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ScaleInfo" extVirtualLinks: description: > Information about external VLs to connect the VNF to, including configuration information @@ -475,7 +475,7 @@ definitions: and 3. type: array items: - $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/ScaleInfo" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ScaleInfo" extVirtualLinks: description: > Information about external VLs to connect the VNF to, including configuration information @@ -550,9 +550,9 @@ definitions: additionalParams: description: > - Additional parameters passed by the NFVO as input to the termination - process, specific to the VNF being terminated, as declared in the - VNFD as part of "TerminateVnfOpConfig". + Additional parameters passed by the EM as input to the termination process, + specific to the VNF being terminated, as declared in the VNFD as part of + "TerminateVnfOpConfig" defined in ETSI GS NFV-IFA 011 [7]. $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" HealVnfRequest: @@ -572,9 +572,9 @@ definitions: type: string additionalParams: description: > - Additional parameters passed by the NFVO as input to the healing - process, specific to the VNF being healed, as declared in the VNFD - as part of "HealVnfOpConfig". + Additional parameters passed by the EM as input to the healing process, + specific to the VNF being healed as declared in the VNFD as part of "HealVnfOpConfig" + defined in ETSI GS NFV-IFA 011 [7]. $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" healScript: description: > @@ -622,9 +622,9 @@ definitions: type: integer additionalParams: description: > - Additional parameters passed by the NFVO as input to the process, - specific to the VNF of which the operation status is changed, as - declared in the VNFD as part of "OperateVnfOpConfig". + Additional parameters passed by the EM as input to the process, specific to the + VNF of which the operation status is changed, as declared in the VNFD as part of + "OperateVnfOpConfig" defined in ETSI GS NFV-IFA 011 [7]. $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" ChangeExtVnfConnectivityRequest: @@ -651,9 +651,9 @@ definitions: $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ExtVirtualLinkData" additionalParams: description: > - Additional input parameters for the instantiation process, specific - to the VNF being instantiated, as declared in the VNFD as part of - "ChangeExtVnfConnectivityOpConfig". + Additional parameters passed by the EM as input to the process, specific to the VNF + of which the external connectivity is changed, as declared in the VNFD as part of + "ChangeExtVnfConnectivityOpConfig" defined in ETSI GS NFV-IFA 011 [7]. $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" ChangeCurrentVnfPkgRequest: @@ -696,7 +696,8 @@ definitions: additionalParams: description: > Additional parameters passed by the EM as input to the process, specific to the VNF of which the underlying - VNF package is changed, as declared in the VNFD as part of "ChangeCurrentVnfPkgOpConfig". + VNF package is changed, as declared in the VNFD as part of "ChangeCurrentVnfPkgOpConfig" defined in + ETSI GS NFV-IFA 011 [7]. $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" extensions: descriptions: > @@ -793,7 +794,7 @@ definitions: additionalParams: description: > Additional input parameters for the snapshot creation process, specific for the VNF being “snapshotted”, - as declared in the VNFD as part of "CreateSnapshotVnfOpConfig". + as declared in the VNFD as part of "CreateSnapshotVnfOpConfig" defined in ETSI GS NFV-IFA 011 [7]. $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" userDefinedData: description: > @@ -822,7 +823,7 @@ definitions: additionalParams: description: > Additional input parameters for the revert to VNF snapshot process, specific for the VNF being “reverted”, - as declared in the VNFD as part of “RevertToSnapshotVnfOpConfig”. + as declared in the VNFD as part of “RevertToSnapshotVnfOpConfig” defined in ETSI GS NFV-IFA 011 [7]. $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" CreateVnfSnapshotInfoRequest: diff --git a/src/SOL002/VNFLifecycleManagementNotification/definitions/SOL002VNFLifecycleManagementNotification_def.yaml b/src/SOL002/VNFLifecycleManagementNotification/definitions/SOL002VNFLifecycleManagementNotification_def.yaml index 9d64108b..e0efe2a4 100644 --- a/src/SOL002/VNFLifecycleManagementNotification/definitions/SOL002VNFLifecycleManagementNotification_def.yaml +++ b/src/SOL002/VNFLifecycleManagementNotification/definitions/SOL002VNFLifecycleManagementNotification_def.yaml @@ -175,6 +175,14 @@ definitions: type: array items: $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/AffectedVipCp" + affectedVirtualCps: + descriptions: > + Information about virtual CP instances that were affected during the execution of the + lifecycle management operation, if this notification represents the result of a lifecycle + management operation occurrence. + type: array + items: + $ref: "SOL002VNFLifecycleManagementNotification_def.yaml#/definitions/AffectedVirtualCp" changedExtConnectivity: description: > Information about changed external connectivity, if this @@ -203,4 +211,37 @@ definitions: _links: description: > Links to resources related to this notification. - $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/LccnLinks" \ No newline at end of file + $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/LccnLinks" + AffectedVirtualCp: + description: > + This type provides information about added, deleted and modified virtual CP instances. + type: object + required: + - cpInstanceId + - cpdId + - changeType + properties: + cpInstanceId: + description: > + dentifier of the virtual CP instance and the related "VirtualCpInfo" + structure in "VnfInstance". + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + cpdId: + description: > + Identifier of the VirtualCpd in the VNFD. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + vnfdId: + description: > + Reference to the VNFD. + Shall be present in case of a "change current VNF Package" to identify whether + the affected virtual CP instance is associated to a VirtualCpd which is referred + from the source or destination VNFD. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + changeType: + description: > + Signals the type of change. + type: string + enum: + - ADDED + - REMOVED + - MODIFIED \ No newline at end of file -- GitLab From 6f667d1a3c9424f38e0d174d5dfca347fc7177a4 Mon Sep 17 00:00:00 2001 From: muhammadh Date: Thu, 16 Jun 2022 18:17:41 +0500 Subject: [PATCH 06/41] update data models in VNF LCM as per ed 4.3.1 --- .../SOL003VNFLifecycleManagement_def.yaml | 241 +++++++++++++----- ...OL002SOL003VNFLifecycleManagement_def.yaml | 3 + 2 files changed, 181 insertions(+), 63 deletions(-) diff --git a/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml b/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml index a2b7c1c6..39f78064 100644 --- a/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml +++ b/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml @@ -7,17 +7,24 @@ definitions: This type represents request parameters for the "Instantiate VNF" operation. It shall comply with the provisions defined in table 5.5.2.4-1. - NOTE 1: The indication of externally-managed internal VLs is needed in case - networks have been pre-configured for use with certain VNFs, for instance - to ensure that these networks have certain properties such as security or - acceleration features, or to address particular network topologies. - The present document assumes that externally-managed internal VLs are - managed by the NFVO and created towards the VIM. - NOTE 2: It is possible to have several ExtManagedVirtualLinkData for the same VNF - internal VL in case of a multi-site VNF spanning several VIMs. The set of - ExtManagedVirtualLinkData corresponding to the same VNF internal VL shall - indicate so by referencing to the same VnfVirtualLinkDesc and externally-managed - multi-site VL instance (refer to clause 4.4.1.12). + * NOTE 1: The indication of externally-managed internal VLs is needed in case + networks have been pre-configured for use with certain VNFs, for instance + to ensure that these networks have certain properties such as security or + acceleration features, or to address particular network topologies. + The present document assumes that externally-managed internal VLs are + managed by the NFVO and created towards the VIM. + * NOTE 2: It is possible to have several ExtManagedVirtualLinkData for the same VNF + internal VL in case of a multi-site VNF spanning several VIMs. The set of + ExtManagedVirtualLinkData corresponding to the same VNF internal VL shall + indicate so by referencing to the same VnfVirtualLinkDesc and externally-managed + multi-site VL instance (refer to clause 4.4.1.12). + * NOTE 3: The target size for VNF instantiation may be specified in either instantiationLevelId or targetScaleLevelInfo, but + not both. If none of the two attributes (instantiationLevelId or targetScaleLevelInfo) are present, the default + instantiation level as declared in the VNFD shall be used. + * NOTE 4: If targetScaleLevelInfo is specified, information provided in targetScaleLevelInfo shall be used for instantiating + scalable constituents of the VNF (e.g, VDUs/VLs). For scaling aspects not specified in targetScaleLevelInfo or + for the VNF constituents (e.g.,VDUs/VLs) that are not scalable, the default instantiation level as declared in the + VNFD shall be used for instantiation. type: object required: - flavourId @@ -28,20 +35,34 @@ definitions: $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" instantiationLevelId: description: > - Identifier of the instantiation level of the deployment flavour to be - instantiated. If not present, the default instantiation level as - declared in the VNFD is instantiated. + Identifier of the instantiation level of the deployment + flavour to be instantiated. See note 3. $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + targetScaleLevelInfo: + description: > + This attribute is applicable if VNF supports target + scale level instantiation. + For each scaling aspect of the current deployment + flavour, the attribute specifies the scale level of VNF + constituents (e.g., VDU level) to be instantiated. See + notes 3 and 4. + type: array + items: + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ScaleInfo" extVirtualLinks: description: > - Information about external VLs to connect the VNF to, including configuration information - for the CPs via which the VNF instance can attach to this VL. - The following applies to the "ExtVirtualLinkData" information provided in this - request, together with the related overriding information provided in the - "Grant" structure (see clause 9.5.2.3): Even if the VNF is not instantiated in - fully scaled-out state, the API consumer shall provide enough CP configuration - records to allow connecting the VNF instance, fully scaled out in all scaling - aspects, to the external VLs + Information about external VLs to connect the VNF + to, including configuration information for the CPs + via which the VNF instance can attach to this VL. + The following applies to the "ExtVirtualLinkData" + information provided in this request, together with + the the related overriding information provided in the + "Grant" structure (see clause 9.5.2.3): Even if the + VNF is not instantiated in fully scaled-out state, the + API consumer shall provide enough CP + configuration records to allow connecting the VNF + instance, fully scaled out in all scaling aspects, to + the external VLs. type: array items: $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ExtVirtualLinkData" @@ -53,11 +74,21 @@ definitions: $ref: "#/definitions/ExtManagedVirtualLinkData" vimConnectionInfo: description: > - Information about VIM connections to be used for managing the resources for the VNF instance, or refer to - external / externally-managed virtual links. This attribute shall only be supported and may be present if - VNF-related resource management in direct mode is applicable. The VNFM shall apply the content of this - attribute to the "vimConnectionInfo" attribute of "VnfInstance" according to the rules of JSON Merge Patch - (see IETF RFC 7396). + Information about VIM or CISM connections to be + used for managing the resources for the VNF + instance, or refer to external/externally-managed + virtual links. + This attribute shall only be supported and may be + present if + - the resources for at least one of the VNFCs + shall be managed by a VIM and VNFrelated resource management in direct + mode is applicable. + - the resources for at least one of the VNFCs + shall be managed by a CISM. + The VNFM shall apply the content of this attribute to + the "vimConnectionInfo" attribute of "VnfInstance" + according to the rules of JSON Merge Patch (see + IETF RFC 7396 [5]). type: object additionalProperties: $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/VimConnectionInfo" @@ -69,9 +100,10 @@ definitions: $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/String" additionalParams: description: > - Additional input parameters for the instantiation process, specific - to the VNF being instantiated, as declared in the VNFD as part of - "InstantiateVnfOpConfig". + Additional input parameters for the instantiation + process, specific to the VNF being instantiated, as + declared in the VNFD as part of + "InstantiateVnfOpConfig" defined in ETSI GS NFVIFA 011 [10]. $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" extensions: description: > @@ -170,16 +202,23 @@ definitions: This type represents request parameters for the "Change VNF flavour" operation. It shall comply with the provisions defined in table 5.5.2.7-1. - NOTE 1: The indication of externally-managed internal VLs is needed in case networks - have been pre-configured for use with certain VNFs, for instance to ensure - that these networks have certain properties such as security or acceleration - features, or to address particular network topologies. The present document - assumes that externally-managed internal VLs are managed by the NFVO and created - towards the VIM. - NOTE 2: It is possible to have several ExtManagedVirtualLinkData for the same VNF internal - VL in case of a multi-site VNF spanning several VIMs. The set of ExtManagedVirtualLinkData - corresponding to the same VNF internal VL shall indicate so by referencing to the same - VnfVirtualLinkDesc and externally-managed multi-site VL instance (refer to clause 4.4.1.12). + * NOTE 1: The indication of externally-managed internal VLs is needed in case networks + have been pre-configured for use with certain VNFs, for instance to ensure + that these networks have certain properties such as security or acceleration + features, or to address particular network topologies. The present document + assumes that externally-managed internal VLs are managed by the NFVO and created + towards the VIM. + * NOTE 2: It is possible to have several ExtManagedVirtualLinkData for the same VNF internal + VL in case of a multi-site VNF spanning several VIMs. The set of ExtManagedVirtualLinkData + corresponding to the same VNF internal VL shall indicate so by referencing to the same + VnfVirtualLinkDesc and externally-managed multi-site VL instance (refer to clause 4.4.1.12). + * NOTE 3: The target size for VNF instantiation may be specified in either instantiationLevelId or targetScaleLevelInfo, but + not both. If none of the two attributes (instantiationLevelId or targetScaleLevelInfo) are present, the default + instantiation level as declared in the VNFD shall be used. + * NOTE 4: If targetScaleLevelInfo is specified, information provided in targetScaleLevelInfo shall be used for instantiating + scalable constituents of the VNF (e.g, VDUs/VLs). For scaling aspects not specified in targetScaleLevelInfo or + for the VNF constituents (e.g.,VDUs/VLs) that are not scalable, the default instantiation level as declared in the + VNFD shall be used for instantiation. type: object required: - newFlavourId @@ -191,9 +230,20 @@ definitions: instantiationLevelId: description: > Identifier of the instantiation level of the deployment flavour to - be instantiated. If not present, the default instantiation level as + be instantiated. See note 3. If not present, the default instantiation level as declared in the VNFD is instantiated. $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + targetScaleLevelInfo: + description: > + This attribute is applicable if VNF supports target scale + level instantiation. + For each scaling aspect of the current deployment + flavour, the attribute specifies the scale level of VNF + constituents (e.g., VDU level) to be instantiated. See + notes 3 and 4. + type: array + items: + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ScaleInfo" extVirtualLinks: description: > Information about external VLs to connect the VNF to, including configuration information @@ -218,11 +268,21 @@ definitions: $ref: "#/definitions/ExtManagedVirtualLinkData" vimConnectionInfo: description: > - Information about VIM connections to be used for managing the resources for the VNF instance, or refer to - external / externally-managed virtual links. This attribute shall only be supported and may be present if - VNF-related resource management in direct mode is applicable. The VNFM shall apply the content of this - attribute to the "vimConnectionInfo" attribute of "VnfInstance" according to the rules of JSON Merge Patch - (see IETF RFC 7396). + Information about VIM or CISM connections to be used + for managing the resources for the VNF instance, or + refer to external/externally-managed virtual links. + This attribute shall only be supported and may be + present if + - the resources for at least one of the VNFCs + shall be managed by a VIM and VNF-related + resource management in direct mode is + applicable. + - the resources for at least one of the VNFCs + shall be managed by a CISM. + The VNFM shall apply the content of this attribute to + the "vimConnectionInfo" attribute of "VnfInstance" + according to the rules of JSON Merge Patch (see IETF + RFC 7396 [5]). type: object additionalProperties: $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/VimConnectionInfo" @@ -230,7 +290,7 @@ definitions: description: > Additional input parameters for the instantiation process, specific to the VNF being instantiated, as declared in the VNFD as part of - "InstantiateVnfOpConfig". + "InstantiateVnfOpConfig" defined in ETSI GS NFV-IFA 011 [10]. $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" extensions: description: > @@ -290,7 +350,7 @@ definitions: description: > Additional parameters passed by the NFVO as input to the termination process, specific to the VNF being terminated, as declared in the - VNFD as part of "TerminateVnfOpConfig". + VNFD as part of "TerminateVnfOpConfig" defined in ETSI GS NFV-IFA 011 [10]. $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" HealVnfRequest: @@ -304,7 +364,7 @@ definitions: description: > Additional parameters passed by the NFVO as input to the healing process, specific to the VNF being healed, as declared in the VNFD - as part of "HealVnfOpConfig". + as part of "HealVnfOpConfig" defined in ETSI GS NFV-IFA 011 [10]. $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" OperateVnfRequest: @@ -342,7 +402,7 @@ definitions: description: > Additional parameters passed by the NFVO as input to the process, specific to the VNF of which the operation status is changed, as - declared in the VNFD as part of "OperateVnfOpConfig". + declared in the VNFD as part of "OperateVnfOpConfig" defined in ETSI GS NFV-IFA 011 [10]. $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" ChangeExtVnfConnectivityRequest: @@ -806,8 +866,8 @@ definitions: the VNFD if auto-scaling and/or auto-healing are supported by the VNF: - isAutoscaleEnabled: If present, the VNF supports auto-scaling. If set to true, auto-scaling is currently enabled. If set to false, auto-scaling is currently disabled. - - isAutohealEnabled: If present, the VNF supports auto-healing. If set to true, auto-healing is - currently enabled. If set to false, auto-healing is currently disabled. + - isAutohealEnabled: If present, the VNF supports auto-healing. If set to true, auto-healing is + currently enabled. If set to false, auto-healing is currently disabled. These configurable properties can be initialized with default values from the VNFD (see note 4). @@ -819,20 +879,55 @@ definitions: $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" vimConnectionInfo: description: > - Information about VIM connections to be used for managing the - resources for the VNF instance. The keys of the map, each of - which identifies information about a particular VIM connection, - are managed by the NFVO and referenced from other data structures - via the "vimConnectionId" attribute. This attribute shall only - be supported and present if VNF-related resource management in - direct mode is pplicable. - This attribute can be modified with the PATCH method. + Information about VIM or CISM connections + to be used for managing the resources for + the VNF instance. The keys of the map, each + of which identifies information about a + particular VIM connection, are managed by + the NFVO and referenced from other data + structures via the "vimConnectionId" + attribute. + This attribute shall only be supported and + present if + - the resources of at least of the + VNFCs are managed by a VIM and + VNF-related resource management + in direct mode is applicable. + - the resources of at least of the + VNFCs are managed by a CISM. + This attribute can be modified with the + PATCH method. + type: object + additionalProperties: + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/VimConnectionInfo" + cirConnectionInfo: + description: > + Information about the CIR connection for + managing OS container images for the VNF + instance. + Shall be present when all or part of the VNF + is realized by a set of OS containers and + shall be absent otherwise. + type: object + additionalProperties: + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/VimConnectionInfo" + mciopRepositoryInfo: + description: > + Information about the MCIOP repository for + the VNF instance. + Shall be present when all or part of the VNF + is realized by a set of OS containers and + shall be absent otherwise. + See note 1. type: object additionalProperties: $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/VimConnectionInfo" instantiationState: description: > The instantiation state of the VNF. + Permitted values: + - NOT_INSTANTIATED: The VNF instance is terminated or not instantiated. + - INSTANTIATED: The VNF instance is instantiated. type: string enum: - NOT_INSTANTIATED @@ -857,9 +952,12 @@ definitions: $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/VnfOperationalStateType" scaleStatus: description: > - Scale status of the VNF, one entry per aspect. - Represents for every scaling aspect how "big" the VNF has been scaled w.r.t. that aspect. - This attribute shall be present if the VNF supports scaling. + Scale status of the VNF, one entry per + aspect. Represents for every scaling aspect + how "big" the VNF has been scaled w.r.t. + that aspect. + This attribute shall be present if the VNF + supports scaling. See clause B.2 for an explanation of VNF scaling. type: array items: @@ -889,6 +987,14 @@ definitions: minItems: 1 items: $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/VipCpInfo" + virtualCpInfo: + description: > + Virtual CPs that are part of the VNF instance. Shall be present when a particular Virtual CP + is associated to an external CP of the VNF instance. + May be present otherwise. + type: array + items: + $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/VirtualCpInfo - TO DO" extVirtualLinkInfo: description: > Information about the external VLs the VNF instance is connected to. @@ -934,6 +1040,15 @@ definitions: type: array items: $ref: "#/definitions/VirtualStorageResourceInfo" + mcioInfo: + description: > + Information on the MCIO(s) representing + VNFC instance(s) realized by one or a set of + OS containers and created from the same + VDU for the VNF instance. + type: array + items: + $ref: "#/definitions/McioInfo - TO DO" metadata: description: > Additional VNF-specific attributes that provide metadata describing the VNF instance. diff --git a/src/definitions/SOL002SOL003VNFLifecycleManagement_def.yaml b/src/definitions/SOL002SOL003VNFLifecycleManagement_def.yaml index 222f0a87..a6fa2835 100644 --- a/src/definitions/SOL002SOL003VNFLifecycleManagement_def.yaml +++ b/src/definitions/SOL002SOL003VNFLifecycleManagement_def.yaml @@ -28,6 +28,9 @@ definitions: $ref: "SOL002SOL003_def.yaml#/definitions/KeyValuePairs" ScaleVnfRequest: + description: > + This type represents request parameters for the "Scale VNF" operation. It shall comply with the provisions defined in + table 5.5.2.5-1. See clause B.2 in annex B for an explanation of VNF scaling. type: object required: - type -- GitLab From 634c7132063bcca89930dbc52a9d5364a382ce1c Mon Sep 17 00:00:00 2001 From: muhammadh Date: Thu, 16 Jun 2022 18:49:05 +0500 Subject: [PATCH 07/41] update probableCause attribute in VNF Fault Mgmt API --- .../definitions/SOL003VNFFaultManagement_def.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SOL003/VNFFaultManagement/definitions/SOL003VNFFaultManagement_def.yaml b/src/SOL003/VNFFaultManagement/definitions/SOL003VNFFaultManagement_def.yaml index d9ab6c94..63f84870 100644 --- a/src/SOL003/VNFFaultManagement/definitions/SOL003VNFFaultManagement_def.yaml +++ b/src/SOL003/VNFFaultManagement/definitions/SOL003VNFFaultManagement_def.yaml @@ -107,7 +107,7 @@ definitions: physical maintenance/repair, hypervisor software updates, etc. - "NFVI_COMPONENT_EVACUATION": Evacuation of physical hosts. - "NFVI_COMPONENT_OPTIMIZATION": Operation and management of NFVI resources, e.g. - to support energy efficiency or resource usage optimization. + to support energy efficiency or resource usage. type: string isRootCause: description: > -- GitLab From 54afabfa1c3b7cd3c7ec085b036dc48bd5931416 Mon Sep 17 00:00:00 2001 From: Ayesha Ayub Date: Fri, 17 Jun 2022 11:26:17 +0500 Subject: [PATCH 08/41] add new datatypes in VNFLCM API of SOL002 --- ...NFLifecycleManagementNotification_def.yaml | 37 +----- ...OL002SOL003VNFLifecycleManagement_def.yaml | 117 ++++++++++++++++++ 2 files changed, 119 insertions(+), 35 deletions(-) diff --git a/src/SOL002/VNFLifecycleManagementNotification/definitions/SOL002VNFLifecycleManagementNotification_def.yaml b/src/SOL002/VNFLifecycleManagementNotification/definitions/SOL002VNFLifecycleManagementNotification_def.yaml index e0efe2a4..493e628d 100644 --- a/src/SOL002/VNFLifecycleManagementNotification/definitions/SOL002VNFLifecycleManagementNotification_def.yaml +++ b/src/SOL002/VNFLifecycleManagementNotification/definitions/SOL002VNFLifecycleManagementNotification_def.yaml @@ -182,7 +182,7 @@ definitions: management operation occurrence. type: array items: - $ref: "SOL002VNFLifecycleManagementNotification_def.yaml#/definitions/AffectedVirtualCp" + $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/AffectedVirtualCp" changedExtConnectivity: description: > Information about changed external connectivity, if this @@ -211,37 +211,4 @@ definitions: _links: description: > Links to resources related to this notification. - $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/LccnLinks" - AffectedVirtualCp: - description: > - This type provides information about added, deleted and modified virtual CP instances. - type: object - required: - - cpInstanceId - - cpdId - - changeType - properties: - cpInstanceId: - description: > - dentifier of the virtual CP instance and the related "VirtualCpInfo" - structure in "VnfInstance". - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" - cpdId: - description: > - Identifier of the VirtualCpd in the VNFD. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" - vnfdId: - description: > - Reference to the VNFD. - Shall be present in case of a "change current VNF Package" to identify whether - the affected virtual CP instance is associated to a VirtualCpd which is referred - from the source or destination VNFD. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" - changeType: - description: > - Signals the type of change. - type: string - enum: - - ADDED - - REMOVED - - MODIFIED \ No newline at end of file + $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/LccnLinks" \ No newline at end of file diff --git a/src/definitions/SOL002SOL003VNFLifecycleManagement_def.yaml b/src/definitions/SOL002SOL003VNFLifecycleManagement_def.yaml index a6fa2835..8ebac213 100644 --- a/src/definitions/SOL002SOL003VNFLifecycleManagement_def.yaml +++ b/src/definitions/SOL002SOL003VNFLifecycleManagement_def.yaml @@ -1109,4 +1109,121 @@ definitions: Metadata about this VIP CP. type: array items: + $ref: "SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + + AffectedVirtualCp: + description: > + This type provides information about added, deleted and modified virtual CP instances. + type: object + required: + - cpInstanceId + - cpdId + - changeType + properties: + cpInstanceId: + description: > + dentifier of the virtual CP instance and the related "VirtualCpInfo" + structure in "VnfInstance". + $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + cpdId: + description: > + Identifier of the VirtualCpd in the VNFD. + $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + vnfdId: + description: > + Reference to the VNFD. + Shall be present in case of a "change current VNF Package" to identify whether + the affected virtual CP instance is associated to a VirtualCpd which is referred + from the source or destination VNFD. + $ref: "SOL002SOL003_def.yaml#/definitions/Identifier" + changeType: + description: > + Signals the type of change. + type: string + enum: + - ADDED + - REMOVED + - MODIFIED + + McioInfo: + description: > + This type provides information about an MCIO representing the set of VNFC instances realized by one + or a set of OS containers which have been created based on the same VDU. + Within the CISM, an MCIO controller monitors the actual state of an MCIO representing the set of VNFC + instances realized by one or a set of OS containers and compare it to the desired state as specified + in the respective declarative descriptor. It triggers actions toward the CIS to align the actual to + the desired state. Monitoring the actual state includes monitoring the number of MCIO instances available + at any specific point in time. In addition, an MCIO controller maintains properties and runtime information + on the MCIO instances which have been created based on the same VDU. + The McioInfo data structure provides the runtime information on the MCIOs obtained from the MCIO controller. + + NOTE: There are different types of MCIOs. The set of VNFC instances based on the same VDU is represented + by one MCIO, e.g. of type Deployment. Each individual VNFC instance is represented by another type + of MCIO, e.g. a POD. + + Runtime information of the set of OS containers realizing an individual VNFC instance is not part of the + McioInfo data structure; such runtime information is provided in the ResourceHandle data structure + referenced from the VnfcResourceInfo. The McioInfo does not provide runtime information of a constituent + VNFC instance created based on a specific VDU. + + NOTE 1: The type of MCIO as specified in the declarative descriptor of the MCIO, and that can be read from + the CISM. EXAMPLE: In case of MCIOs managed by Kubernetes®, the type of MCIO corresponds to the + “kind” property of the declarative descriptor. + NOTE 2: If the attribute additionalInfo is present, it may contain runtime information on the actual and + desired state of the MCIO(s). + NOTE 3: When the container infrastructure service is a Kubernetes® instance, the mcioId is the combined + values from the kind and name fields of the Kubernetes resource object, separated by a slash. + Example: "Deployment/abcd". + NOTE 4: When the container infrastructure service is a Kubernetes® instance, the mcioName is the name + field of the resource object. + type: object + required: + - mcioId + - mcioName + - mcioNamespace + - vduId + - cismId + - mcioType + - desiredInstances + - availableInstances + properties: + mcioId: + description: > + Identifier of this MCIO, created by the CISM. See note 3. + $ref: "SOL002SOL003_def.yaml#/definitions/Identifier" + mcioName: + description: > + Human readable name of this MCIO. See note 4. + type: string + mcioNamespace: + description: > + Namespace of this MCIO. + type: string + vduId: + description: > + Reference to the related VDU in the VNFD applicable to this resource. + $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + cismId: + description: > + Identifier of the CISM managing this MCIO. + $ref: "SOL002SOL003_def.yaml#/definitions/Identifier" + mcioType: + description: > + The type of MCIO. Specific values, their semantics and associated MCIO types are + defined in clause 5.5.4.9. Additional values are also permitted. + See note 1. + type: string + desiredInstances: + description: > + Number of desired MCIO instances. + type: integer + availableInstances: + description: > + Number of available MCIO instances. + type: integer + additionalInfo: + decription: > + Additional information which is specific to the MCIO, its type, and which is available + from the CISM. + See note 2. $ref: "SOL002SOL003_def.yaml#/definitions/KeyValuePairs" \ No newline at end of file -- GitLab From ccf6c8f55761634dca59e53036f21fbb447155e9 Mon Sep 17 00:00:00 2001 From: muhammadh Date: Fri, 17 Jun 2022 11:51:55 +0500 Subject: [PATCH 09/41] add and update attributes in VNF LC operating granting API in SOL003 --- ...L003VNFLifecycleOperationGranting_def.yaml | 265 ++++++++++++++---- 1 file changed, 205 insertions(+), 60 deletions(-) diff --git a/src/SOL003/VNFLifecycleOperationGranting/definitions/SOL003VNFLifecycleOperationGranting_def.yaml b/src/SOL003/VNFLifecycleOperationGranting/definitions/SOL003VNFLifecycleOperationGranting_def.yaml index 0e888be6..0d2ab366 100644 --- a/src/SOL003/VNFLifecycleOperationGranting/definitions/SOL003VNFLifecycleOperationGranting_def.yaml +++ b/src/SOL003/VNFLifecycleOperationGranting/definitions/SOL003VNFLifecycleOperationGranting_def.yaml @@ -6,30 +6,36 @@ definitions: description: > This type represents a grant request. It shall comply with the provisions defined in table 9.5.2.2-1. - NOTE 1: The VNF LCM operations CreateVnfIdentifier, DeleteVnfIdentifier, QueryVnf and ModifyVnfInformation - can be executed by the VNFM without requesting granting. - NOTE 2: If the granting request is for InstantiateVNF, either instantiationLevel or addResources shall be present. - NOTE 3: The NFVO will assume that the VNFM will be responsible to both allocate and release the temporary resource - during the runtime of the LCM operation. This means, the resource can be allocated and consumed after the - "start" notification for the LCM operation is sent by the VNFM, and the resource will be released before the - "result" notification of the VNF LCM operation is sent by the VNFM. - NOTE 4: For the affinity/anti-affinity rules defined in the VNFD and the placement constraints in the GrantVnfLifecycleOperation - as defined in this clause, the following applies: Assuming unlimited capacity, the combination of all the - aforementioned rules shall be satisfiable by at least one possible placement of the new resources, with the - exception that some of the rules with fallbackBestEffort may be unsatisfiable due to the actual placement of - existing resources. In this case, rules with fallbackBestEffort are allowed to be violated only in relation - to the placement of existing resources. - NOTE 5: Passing constraints allows the VNFM or the lifecycle management scripts to influence resource placement decisions - by the NFVO to ensure VNF properties such as performance or fault tolerance. - NOTE 6: If fallbackBestEffort is present and set to "true" in one or more placement constraints and, the NFVO - cannot find a resource placement that satisfies all of these due to limited capacity, the NFVO shall process - each such affinity/anti-affinity constraint in a best effort manner, in which case, if specified resources - cannot be allocated based on the specified placement constraint, the NFVO shall look for an alternate best - effort placement for the specified resources to be granted. In the best effort anti-affinity case, the - resources are expected to be spread optimally over all available instances of scope (e.g. zones), and in - the best effort affinity case, they are expected to be distributed optimally over as few instances of scope as - possible. Being able to satisfy a "best-effort" constraint in a best effort manner only, as defined above, - shall not lead to rejecting the grant. + NOTE 1: The VNF LCM operations CreateVnfIdentifier, DeleteVnfIdentifier, QueryVnf and + ModifyVnfInformation can be executed by the VNFM without requesting granting. + NOTE 2: If the granting request is for InstantiateVNF, only one of the three parameters (instantiationLevel or + targetScaleLevelInfo or addResources) shall be present. + NOTE 3: The NFVO will assume that the VNFM will be responsible to both allocate and release the temporary + resource during the runtime of the LCM operation. This means, the resource can be allocated and + consumed after the "start" notification for the LCM operation is sent by the VNFM, and the resource + will be released before the "result" notification of the VNF LCM operation is sent by the VNFM. + NOTE 4: For the affinity/anti-affinity rules defined in the VNFD and the placement constraints in the + GrantVnfLifecycleOperation as defined in this clause, the following applies: Assuming unlimited + capacity, the combination of all the aforementioned rules shall be satisfiable by at least one possible + placement of the new resources, with the exception that some of the rules with fallbackBestEffort + may be unsatisfiable due to the actual placement of existing resources. In this case, rules with + fallbackBestEffort are allowed to be violated only in relation to the placement of existing resources. + NOTE 5: Passing constraints allows the VNFM or the lifecycle management scripts to influence resource + placement decisions by the NFVO to ensure VNF properties such as performance or fault tolerance. + NOTE 6: If fallbackBestEffort is present and set to "true" in one or more placement constraints and the NFVO + cannot find a resource placement that satisfies all of these due to limited capacity, the NFVO shall + process each such affinity/antiAffinity constraint in a best effort manner, in which case, if specified + resources cannot be allocated based on the specified placement constraint, the NFVO shal look for + an alternate best effort placement for the specified resources to be granted. In the best effort antiaffinity case, the resources are expected to be spread optimally over all available instances of scope + (e.g. zones), and in the best effort affinity case, they are expected to be distributed optimally over as + few instances of scope as possible. Being able to satisfy a "best-effort" constraint in a best effort + manner only, as defined above, shall not lead to rejecting the grant. + NOTE 7: The target size for VNF instantiation may be specified in either instantiationLevelId or + targetScaleLevelInfo, but not both. + NOTE 8: If targetScaleLevelInfo is specified, information provided in targetScaleLevelInfo shall be used for + scalable constituents of the VNF (e.g, VDUs/VLs) in the granting process. For scaling aspects not + specified in targetScaleLevelInfo or for the VNF constituents (e.g.,VDUs/VLs) that are not scalable, + the default instantiation level as declared in the VNFD shall be used in the granting process. type: object required: - vnfInstanceId @@ -87,10 +93,25 @@ definitions: type: boolean instantiationLevelId: description: > - If operation=INSTANTIATE, the identifier of the instantiation level may be provided as an - alternative way to define the resources to be added. This attribute shall only be used if - operation=INSTANTIATE. See note 2. + If operation=INSTANTIATE, the identifier of the instantiation level may be provided as an + alternative way to define the resources to be added. This attribute shall only be used if + operation=INSTANTIATE. See notes 2 and 7. $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + targetScaleLevelInfo: + description: > + This attribute shall only be used for + Instantiate VNF requests. This is applicable + if VNF supports target scale level + instantiation. + This attribute provides an alternative way to + define the resources to be added for the + VNFs. + For each scaling aspect of the current + deployment flavour, the attribute specifies + the scale level of VNF constituents (e.g., + VDU level) to be instantiated. See notes 2, + 7 and 8. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ScaleInfo" addResources: description: > List of resource definitions in the VNFD for resources to be added by the LCM operation @@ -243,18 +264,50 @@ definitions: $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" vimConnectionInfo: description: > - Provides information regarding VIM connections that are approved to be used - by the VNFM to allocate resources and provides parameters of these VIM connections. - - The VNFM shall update the "vimConnectionInfo" attribute of the "VnfInstance" structure - by adding unknown entries received in this attribute. - - This attribute is not intended for the modification of VimConnectionInfo entries passed - earlier; for that, the VnfInfoModificationRequest structure shall be used. - - This attribute shall only be supported when VNF-related Resource Management in direct mode - is applicable. In direct mode, this parameter shall be absent if the VIM information was - configured to the VNFM in another way, present otherwise. See note 1. + Provides information regarding VIM and/or CISM connections that are + approved to be used by the VNFM to allocate resources and provides + parameters of these VIM and/or CISM connections. + The VNFM shall update the + "vimConnectionInfo" attribute of the "VnfInstance" structure by adding + unknown entries received in this attribute. + This attribute is not intended for the modification of VimConnectionInfo + entries passed earlier; for that, the VnfInfoModificationRequest structure + shall be used. + This attribute shall only be supported + when + - all or part of the granted + resources are managed by + a VIM and VNF-related + Resource Management in + direct mode is applicable. + - all or part of the granted + resources are managed by + a CISM. + In direct mode, this parameter shall + be absent if the VIM or CISM + information was configured to the + VNFM in another way, present + otherwise. + See note 1. + type: object + additionalProperties: + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/VimConnectionInfo" + cirConnectionInfo: + description: > + Provides information regarding a CIR connection that is approved to be + used by the VNFM to obtain information about OS container + images. It shall be absent in case of rejection or if the CIR information + was configured to the VNFM in another way or if the granted + resources are not managed by a CISM, present otherwise. + type: object + additionalProperties: + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/VimConnectionInfo" + mciopRepositoryInfo: + description: > + Provides information regarding a MCIOP repository. It shall be absent + in case of rejection or if the MCIOP repository information was configured + to the VNFM in another way or if the granted resources are not managed + by a CISM, present otherwise. type: object additionalProperties: $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/VimConnectionInfo" @@ -315,8 +368,10 @@ definitions: $ref: "#/definitions/GrantInfo" vimAssets: description: > - Information about assets for the VNF that are managed by the NFVO in the VIM, - such as software images and virtualised compute resource flavours. See note 3. + Information about assets for the VNF that are defined in VNFD and + managed by the NFVO in the VIM/NFVI, such as software images + and virtualised compute resource flavours. + See note 3. type: object properties: computeResourceFlavours: @@ -340,6 +395,13 @@ definitions: type: array items: $ref: "#/definitions/VimSnapshotResource" + storageAssets: + description: > + Mappings between virtual storages defined in the VNFD and virtual + storages managed in the NFVI. + type: array + items: + $ref: "#/definitions/StorageAsset" extVirtualLinks: description: > Information about external VLs to connect the VNF to. See notes 5, 7 and 8. If this attribute @@ -418,6 +480,8 @@ definitions: - VL - STORAGE - LINKPORT + - OSCONTAINER + - VIRTUALCP vduId: description: > Reference to the related VDU in the VNFD applicable to this @@ -437,7 +501,13 @@ definitions: - if type="COMPUTE": VirtualComputeDesc - if type="LINKPORT" : VnfExtCpd - if type="STORAGE" : VirtualStorageDesc - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + - If type="OSCONTAINER": OsContainerDesc + - Cardinality may be greater than "1" when type="OSCONTAINER" and multiple references to + OsContainerDesc are present in the VDU indicated by the "vduId". Cardinality shall be "1" otherwise. + type: array + minItems: 1 + items: + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" secondaryResourceTemplateId: description: > Reference to a secondary resource template (VnfExtCpd) in the VNFD. @@ -480,14 +550,16 @@ definitions: $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVim" vimConnectionId: description: > - Identifier of the VIM connection to be used to manage this resource. + Identifier of the VIM or CISM connection to be used to manage this resource. Shall be present for new resources, and shall be absent for resources that have already been allocated. The applicable "VimConnectionInfo" structure, which is referenced by vimConnectionId, can be obtained from the "vimConnectionInfo" attribute of the "VnfInstance" structure. - This attribute shall only be supported when VNF-related Resource - Management in direct mode is applicable. + This attribute shall only be supported when + - all or part of the granted resources are managed by a VIM and VNF-related Resource Management in + direct mode is applicable. + - all or part of the granted resources are managed by a CISM. $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" resourceProviderId: description: > @@ -520,7 +592,24 @@ definitions: This attribute shall be absent for resources that have already been allocated. $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVim" - + containerNamespace: + description: > + The value of the namespace in which the MCIOs of a VNF with containerized components shall be deployed. + This attribute shall be present if the granted resources are managed by a CISM. The attribute shall be + absent if the granted resources are not managed by a CISM. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/String" + mcioConstraints: + description: > + The constraint values to be assigned to MCIOs of a VNF with containerized components. + The key in the key-value pair indicates the parameter name of + the MCIO constraint in the MCIO declarative descriptor and + shall be one of the possible enumeration values of the + "mcioConstraintsParams" attribute as specified in clause + 7.1.6.2.2 of ETSI GS NFV-IFA 011 [10]. The value in the keyvalue pair indicates the value to be assigned + to the MCIO constraint. + This attribute shall be present if the granted resources are managed by a CISM. The attribute shall be + absent if the granted resources are not managed by a CISM. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" ZoneInfo: description: > This type provides information regarding a resource zone. @@ -596,6 +685,13 @@ definitions: zones: {type="AFFINITY"; scope="NFVI_POP"; {resource1,resource2}} {type="ANTI_AFFINITY"; scope="ZONE"; {resource1,resource2}} + + Annex B in ETSI GS NFV-IFA 011 [10] provides additional description and examples about the usage of the + affinity/anti-affinity rules. + + + NOTE: The "CIS_NODE" and “CONTAINER_NAMESPACE” scopes shall only be used to express affinity or + antiaffinity relationship between containerized workloads. type: object required: - affinityOrAntiAffinity @@ -617,16 +713,21 @@ definitions: The scope of the placement constraint indicating the category of the "place" where the constraint applies. Permitted values: - * NFVI_POP - * ZONE - * ZONE_GROUP - * NFVI_NODE + - NFVI_POP + - ZONE + - ZONE_GROUP + - NFVI_NODE + - CIS_NODE + - CONTAINER_NAMESPACE + - See note. type: string enum: - NFVI_POP - ZONE - ZONE_GROUP - NFVI_NODE + - CIS_NODE + - CONTAINER_NAMESPACE resource: description: > References to resources in the constraint rule. @@ -767,7 +868,10 @@ definitions: description: > This type contains a mapping between a software image definition the VNFD and the corresponding software image managed by the NFVO in the - VIM which is needed during compute resource instantiation. + VIM or CIR which is needed during compute resource instantiation. + + NOTE: For an OS container image, the value of this attribute is a string concatenating the name and tag of the + image in the CIR separated by a colon ':' with no spaces, e.g. “dbImage:001”. type: object required: - vnfdSoftwareImageId @@ -775,13 +879,15 @@ definitions: properties: vimConnectionId: description: > - Identifier of the VIM connection to access the software image - referenced in this structure. - The applicable "VimConnectionInfo" structure, which is referenced by - vimConnectionId, can be obtained from the "vimConnectionInfo" - attribute of the "VnfInstance" structure. - This attribute shall only be supported and present if VNF-related - resource management in direct mode is applicable. + Identifier of the VIM or CIR connection to access the + software image referenced in this structure. + The applicable "VimConnectionInfo" structure, which is + referenced by vimConnectionId, can be obtained from the + "vimConnectionInfo" attribute of the "VnfInstance" structure. + This attribute shall only be supported and present if + - the software image is to be loaded in a virtual machine and VNF-related resource management in + direct mode is applicable. + - the software image is to be loaded in an OS container managed by a CISM. $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" resourceProviderId: description: > @@ -799,7 +905,7 @@ definitions: vimSoftwareImageId: description: > Identifier of the software image in the resource management layer - (i.e. VIM). + (i.e. VIM). See note. $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVim" SnapshotResourceDefinition: @@ -896,4 +1002,43 @@ definitions: vimSnapshotResourceId: description: > Identifier of the snapshot resource in the resource management layer (i.e. VIM). - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVim" \ No newline at end of file + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVim" + + StorageAsset: + description: > + This type provides a mapping between a VirtualStorageDesc in the VNFD and the corresponding virtual storage + managed by the NFVO in the NFVI. It shall comply with the provisions defined in table 9.5.3.13-1. + type: object + required: + - virtualStorageDescId + - storageClassName + properties: + vimConnectionId: + description: > + Identifier of the VIM or CISM connection to access the virtual + storage referenced in this data type. + The applicable "VimConnectionInfo" structure, which is referenced by + vimConnectionId, can be obtained from the "vimConnectionInfo" + attribute of the "VnfInstance" structure. + This attribute shall only be supported and present if + - all or part of the granted resources are managed by + a VIM and VNF related resource management in direct mode is applicable. + - all or part of the granted resources are managed by a CISM. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + resourceProviderId: + description: > + Identifier used by NFVO to determine the entity responsible for the + management of the storage asset. + This attribute shall only be supported and present if VNF-related resource + management in indirect mode is applicable. The identification scheme + is outside the scope of the present document. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + virtualStorageDescId: + description: > + Identifier of the virtual storage descriptor in the VNFD. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + storageClassName: + description: > + Name of storage class, which represents features and policies + concerning a virtual storage. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/String" -- GitLab From 69da576ec8a9742b5f87da4b50a41d5eb6d5b92c Mon Sep 17 00:00:00 2001 From: muhammadh Date: Fri, 17 Jun 2022 12:00:37 +0500 Subject: [PATCH 10/41] add/update attributes in VNG Pkge Mgmt API in SOL003 --- .../SOL003VNFPackageManagement_def.yaml | 54 +++++++++++-------- 1 file changed, 32 insertions(+), 22 deletions(-) diff --git a/src/SOL003/VNFPackageManagement/definitions/SOL003VNFPackageManagement_def.yaml b/src/SOL003/VNFPackageManagement/definitions/SOL003VNFPackageManagement_def.yaml index b65b2b57..ac50a9cf 100644 --- a/src/SOL003/VNFPackageManagement/definitions/SOL003VNFPackageManagement_def.yaml +++ b/src/SOL003/VNFPackageManagement/definitions/SOL003VNFPackageManagement_def.yaml @@ -32,6 +32,15 @@ definitions: It shall be present after the VNF package content has been on-boarded and absent otherwise. $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + vnfdExtInvariantId: + description: > + Identifies a VNFD in a version independent manner. This attribute is invariant across + versions of the VNFD that fulfil certain conditions related to the external + connectivity and management of the VNF. + It shall be present after the VNF package content has been on-boarded if it is + included in the VNFD and shall be absent otherwise. If present it is copied from the + VNFD of the on-boarded VNF package. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" vnfProvider: description: > Provider of the VNF package and the VNFD. This information is copied @@ -230,10 +239,14 @@ definitions: This type represents an artifact contained in or external to a VNF package which represents a software image. It shall comply with the provisions defined in table 10.5.3.2-1. - NOTE 1: The list of permitted values was taken from "Container formats" in OpenStack® documentation: "Disk and container formats for images" - (Available at https://docs.openstack.org/glance/pike/user/formats.html). - NOTE 2: The list of permitted values was adapted from "Disk formats" in OpenStack® documentation: "Disk and container formats for images" - (Available at https://docs.openstack.org/glance/pike/user/formats.html). + * NOTE 1: The list of permitted values was taken from "Container formats" in OpenStack® documentation: "Disk and container formats for images" + (Available at https://docs.openstack.org/glance/pike/user/formats.html). + * NOTE 2: The list of permitted values was adapted from "Disk formats" in OpenStack® documentation: "Disk and container formats for images" + (Available at https://docs.openstack.org/glance/pike/user/formats.html). + * NOTE 3: The attribute shall be present for VM-based software images referenced from a Vdu, and shall be absent + otherwise. + * NOTE 4: The attribute shall be present for software images referenced from a VirtualStorageDesc, and shall be absent + otherwise. type: object required: - id @@ -243,10 +256,7 @@ definitions: - checksum - isEncrypted - containerFormat - - diskFormat - createdAt - - minDisk - - minRam - size properties: id: @@ -301,19 +311,19 @@ definitions: Disk format of a software image is the format of the underlying disk image. Permitted values: - - AKI: a kernel image format - - AMI: a machine image format - - ARI: a ramdisk image format - - ISO: an archive format for the data contents of an optical disc, - such as CD-ROM - - QCOW2: a common disk image format, which can expand dynamically - and supports copy on write - - RAW: an unstructured disk image format - - VDI: a common disk image format - - VHD: a common disk image format - - VHDX: enhanced version of VHD format - - VMDK: a common disk image format - See note 2. + - AKI: a kernel image format + - AMI: a machine image format + - ARI: a ramdisk image format + - ISO: an archive format for the data contents of an optical disc, + such as CD-ROM + - QCOW2: a common disk image format, which can expand dynamically + and supports copy on write + - RAW: an unstructured disk image format + - VDI: a common disk image format + - VHD: a common disk image format + - VHDX: enhanced version of VHD format + - VMDK: a common disk image format + See notes 2 and 3. type: string enum: - AKI @@ -331,11 +341,11 @@ definitions: $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" minDisk: description: > - The minimal disk for this software image in bytes. + The minimal disk for this software image in bytes. See note 4. type: integer minRam: description: > - The minimal RAM for this software image in bytes. + The minimal RAM for this software image in bytes. See note 3. type: integer size: description: > -- GitLab From eb9ddca8dd51b5a7c8a65bc66c2b575369d65cdd Mon Sep 17 00:00:00 2001 From: muhammadh Date: Fri, 17 Jun 2022 12:16:21 +0500 Subject: [PATCH 11/41] fix Bugzilla issues (263, 264, 265 and 266) in SOL003 --- .../VNFLifecycleManagement/VNFLifecycleManagement.yaml | 8 +++----- .../definitions/SOL003VNFLifecycleManagement_def.yaml | 7 ++++--- .../SOL003VNFLifecycleOperationGranting_def.yaml | 2 +- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/SOL003/VNFLifecycleManagement/VNFLifecycleManagement.yaml b/src/SOL003/VNFLifecycleManagement/VNFLifecycleManagement.yaml index 25dfb160..281eaad2 100644 --- a/src/SOL003/VNFLifecycleManagement/VNFLifecycleManagement.yaml +++ b/src/SOL003/VNFLifecycleManagement/VNFLifecycleManagement.yaml @@ -1778,10 +1778,6 @@ components: explode: false schema: type: string - content: - application/json: - schema: - $ref: "./definitions/SOL003VNFLifecycleManagement_def.yaml#/definitions/VnfInstance" IndividualVnfInstance.Patch.409: description: | @@ -3565,7 +3561,9 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/LccnSubscription" + type: array + items: + $ref: "../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/LccnSubscription" IndividualSubscription.Get.200: description: | diff --git a/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml b/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml index 39f78064..be7e6b48 100644 --- a/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml +++ b/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml @@ -1095,6 +1095,7 @@ definitions: Further, these attributes can be created, modified or deleted with the PATCH method. In addition, the provisions in clause 5.7 shall apply. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" _links: description: > Links to resources related to this resource. @@ -1446,15 +1447,15 @@ definitions: description: > Checksum of the VNF state snapshot file. Hash algorithms applicable to VNF snapshot package artifacts are defined in ETSI GS NFV-SOL 010. - $ref: "../definitions/SOL002SOL003_def.yaml#/definitions/Checksum" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Checksum" isEncrypted: description: > Reflects whether the VNF state snapshot content is encrypted (true) or not (false). - $ref: "../definitions/SOL002SOL003_def.yaml#/definitions/Boolean" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Boolean" metadata: description: > The metadata with additional information such as content type, size, creation date, etc. - $ref: "../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" VnfSnapshot: description: > diff --git a/src/SOL003/VNFLifecycleOperationGranting/definitions/SOL003VNFLifecycleOperationGranting_def.yaml b/src/SOL003/VNFLifecycleOperationGranting/definitions/SOL003VNFLifecycleOperationGranting_def.yaml index 0d2ab366..0fa828b1 100644 --- a/src/SOL003/VNFLifecycleOperationGranting/definitions/SOL003VNFLifecycleOperationGranting_def.yaml +++ b/src/SOL003/VNFLifecycleOperationGranting/definitions/SOL003VNFLifecycleOperationGranting_def.yaml @@ -998,7 +998,7 @@ definitions: Identifier of the virtual storage resource that has been snapshotted as referred in the VNFC snapshot information. Shall only be present if the snapshot resource in the VIM is a storage resource (as indicated by "type=STORAGE" in the parent resource definition). - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" vimSnapshotResourceId: description: > Identifier of the snapshot resource in the resource management layer (i.e. VIM). -- GitLab From f511856aa641cebd8d5a85cf4c270c1833584105 Mon Sep 17 00:00:00 2001 From: muhammadh Date: Fri, 17 Jun 2022 12:29:51 +0500 Subject: [PATCH 12/41] update SOL002 and SOL003 API version in README file --- Readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Readme.md b/Readme.md index b91d223d..4852a88d 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 v3.6.1. +for the APIs defined in ETSI NFV GSs SOL002 and SOL003 v4.3.1. The APIs described in this repository are defined for the following reference points: -- GitLab From 1bdc90f85c7413a86deb39766e47f7c0c01eaa44 Mon Sep 17 00:00:00 2001 From: Ayesha Ayub Date: Fri, 17 Jun 2022 12:59:41 +0500 Subject: [PATCH 13/41] add new datatypes in VNFLCM API --- ...OL002SOL003VNFLifecycleManagement_def.yaml | 162 +++++++++++++++++- 1 file changed, 159 insertions(+), 3 deletions(-) diff --git a/src/definitions/SOL002SOL003VNFLifecycleManagement_def.yaml b/src/definitions/SOL002SOL003VNFLifecycleManagement_def.yaml index 8ebac213..63e8ec1a 100644 --- a/src/definitions/SOL002SOL003VNFLifecycleManagement_def.yaml +++ b/src/definitions/SOL002SOL003VNFLifecycleManagement_def.yaml @@ -1139,6 +1139,11 @@ definitions: changeType: description: > Signals the type of change. + + Permitted values: + - ADDED + - REMOVED + - MODIFIED type: string enum: - ADDED @@ -1209,8 +1214,8 @@ definitions: $ref: "SOL002SOL003_def.yaml#/definitions/Identifier" mcioType: description: > - The type of MCIO. Specific values, their semantics and associated MCIO types are - defined in clause 5.5.4.9. Additional values are also permitted. + The type of MCIO. Specific values, their semantics and associated MCIO types are defined in clause + 5.5.4.9. Additional values are also permitted. See note 1. type: string desiredInstances: @@ -1226,4 +1231,155 @@ definitions: Additional information which is specific to the MCIO, its type, and which is available from the CISM. See note 2. - $ref: "SOL002SOL003_def.yaml#/definitions/KeyValuePairs" \ No newline at end of file + $ref: "SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + + virtualCpInfo: + description: > + This type provides information related to a virtual CP instance of a VNF. It shall comply with the provisions + in table 5.5.3.31-1. + + NOTE: A consumer of the VNF LCM interface can learn the actual VNFC instances implementing the service + accessible via the virtual CP instance by querying the "vnfcResourceInfo" from the "InstantiatedVnfInfo" + and filtering by corresponding "vduIds" values. + type: object + required: + - cpInstanceId + - cpdId + - resourceHandle + - vduIds + properties: + cpInstanceId: + description: > + Identifier of this virtual CP instance. + $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + cpdId: + description: > + Identifier of the VirtualCpd in the VNFD. + $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + resourceHandle: + description: > + Reference to the virtualised resource realizing this virtual CP. + $ref: "SOL002SOL003_def.yaml#/definitions/ResourceHandle" + vnfExtCpId: + description: > + When the virtual CP is exposed as external CP of the VNF, the identifier of this external VNF CP instance. + $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + cpProtocolInfo: + description: > + Protocol information for this CP. There shall be one cpProtocolInfo for each layer protocol supported. + type: array + items: + $ref: "#/definitions/CpProtocolInfo" + vduIds: + description: > + Reference to the VDU(s) which implement the service accessible via the virtual CP instance. See note. + type: array + minitems: 1 + items: + $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + additionalServiceInfo: + description: > + Additional service identification information of the virtual CP instance. + type: array + items: + $ref: "#/definitions/AdditionalServiceInfo" + metadata: + description: > + Metadata about this virtual CP instance. + $ref: "SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + + AdditionalServiceInfo: + description: > + This type provides additional service information of the virtual CP instance used to expose properties of the + virtual CP to NFV-MANO. It shall comply with the provisions in table 5.5.3.32-1. + + NOTE: This attribute shall only be present if additional information is needed to identify the service + termination within the VNF, such as for example a URL path information in an HTTP request required + to allow a single virtual CP IP address to be used for several HTTP based services that use the + same port number. + type: object + required: + - portInfo + properties: + portInfo: + description: > + Service port numbers exposed by the virtual CP instance. + minitems: 1 + type: array + items: + $ref: "#/definitions/ServicePortInfo" + serviceInfo: + description: > + Service matching information exposed by the virtual CP instance. + See note. + $ref: "SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + + ServicePortInfo: + description: > + This type describes the service identifying port properties exposed by the virtual CP instance. It shall + comply with the provisions in table 5.5.3.33-1. + type: object + required: + - name + - port + - portConfigurable + properties: + name: + description: > + The name of the port exposed by the virtual CP instance. + type: string + protocol: + description: > + The L4 protocol for this port exposed by the virtual CP instance. + + Permitted values: + - TCP + - UDP + - SCTP + type: string + enum: + - TCP + - UDP + - SCTP + port: + description: > + The L4 port number exposed by the virtual CP instance. + type: integer + portConfigurable: + description: + Specifies whether the port attribute value is allowed to be configurable. + $ref: "SOL002SOL003_def.yaml#/definitions/Boolean" + + NetAttDefResourceInfo: + description: > + This type contains information related to a network attachment definition resource that provides the + specification of the interface used to connect one or multiple connection points to a secondary container + cluster network. It shall comply with the provisions defined in table 5.5.3.36-1. + type: object + required: + - netAttDefResourceInfoId + - netAttDefResource + properties: + netAttDefResourceInfoId: + description: > + Identifier of this network attachment definition resource as provided by the entity that has + created it. + $ref: "SOL002SOL003_def.yaml#/definitions/Identifier" + netAttDefResource: + description: > + Resource handle of the resource in the scope of the CISM. + $ref: "SOL002SOL003_def.yaml#/definitions/ResourceHandle" + associatedExtCpId: + description: > + Identifier of the external CP associated to this network attachment definition resource. Shall be present + when the network attachment definition resource is used for external connectivity by the VNF. + type: array + items: + $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + associatedVnfcCpId: + description: > + Identifier of the VNFC CP associated to this network attachment definition resource. May be present when + the network attachment definition resource is used for internal connectivity by the VNF. + type: array + items: + $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" \ No newline at end of file -- GitLab From 60bbf1599419867029a79516369d6bc9d436db3e Mon Sep 17 00:00:00 2001 From: muhammadh Date: Mon, 20 Jun 2022 12:52:01 +0500 Subject: [PATCH 14/41] update/add attributes in SOL003 VNF LCM --- .../SOL003VNFLifecycleManagement_def.yaml | 118 ++++++++++++++---- ...OL002SOL003VNFLifecycleManagement_def.yaml | 7 ++ 2 files changed, 99 insertions(+), 26 deletions(-) diff --git a/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml b/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml index be7e6b48..9e24a29e 100644 --- a/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml +++ b/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml @@ -406,7 +406,6 @@ definitions: $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" ChangeExtVnfConnectivityRequest: - #SOL003 location: 5.5.2.11 description: > This type represents request parameters for the "Change external VNF connectivity" operation to modify the external @@ -433,10 +432,17 @@ definitions: $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ExtVirtualLinkData" vimConnectionInfo: description: > - Information about VIM connections to be used for managing the resources for the VNF instance, or refer to - external virtual links. This attribute shall only be supported and may be present if VNF-related resource - management in direct mode is applicable. The VNFM shall apply the content of this attribute to the - "vimConnectionInfo" attribute of "VnfInstance" according to the rules of JSON Merge Patch (see IETF RFC 7396). + Information about VIM or CISM connections to be used for managing the resources for the VNF instance, or + refer to external virtual links. + This attribute shall only be supported and may be present if + - the resources for at least one of the VNFCs + shall be managed by a VIM and VNF-related + resource management in direct mode is + applicable. + - the resources for at least one of the VNFCs + shall be managed by a CISM. + The VNFM shall apply the content of this attribute to the "vimConnectionInfo" attribute of "VnfInstance" + according to the rules of JSON Merge Patch (see IETF RFC 7396 [5]). type: object additionalProperties: $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/VimConnectionInfo" @@ -444,7 +450,7 @@ definitions: description: > Additional input parameters for the instantiation process, specific to the VNF being instantiated, as declared in the VNFD as part of - "ChangeExtVnfConnectivityOpConfig".". + "ChangeExtVnfConnectivityOpConfig" defined in ETSI GS NFV-IFA 011 [10]. $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" ChangeCurrentVnfPkgRequest: @@ -495,10 +501,14 @@ definitions: $ref: "#/definitions/ExtManagedVirtualLinkData" vimConnectionInfo: description: > - Information about VIM connections to be used for managing the resources for the VNF instance, or refer to - external virtual links. This attribute shall only be supported and may be present if VNF-related resource - management in direct mode is applicable. The VNFM shall apply the content of this attribute to the - "vimConnectionInfo" attribute of "VnfInstance" according to the rules of JSON Merge Patch (see IETF RFC 7396). + Information about VIM or CISM connections to be used for managing the resources for the VNF + instance, or refer to external virtual links. + This attribute shall only be supported and may be present if + - the resources for at least one of the VNFCs shall be managed by a VIM and + VNF-related resource management in direct mode is applicable. + - the resources for at least one of the VNFCs shall be managed by a CISM. + The VNFM shall apply the content of this attribute to the "vimConnectionInfo" attribute of + "VnfInstance" according to the rules of JSON Merge Patch (see IETF RFC 7396 [5]). type: object additionalProperties: $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/VimConnectionInfo" @@ -506,7 +516,7 @@ definitions: description: > Additional parameters passed by the NFVO as input to the process, specific to the VNF of which the underlying VNF package is changed, as declared in - the VNFD as part of "ChangeCurrentVnfPkgOpConfig". + the VNFD as part of "ChangeCurrentVnfPkgOpConfig" " defined in ETSI GS NFV-IFA 011 [10]. $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" extensions: description: > @@ -682,7 +692,7 @@ definitions: description: > Additional input parameters for the snapshot creation process, specific for the VNF being “snapshotted”, as declared in the VNFD as part of - “CreateSnapshotVnfOpConfig”. + “CreateSnapshotVnfOpConfig” defined in ETSI GS NFV-IFA 011 [10]. $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" userDefinedData: description: > @@ -724,7 +734,7 @@ definitions: additionalParams: description: > Additional input parameters for the revert to VNF snapshot process, specific for the VNF being - “reverted”, as declared in the VNFD as part of “RevertToSnapshotVnfOpConfig”. + “reverted”, as declared in the VNFD as part of “RevertToSnapshotVnfOpConfig” defined in ETSI GS NFV-IFA 011 [10]. $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" VnfSnapshotInfoModificationRequest: @@ -1215,6 +1225,13 @@ definitions: type: array items: $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/VnfLinkPortInfo" + vnfNetAttDefResource: + description: > + Network attachment definition resources that provide the specification of the interface to attach connection + points to this VL. + type: array + items: + $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/NetAttDefResourceInfo" extManagedMultisiteVirtualLinkId: description: > Identifier of the externally-managed multi-site VL instance. The identifier is assigned by the NFVMANO entity @@ -1255,7 +1272,7 @@ definitions: $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" storageResource: description: > - Reference to the VirtualStorage resource. + Reference to the VirtualStorage resource or reference to a Storage MCIO. $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ResourceHandle" zoneId: description: > @@ -1276,9 +1293,15 @@ definitions: VnfcResourceInfo: description: > - This type represents the information on virtualised compute and storage resources - used by a VNFC in a VNF instance. It shall comply with the provisions defined in - table 5.5.3.5-1. + This type represents the information on virtualised compute and storage resources used by a VNFC in a VNF instance. + Depending on the form of virtualisation container of the VNFC: + - For a VNFC based on VM, a reference to the corresponding VirtualCompute shall be provided, and + - For a VNFC based on OS container(s), a reference to the Compute MCIO shall be provided. Hence, exposure of + information by the VNFM to the NFVO is at the MCIO level. + In addition, the references to the storage resources depend on the form of the VNFC: + a) For a VNFC based on VM, storage resource identifiers shall refer to VirtualStorage resources, and + b) For a VNFC based on OS container(s), storage resource identifiers shall refer to Storage MCIOs. + It shall comply with the provisions defined in table 5.5.3.5-1. NOTE 1: ETSI GS NFV-SOL 001 specifies the structure and format of the VNFD based on TOSCA specifications. @@ -1291,6 +1314,10 @@ definitions: structure by an LCM operation occurrence, this does not represent a change that requires including a related "AffectedVnfc" structure in the VNF LCM operation occurrence notifications or the "VnfLcmOpOcc" structure related to this LCM operation occurrence. + NOTE 5: Cardinality greater than 1 is only applicable for specific cases where more than one network attachment + definition resource is needed to fulfil the connectivity requirements of the internal CP, e.g. to build a link + redundant mated pair in SR-IOV cases. + NOTE 6: When more than one netAttDefResourceId is indicated, all shall belong to the same namespace. type: object required: - id @@ -1313,7 +1340,7 @@ definitions: $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" computeResource: description: > - Reference to the VirtualCompute resource. + Reference to the VirtualCompute resource or reference to a Compute MCIO. $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ResourceHandle" zoneId: description: > @@ -1324,8 +1351,8 @@ definitions: $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" storageResourceIds: description: > - References to the VirtualStorage resources. The value refers to a - VirtualStorageResourceInfo item in the VnfInstance. + References to the VirtualStorage resources or references to Storage MCIOs. + The value refers to a VirtualStorageResourceInfo item in the VnfInstance. type: array items: $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" @@ -1384,9 +1411,17 @@ definitions: Identifier of another VNFC CP instance that corresponds to the parent port of a trunk that the present VNFC CP instance participates in. Shall be provided if the present CP instance participates in a trunk as subport, and the referred VNFC CP instances are also present in the vnfcCpInfo attribute. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" - + + netAttDefResourceInfoId: + description: > + Identifier of the “NetAttDefResourceInfo” structure that provides the specification of the interface to attach the + connection point to a secondary container cluster network. See notes 5 and 6. + It shall be present if the internal CP is associated to a VNFC realized by one or a set of OS containers and is + connected to a secondary container cluster network. It shall not be present otherwise. + type: array + items: + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" metadata: description: > @@ -1636,7 +1671,7 @@ definitions: $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" networkResource: description: > - Reference to the VirtualNetwork resource. + Reference to the VirtualNetwork resource or reference to a Network MCIO. $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ResourceHandle" zoneId: description: > @@ -2326,8 +2361,19 @@ definitions: type: array items: $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/AffectedVipCp" - - + + affectedVirtualCps: + description: + Information about virtual CP instances that were affected during the execution of the lifecycle + management operation, if this notification represents the result of a lifecycle management operation + occurrence. + Shall be present if the "notificationStatus" is set to "RESULT", the "verbosity" attribute is set to "FULL" + and the operation has made any changes to the virtual CP instances of the VNF instance. Shall be absent + otherwise. Only information about virtual CP instances that have been added, deleted or modified shall be + provided. + type: array + items: + $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/AffectedVirtualCp" changedExtConnectivity: description: > Information about changed external connectivity, if this notification @@ -2550,4 +2596,24 @@ definitions: provides the specification of the interface to attach the VNF internal CP created from the CPD identified by cpdId to a secondary container cluster network. See note. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" \ No newline at end of file + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + + VirtualCpAddressInfo: + description: > + This type represents information about a network address that has been assigned to a virtual CP. + type: object + required: + - type + properties: + type: + description: > + The type of the IP addresses. + Permitted values: IPV4, IPV6. + type: string + enum: + - IPV4 + - IPV6 + loadBalancerIp: + description: > + Fixed addresses assigned to an external load balancer. + $ref: '../../../definitions/SOL002SOL003_def.yaml#/definitions/IpAddress' \ No newline at end of file diff --git a/src/definitions/SOL002SOL003VNFLifecycleManagement_def.yaml b/src/definitions/SOL002SOL003VNFLifecycleManagement_def.yaml index 63e8ec1a..62631236 100644 --- a/src/definitions/SOL002SOL003VNFLifecycleManagement_def.yaml +++ b/src/definitions/SOL002SOL003VNFLifecycleManagement_def.yaml @@ -302,6 +302,13 @@ definitions: type: array items: $ref: "SOL002SOL003_def.yaml#/definitions/VnfExtCpData" + extNetAttDefResourceData: + description: > + Network attachment definition resources that provide the specification of the interface to attach connection + points to this VL. + type: array + items: + $ref: "SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/NetAttDefResourceInfo" VnfLinkPortInfo: description: > -- GitLab From 4269fabb792337526e59568458598c357048faae Mon Sep 17 00:00:00 2001 From: Ayesha Ayub Date: Mon, 20 Jun 2022 13:07:11 +0500 Subject: [PATCH 15/41] update/add attributes for SOL002 VNF LCM API --- .../SOL002VNFLifecycleManagement_def.yaml | 143 +++++++++++++++--- ...OL002SOL003VNFLifecycleManagement_def.yaml | 13 +- src/definitions/SOL002SOL003_def.yaml | 2 +- 3 files changed, 135 insertions(+), 23 deletions(-) diff --git a/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml b/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml index ce99b603..d2fe175c 100644 --- a/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml +++ b/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml @@ -170,6 +170,14 @@ definitions: type: array items: $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/VipCpInfo" + virtualCpInfo: + description: > + Virtual CPs that are part of the VNF instance. Shall be present when a particular virtual CP is + associated to an external CP of the VNF instance. + May be present otherwise. + type: array + items: + $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/VirtualCpInfo" extVirtualLinkInfo: description: > Information about the external VLs the VNF instance is connected to. @@ -230,6 +238,13 @@ definitions: type: array items: $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/VnfcInfo" + mcioInfo: + description: > + Information on the MCIO(s) representing VNFC instance(s) realized by one or a set of OS containers + and created from the same VDU for the VNF instance. + type: array + items: + $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/McioInfo" metadata: description: > Additional VNF-specific attributes that provide metadata describing the VNF instance. @@ -976,7 +991,7 @@ definitions: computeSnapshotResource: description: > Reference to a compute snapshot resource. See note 1. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ResourceHandle" + $ref: "#/definitions/ResourceHandle" storageSnapshotResources: description: > Mapping of the storage resources associated to the VNFC with the storage snapshot resources. @@ -993,7 +1008,7 @@ definitions: storageSnapshotResource: description: > Reference to a storage snapshot resource. See note 2. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ResourceHandle" + $ref: "#/definitions/ResourceHandle" userDefinedData: description: > User defined data for the VNF snapshot. @@ -1052,6 +1067,9 @@ definitions: $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVim" ExtManagedVirtualLinkInfo: + description: > + This type provides information about an externally-managed virtual link. It shall + comply with the provisions defined in table 5.5.3.5-1. type: object required: - id @@ -1078,18 +1096,34 @@ definitions: networkResource: description: > Reference to the VirtualNetwork resource providing this VL. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ResourceHandle" + $ref: "#/definitions/ResourceHandle" vnfLinkPorts: description: > Link ports of this VL. type: array items: $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/VnfLinkPortInfo" + vnfNetAttDefResource: + description: > + Network attachment definition resources that provide the specification of the interface + to attach connection points to this VL. + type: array + items: + $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/NetAttDefResourceInfo" VnfcResourceInfo: description: > This type represents the information on virtualised compute and storage resources used by a VNFC in a VNF instance. + Depending on the form of virtualisation container of the VNFC: + - For a VNFC based on VM, a reference to the corresponding VirtualCompute shall be provided, and + - For a VNFC based on OS container(s), a reference to the Compute MCIO shall be provided. Hence, exposure + of information by the VNFM to the NFVO is at the MCIO level. + In addition, the references to the storage resources depend on the form of the VNFC: + - For a VNFC based on VM, storage resource identifiers shall refer to VirtualStorage resources, and + - For a VNFC based on OS container(s), storage resource identifiers shall refer to Storage MCIOs. + + * NOTE 1: ETSI GS NFV-SOL 001 specifies the structure and format of the VNFD based on TOSCA specifications. * NOTE 2: A VNFC CP is "connected to" an external CP if the VNFC CP is connected to an internal VL that exposes an external CP. A VNFC CP is "exposed as" an external CP if it is connected directly @@ -1099,6 +1133,10 @@ definitions: an LCM operation occurrence, this does not represent a change that requires including a related "AffectedVnfc" structure in the VNF LCM operation occurrence notifications or the "VnfLcmOpOcc" structure related to this LCM operation occurrence. + * NOTE 5: Cardinality greater than 1 is only applicable for specific cases where more than one network attachment + definition resource is needed to fulfil the connectivity requirements of the internal CP, e.g. to build + a link redundant mated pair in SR-IOV cases. + * NOTE 6: When more than one netAttDefResourceId is indicated, all shall belong to the same namespace. type: object required: - id @@ -1121,12 +1159,12 @@ definitions: $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" computeResource: description: > - Reference to the VirtualCompute resource. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ResourceHandle" + Reference to the VirtualCompute resource or reference to a Compute MCIO. + $ref: "#/definitions/ResourceHandle" storageResourceIds: description: > - References to the VirtualStorage resources. The value refers to a - VirtualStorageResourceInfo item in the VnfInstance. + References to the VirtualStorage resources or references to Storage MCIO(s). + The value refers to a VirtualStorageResourceInfo item in the VnfInstance. type: array items: $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" @@ -1179,11 +1217,20 @@ definitions: Identifier of another VNFC CP instance that corresponds to the parent port of a trunk that the present VNFC CP instance participates in. Shall be provided if the present CP instance participates in a trunk as subport. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" metadata: description: > Metadata about this CP. $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + netAttDefResourceId: + description: > + Identifier of the “NetAttDefResourceInfo” structure that provides the specification of the interface + to attach the connection point to a secondary container cluster network. See notes 5 and 6. + It shall be present if the internal CP is associated to a VNFC realized by one or a set of OS + containers and is connected to a secondary container cluster network. It shall not be present otherwise. + type: array + items: + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" metadata: description: > Metadata about this resource. @@ -1220,8 +1267,8 @@ definitions: $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" networkResource: description: > - Reference to the VirtualNetwork resource. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ResourceHandle" + Reference to the VirtualNetwork resource or reference to a Network MCIO. + $ref: "#/definitions/ResourceHandle" reservationId: description: > The reservation identifier applicable to the resource. It shall be @@ -1272,8 +1319,8 @@ definitions: $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" storageResource: description: > - Reference to the VirtualStorage resource. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ResourceHandle" + Reference to the VirtualStorage resource or reference to a Storage MCIO. + $ref: "#/definitions/ResourceHandle" reservationId: description: > The reservation identifier applicable to the resource. It shall be @@ -1330,7 +1377,7 @@ definitions: Reference to the VirtualCompute resource. Detailed information is (for new and modified resources) or has been (for removed resources) available from the VIM. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ResourceHandle" + $ref: "#/definitions/ResourceHandle" metadata: description: > Metadata about this resource. @@ -1427,7 +1474,7 @@ definitions: Reference to the VirtualNetwork resource. Detailed information is (for new and modified resources) or has been (for removed resources) available from the VIM. See note. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ResourceHandle" + $ref: "#/definitions/ResourceHandle" vnfLinkPortIds: description: > Identifiers of the link ports of the affected VL related to the change. Each identifier references a @@ -1495,7 +1542,7 @@ definitions: Reference to the VirtualStorage resource. Detailed information is (for new and modified resources) or has been (for removed resources) available from the VIM. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ResourceHandle" + $ref: "#/definitions/ResourceHandle" metadata: description: > Metadata about this resource. @@ -1861,7 +1908,7 @@ definitions: description: > Reference to the link port resource. Detailed information is (for added resources) or has been (for removed resources) available from the VIM. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ResourceHandle" + $ref: "#/definitions/ResourceHandle" VnfInfoModifications: description: > @@ -1937,4 +1984,66 @@ definitions: in clause 5.5.2.12. type: array items: - $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/VnfcInfoModifications" \ No newline at end of file + $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/VnfcInfoModifications" + + ResourceHandle: + required: + - resourceId + type: object + description: > + This type represents the information that allows addressing a virtualised + resource that is used by a VNF instance. Information about the resource + is available from the VIM. + + * NOTE 1: The information about the VIM or CISM 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: The value set of the "vimLevelResourceType" attribute is within the scope of the VIM or CISM or the + resource provider and can be used as information that complements the ResourceHandle. When the + container infrastructure service is a Kubernetes® instance the vimLevelResourceType is the type of + resource, as would correspond to the ‘kind’ field if the resource is declared in its own Kubernetes® + manifest, e.g.: Pod, PersistentVolumeClaim, NetworkAttachmentDefinition. + + * NOTE 3: When the container infrastructure service is a Kubernetes® instance the resourceId shall be populated + in the following way: + - For a compute MCIO, it is the instance identifier that Kubernetes® assigns, which is unique cluster + wide per resource type. + - For a storage MCIO modelled as a persistent volume claim, it is the name of the persistent volume claim, + i.e. the value of the ‘claimName’ field in the Kubernetes® manifest, or a compound name built by Kubernetes® + if the persistent volume claim is defined inline in another template instead of in its own manifest. + - For a network MCIO representing a NetworkAttachmentDefinition, a Service or an Ingress, it is the value of + the ‘metadata.name’ field in Kubernetes® manifest. + properties: + vimConnectionId: + description: > + Identifier of the VIM or CISM connection to manage the resource. + This attribute shall be supported when the resource is managed by a CISM. + When the resource is managed by a VIM, this attribute shall only be supported and present if VNF--related + resource management in direct mode is applicable. + See note 1. + + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + resourceProviderId: + description: > + Identifier of the entity responsible for the management of the resource. + This attribute shall only be supported and present when VNF-related resource management in indirect mode is applicable. The + identification scheme is outside the scope of the present document. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + resourceId: + description: > + Identifier of the resource in the scope of the VIM or the CISM or the resource provider. See note 3. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVim" + vimLevelResourceType: + description: > + Type of the resource in the scope of the VIM or the CISM or the resource provider. See note 2. + type: string + vimLevelAdditionalResourceInfo: + descriptions: > + Additional resource information which is specific to this resource and its type, and which is available + from the VIM or the CISM or the resource provider. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/AdditionalResourceInfo" + containerNamespace: + description: > + The value of the namespace in which the MCIO corresponding to the resource is deployed. + This attribute shall be present if the resource is managed by a CISM and it shall be absent otherwise. + type: string \ No newline at end of file diff --git a/src/definitions/SOL002SOL003VNFLifecycleManagement_def.yaml b/src/definitions/SOL002SOL003VNFLifecycleManagement_def.yaml index 62631236..b03cc32b 100644 --- a/src/definitions/SOL002SOL003VNFLifecycleManagement_def.yaml +++ b/src/definitions/SOL002SOL003VNFLifecycleManagement_def.yaml @@ -302,13 +302,13 @@ definitions: type: array items: $ref: "SOL002SOL003_def.yaml#/definitions/VnfExtCpData" - extNetAttDefResourceData: + extNetAttDefResource: description: > - Network attachment definition resources that provide the specification of the interface to attach connection - points to this VL. + Network attachment definition resources that provide the specification of the interface to attach connection points + to this VL. type: array items: - $ref: "SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/NetAttDefResourceInfo" + $ref: "#/definitions/NetAttDefResourceInfo" VnfLinkPortInfo: description: > @@ -1225,6 +1225,9 @@ definitions: 5.5.4.9. Additional values are also permitted. See note 1. type: string + enum: + - Deployment + - Statefulset desiredInstances: description: > Number of desired MCIO instances. @@ -1240,7 +1243,7 @@ definitions: See note 2. $ref: "SOL002SOL003_def.yaml#/definitions/KeyValuePairs" - virtualCpInfo: + VirtualCpInfo: description: > This type provides information related to a virtual CP instance of a VNF. It shall comply with the provisions in table 5.5.3.31-1. diff --git a/src/definitions/SOL002SOL003_def.yaml b/src/definitions/SOL002SOL003_def.yaml index 89ef46c4..a1ed17c4 100644 --- a/src/definitions/SOL002SOL003_def.yaml +++ b/src/definitions/SOL002SOL003_def.yaml @@ -497,7 +497,7 @@ definitions: - IP_OVER_ETHERNET ipOverEthernet: description: > - Network address data for IP over Ethernet to assign to the extCP + Network address data for IP over Ethernet to assign to the external CP instance. Shall be present if layerProtocol is equal to "IP_OVER_ETHERNET", and shall be absent otherwise. $ref: "#/definitions/IpOverEthernetAddressData" -- GitLab From 52ccb377dd03d0409a4bad96e4d5a7c77f05869d Mon Sep 17 00:00:00 2001 From: muhammadh Date: Mon, 20 Jun 2022 13:17:27 +0500 Subject: [PATCH 16/41] update/add attributes in SOL003 VNF LCM API --- .../SOL003VNFLifecycleManagement_def.yaml | 22 +---------- ...OL002SOL003VNFLifecycleManagement_def.yaml | 39 ++++++++++++++++--- 2 files changed, 35 insertions(+), 26 deletions(-) diff --git a/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml b/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml index 9e24a29e..9d605765 100644 --- a/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml +++ b/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml @@ -2596,24 +2596,4 @@ definitions: provides the specification of the interface to attach the VNF internal CP created from the CPD identified by cpdId to a secondary container cluster network. See note. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" - - VirtualCpAddressInfo: - description: > - This type represents information about a network address that has been assigned to a virtual CP. - type: object - required: - - type - properties: - type: - description: > - The type of the IP addresses. - Permitted values: IPV4, IPV6. - type: string - enum: - - IPV4 - - IPV6 - loadBalancerIp: - description: > - Fixed addresses assigned to an external load balancer. - $ref: '../../../definitions/SOL002SOL003_def.yaml#/definitions/IpAddress' \ No newline at end of file + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" \ No newline at end of file diff --git a/src/definitions/SOL002SOL003VNFLifecycleManagement_def.yaml b/src/definitions/SOL002SOL003VNFLifecycleManagement_def.yaml index b03cc32b..b8b791e1 100644 --- a/src/definitions/SOL002SOL003VNFLifecycleManagement_def.yaml +++ b/src/definitions/SOL002SOL003VNFLifecycleManagement_def.yaml @@ -416,9 +416,9 @@ definitions: $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" trunkResourceId: description: > - Identifier of the trunk resource in the VIM. - Shall be present if the present link port corresponds to the parent port that the trunk resource is associated with. - See note 2. + Identifier of the trunk resource in the VIM. + Shall be present if the present link port corresponds to the parent port that the trunk resource is associated with. + See note 2. $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVim" CpProtocolInfo: @@ -437,7 +437,9 @@ definitions: description: > The identifier of layer(s) and protocol(s) associated to the network address information. - Permitted values: IP_OVER_ETHERNET + Permitted values: + 1. IP_OVER_ETHERNET + 2. IP_FOR_VIRTUAL_CP See note. type: string enum: @@ -448,6 +450,12 @@ definitions: present if layerProtocol is equal to " IP_OVER_ETHERNET", and shall be absent otherwise. $ref: "#/definitions/IpOverEthernetAddressInfo" + virtualCpAddress: + description: > + IP address data assigned to an external CP instance exposing a virtual CP. It shall be present if + 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" IpOverEthernetAddressInfo: description: > @@ -1392,4 +1400,25 @@ definitions: the network attachment definition resource is used for internal connectivity by the VNF. type: array items: - $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" \ No newline at end of file + $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + + VirtualCpAddressInfo: + description: > + This type represents information about a network address that has been assigned to a virtual CP. + type: object + required: + - type + properties: + type: + description: > + The type of the IP addresses. Permitted values: + - IPV4 + - IPV6 + type: string + enum: + - IPV4 + - IPV6 + loadBalancerIp: + description: > + Fixed addresses assigned to an external load balancer. + $ref: 'SOL002SOL003_def.yaml#/definitions/IpAddress' \ No newline at end of file -- GitLab From b2153db2879bf791899dc3b200a6119e88b02dfe Mon Sep 17 00:00:00 2001 From: Ayesha Ayub Date: Mon, 20 Jun 2022 14:36:50 +0500 Subject: [PATCH 17/41] update/add/remove attributes for SOL002 VNF LCM API --- .../SOL002VNFConfiguration_def.yaml | 5 ----- ...OL002SOL003VNFLifecycleManagement_def.yaml | 22 +++++++++++++++++-- 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/src/SOL002/VNFConfiguration/definitions/SOL002VNFConfiguration_def.yaml b/src/SOL002/VNFConfiguration/definitions/SOL002VNFConfiguration_def.yaml index 2eb1cdde..8103bb3d 100644 --- a/src/SOL002/VNFConfiguration/definitions/SOL002VNFConfiguration_def.yaml +++ b/src/SOL002/VNFConfiguration/definitions/SOL002VNFConfiguration_def.yaml @@ -86,11 +86,6 @@ definitions: type: array items: $ref: '#/definitions/CpConfiguration' - dhcpServer: - description: > - IP address of the DHCP server that the VNF instance can use to obtain - IP addresses to be assigned to its external CPs. - $ref: '../../../definitions/SOL002SOL003_def.yaml#/definitions/IpAddress' vnfSpecificData: description: > Additional configurable properties of the VNF instance declared in the diff --git a/src/definitions/SOL002SOL003VNFLifecycleManagement_def.yaml b/src/definitions/SOL002SOL003VNFLifecycleManagement_def.yaml index b8b791e1..54589e55 100644 --- a/src/definitions/SOL002SOL003VNFLifecycleManagement_def.yaml +++ b/src/definitions/SOL002SOL003VNFLifecycleManagement_def.yaml @@ -658,10 +658,14 @@ definitions: This type represents information about an external CP of a VNF. It shall comply with the provisions defined in table 5.5.3.17 1. - NOTE 1: The attributes "associatedVnfcCpId", "associatedVipCpId" and "associatedVnfVirtualLinkId" - are mutually exclusive. Exactly one shall be present. + NOTE 1: The attributes "associatedVnfcCpId", "associatedVipCpId", "associatedVirtualCpId" 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. + NOTE 3: Cardinality greater than 1 is only applicable for specific cases where more than one network + attachment definition resource is needed to fulfil the connectivity requirements of the external + CP, e.g. to build a link redundant mated pair in SR-IOV cases. + NOTE 4: When more than one netAttDefResourceId is indicated, all shall belong to the same namespace. type: object required: - id @@ -722,6 +726,11 @@ definitions: floating IP address, and the related "VipCpInfo" structure in "VnfInstance". Shall be present if the cpdId of this VnfExtCp has a vipCpd attribute. See note 1. $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + associatedVirtualCpId: + description: > + Identifier of the "VirtualCpInfo" structure that represents the Virtual CP that is exposed by this external + CP instance. Shall be present in case this CP instance maps to a Virtual CP. See note 1. + $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" associatedVnfVirtualLinkId: description: > Identifier of the "VnfVirtualLinkResourceInfo" structure that represents the internal VL or of the @@ -729,6 +738,15 @@ definitions: exposed by this external CP instance. Shall be present in case this CP instance maps to an internal VL (including externally-managed internal VL). See note 1. $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + netAttDefResourceInfoId: + description: > + Identifier of the “NetAttDefResourceInfo” structure that provides the specification of the interface to + attach the connection point to a secondary container cluster network. See notes 3 and 4. + It shall be present if the external CP is associated to a VNFC realized by one or a set of OS containers + and is connected to a secondary container cluster network. It shall not be present otherwise. + type: array + items: + $ref: "SOL002SOL003_def.yaml#/definitions/Identifier" VnfOperationalStateType: description: > -- GitLab From 6e7a3f1ba6c84be2d3bfd0cfa9de8cf685598385 Mon Sep 17 00:00:00 2001 From: muhammadh Date: Mon, 20 Jun 2022 15:17:24 +0500 Subject: [PATCH 18/41] update/add attributes in SOL003 VNF LCM API --- .../SOL003VNFLifecycleManagement_def.yaml | 5 +++-- ...OL002SOL003VNFLifecycleManagement_def.yaml | 22 +++++++++++++------ 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml b/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml index 9d605765..dafdfd17 100644 --- a/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml +++ b/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml @@ -1004,7 +1004,7 @@ definitions: May be present otherwise. type: array items: - $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/VirtualCpInfo - TO DO" + $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/VirtualCpInfo" extVirtualLinkInfo: description: > Information about the external VLs the VNF instance is connected to. @@ -1058,7 +1058,8 @@ definitions: VDU for the VNF instance. type: array items: - $ref: "#/definitions/McioInfo - TO DO" + $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/McioInfo" + metadata: description: > Additional VNF-specific attributes that provide metadata describing the VNF instance. diff --git a/src/definitions/SOL002SOL003VNFLifecycleManagement_def.yaml b/src/definitions/SOL002SOL003VNFLifecycleManagement_def.yaml index 54589e55..35d9973c 100644 --- a/src/definitions/SOL002SOL003VNFLifecycleManagement_def.yaml +++ b/src/definitions/SOL002SOL003VNFLifecycleManagement_def.yaml @@ -728,9 +728,9 @@ definitions: $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" associatedVirtualCpId: description: > - Identifier of the "VirtualCpInfo" structure that represents the Virtual CP that is exposed by this external - CP instance. Shall be present in case this CP instance maps to a Virtual CP. See note 1. - $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + Identifier of the "VirtualCpInfo" structure that represents the Virtual CP that is exposed by this + external CP instance. Shall be present in case this CP instance maps to a Virtual CP. See note 1. + $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" associatedVnfVirtualLinkId: description: > Identifier of the "VnfVirtualLinkResourceInfo" structure that represents the internal VL or of the @@ -740,10 +740,10 @@ definitions: $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" netAttDefResourceInfoId: description: > - Identifier of the “NetAttDefResourceInfo” structure that provides the specification of the interface to - attach the connection point to a secondary container cluster network. See notes 3 and 4. - It shall be present if the external CP is associated to a VNFC realized by one or a set of OS containers - and is connected to a secondary container cluster network. It shall not be present otherwise. + Identifier of the “NetAttDefResourceInfo” structure that provides the specification of the interface to attach the + connection point to a secondary container cluster network. See notes 3 and 4. + It shall be present if the external CP is associated to a VNFC realized by one or a set of OS containers and + is connected to a secondary container cluster network. It shall not be present otherwise. type: array items: $ref: "SOL002SOL003_def.yaml#/definitions/Identifier" @@ -1043,6 +1043,14 @@ definitions: - FULL - SHORT + McioTypeName: + description: > + The present type definition provides valid string values for the "mcioType" attribute of the "McioInfo" data type , and + the valid values are defined in table 5.5.4.9-1. + type: string + enum: + - Deployment + - Statefulset AffectedVipCp: description: > -- GitLab From 0ef4afc13707d5a3b916a7c8836312e3db45254c Mon Sep 17 00:00:00 2001 From: muhammadh Date: Mon, 20 Jun 2022 15:34:57 +0500 Subject: [PATCH 19/41] minor fixes in description tag --- src/SOL002/VNFConfiguration/VNFConfiguration.yaml | 3 ++- .../VNFPerformanceManagement/VNFPerformanceManagement.yaml | 2 +- src/SOL003/VNFLifecycleManagement/VNFLifecycleManagement.yaml | 2 +- .../VNFSnapshotPackageManagement.yaml | 2 +- src/definitions/SOL002SOL003_def.yaml | 4 ++-- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/SOL002/VNFConfiguration/VNFConfiguration.yaml b/src/SOL002/VNFConfiguration/VNFConfiguration.yaml index 94a6ff2b..719e62ff 100644 --- a/src/SOL002/VNFConfiguration/VNFConfiguration.yaml +++ b/src/SOL002/VNFConfiguration/VNFConfiguration.yaml @@ -132,7 +132,8 @@ components: schema: type: string Content-Type: - description: The MIME type of the body of the response. + description: > + The MIME type of the body of the response. style: simple explode: false schema: diff --git a/src/SOL002/VNFPerformanceManagement/VNFPerformanceManagement.yaml b/src/SOL002/VNFPerformanceManagement/VNFPerformanceManagement.yaml index c433bd98..24f535d2 100644 --- a/src/SOL002/VNFPerformanceManagement/VNFPerformanceManagement.yaml +++ b/src/SOL002/VNFPerformanceManagement/VNFPerformanceManagement.yaml @@ -457,7 +457,7 @@ components: exclude_default_pm_jobs: name: exclude_default in: query - description: >- + description: > Indicates to exclude the following complex attributes from the response. See clause 5.3 of ETSI GS NFV-SOL 013 [6] for details. The VNFM shall support this parameter. diff --git a/src/SOL003/VNFLifecycleManagement/VNFLifecycleManagement.yaml b/src/SOL003/VNFLifecycleManagement/VNFLifecycleManagement.yaml index 281eaad2..6ad5cbd1 100644 --- a/src/SOL003/VNFLifecycleManagement/VNFLifecycleManagement.yaml +++ b/src/SOL003/VNFLifecycleManagement/VNFLifecycleManagement.yaml @@ -1053,7 +1053,7 @@ paths: 504: $ref: "../../responses/SOL002SOL003_resp.yaml#/components/responses/504" get: - description: > + description: > The GET method queries information about multiple VNF snapshots. This method shall follow the provisions specified in the tables 5.4.23.3.2-1 and 5.4.23.3.2-2 for URI query parameters, request and response data structures, diff --git a/src/SOL003/VNFSnapshotPackageManagement/VNFSnapshotPackageManagement.yaml b/src/SOL003/VNFSnapshotPackageManagement/VNFSnapshotPackageManagement.yaml index 6c167d7d..7b5cdeaf 100644 --- a/src/SOL003/VNFSnapshotPackageManagement/VNFSnapshotPackageManagement.yaml +++ b/src/SOL003/VNFSnapshotPackageManagement/VNFSnapshotPackageManagement.yaml @@ -222,7 +222,7 @@ components: exclude_default_vnf_packages: name: exclude_default in: query - description: >- + description: > Indicates to exclude the following complex attributes from the response. See clause 5.3 of ETSI GS NFV-SOL 013 [8] for details. The NFVO shall support this parameter. diff --git a/src/definitions/SOL002SOL003_def.yaml b/src/definitions/SOL002SOL003_def.yaml index a1ed17c4..04bcc44e 100644 --- a/src/definitions/SOL002SOL003_def.yaml +++ b/src/definitions/SOL002SOL003_def.yaml @@ -643,7 +643,7 @@ definitions: - IPV4 - IPV6 loadBalancerIp: - description: + description: > Fixed address to assign to an external load balancer. See notes 1 and 2. $ref: "#/definitions/IpAddress" @@ -714,7 +714,7 @@ definitions: items: $ref: "#/definitions/ExtLinkPortData" extNetAttDefResourceData: - description: + description: > Externally provided network attachment definition resource(s) that provide the specification of the interface to attach external CPs to this external VL. See note 2. -- GitLab From 679be36ae9de3a1da69c25c1cdddac2446c7513d Mon Sep 17 00:00:00 2001 From: muhammadh Date: Mon, 20 Jun 2022 16:27:41 +0500 Subject: [PATCH 20/41] add if-match and if-unmodified-since in SOL002 and SOL003 params --- src/components/SOL002_params.yaml | 24 ++++++++++++++++++++++++ src/components/SOL003_params.yaml | 24 ++++++++++++++++++++++++ 2 files changed, 48 insertions(+) diff --git a/src/components/SOL002_params.yaml b/src/components/SOL002_params.yaml index ba54fb11..a93ee96c 100644 --- a/src/components/SOL002_params.yaml +++ b/src/components/SOL002_params.yaml @@ -74,5 +74,29 @@ components: ETSI GS NFV-SOL 013 [6] for this resource. in: query required: false + schema: + type: string + + If-Unmodified-Since: + name: If-Unmodified-Since + description: > + Used to make the request method conditional on the selected resource representation's last modification date being + earlier than or equal to the date provided in the field-value. If the condition is not met, the request fails with a + "412 Precondition Failed" response. + required: false + in: header + schema: + type: string + format: date-time + + If-Match: + name: If-Match + description: > + Used to make the request method conditional on the recipient origin server either having at least one current representation + of the target resource, when the field-value is "*", or having a current representation of the target resource that has an + entity-tag matching a member of the list of entity-tags provided in the field-value. If the condition is not met, the request + fails with a "412 Precondition Failed" response. + required: false + in: header schema: type: string \ No newline at end of file diff --git a/src/components/SOL003_params.yaml b/src/components/SOL003_params.yaml index 32ad1074..c9ee120a 100644 --- a/src/components/SOL003_params.yaml +++ b/src/components/SOL003_params.yaml @@ -115,5 +115,29 @@ components: GS NFV-SOL 013 [8] for this resource. in: query required: false + schema: + type: string + + If-Unmodified-Since: + name: If-Unmodified-Since + description: > + Used to make the request method conditional on the selected resource representation's last modification date being + earlier than or equal to the date provided in the field-value. If the condition is not met, the request fails with a + "412 Precondition Failed" response. + required: false + in: header + schema: + type: string + format: date-time + + If-Match: + name: If-Match + description: > + Used to make the request method conditional on the recipient origin server either having at least one current representation + of the target resource, when the field-value is "*", or having a current representation of the target resource that has an + entity-tag matching a member of the list of entity-tags provided in the field-value. If the condition is not met, the request + fails with a "412 Precondition Failed" response. + required: false + in: header schema: type: string \ No newline at end of file -- GitLab From 9c776f83592e77c88acef1cbf40358ec7d65af69 Mon Sep 17 00:00:00 2001 From: Ayesha Ayub Date: Mon, 20 Jun 2022 17:46:09 +0500 Subject: [PATCH 21/41] add HTTP conditional requests for SOL002 --- .../VNFConfiguration/VNFConfiguration.yaml | 33 ++++++++++ .../VNFFaultManagement.yaml | 32 +++++++++ src/SOL002/VNFIndicator/VNFIndicator.yaml | 6 +- .../VNFLifecycleManagement.yaml | 18 +++++ .../VNFPerformanceManagement.yaml | 66 +++++++++++++++++++ 5 files changed, 152 insertions(+), 3 deletions(-) diff --git a/src/SOL002/VNFConfiguration/VNFConfiguration.yaml b/src/SOL002/VNFConfiguration/VNFConfiguration.yaml index 719e62ff..a21547bc 100644 --- a/src/SOL002/VNFConfiguration/VNFConfiguration.yaml +++ b/src/SOL002/VNFConfiguration/VNFConfiguration.yaml @@ -67,6 +67,9 @@ paths: patch: description: | This method sets or modifies a configuration resource. See clause 9.4.2.3.4. + parameters: + - $ref: ../../components/SOL002_params.yaml#/components/parameters/If-Unmodified-Since + - $ref: ../../components/SOL002_params.yaml#/components/parameters/If-Match requestBody: $ref: '#/components/requestBodies/ConfigurationRequest' responses: @@ -138,6 +141,21 @@ components: explode: false schema: type: string + ETag: + description: > + Used to provide the current entity-tag for the selected resource representation. It can be sent in + "200 OK", "201 Created" and "204 No Content" responses. + style: simple + schema: + type: string + Last-Modified: + description: > + Used to provide a timestamp indicating the date and time at which the server believes the selected resource + representation was last modified. It can be sent in "200 OK", "201 Created" and "204 No Content" responses. + style: simple + schema: + type: string + format: date-time content: application/json: schema: @@ -161,6 +179,21 @@ components: explode: false schema: type: string + ETag: + description: > + Used to provide the current entity-tag for the selected resource representation. It can be sent in + "200 OK", "201 Created" and "204 No Content" responses. + style: simple + schema: + type: string + Last-Modified: + description: > + Used to provide a timestamp indicating the date and time at which the server believes the selected resource + representation was last modified. It can be sent in "200 OK", "201 Created" and "204 No Content" responses. + style: simple + schema: + type: string + format: date-time content: application/json: schema: diff --git a/src/SOL002/VNFFaultManagement/VNFFaultManagement.yaml b/src/SOL002/VNFFaultManagement/VNFFaultManagement.yaml index 060c01e5..6a7731fa 100644 --- a/src/SOL002/VNFFaultManagement/VNFFaultManagement.yaml +++ b/src/SOL002/VNFFaultManagement/VNFFaultManagement.yaml @@ -115,6 +115,8 @@ paths: parameters: - $ref: ../../components/SOL002_params.yaml#/components/parameters/Accept - $ref: ../../components/SOL002_params.yaml#/components/parameters/ContentType + - $ref: ../../components/SOL002_params.yaml#/components/parameters/If-Unmodified-Since + - $ref: ../../components/SOL002_params.yaml#/components/parameters/If-Match requestBody: $ref: '#/components/requestBodies/IndividualAlarmRequest' responses: @@ -492,6 +494,21 @@ components: explode: false schema: type: string + ETag: + description: > + Used to provide the current entity-tag for the selected resource representation. It can be sent in + "200 OK", "201 Created" and "204 No Content" responses. + style: simple + schema: + type: string + Last-Modified: + description: > + Used to provide a timestamp indicating the date and time at which the server believes the selected resource + representation was last modified. It can be sent in "200 OK", "201 Created" and "204 No Content" responses. + style: simple + schema: + type: string + format: date-time content: application/json: schema: @@ -523,6 +540,21 @@ components: explode: false schema: type: string + ETag: + description: > + Used to provide the current entity-tag for the selected resource representation. It can be sent in + "200 OK", "201 Created" and "204 No Content" responses. + style: simple + schema: + type: string + Last-Modified: + description: > + Used to provide a timestamp indicating the date and time at which the server believes the selected resource + representation was last modified. It can be sent in "200 OK", "201 Created" and "204 No Content" responses. + style: simple + schema: + type: string + format: date-time content: application/json: schema: diff --git a/src/SOL002/VNFIndicator/VNFIndicator.yaml b/src/SOL002/VNFIndicator/VNFIndicator.yaml index bf58b2f7..9861cae2 100644 --- a/src/SOL002/VNFIndicator/VNFIndicator.yaml +++ b/src/SOL002/VNFIndicator/VNFIndicator.yaml @@ -365,9 +365,9 @@ components: in: path description: | Identifier of this subscription. NOTE: - This identifier can be retrieved from the resource referenced by the "Location" HTTP header - in the response to a POST request creating a new subscription resource. It can also be retrieved - from the "id" attribute in the payload body of that response. + This identifier can be retrieved from the resource referenced by the "Location" HTTP header + in the response to a POST request creating a new subscription resource. It can also be retrieved + from the "id" attribute in the payload body of that response. required: true style: simple explode: false diff --git a/src/SOL002/VNFLifecycleManagement/VNFLifecycleManagement.yaml b/src/SOL002/VNFLifecycleManagement/VNFLifecycleManagement.yaml index fc6e65d7..61926203 100644 --- a/src/SOL002/VNFLifecycleManagement/VNFLifecycleManagement.yaml +++ b/src/SOL002/VNFLifecycleManagement/VNFLifecycleManagement.yaml @@ -182,6 +182,9 @@ paths: patch: description: | This method modifies an "Individual VNF instance" resource. See clause 5.4.3.3.4. + parameters: + - $ref: ../../components/SOL002_params.yaml#/components/parameters/If-Unmodified-Since + - $ref: ../../components/SOL002_params.yaml#/components/parameters/If-Match requestBody: $ref: '#/components/requestBodies/VnfInstanceModificationRequest' responses: @@ -1588,6 +1591,21 @@ components: explode: false schema: type: string + ETag: + description: > + Used to provide the current entity-tag for the selected resource representation. It can be sent in + "200 OK", "201 Created" and "204 No Content" responses. + style: simple + schema: + type: string + Last-Modified: + description: > + Used to provide a timestamp indicating the date and time at which the server believes the selected resource + representation was last modified. It can be sent in "200 OK", "201 Created" and "204 No Content" responses. + style: simple + schema: + type: string + format: date-time content: application/json: schema: diff --git a/src/SOL002/VNFPerformanceManagement/VNFPerformanceManagement.yaml b/src/SOL002/VNFPerformanceManagement/VNFPerformanceManagement.yaml index 24f535d2..cb0abff2 100644 --- a/src/SOL002/VNFPerformanceManagement/VNFPerformanceManagement.yaml +++ b/src/SOL002/VNFPerformanceManagement/VNFPerformanceManagement.yaml @@ -182,6 +182,9 @@ paths: patch: description: | This method allows to modify an "individual PM job" resource. See clause 6.4.3.3.4. + parameters: + - $ref: ../../components/SOL002_params.yaml#/components/parameters/If-Unmodified-Since + - $ref: ../../components/SOL002_params.yaml#/components/parameters/If-Match requestBody: $ref: '#/components/requestBodies/PmJobModificationRequest' responses: @@ -404,6 +407,9 @@ paths: patch: description: | This method allows to modify an "Individual threshold" resource. See clause 6.4.6.3.4. + parameters: + - $ref: ../../components/SOL002_params.yaml#/components/parameters/If-Unmodified-Since + - $ref: ../../components/SOL002_params.yaml#/components/parameters/If-Match requestBody: $ref: '#/components/requestBodies/ThresholdModificationRequest' responses: @@ -666,6 +672,21 @@ components: explode: false schema: type: string + ETag: + description: > + Used to provide the current entity-tag for the selected resource representation. It can be sent in + "200 OK", "201 Created" and "204 No Content" responses. + style: simple + schema: + type: string + Last-Modified: + description: > + Used to provide a timestamp indicating the date and time at which the server believes the selected resource + representation was last modified. It can be sent in "200 OK", "201 Created" and "204 No Content" responses. + style: simple + schema: + type: string + format: date-time content: application/json: schema: @@ -724,6 +745,21 @@ components: explode: false schema: type: string + ETag: + description: > + Used to provide the current entity-tag for the selected resource representation. It can be sent in + "200 OK", "201 Created" and "204 No Content" responses. + style: simple + schema: + type: string + Last-Modified: + description: > + Used to provide a timestamp indicating the date and time at which the server believes the selected resource + representation was last modified. It can be sent in "200 OK", "201 Created" and "204 No Content" responses. + style: simple + schema: + type: string + format: date-time content: application/json: schema: @@ -870,6 +906,21 @@ components: explode: false schema: type: string + ETag: + description: > + Used to provide the current entity-tag for the selected resource representation. It can be sent in + "200 OK", "201 Created" and "204 No Content" responses. + style: simple + schema: + type: string + Last-Modified: + description: > + Used to provide a timestamp indicating the date and time at which the server believes the selected resource + representation was last modified. It can be sent in "200 OK", "201 Created" and "204 No Content" responses. + style: simple + schema: + type: string + format: date-time content: application/json: schema: @@ -922,6 +973,21 @@ components: explode: false schema: type: string + ETag: + description: > + Used to provide the current entity-tag for the selected resource representation. It can be sent in + "200 OK", "201 Created" and "204 No Content" responses. + style: simple + schema: + type: string + Last-Modified: + description: > + Used to provide a timestamp indicating the date and time at which the server believes the selected resource + representation was last modified. It can be sent in "200 OK", "201 Created" and "204 No Content" responses. + style: simple + schema: + type: string + format: date-time content: application/json: schema: -- GitLab From a588c08282395ac99b2607ef7cfa2f8f40a03b81 Mon Sep 17 00:00:00 2001 From: muhammadh Date: Tue, 21 Jun 2022 13:39:34 +0500 Subject: [PATCH 22/41] add HTTP conditional requests in SOL003 APIs --- .../VNFFaultManagement.yaml | 33 ++++++++++++ .../VNFLifecycleManagement.yaml | 54 +++++++++++++++++++ .../VNFPerformanceManagement.yaml | 53 ++++++++++++++++++ 3 files changed, 140 insertions(+) diff --git a/src/SOL003/VNFFaultManagement/VNFFaultManagement.yaml b/src/SOL003/VNFFaultManagement/VNFFaultManagement.yaml index c3c6b2bb..098ccf8c 100644 --- a/src/SOL003/VNFFaultManagement/VNFFaultManagement.yaml +++ b/src/SOL003/VNFFaultManagement/VNFFaultManagement.yaml @@ -111,6 +111,9 @@ paths: patch: description: | This method modifies an "Individual alarm" resource. See clause 7.4.3.3.4. + parameters: + - $ref: '../../components/SOL003_params.yaml#/components/parameters/If-Unmodified-Since' + - $ref: '../../components/SOL003_params.yaml#/components/parameters/If-Match' requestBody: $ref: '#/components/requestBodies/IndividualAlarmRequest' responses: @@ -425,6 +428,21 @@ components: explode: false schema: type: string + ETag: + description: > + Used to provide the current entity-tag for the selected resource representation. It can be sent in + "200 OK", "201 Created" and "204 No Content" responses. + style: simple + schema: + type: string + Last-Modified: + description: > + Used to provide a timestamp indicating the date and time at which the server believes the selected resource + representation was last modified. It can be sent in "200 OK", "201 Created" and "204 No Content" responses. + style: simple + schema: + type: string + format: date-time content: application/json: schema: @@ -458,6 +476,21 @@ components: explode: false schema: type: string + ETag: + description: > + Used to provide the current entity-tag for the selected resource representation. It can be sent in + "200 OK", "201 Created" and "204 No Content" responses. + style: simple + schema: + type: string + Last-Modified: + description: > + Used to provide a timestamp indicating the date and time at which the server believes the selected resource + representation was last modified. It can be sent in "200 OK", "201 Created" and "204 No Content" responses. + style: simple + schema: + type: string + format: date-time content: application/json: schema: diff --git a/src/SOL003/VNFLifecycleManagement/VNFLifecycleManagement.yaml b/src/SOL003/VNFLifecycleManagement/VNFLifecycleManagement.yaml index 6ad5cbd1..ac15c647 100644 --- a/src/SOL003/VNFLifecycleManagement/VNFLifecycleManagement.yaml +++ b/src/SOL003/VNFLifecycleManagement/VNFLifecycleManagement.yaml @@ -149,6 +149,9 @@ paths: #SOL003 location: 5.4.3.3.4 description: | This method modifies an "Individual VNF instance" resource. See clause 5.4.3.3.4. + parameters: + - $ref: '../../components/SOL003_params.yaml#/components/parameters/If-Unmodified-Since' + - $ref: '../../components/SOL003_params.yaml#/components/parameters/If-Match' requestBody: $ref: '#/components/requestBodies/VnfInfoModificationRequest' responses: @@ -1136,6 +1139,8 @@ paths: parameters: - $ref: ../../components/SOL003_params.yaml#/components/parameters/Accept - $ref: ../../components/SOL003_params.yaml#/components/parameters/ContentType + - $ref: '../../components/SOL003_params.yaml#/components/parameters/If-Unmodified-Since' + - $ref: '../../components/SOL003_params.yaml#/components/parameters/If-Match' requestBody: $ref: '#/components/requestBodies/VnfSnapshotInfoModificationRequest' responses: @@ -1734,6 +1739,22 @@ components: explode: false schema: type: string + ETag: + description: > + Used to provide the current entity-tag for the selected resource representation. It can be sent in + "200 OK", "201 Created" and "204 No Content" responses. + style: simple + schema: + type: string + + Last-Modified: + description: > + Used to provide a timestamp indicating the date and time at which the server believes the selected resource + representation was last modified. It can be sent in "200 OK", "201 Created" and "204 No Content" responses. + style: simple + schema: + type: string + format: date-time content: application/json: schema: @@ -4030,6 +4051,22 @@ components: explode: false schema: type: string + ETag: + description: > + Used to provide the current entity-tag for the selected resource representation. It can be sent in + "200 OK", "201 Created" and "204 No Content" responses. + style: simple + schema: + type: string + + Last-Modified: + description: > + Used to provide a timestamp indicating the date and time at which the server believes the selected resource + representation was last modified. It can be sent in "200 OK", "201 Created" and "204 No Content" responses. + style: simple + schema: + type: string + format: date-time content: application/json: schema: @@ -4064,6 +4101,23 @@ components: explode: false schema: type: string + ETag: + description: > + Used to provide the current entity-tag for the selected resource representation. It can be sent in + "200 OK", "201 Created" and "204 No Content" responses. + style: simple + schema: + type: string + + Last-Modified: + description: > + Used to provide a timestamp indicating the date and time at which the server believes the selected resource + representation was last modified. It can be sent in "200 OK", "201 Created" and "204 No Content" responses. + style: simple + schema: + type: string + format: date-time + content: application/json: schema: diff --git a/src/SOL003/VNFPerformanceManagement/VNFPerformanceManagement.yaml b/src/SOL003/VNFPerformanceManagement/VNFPerformanceManagement.yaml index c1f5fa91..432b983d 100644 --- a/src/SOL003/VNFPerformanceManagement/VNFPerformanceManagement.yaml +++ b/src/SOL003/VNFPerformanceManagement/VNFPerformanceManagement.yaml @@ -149,6 +149,9 @@ paths: patch: description: | This method allows to modify an "Individual PM job" resource. See clause 6.4.3.3.4. + parameters: + - $ref: '../../components/SOL003_params.yaml#/components/parameters/If-Unmodified-Since' + - $ref: '../../components/SOL003_params.yaml#/components/parameters/If-Match' responses: 200: $ref: '#/components/responses/IndividualPmJob.Patch.200' @@ -352,6 +355,9 @@ paths: patch: description: | This method allows to modify an "Individual threshold" resource. See clause 6.4.6.3.4. + parameters: + - $ref: '../../components/SOL003_params.yaml#/components/parameters/If-Unmodified-Since' + - $ref: '../../components/SOL003_params.yaml#/components/parameters/If-Match' responses: 200: $ref: '#/components/responses/IndividualThreshold.Patch.200' @@ -701,6 +707,22 @@ components: explode: false schema: type: string + ETag: + description: > + Used to provide the current entity-tag for the selected resource representation. It can be sent in + "200 OK", "201 Created" and "204 No Content" responses. + style: simple + schema: + type: string + + Last-Modified: + description: > + Used to provide a timestamp indicating the date and time at which the server believes the selected resource + representation was last modified. It can be sent in "200 OK", "201 Created" and "204 No Content" responses. + style: simple + schema: + type: string + format: date-time content: application/json: schema: @@ -1022,6 +1044,22 @@ components: explode: false schema: type: string + ETag: + description: > + Used to provide the current entity-tag for the selected resource representation. It can be sent in + "200 OK", "201 Created" and "204 No Content" responses. + style: simple + schema: + type: string + + Last-Modified: + description: > + Used to provide a timestamp indicating the date and time at which the server believes the selected resource + representation was last modified. It can be sent in "200 OK", "201 Created" and "204 No Content" responses. + style: simple + schema: + type: string + format: date-time content: application/json: schema: @@ -1055,6 +1093,21 @@ components: explode: false schema: type: string + ETag: + description: > + Used to provide the current entity-tag for the selected resource representation. It can be sent in + "200 OK", "201 Created" and "204 No Content" responses. + style: simple + schema: + type: string + Last-Modified: + description: > + Used to provide a timestamp indicating the date and time at which the server believes the selected resource + representation was last modified. It can be sent in "200 OK", "201 Created" and "204 No Content" responses. + style: simple + schema: + type: string + format: date-time content: application/json: schema: -- GitLab From 4713c1241bed6c177d653fcae321024c8cc19d4d Mon Sep 17 00:00:00 2001 From: Ayesha Ayub Date: Tue, 21 Jun 2022 16:35:09 +0500 Subject: [PATCH 23/41] update ReourceHandle attribute referncing in SOL002 --- .../SOL002VNFLifecycleManagement_def.yaml | 84 +++---------------- src/definitions/SOL002SOL003_def.yaml | 8 +- 2 files changed, 17 insertions(+), 75 deletions(-) diff --git a/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml b/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml index d2fe175c..42d95fb4 100644 --- a/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml +++ b/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml @@ -991,7 +991,7 @@ definitions: computeSnapshotResource: description: > Reference to a compute snapshot resource. See note 1. - $ref: "#/definitions/ResourceHandle" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ResourceHandle" storageSnapshotResources: description: > Mapping of the storage resources associated to the VNFC with the storage snapshot resources. @@ -1008,7 +1008,7 @@ definitions: storageSnapshotResource: description: > Reference to a storage snapshot resource. See note 2. - $ref: "#/definitions/ResourceHandle" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ResourceHandle" userDefinedData: description: > User defined data for the VNF snapshot. @@ -1096,7 +1096,7 @@ definitions: networkResource: description: > Reference to the VirtualNetwork resource providing this VL. - $ref: "#/definitions/ResourceHandle" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ResourceHandle" vnfLinkPorts: description: > Link ports of this VL. @@ -1160,7 +1160,7 @@ definitions: computeResource: description: > Reference to the VirtualCompute resource or reference to a Compute MCIO. - $ref: "#/definitions/ResourceHandle" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ResourceHandle" storageResourceIds: description: > References to the VirtualStorage resources or references to Storage MCIO(s). @@ -1268,7 +1268,7 @@ definitions: networkResource: description: > Reference to the VirtualNetwork resource or reference to a Network MCIO. - $ref: "#/definitions/ResourceHandle" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ResourceHandle" reservationId: description: > The reservation identifier applicable to the resource. It shall be @@ -1320,7 +1320,7 @@ definitions: storageResource: description: > Reference to the VirtualStorage resource or reference to a Storage MCIO. - $ref: "#/definitions/ResourceHandle" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ResourceHandle" reservationId: description: > The reservation identifier applicable to the resource. It shall be @@ -1377,7 +1377,7 @@ definitions: Reference to the VirtualCompute resource. Detailed information is (for new and modified resources) or has been (for removed resources) available from the VIM. - $ref: "#/definitions/ResourceHandle" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ResourceHandle" metadata: description: > Metadata about this resource. @@ -1474,7 +1474,7 @@ definitions: Reference to the VirtualNetwork resource. Detailed information is (for new and modified resources) or has been (for removed resources) available from the VIM. See note. - $ref: "#/definitions/ResourceHandle" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ResourceHandle" vnfLinkPortIds: description: > Identifiers of the link ports of the affected VL related to the change. Each identifier references a @@ -1542,7 +1542,7 @@ definitions: Reference to the VirtualStorage resource. Detailed information is (for new and modified resources) or has been (for removed resources) available from the VIM. - $ref: "#/definitions/ResourceHandle" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ResourceHandle" metadata: description: > Metadata about this resource. @@ -1908,7 +1908,7 @@ definitions: description: > Reference to the link port resource. Detailed information is (for added resources) or has been (for removed resources) available from the VIM. - $ref: "#/definitions/ResourceHandle" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ResourceHandle" VnfInfoModifications: description: > @@ -1984,66 +1984,4 @@ definitions: in clause 5.5.2.12. type: array items: - $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/VnfcInfoModifications" - - ResourceHandle: - required: - - resourceId - type: object - description: > - This type represents the information that allows addressing a virtualised - resource that is used by a VNF instance. Information about the resource - is available from the VIM. - - * NOTE 1: The information about the VIM or CISM 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: The value set of the "vimLevelResourceType" attribute is within the scope of the VIM or CISM or the - resource provider and can be used as information that complements the ResourceHandle. When the - container infrastructure service is a Kubernetes® instance the vimLevelResourceType is the type of - resource, as would correspond to the ‘kind’ field if the resource is declared in its own Kubernetes® - manifest, e.g.: Pod, PersistentVolumeClaim, NetworkAttachmentDefinition. - - * NOTE 3: When the container infrastructure service is a Kubernetes® instance the resourceId shall be populated - in the following way: - - For a compute MCIO, it is the instance identifier that Kubernetes® assigns, which is unique cluster - wide per resource type. - - For a storage MCIO modelled as a persistent volume claim, it is the name of the persistent volume claim, - i.e. the value of the ‘claimName’ field in the Kubernetes® manifest, or a compound name built by Kubernetes® - if the persistent volume claim is defined inline in another template instead of in its own manifest. - - For a network MCIO representing a NetworkAttachmentDefinition, a Service or an Ingress, it is the value of - the ‘metadata.name’ field in Kubernetes® manifest. - properties: - vimConnectionId: - description: > - Identifier of the VIM or CISM connection to manage the resource. - This attribute shall be supported when the resource is managed by a CISM. - When the resource is managed by a VIM, this attribute shall only be supported and present if VNF--related - resource management in direct mode is applicable. - See note 1. - - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" - resourceProviderId: - description: > - Identifier of the entity responsible for the management of the resource. - This attribute shall only be supported and present when VNF-related resource management in indirect mode is applicable. The - identification scheme is outside the scope of the present document. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" - resourceId: - description: > - Identifier of the resource in the scope of the VIM or the CISM or the resource provider. See note 3. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVim" - vimLevelResourceType: - description: > - Type of the resource in the scope of the VIM or the CISM or the resource provider. See note 2. - type: string - vimLevelAdditionalResourceInfo: - descriptions: > - Additional resource information which is specific to this resource and its type, and which is available - from the VIM or the CISM or the resource provider. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/AdditionalResourceInfo" - containerNamespace: - description: > - The value of the namespace in which the MCIO corresponding to the resource is deployed. - This attribute shall be present if the resource is managed by a CISM and it shall be absent otherwise. - type: string \ No newline at end of file + $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/VnfcInfoModifications" \ No newline at end of file diff --git a/src/definitions/SOL002SOL003_def.yaml b/src/definitions/SOL002SOL003_def.yaml index 04bcc44e..1294faf1 100644 --- a/src/definitions/SOL002SOL003_def.yaml +++ b/src/definitions/SOL002SOL003_def.yaml @@ -279,7 +279,11 @@ definitions: resource that is used by a VNF instance. Information about the resource is available from the VIM. - * NOTE 1: The value set of the "vimLevelResourceType" attribute is within the scope of the VIM + * NOTE 1: The information about the VIM or CISM connection referenced by the VIM connection id is + known to the VNFM. Moreover, the identifier of the VIM connection provides scope to the + resourceId. (This applies in case of SOL002) + + * NOTE 2: The value set of the "vimLevelResourceType" attribute is within the scope of the VIM or CISM or the resource provider and can be used as information that complements the ResourceHandle. This value set is different from the value set of the "type" attribute in the ResourceDefinition (refer to clause 9.5.3.2). When the container infrastructure @@ -287,7 +291,7 @@ definitions: resource, as would correspond to the 'kind' field if the resource is declared in its own Kubernetes® manifest, e.g.: Pod, PersistentVolumeClaim, NetworkAttachmentDefinition. - * NOTE 2: When the container infrastructure service management is a Kubernetes® instance the resourceId shall be + * NOTE 3: When the container infrastructure service management is a Kubernetes® instance the resourceId shall be populated in the following way: - For a compute MCIO, it is the instance identifier that Kubernetes® assigns, which is unique cluster wide per resource type. -- GitLab From c4e7f6e814562ff5f1c0f7c7441af0c324feba81 Mon Sep 17 00:00:00 2001 From: Ayesha Ayub Date: Wed, 22 Jun 2022 10:47:56 +0500 Subject: [PATCH 24/41] update descriptions of common datatype --- src/definitions/SOL002SOL003_def.yaml | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/src/definitions/SOL002SOL003_def.yaml b/src/definitions/SOL002SOL003_def.yaml index 1294faf1..9ef9548d 100644 --- a/src/definitions/SOL002SOL003_def.yaml +++ b/src/definitions/SOL002SOL003_def.yaml @@ -313,7 +313,8 @@ definitions: The applicable "VimConnectionInfo" structure, which is referenced by vimConnectionId, can be obtained from the "vimConnectionInfo" attribute of the "VnfInstance" - structure. + structure. (This applies in case of SOL003) + See note 1. (This applies in case of SOL002) $ref: "#/definitions/Identifier" resourceProviderId: description: > @@ -325,12 +326,12 @@ definitions: resourceId: description: > Identifier of the resource in the scope of the VIM or the - CISM or the resource provider. See note 2. + CISM or the resource provider. See note 3. $ref: "#/definitions/IdentifierInVim" vimLevelResourceType: description: > Type of the resource in the scope of the VIM or the CISM - or the resource provider. See note 1. + or the resource provider. See note 2. type: string vimLevelAdditionalResourceInfo: descriptions: > @@ -629,6 +630,9 @@ definitions: This type represents network address data for a virtual CP. It shall comply with the provisions defined in table 4.4.1.10d-1. + This type represents information about a link port of an external VL, i.e. a port providing connectivity + for the VNF to an NS VL. It shall comply with the provisions defined in table 5.5.3.6d-1. (This applies in case of SOL002) + * NOTE 1: If the container cluster is set up to be able to configure an external load balancer this address will be used, otherwise it will be ignored by the CISM. @@ -655,7 +659,10 @@ definitions: ExtVirtualLinkData: description: > This type represents an external VL. - * NOTE 1: A link port is not needed for an external CP instance that exposes a VIP CP in the following cases: + * 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. (This applies in case of SOL002) + + * NOTE 2: 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 an external CP: 1.1 No dedicated IP address is allocated as VIP address, as indicated in the VNFD. 1.2 A dedicated IP address is allocated as VIP address, but the NFVO indicates that no port is needed @@ -667,7 +674,7 @@ definitions: 4 For a VNFC CP exposed as an external CP in a secondary container cluster external network or a secondary container cluster internal network. - * NOTE 2: An example of the network attachment definition resource when the container infrastructure service + * 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). type: object required: @@ -684,7 +691,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. + resource management in direct mode is applicable. See note 1. $ref: "#/definitions/Identifier" resourceProviderId: description: > @@ -713,7 +720,7 @@ definitions: external connection points to this external VL. If this attribute is not present, the VNFM shall create the link ports on the external VL except in the cases defined - below. See note 1. + below. See note 2. type: array items: $ref: "#/definitions/ExtLinkPortData" @@ -721,7 +728,7 @@ definitions: description: > Externally provided network attachment definition resource(s) that provide the specification of the interface - to attach external CPs to this external VL. See note 2. + to attach external CPs to this external VL. See note 3. It is only applicable if the external VL is realized by a secondary container cluster network. It shall not be present otherwise. -- GitLab From 889e35e00482deafc92e349ccd21c374330c97c0 Mon Sep 17 00:00:00 2001 From: Ayesha Ayub Date: Mon, 27 Jun 2022 10:56:58 +0500 Subject: [PATCH 25/41] fix attribute naming in SOL002-VNF LCM API --- .../definitions/SOL002VNFLifecycleManagement_def.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml b/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml index 42d95fb4..a64aac74 100644 --- a/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml +++ b/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml @@ -226,7 +226,7 @@ definitions: type: array items: $ref: "#/definitions/VnfVirtualLinkResourceInfo" - vnfVirtualStorageResourceInfo: + virtualStorageResourceInfo: description: > Information on the virtualised storage resource(s) used as storage for the VNF instance. type: array -- GitLab From d6c42352709092de67c8671d780b1c4d15f01837 Mon Sep 17 00:00:00 2001 From: muhammadh Date: Wed, 29 Jun 2022 14:14:25 +0500 Subject: [PATCH 26/41] fix minItems attribute in SOL002SOL003 LCM def file --- src/definitions/SOL002SOL003VNFLifecycleManagement_def.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/definitions/SOL002SOL003VNFLifecycleManagement_def.yaml b/src/definitions/SOL002SOL003VNFLifecycleManagement_def.yaml index 35d9973c..e91be6a4 100644 --- a/src/definitions/SOL002SOL003VNFLifecycleManagement_def.yaml +++ b/src/definitions/SOL002SOL003VNFLifecycleManagement_def.yaml @@ -1318,7 +1318,7 @@ definitions: description: > Reference to the VDU(s) which implement the service accessible via the virtual CP instance. See note. type: array - minitems: 1 + minItems: 1 items: $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" additionalServiceInfo: @@ -1348,7 +1348,7 @@ definitions: portInfo: description: > Service port numbers exposed by the virtual CP instance. - minitems: 1 + minItems: 1 type: array items: $ref: "#/definitions/ServicePortInfo" -- GitLab From 9375d1739763926b9297bc3b45b00b1cab6cbf68 Mon Sep 17 00:00:00 2001 From: muhammadh Date: Wed, 29 Jun 2022 14:26:36 +0500 Subject: [PATCH 27/41] fix description typo --- .../definitions/SOL002VNFIndicatorNotification_def.yaml | 2 +- .../definitions/SOL002VNFLifecycleManagement_def.yaml | 2 +- .../SOL002VNFLifecycleManagementNotification_def.yaml | 2 +- src/definitions/SOL002SOL003_def.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/SOL002/VNFIndicatorNotification/definitions/SOL002VNFIndicatorNotification_def.yaml b/src/SOL002/VNFIndicatorNotification/definitions/SOL002VNFIndicatorNotification_def.yaml index bc95b94f..f0dc8fcc 100644 --- a/src/SOL002/VNFIndicatorNotification/definitions/SOL002VNFIndicatorNotification_def.yaml +++ b/src/SOL002/VNFIndicatorNotification/definitions/SOL002VNFIndicatorNotification_def.yaml @@ -87,7 +87,7 @@ definitions: - vnfInstanceId properties: id: - descriptions: | + description: | Identifier of this notification. If a notification is sent multiple times due to multiple subscriptions, the "id" attribute of all these notifications shall have the same value. diff --git a/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml b/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml index a64aac74..f4858d80 100644 --- a/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml +++ b/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml @@ -715,7 +715,7 @@ definitions: ETSI GS NFV-IFA 011 [7]. $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" extensions: - descriptions: > + description: > If present, this attribute provides modifications to the values of the "extensions" attribute in "VnfInstance", as defined in clause 5.5.2.2. Provisions for handling extensions during the operation, and needed passed parameter values in case of conflicts, are defined in clause 5.4.11a.3.1. diff --git a/src/SOL002/VNFLifecycleManagementNotification/definitions/SOL002VNFLifecycleManagementNotification_def.yaml b/src/SOL002/VNFLifecycleManagementNotification/definitions/SOL002VNFLifecycleManagementNotification_def.yaml index 493e628d..6d22b276 100644 --- a/src/SOL002/VNFLifecycleManagementNotification/definitions/SOL002VNFLifecycleManagementNotification_def.yaml +++ b/src/SOL002/VNFLifecycleManagementNotification/definitions/SOL002VNFLifecycleManagementNotification_def.yaml @@ -176,7 +176,7 @@ definitions: items: $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/AffectedVipCp" affectedVirtualCps: - descriptions: > + description: > Information about virtual CP instances that were affected during the execution of the lifecycle management operation, if this notification represents the result of a lifecycle management operation occurrence. diff --git a/src/definitions/SOL002SOL003_def.yaml b/src/definitions/SOL002SOL003_def.yaml index 9ef9548d..859a0a6b 100644 --- a/src/definitions/SOL002SOL003_def.yaml +++ b/src/definitions/SOL002SOL003_def.yaml @@ -334,7 +334,7 @@ definitions: or the resource provider. See note 2. type: string vimLevelAdditionalResourceInfo: - descriptions: > + description: > Additional resource information which is specific to this resource and its type, and which is available from the VIM or the CISM or the resource provider. -- GitLab From 65988d63670be5ea63f8a5b3bbac7930ffbf6364 Mon Sep 17 00:00:00 2001 From: muhammadh Date: Wed, 29 Jun 2022 15:26:51 +0500 Subject: [PATCH 28/41] Remove and separate common SOL002 SOL003 LCM definitions --- .../VNFLifecycleManagement.yaml | 18 +- .../SOL002VNFLifecycleManagement_def.yaml | 1418 +++++++++++++++- .../VNFLifecycleManagementNotification.yaml | 4 +- ...NFLifecycleManagementNotification_def.yaml | 14 +- .../VNFLifecycleManagement.yaml | 76 +- .../SOL003VNFLifecycleManagement_def.yaml | 1449 +++++++++++++++- .../VNFLifecycleManagementNotification.yaml | 4 +- ...OL002SOL003VNFLifecycleManagement_def.yaml | 1450 ----------------- 8 files changed, 2855 insertions(+), 1578 deletions(-) delete mode 100644 src/definitions/SOL002SOL003VNFLifecycleManagement_def.yaml diff --git a/src/SOL002/VNFLifecycleManagement/VNFLifecycleManagement.yaml b/src/SOL002/VNFLifecycleManagement/VNFLifecycleManagement.yaml index 61926203..f842ac7f 100644 --- a/src/SOL002/VNFLifecycleManagement/VNFLifecycleManagement.yaml +++ b/src/SOL002/VNFLifecycleManagement/VNFLifecycleManagement.yaml @@ -1367,7 +1367,7 @@ components: content: application/json: schema: - $ref: ../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/CreateVnfRequest + $ref: definitions/SOL002VNFLifecycleManagement_def.yaml#/definitions/CreateVnfRequest required: true VnfInstanceModificationRequest: @@ -1375,7 +1375,7 @@ components: content: application/json: schema: - $ref: ../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/VnfInfoModificationRequest + $ref: definitions/SOL002VNFLifecycleManagement_def.yaml#/definitions/VnfInfoModificationRequest required: true VnfInstanceInstantiationRequest: @@ -1391,7 +1391,7 @@ components: content: application/json: schema: - $ref: ../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/ScaleVnfRequest + $ref: definitions/SOL002VNFLifecycleManagement_def.yaml#/definitions/ScaleVnfRequest required: true VnfInstanceScaleToLevelRequest: @@ -1399,7 +1399,7 @@ components: content: application/json: schema: - $ref: ../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/ScaleVnfToLevelRequest + $ref: definitions/SOL002VNFLifecycleManagement_def.yaml#/definitions/ScaleVnfToLevelRequest required: true VnfInstanceChangeFlavourRequest: @@ -1458,7 +1458,7 @@ components: content: application/json: schema: - $ref: ../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/LccnSubscriptionRequest + $ref: definitions/SOL002VNFLifecycleManagement_def.yaml#/definitions/LccnSubscriptionRequest required: true VnfInstanceCreateSnapshotRequest: @@ -1634,7 +1634,7 @@ components: content: application/json: schema: - $ref: ../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/VnfIdentifierDeletionNotification + $ref: definitions/SOL002VNFLifecycleManagement_def.yaml#/definitions/VnfIdentifierDeletionNotification IndividualVnfInstance.Delete.409: description: | @@ -2855,7 +2855,7 @@ components: content: application/json: schema: - $ref: ../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/LccnSubscription + $ref: definitions/SOL002VNFLifecycleManagement_def.yaml#/definitions/LccnSubscription Subscriptions.Post.201: description: | @@ -2894,7 +2894,7 @@ components: content: application/json: schema: - $ref: ../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/LccnSubscription + $ref: definitions/SOL002VNFLifecycleManagement_def.yaml#/definitions/LccnSubscription IndividualSubscription.Get.200: description: | @@ -2925,7 +2925,7 @@ components: content: application/json: schema: - $ref: ../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/LccnSubscription + $ref: definitions/SOL002VNFLifecycleManagement_def.yaml#/definitions/LccnSubscription IndividualSubscription.Delete.204: description: | diff --git a/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml b/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml index f4858d80..35d3a431 100644 --- a/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml +++ b/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml @@ -135,7 +135,7 @@ definitions: vnfState: description: > The state of the VNF instance. - $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/VnfOperationalStateType" + $ref: "#/definitions/VnfOperationalStateType" scaleStatus: description: > Scale status of the VNF, one entry per aspect. Represents for every @@ -160,7 +160,7 @@ definitions: type: array minItems: 1 items: - $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/VnfExtCpInfo" + $ref: "#/definitions/VnfExtCpInfo" vipCpInfo: description: > VIP CPs that are part of the VNF instance. Shall be present when that particular VIP @@ -169,7 +169,7 @@ definitions: May be present otherwise. type: array items: - $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/VipCpInfo" + $ref: "#/definitions/VipCpInfo" virtualCpInfo: description: > Virtual CPs that are part of the VNF instance. Shall be present when a particular virtual CP is @@ -177,13 +177,13 @@ definitions: May be present otherwise. type: array items: - $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/VirtualCpInfo" + $ref: "#/definitions/VirtualCpInfo" extVirtualLinkInfo: description: > Information about the external VLs the VNF instance is connected to. type: array items: - $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/ExtVirtualLinkInfo" + $ref: "#/definitions/ExtVirtualLinkInfo" extManagedVirtualLinkInfo: description: > Information about the externally managed internal VLs of the VNF instance. See note 5 and note 6. @@ -201,7 +201,7 @@ definitions: Active monitoring parameters. type: array items: - $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/MonitoringParameter" + $ref: "#/definitions/MonitoringParameter" localizationLanguage: description: > Information about localization language of the VNF (includes e.g. @@ -237,14 +237,14 @@ definitions: Information about the VNFC instances. type: array items: - $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/VnfcInfo" + $ref: "#/definitions/VnfcInfo" mcioInfo: description: > Information on the MCIO(s) representing VNFC instance(s) realized by one or a set of OS containers and created from the same VDU for the VNF instance. type: array items: - $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/McioInfo" + $ref: "#/definitions/McioInfo" metadata: description: > Additional VNF-specific attributes that provide metadata describing the VNF instance. @@ -622,7 +622,7 @@ definitions: description: > The desired operational state (i.e. started or stopped) to change the VNF to. - $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/VnfOperationalStateType" + $ref: "#/definitions/VnfOperationalStateType" stopType: description: > It signals whether forceful or graceful stop is requested. See note @@ -787,7 +787,7 @@ definitions: the data type of "newEntry (refer to clause 5.5.3.24 for the data type "VnfcInfoModifications"). type: array items: - $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/VnfcInfoModifications" + $ref: "#/definitions/VnfcInfoModifications" CreateVnfSnapshotRequest: description: > @@ -987,7 +987,7 @@ definitions: Reference to the "VnfcResourceInfo" structure in the "VnfInstance" structure that represents the resources of the snapshotted VNFC instance. A snapshot of that structure is available in the "vnfInstance" attribute of the "VnfSnapshot" structure. - $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/VnfcInfo" + $ref: "#/definitions/VnfcInfo" computeSnapshotResource: description: > Reference to a compute snapshot resource. See note 1. @@ -1102,14 +1102,14 @@ definitions: Link ports of this VL. type: array items: - $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/VnfLinkPortInfo" + $ref: "#/definitions/VnfLinkPortInfo" vnfNetAttDefResource: description: > Network attachment definition resources that provide the specification of the interface to attach connection points to this VL. type: array items: - $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/NetAttDefResourceInfo" + $ref: "#/definitions/NetAttDefResourceInfo" VnfcResourceInfo: description: > @@ -1204,7 +1204,7 @@ definitions: See note 3. type: array items: - $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/CpProtocolInfo" + $ref: "#/definitions/CpProtocolInfo" vnfLinkPortId: description: > Identifier of the "VnfLinkPortInfo" structure in the "VnfVirtualLinkResourceInfo" @@ -1282,7 +1282,7 @@ definitions: May be present otherwise. type: array items: - $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/VnfLinkPortInfo" + $ref: "#/definitions/VnfLinkPortInfo" metadata: description: > Metadata about this resource. @@ -1593,7 +1593,7 @@ definitions: operationState: description: > The state of the LCM operation. - $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/LcmOperationStateType" + $ref: "#/definitions/LcmOperationStateType" stateEnteredTime: description: > Date-time when the current state has been entered. @@ -1654,7 +1654,7 @@ definitions: description: > The mode of an ongoing cancellation. Shall be present when isCancelPending=true, and shall be absent otherwise. - $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/CancelModeType" + $ref: "#/definitions/CancelModeType" error: description: > If "operationState" is "FAILED_TEMP" or "FAILED" or "operationState" @@ -1709,19 +1709,19 @@ definitions: the execution of the lifecycle management operation. type: array items: - $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/AffectedVipCp" + $ref: "#/definitions/AffectedVipCp" changedExtConnectivity: description: > Information about changed external connectivity, if applicable. See note 1. type: array items: - $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/ExtVirtualLinkInfo" + $ref: "#/definitions/ExtVirtualLinkInfo" modificationsTriggeredByVnfPkgChange: description: > Information about performed changes of "VnfInstance" attributes triggered by changing the current VNF package, if applicable. Shall be absent if the "operation" attribute is different from "CHANGE_VNFPKG". See note 1 and note 2. - $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/ModificationsTriggeredByVnfPkgChange" + $ref: "#/definitions/ModificationsTriggeredByVnfPkgChange" vnfSnapshotInfoId: description: > Identifier of the "individual VNF snapshot" resource. Shall be present if applicable to the type of LCM operation, @@ -1984,4 +1984,1380 @@ definitions: in clause 5.5.2.12. type: array items: - $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/VnfcInfoModifications" \ No newline at end of file + $ref: "#/definitions/VnfcInfoModifications" + + CreateVnfRequest: + type: object + required: + - vnfdId + properties: + vnfdId: + description: > + Identifier that identifies the VNFD which defines the VNF instance to + be created. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + vnfInstanceName: + description: > + Human-readable name of the VNF instance to be created. + type: string + vnfInstanceDescription: + description: > + Human-readable description of the VNF instance to be created. + type: string + metadata: + description: > + If present, this attribute provides additional initial values, overriding those obtained from the VNFD, for + the "metadata" attribute in "VnfInstance", as defined in clause 5.5.2.2. Provisions for handling metadata + during the operation are defined in clause 5.4.2.3.1. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + + ScaleVnfRequest: + description: > + This type represents request parameters for the "Scale VNF" operation. It shall comply with the provisions defined in + table 5.5.2.5-1. See clause B.2 in annex B for an explanation of VNF scaling. + type: object + required: + - type + - aspectId + properties: + type: + description: > + Indicates the type of the scale operation requested. + Permitted values: + * SCALE_OUT: adding additional VNFC instances to the VNF to increase + capacity + * SCALE_IN: removing VNFC instances from the VNF in order to release + unused capacity. + type: string + enum: + - SCALE_OUT + - SCALE_IN + aspectId: + description: > + Identifier of the scaling aspect. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + numberOfSteps: + description: > + Number of scaling steps to be executed as part of this Scale VNF + operation. It shall be a positive number and the default value + shall be 1. + type: integer + default: 1 + additionalParams: + description: > + Additional parameters passed by the NFVO as input to the scaling + process, specific to the VNF being scaled, as declared in the VNFD + as part of "ScaleVnfOpConfig" defined in ETSI GS NFV-IFA 011 [7]. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + + ScaleVnfToLevelRequest: + description: > + This type represents request parameters for the "Scale VNF to Level" operation. + It shall comply with the provisions defined in table 5.5.2.6-1. See clause B.2 + for an explanation of VNF scaling. + + NOTE: Either the instantiationLevelId attribute or the scaleInfo attribute shall + be included. + type: object + anyOf: + - oneOf: + - required: + - instantiationLevelId + - required: + - scaleInfo + properties: + instantiationLevelId: + description: > + Identifier of the target instantiation level of the current + deployment flavour to which the VNF is requested to be scaled. + See note. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + scaleInfo: + description: > + For each scaling aspect of the current deployment flavour, indicates + the target scale level to which the VNF is to be scaled. + See note. + type: array + items: + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ScaleInfo" + additionalParams: + description: > + Additional parameters passed by the NFVO as input to the scaling + process, specific to the VNF being scaled, as declared in the + VNFD as part of "ScaleVnfToLevelOpConfig" defined in ETSI GS NFV-IFA 011 [7]. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + + CancelMode: + description: > + This type represents a parameter to select the mode of cancelling an + ongoing VNF LCM operation occurrence. + type: object + required: + - cancelMode + properties: + cancelMode: + description: > + Cancellation mode to apply. + $ref: "#/definitions/CancelModeType" + + LccnSubscriptionRequest: + description: > + This type represents a subscription request related to notifications + about VNF lifecycle changes. + type: object + required: + - callbackUri + properties: + filter: + description: > + Filter settings for this subscription, to define the subset of all + notifications this subscription relates to. A particular + notification is sent to the subscriber if the filter matches, or if + there is no filter. + $ref: "#/definitions/LifecycleChangeNotificationsFilter" + callbackUri: + description: > + The URI of the endpoint to send the notification to. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Uri" + authentication: + description: > + Authentication parameters to configure the use of Authorization when + sending notifications corresponding to this subscription, as defined + in clause 8.3.4 of ETSI GS NFV-SOL 013. + This attribute shall only be present if the subscriber requires + authorization of notifications. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/SubscriptionAuthentication" + verbosity: + description: > + This attribute signals the requested verbosity of LCM operation occurrence notifications. If it is not present, + it shall default to the value "FULL". + $ref: "#/definitions/LcmOpOccNotificationVerbosityType" + + LccnSubscription: + description: > + This type represents a subscription related to notifications about VNF + lifecycle changes. + type: object + required: + - id + - callbackUri + - verbosity + - _links + properties: + id: + description: > + Identifier of this subscription resource. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + filter: + description: > + Filter settings for this subscription, to define the subset of all + notifications this subscription relates to. A particular + notification is sent to the subscriber if the filter matches, or if + there is no filter. + $ref: "#/definitions/LifecycleChangeNotificationsFilter" + callbackUri: + description: > + The URI of the endpoint to send the notification to. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Uri" + verbosity: + description: > + This attribute signals the verbosity of LCM operation occurrence notifications. + $ref: "#/definitions/LcmOpOccNotificationVerbosityType" + _links: + description: > + Links to resources related to this resource. + type: object + required: + - self + properties: + self: + description: > + URI of this resource. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + + ExtVirtualLinkInfo: + description: > + This type represents information about an external VL. It shall comply with the provisions defined in table 5.5.3.2-1. + + NOTE: This attribute reflects the current configuration information that has resulted from merging into this attribute + the "VnfExtCpData" information which was passed as part of the "ExtVirtualLinkData" structure in the input of the + most recent VNF LCM operation such as "InstantiateVnfRequest", "ChangeExtVnfConnectivityRequest", "ChangeVnfFlavourRequest" + or "ChangeCurrentVnfPkgRequest", or in the Grant response. If applying such change results in an empty list of + "currentVnfExtCpData" structure instances, the affected instance of "ExtVirtualLinkInfo" shall be removed from its + parent data structure. + type: object + required: + - id + - resourceHandle + - currentVnfExtCpData + properties: + id: + description: > + Identifier of the external VL and the related external VL + information instance. + The identifier is assigned by the NFV-MANO entity that manages this + VL instance. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + resourceHandle: + description: > + Reference to the resource realizing this VL. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ResourceHandle" + extLinkPorts: + description: > + Link ports of this VL. + type: array + items: + $ref: "#/definitions/ExtLinkPortInfo" + currentVnfExtCpData: + description: > + Allows the API consumer to read the current CP configuration information for the connection of external CPs + to the external virtual link. See note. + type: array + items: + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/VnfExtCpData" + extNetAttDefResource: + description: > + Network attachment definition resources that provide the specification of the interface to attach connection points + to this VL. + type: array + items: + $ref: "#/definitions/NetAttDefResourceInfo" + + VnfLinkPortInfo: + description: > + This type represents a link port of an internal VL of a VNF. It shall comply with the provisions + defined in table 5.5.3.8 1. + + NOTE 1: Either cpInstanceId with cpInstanceType set to "EXT_CP" or any combination of cpInstanceId + with cpInstanceType set to "VNFC_CP" and vipCpInstanceId (i.e. one or both of them) shall be + present for a VnfLinkPortInfo. In case both cpInstanceId with cpInstanceType set to "VNFC_CP" + and vipCpInstanceId are present, the two different CP instances share the linkport. + NOTE 2: Annex A.4 of ETSI GS NFV-IFA 007 provides examples for configurations where both vipCpInstanceId + and vnfcCpInstanceId are present (UC#5 and UC#5-b), only vnfcCpInstanceId is present (UC#2), or + only vipCpInstanceId is present (UC6 and UC#6-b). + NOTE 3: The value of "trunkResourceId" is scoped by the value of "vimConnectionId" in the "resourceHandle" + attribute. + type: object + required: + - id + - resourceHandle + properties: + id: + description: > + Identifier of this link port as provided by the entity that has created the link port. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + resourceHandle: + description: > + Reference to the virtualised resource realizing this link + port. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ResourceHandle" + cpInstanceId: + description: > + When the link port is used for external connectivity by the VNF, this attribute represents the + identifier of the external CP associated with this link port. + + When the link port is used for internal connectivity in the VNF, this attribute represents the + identifier of the VNFC CP to be connected to this link port. + + Shall be present when the link port is used for external connectivity by the VNF. + May be present if used to reference a VNFC CP instance. + There shall be at most one link port associated with any external connection point instance or + internal connection point (i.e. VNFC CP) instance. + The value refers to an "extCpInfo" item in the VnfInstance or a "vnfcCpInfo" item of a "vnfcResourceInfo" + item in the VnfInstance. See note 1. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + cpInstanceType: + description: > + Type of the CP instance that is identified by cpInstanceId. + Shall be present if "cpInstanceId" is present and shall be absent otherwise. + + Permitted values: + - VNFC_CP: The link port is connected to a VNFC CP. + - EXT_CP: The link port is associated to an external CP. + See note 1. + type: string + enum: + - VNFC_CP + - EXT_CP + vipCpInstanceId: + description: > + VIP CP instance of the VNF connected to this link port. May be present. + See notes 1, and 2. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + trunkResourceId: + description: > + Identifier of the trunk resource in the VIM. + Shall be present if the present link port corresponds to the parent port that the trunk resource is associated with. + See note 3. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVim" + + ExtLinkPortInfo: + description: > + This type represents information about a link port of an external VL, i.e. a port providing connectivity for the VNF to + an NS VL. It shall comply with the provisions defined in table 5.5.3.9-1. + + NOTE 1: The use cases UC#4 and UC#5 in clause A.4 of ETSI GS NFV-IFA 007 provide examples for such a configuration. + NOTE 2: The value of "trunkResourceId" is scoped by the value of "vimConnectionId" in the "resourceHandle" attribute. + type: object + required: + - id + - resourceHandle + properties: + id: + description: > + Identifier of this link port as provided by the entity that has + created the link port. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + resourceHandle: + description: > + Reference to the virtualised resource realizing this link + port. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ResourceHandle" + cpInstanceId: + description: > + Identifier of the external CP of the VNF connected to this link + port. There shall be at most one link port associated with any + external connection point instance. The value refers to an + "extCpInfo" item in the VnfInstance. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + secondaryCpInstanceId: + description: > + Additional external CP of the VNF connected to this link port. + If present, this attribute shall refer to a "secondary" ExtCpInfo item in the VNF instance that exposes a virtual + IP CP instance which shares this linkport with the external CP instance referenced by the "cpInstanceId" attribute. + See note 1. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + trunkResourceId: + description: > + Identifier of the trunk resource in the VIM. + Shall be present if the present link port corresponds to the parent port that the trunk resource is associated with. + See note 2. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVim" + + CpProtocolInfo: + description: > + This type describes the protocol layer(s) that a CP uses together with protocol-related information, like addresses. + It shall comply with the provisions defined in table 5.5.3.9b-1. + + NOTE: This attribute allows to signal the addition of further types of layer and protocol in future versions of the + present document in a backwards-compatible way. In the current version of the present document, only IP over + Ethernet is supported. + type: object + required: + - layerProtocol + properties: + layerProtocol: + description: > + The identifier of layer(s) and protocol(s) associated to the network address information. + + Permitted values: + 1. IP_OVER_ETHERNET + 2. IP_FOR_VIRTUAL_CP + See note. + type: string + enum: + - IP_OVER_ETHERNET + ipOverEthernet: + description: > + IP addresses over Ethernet to assign to the extCP instance. Shall be + present if layerProtocol is equal to " IP_OVER_ETHERNET", and shall + be absent otherwise. + $ref: "#/definitions/IpOverEthernetAddressInfo" + virtualCpAddress: + description: > + IP address data assigned to an external CP instance exposing a virtual CP. It shall be present if + 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" + + IpOverEthernetAddressInfo: + description: > + This type represents information about a network address that has been assigned. + It shall comply with the provisions defined in table 5.5.3.10-1. + + NOTE 1: At least one of "macAddress" or "ipAddresses" shall be present. + NOTE 2: Exactly one of "addresses" or "addressRange" shall be present. + NOTE 3: If the Cp instance represents a subport in a trunk, segmentationId shall be present. + Otherwise it shall not be present. + NOTE 4: Depending on the NFVI networking infrastructure, the segmentationId may indicate the + actual network segment value (e.g. vlan Id, Vxlan segmentation id, etc.) used in the + transport header of the packets or it may be an identifier used between the application + and the NFVI networking infrastructure to identify the network sub-interface of the trunk + port in question. In the latter case the NFVI infrastructure will map this local segmentationId + to whatever segmentationId is actually used by the NFVI’s transport technology. + type: object + anyOf: + - required: + - macAddress + - required: + - ipAddresses + oneOf: + - required: + - addresses + - required: + - addressRange + properties: + macAddress: + description: > + MAC address, if assigned. See note 1. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/MacAddress" + segmentationId: + description: > + Identification of the network segment to which the Cp instance connects to. See notes 3 and 4. + type: string + ipAddresses: + description: > + Addresses assigned to the CP instance. Each entry represents IP addresses assigned by fixed or + dynamic IP address assignment per subnet. See note 1. + type: array + items: + type: object + required: + - type + properties: + type: + description: > + The type of the IP addresses. + Permitted values: IPV4, IPV6. + type: string + enum: + - IPV4 + - IPV6 + addresses: + description: > + Fixed addresses assigned (from the subnet defined by "subnetId" if provided). See note 2. + type: array + items: + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IpAddress" + isDynamic: + description: > + Indicates whether this set of addresses was assigned + dynamically (true) or based on address information provided as + input from the API consumer (false). Shall be present if + "addresses" is present and shall be absent otherwise. + type: boolean + addressRange: + description: > + An IP address range used, e.g. in case of egress connections. See note 2. + type: object + required: + - minAddress + - maxAddress + properties: + minAddress: + description: > + Lowest IP address belonging to the range. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IpAddress" + maxAddress: + description: > + Highest IP address belonging to the range + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IpAddress" + subnetId: + description: > + Subnet defined by the identifier of the subnet resource in + the VIM. + In case this attribute is present, IP addresses are bound + to that subnet. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVim" + + MonitoringParameter: + type: object + required: + - id + - performanceMetric + properties: + id: + description: > + Identifier of the monitoring parameter defined in the VNFD. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + vnfdId: + description: > + Identifier of the VNFD. + Shall be present in case the value differs from the vnfdId attribute of the VnfInstance (e.g. during a "Change + current VNF package" operation or due to its final failure). + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + name: + description: > + Human readable name of the monitoring parameter, as defined in the + VNFD. + type: string + performanceMetric: + description: > + Performance metric that is monitored. This attribute shall contain the + related "Measurement Name" value as defined in clause 7.2 of ETSI GS NFV-IFA 027. + type: string + + LifecycleChangeNotificationsFilter: + description: > + This type represents a subscription filter related to notifications about VNF lifecycle changes. + It shall comply with the provisions defined in table 5.5.3.12-1. + At a particular nesting level in the filter structure, the following applies: All attributes shall + match in order for the filter to match (logical "and" between different filter attributes). + If an attribute is an array, the attribute shall match if at least one of the values in the array + matches (logical "or" between the values of one filter attribute). + + NOTE: The permitted values of the "notificationTypes" attribute are spelled exactly as the names of + the notification types to facilitate automated code generation systems. + type: object + properties: + vnfInstanceSubscriptionFilter: + description: > + Filter criteria to select VNF instances about which to notify. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/VnfInstanceSubscriptionFilter" + notificationTypes: + description: > + Match particular notification types. + + Permitted values: + - VnfLcmOperationOccurrenceNotification + - VnfIdentifierCreationNotification + - VnfIdentifierDeletionNotification + See note. + type: array + items: + type: string + enum: + - VnfLcmOperationOccurrenceNotification + - VnfIdentifierCreationNotification + - VnfIdentifierDeletionNotification + operationTypes: + description: > + Match particular VNF lifecycle operation types for the notification + of type VnfLcmOperationOccurrenceNotification. + May be present if the "notificationTypes" attribute contains the + value "VnfLcmOperationOccurrenceNotification", and shall be absent + otherwise. + type: array + items: + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/LcmOperationType" + operationStates: + description: > + Match particular LCM operation state values as reported in + notifications of type VnfLcmOperationOccurrenceNotification. + May be present if the "notificationTypes" attribute contains the + value "VnfLcmOperationOccurrenceNotification", and shall be absent + otherwise. + type: array + items: + $ref: "#/definitions/LcmOperationStateType" + + LccnLinks: + description: > + This type represents the links to resources that a notification can + contain. + type: object + required: + - vnfInstance + - subscription + properties: + vnfInstance: + description: > + Link to the resource representing the VNF instance to which the + notified change applies. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/NotificationLink" + subscription: + description: > + Link to the related subscription. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/NotificationLink" + vnfLcmOpOcc: + description: > + Link to the VNF lifecycle management operation occurrence that this + notification is related to. Shall be present if there is a related + lifecycle operation occurrence. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/NotificationLink" + + VnfExtCpInfo: + description: > + This type represents information about an external CP of a VNF. + It shall comply with the provisions defined in table 5.5.3.17 1. + + NOTE 1: The attributes "associatedVnfcCpId", "associatedVipCpId", "associatedVirtualCpId" 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. + NOTE 3: Cardinality greater than 1 is only applicable for specific cases where more than one network + attachment definition resource is needed to fulfil the connectivity requirements of the external + CP, e.g. to build a link redundant mated pair in SR-IOV cases. + NOTE 4: When more than one netAttDefResourceId is indicated, all shall belong to the same namespace. + type: object + required: + - id + - cpdId + - cpConfigId + - cpProtocolInfo + oneOf: + - required: + - associatedVnfcCpId + - required: + - associatedVipCpId + - required: + - associatedVnfVirtualLinkId + properties: + id: + description: > + Identifier of the external CP instance and the related information instance. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + cpdId: + description: > + Identifier of the external CPD, VnfExtCpd, in the VNFD. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + cpConfigId: + description: > + Identifier that references the applied "VnfExtCpConfig" entry in the "cpConfig" map of the "currentVnfExtCpData" + in the "ExtVirtualLinkInfo" structure. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + vnfdId: + description: > + Identifier of the VNFD. + Shall be present in case the value differs from the vnfdId attribute of the VnfInstance (e.g. during a "Change + current VNF package" operation or due to its final failure). + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + cpProtocolInfo: + description: > + Network protocol information for this CP. + type: array + items: + $ref: "#/definitions/CpProtocolInfo" + extLinkPortId: + description: > + Identifier of the "ExtLinkPortInfo" structure inside the "ExtVirtualLinkInfo" structure. + Shall be present if the CP is associated to a link port. See note 2. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + metadata: + description: > + Metadata about this external CP. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + associatedVnfcCpId: + description: > + Identifier of the "vnfcCpInfo" structure in "VnfcResourceInfo" structure that represents the VNFC CP + which is exposed by this external CP instance, either directly or via a floating IP address. + Shall be present in case this CP instance maps to a VNFC CP. See note 1. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + associatedVipCpId: + description: > + Identifier of the VIP CP instance that is exposed as this VnfExtCp instance, either directly or via a + floating IP address, and the related "VipCpInfo" structure in "VnfInstance". Shall be present if the + cpdId of this VnfExtCp has a vipCpd attribute. See note 1. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + associatedVirtualCpId: + description: > + Identifier of the "VirtualCpInfo" structure that represents the Virtual CP that is exposed by this + external CP instance. Shall be present in case this CP instance maps to a Virtual CP. See note 1. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + associatedVnfVirtualLinkId: + description: > + Identifier of the "VnfVirtualLinkResourceInfo" structure that represents the internal VL or of the + "ExtManagedVirtualLinkInfo" structure that represents the externally-managed internal VL which is + exposed by this external CP instance. Shall be present in case this CP instance maps to an internal + VL (including externally-managed internal VL). See note 1. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + netAttDefResourceInfoId: + description: > + Identifier of the “NetAttDefResourceInfo” structure that provides the specification of the interface to attach the + connection point to a secondary container cluster network. See notes 3 and 4. + It shall be present if the external CP is associated to a VNFC realized by one or a set of OS containers and + is connected to a secondary container cluster network. It shall not be present otherwise. + type: array + items: + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + + VnfOperationalStateType: + description: > + STARTED: The VNF instance is up and running. + STOPPED: The VNF instance has been shut down. + type: string + enum: + - STARTED + - STOPPED + + LcmOperationStateType: + description: > + STARTING: The LCM operation is starting. + PROCESSING: The LCM operation is currently in execution. + COMPLETED: The LCM operation has been completed successfully. + FAILED_TEMP: The LCM operation has failed and execution has stopped, + but the execution of the operation is not considered to be closed. + FAILED: The LCM operation has failed and it cannot be retried or rolled back, + as it is determined that such action won't succeed. + ROLLING_BACK: The LCM operation is currently being rolled back. + ROLLED_BACK: The LCM operation has been successfully rolled back, + i.e. The state of the VNF prior to the original operation invocation has been restored as closely as possible. + type: string + enum: + - STARTING + - PROCESSING + - COMPLETED + - FAILED_TEMP + - FAILED + - ROLLING_BACK + - ROLLED_BACK + + CancelModeType: + description: > + Cancellation mode. + GRACEFUL: If the VNF LCM operation occurrence is in "PROCESSING" or + "ROLLING_BACK" state, the VNFM shall not start any new resource + management operation and shall wait for the ongoing resource management + operations in the underlying system, typically the VIM, to finish + execution or to time out. After that, the VNFM shall put the operation + occurrence into the FAILED_TEMP state. + If the VNF LCM operation occurrence is in "STARTING" state, the VNFM + shall not start any resource management operation and shall wait for + the granting request to finish execution or time out. After that, the + VNFM shall put the operation occurrence into the ROLLED_BACK state. + FORCEFUL: If the VNF LCM operation occurrence is in "PROCESSING" or + "ROLLING_BACK" state, the VNFM shall not start any new resource + management operation, shall cancel the ongoing resource management + operations in the underlying system, typically the VIM, and shall wait + for the cancellation to finish or to time out. After that, the VNFM + shall put the operation occurrence into the FAILED_TEMP state. + If the VNF LCM operation occurrence is in "STARTING" state, the VNFM + shall not start any resource management operation and put the operation + occurrence into the ROLLED_BACK state. + type: string + enum: + - GRACEFUL + - FORCEFUL + +######################################################################################################################## + VnfIdentifierCreationNotification: + description: > + This type represents a VNF identifier creation notification, which + informs the receiver of the creation of a new "Individual VNF instance" resource and + the associated VNF instance identifier. + This notification shall be triggered by the VNFM when it has created an + "Individual VNF instance" resource and the associated VNF instance identifier. + type: object + required: + - id + - notificationType + - subscriptionId + - timeStamp + - vnfInstanceId + - _links + properties: + id: + description: > + Identifier of the VNF instance. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + notificationType: + description: > + Discriminator for the different notification types. Shall be set to + "VnfIdentifierCreationNotification" for this notification type. + type: string + enum: + - VnfIdentifierCreationNotification + subscriptionId: + description: > + Identifier of the subscription that this notification relates to. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + timeStamp: + description: > + Date-time of the generation of the notification. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" + vnfInstanceId: + description: > + The created VNF instance identifier. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + _links: + description: > + Links to resources related to this notification. + $ref: "#/definitions/LccnLinks" + + VnfIdentifierDeletionNotification: + description: > + This type represents a VNF identifier deletion notification, which + informs the receiver of the deletion of a new "Individual VNF instance" resource and + the associated VNF instance identifier. + This notification shall be triggered by the VNFM when it has deleted an + "Individual VNF instance" resource and the associated VNF instance identifier. + type: object + required: + - id + - notificationType + - subscriptionId + - timeStamp + - vnfInstanceId + - _links + properties: + id: + description: > + Identifier of this notification. If a notification is sent multiple + times due to multiple subscriptions, the "id" attribute of all these + notifications shall have the same value. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + notificationType: + description: > + Discriminator for the different notification types. Shall be set to + "VnfIdentifierDeletionNotification" for this notification type. + type: string + enum: + - VnfIdentifierDeletionNotification + subscriptionId: + description: > + Identifier of the subscription that this notification relates to. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + timeStamp: + description: > + Date-time of the generation of the notification. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" + vnfInstanceId: + description: > + The deleted VNF instance identifier. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + _links: + description: > + Links to resources related to this notification. + $ref: "#/definitions/LccnLinks" + + VnfcInfoModifications: + description: > + This type represents modifications of an entry in an array of "VnfcInfo" objects. + * NOTE: The attribute "id" in this data type represents the same identifier as the attribute + "vnfcInstanceId" in other related data types in the present document. For reasons of backward + compatibility, this misalignment is not corrected. + type: object + required: + - id + - vnfcConfigurableProperties + properties: + id: + description: > + Identifier of the VNFC instance of which the information is to be modified. + The identifier references the "id" attribute in a "VnfcInfo" structure. See note. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + vnfcConfigurableProperties: + description: > + Changes of the configurable properties of the VNFC instance. + When this structure is part of a request, the modifications signalled in this attribute + shall be applied according to the rules of JSON Merge Patch (see IETF RFC 7396). + In addition, the provisions in clause 5.7 shall apply. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + + VnfcInfo: + description: > + This type represents the information about a VNFC instance that is part of a VNF instance. + * NOTE: This allows to represent the error condition that a VNFC instance has lost its resources. + type: object + required: + - id + - vduId + - vnfcState + properties: + id: + description: > + Identifier of the VNFC instance. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + vduId: + description: > + Reference to the applicable VDU information element in + the VNFD. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + vnfcResourceInfoId: + description: > + Identifier of the VnfcResourceInfo instance representing + the virtualised resources used by this VNFC instance. See note. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + vnfcState: + description: > + Identifier of the VnfcResourceInfo instance representing + the virtualised resources used by this VNFC instance. + State of the VNFC instance. + Permitted values: + • STARTED: The VNFC instance is up and + running. + • STOPPED: The VNFC instance has been shut down + type: string + enum: + - STARTED + - STOPPED + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + vnfcConfigurableProperties: + description: > + Current values of the configurable properties of the + VNFC instance. + Configurable properties referred in this attribute are + declared in the VNFD. + This attribute can be modified with the PATCH method. + In addition, the provisions in clause 5.7 shall apply. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + + ModificationsTriggeredByVnfPkgChange: + description: > + This type represents attribute modifications that were performed on an "Individual VNF instance" resource + when changing the current VNF package. The attributes that can be included consist of those requested to + be modified explicitly in the "ChangeCurrentVnfPkgRequest" data structure, and additional attributes of the + "VnfInstance" data structure that were modified implicitly during the operation. + The "ModificationsTriggeredByVnfPkgChange" data type shall comply with the provisions defined in table 5.5.3.21-1. + + NOTE 1: This attribute represents the delta (semantics as per IETF RFC 7396, JSON Merge Patch) between the value + of the attribute at the start of the "Change current VNF package" operation and the value of the attribute + at its completion. + NOTE 2: If present, this attribute (which depends on the value of the "vnfdId" attribute) was modified implicitly + during the related operation and contains a copy of the value of the related attribute from the VNFD in the + VNF Package identified by the "vnfdId" attribute. + type: object + properties: + vnfConfigurableProperties: + description: > + This attribute signals the modifications of the "vnfConfigurableProperties" attribute in "VnfInstance" performed + by the operation and shall be present if that attribute was modified during the operation. See note 1. + In addition, the provisions in clause 5.7 shall apply. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + metadata: + description: > + This attribute signals the modifications of the "metadata" attribute in "VnfInstance" performed by the operation and + shall be present if that attribute was modified during the operation. See note 1. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + extensions: + description: > + This attribute signals the modifications of the "extensions" attribute in "VnfInstance" performed by the operation and + shall be present if that attribute was modified during the operation. See note 1. + In addition, the provisions in clause 5.7 shall apply. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + vnfdId: + description: > + If present, this attribute signals the new value of the "vnfdId" attribute in "VnfInstance". + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + vnfProvider: + description: > + If present, this attribute signals the new value of the "vnfProvider" attribute in "VnfInstance". See note 2. + type: string + vnfProductName: + description: > + If present, this attribute signals the new value of the "vnfProductName" attribute in "VnfInstance". See note 2. + type: string + vnfSoftwareVersion: + description: > + If present, this attribute signals the new value of the "vnfSoftwareVersion" attribute in "VnfInstance". See note 2. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Version" + vnfdVersion: + description: > + If present, this attribute signals the new value of the "vnfdVersion" attribute in "VnfInstance". See note 2. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Version" + vimConnectionInfo: + description: > + If present, this attribute signals the changes to VIM connection info that were passed in the related + "ChangeCurrentVnfPkgRequest" structure. The provisions for sensitive information defined in clause + 4.4.1.6 apply. + type: object + additionalProperties: + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/VimConnectionInfo" + + LcmOpOccNotificationVerbosityType: + description: > + The enumeration LcmOpOccNotificationVerbosityType provides values to control the verbosity of LCM operation + occurrence notifications. + * FULL: This signals a full notification which contains all change details. + * SHORT: This signals a short notification which omits large-volume change details to reduce the size of data to + be sent via the notification mechanism. + type: string + enum: + - FULL + - SHORT + + McioTypeName: + description: > + The present type definition provides valid string values for the "mcioType" attribute of the "McioInfo" data type , and + the valid values are defined in table 5.5.4.9-1. + type: string + enum: + - Deployment + - Statefulset + + AffectedVipCp: + description: > + This type provides information about added, deleted and modified virtual IP CP instances. + type: object + required: + - cpInstanceId + - cpdId + - changeType + properties: + cpInstanceId: + description: > + Identifier of the virtual IP CP instance and the related "VipCpInfo" structure in "VnfInstance". + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + + cpdId: + description: > + Identifier of the VipCpd in the VNFD. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + + vnfdId: + description: > + Reference to the VNFD. + Shall be present in case of a "change current VNF Package" to + identify whether the affected virtual CP instance is associated + to a VipCpd which is referred from the source or destination VNFD. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + + changeType: + description: > + Signals the type of change. + Permitted values: + - ADDED + - REMOVED + - MODIFIED + type: string + enum: + - ADDED + - REMOVED + - MODIFIED + + VipCpInfo: + description: > + 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 1: It is possible that there is no associated VnfcCp because the VIP CP is available but not + associated yet. + NOTE 2: If only the value or the presence of this attribute is changed in the "VipCpInfo" structure + by an LCM operation occurrence, this does not represent a change that requires including a related + "AffectedVipCp" structure in the VNF LCM operation occurrence notifications or the "VnfLcmOpOcc" + structure related to this LCM operation occurrence. + type: object + required: + - cpInstanceId + - cpdId + properties: + cpInstanceId: + description: > + Identifier of this VIP CP instance and of this VipCpInfo information element. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + cpdId: + description: > + Identifier of the VIP Connection Point Descriptor, VipCpd, in the VNFD. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + vnfdId: + description: > + Identifier of the VNFD. + Shall be present in case the value differs from the vnfdId attribute of the VnfInstance + (e.g. during a "Change current VNF package" operation or due to its final failure). See note 2. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + vnfExtCpId: + description: > + When the VIP CP is exposed as external CP of the VNF, the identifier of this external VNF CP instance. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + cpProtocolInfo: + description: > + Protocol information for this CP. There shall be one cpProtocolInfo for layer 3. + There may be one cpProtocolInfo for layer 2. + type: array + items: + $ref: "#/definitions/CpProtocolInfo" + associatedVnfcCpIds: + description: > + Identifiers of the VnfcCps that share the virtual IP addresse allocated to the VIP CP instance. See note. + type: array + items: + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + vnfLinkPortId: + description: > + Identifier of the "VnfLinkPortInfo" structure in the "VnfVirtualLinkResourceInfo" or + "ExtManagedVirtualLinkInfo" structure. Shall be present if the CP is associated to a + link port on an internal VL (including externally-managed internal VL). + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + metadata: + description: > + Metadata about this VIP CP. + type: array + items: + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + + AffectedVirtualCp: + description: > + This type provides information about added, deleted and modified virtual CP instances. + type: object + required: + - cpInstanceId + - cpdId + - changeType + properties: + cpInstanceId: + description: > + dentifier of the virtual CP instance and the related "VirtualCpInfo" + structure in "VnfInstance". + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + cpdId: + description: > + Identifier of the VirtualCpd in the VNFD. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + vnfdId: + description: > + Reference to the VNFD. + Shall be present in case of a "change current VNF Package" to identify whether + the affected virtual CP instance is associated to a VirtualCpd which is referred + from the source or destination VNFD. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + changeType: + description: > + Signals the type of change. + + Permitted values: + - ADDED + - REMOVED + - MODIFIED + type: string + enum: + - ADDED + - REMOVED + - MODIFIED + + McioInfo: + description: > + This type provides information about an MCIO representing the set of VNFC instances realized by one + or a set of OS containers which have been created based on the same VDU. + Within the CISM, an MCIO controller monitors the actual state of an MCIO representing the set of VNFC + instances realized by one or a set of OS containers and compare it to the desired state as specified + in the respective declarative descriptor. It triggers actions toward the CIS to align the actual to + the desired state. Monitoring the actual state includes monitoring the number of MCIO instances available + at any specific point in time. In addition, an MCIO controller maintains properties and runtime information + on the MCIO instances which have been created based on the same VDU. + The McioInfo data structure provides the runtime information on the MCIOs obtained from the MCIO controller. + + NOTE: There are different types of MCIOs. The set of VNFC instances based on the same VDU is represented + by one MCIO, e.g. of type Deployment. Each individual VNFC instance is represented by another type + of MCIO, e.g. a POD. + + Runtime information of the set of OS containers realizing an individual VNFC instance is not part of the + McioInfo data structure; such runtime information is provided in the ResourceHandle data structure + referenced from the VnfcResourceInfo. The McioInfo does not provide runtime information of a constituent + VNFC instance created based on a specific VDU. + + NOTE 1: The type of MCIO as specified in the declarative descriptor of the MCIO, and that can be read from + the CISM. EXAMPLE: In case of MCIOs managed by Kubernetes®, the type of MCIO corresponds to the + “kind” property of the declarative descriptor. + NOTE 2: If the attribute additionalInfo is present, it may contain runtime information on the actual and + desired state of the MCIO(s). + NOTE 3: When the container infrastructure service is a Kubernetes® instance, the mcioId is the combined + values from the kind and name fields of the Kubernetes resource object, separated by a slash. + Example: "Deployment/abcd". + NOTE 4: When the container infrastructure service is a Kubernetes® instance, the mcioName is the name + field of the resource object. + type: object + required: + - mcioId + - mcioName + - mcioNamespace + - vduId + - cismId + - mcioType + - desiredInstances + - availableInstances + properties: + mcioId: + description: > + Identifier of this MCIO, created by the CISM. See note 3. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + mcioName: + description: > + Human readable name of this MCIO. See note 4. + type: string + mcioNamespace: + description: > + Namespace of this MCIO. + type: string + vduId: + description: > + Reference to the related VDU in the VNFD applicable to this resource. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + cismId: + description: > + Identifier of the CISM managing this MCIO. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + mcioType: + description: > + The type of MCIO. Specific values, their semantics and associated MCIO types are defined in clause + 5.5.4.9. Additional values are also permitted. + See note 1. + type: string + enum: + - Deployment + - Statefulset + desiredInstances: + description: > + Number of desired MCIO instances. + type: integer + availableInstances: + description: > + Number of available MCIO instances. + type: integer + additionalInfo: + decription: > + Additional information which is specific to the MCIO, its type, and which is available + from the CISM. + See note 2. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + + VirtualCpInfo: + description: > + This type provides information related to a virtual CP instance of a VNF. It shall comply with the provisions + in table 5.5.3.31-1. + + NOTE: A consumer of the VNF LCM interface can learn the actual VNFC instances implementing the service + accessible via the virtual CP instance by querying the "vnfcResourceInfo" from the "InstantiatedVnfInfo" + and filtering by corresponding "vduIds" values. + type: object + required: + - cpInstanceId + - cpdId + - resourceHandle + - vduIds + properties: + cpInstanceId: + description: > + Identifier of this virtual CP instance. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + cpdId: + description: > + Identifier of the VirtualCpd in the VNFD. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + resourceHandle: + description: > + Reference to the virtualised resource realizing this virtual CP. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ResourceHandle" + vnfExtCpId: + description: > + When the virtual CP is exposed as external CP of the VNF, the identifier of this external VNF CP instance. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + cpProtocolInfo: + description: > + Protocol information for this CP. There shall be one cpProtocolInfo for each layer protocol supported. + type: array + items: + $ref: "#/definitions/CpProtocolInfo" + vduIds: + description: > + Reference to the VDU(s) which implement the service accessible via the virtual CP instance. See note. + type: array + minItems: 1 + items: + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + additionalServiceInfo: + description: > + Additional service identification information of the virtual CP instance. + type: array + items: + $ref: "#/definitions/AdditionalServiceInfo" + metadata: + description: > + Metadata about this virtual CP instance. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + + AdditionalServiceInfo: + description: > + This type provides additional service information of the virtual CP instance used to expose properties of the + virtual CP to NFV-MANO. It shall comply with the provisions in table 5.5.3.32-1. + + NOTE: This attribute shall only be present if additional information is needed to identify the service + termination within the VNF, such as for example a URL path information in an HTTP request required + to allow a single virtual CP IP address to be used for several HTTP based services that use the + same port number. + type: object + required: + - portInfo + properties: + portInfo: + description: > + Service port numbers exposed by the virtual CP instance. + minItems: 1 + type: array + items: + $ref: "#/definitions/ServicePortInfo" + serviceInfo: + description: > + Service matching information exposed by the virtual CP instance. + See note. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + + ServicePortInfo: + description: > + This type describes the service identifying port properties exposed by the virtual CP instance. It shall + comply with the provisions in table 5.5.3.33-1. + type: object + required: + - name + - port + - portConfigurable + properties: + name: + description: > + The name of the port exposed by the virtual CP instance. + type: string + protocol: + description: > + The L4 protocol for this port exposed by the virtual CP instance. + + Permitted values: + - TCP + - UDP + - SCTP + type: string + enum: + - TCP + - UDP + - SCTP + port: + description: > + The L4 port number exposed by the virtual CP instance. + type: integer + portConfigurable: + description: + Specifies whether the port attribute value is allowed to be configurable. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Boolean" + + NetAttDefResourceInfo: + description: > + This type contains information related to a network attachment definition resource that provides the + specification of the interface used to connect one or multiple connection points to a secondary container + cluster network. It shall comply with the provisions defined in table 5.5.3.36-1. + type: object + required: + - netAttDefResourceInfoId + - netAttDefResource + properties: + netAttDefResourceInfoId: + description: > + Identifier of this network attachment definition resource as provided by the entity that has + created it. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + netAttDefResource: + description: > + Resource handle of the resource in the scope of the CISM. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ResourceHandle" + associatedExtCpId: + description: > + Identifier of the external CP associated to this network attachment definition resource. Shall be present + when the network attachment definition resource is used for external connectivity by the VNF. + type: array + items: + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + associatedVnfcCpId: + description: > + Identifier of the VNFC CP associated to this network attachment definition resource. May be present when + the network attachment definition resource is used for internal connectivity by the VNF. + type: array + items: + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + + VirtualCpAddressInfo: + description: > + This type represents information about a network address that has been assigned to a virtual CP. + type: object + required: + - type + properties: + type: + description: > + The type of the IP addresses. Permitted values: + - IPV4 + - IPV6 + type: string + enum: + - IPV4 + - IPV6 + loadBalancerIp: + description: > + Fixed addresses assigned to an external load balancer. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IpAddress" \ No newline at end of file diff --git a/src/SOL002/VNFLifecycleManagementNotification/VNFLifecycleManagementNotification.yaml b/src/SOL002/VNFLifecycleManagementNotification/VNFLifecycleManagementNotification.yaml index 1fe73d45..fecc3dea 100644 --- a/src/SOL002/VNFLifecycleManagementNotification/VNFLifecycleManagementNotification.yaml +++ b/src/SOL002/VNFLifecycleManagementNotification/VNFLifecycleManagementNotification.yaml @@ -200,7 +200,7 @@ components: content: application/json: schema: - $ref: ../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/VnfIdentifierCreationNotification + $ref: ../VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml#/definitions/VnfIdentifierCreationNotification required: true VnfIdentifierDeletionNotification: @@ -209,7 +209,7 @@ components: content: application/json: schema: - $ref: ../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/VnfIdentifierDeletionNotification + $ref: ../VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml#/definitions/VnfIdentifierCreationNotification required: true responses: diff --git a/src/SOL002/VNFLifecycleManagementNotification/definitions/SOL002VNFLifecycleManagementNotification_def.yaml b/src/SOL002/VNFLifecycleManagementNotification/definitions/SOL002VNFLifecycleManagementNotification_def.yaml index 6d22b276..268a54e3 100644 --- a/src/SOL002/VNFLifecycleManagementNotification/definitions/SOL002VNFLifecycleManagementNotification_def.yaml +++ b/src/SOL002/VNFLifecycleManagementNotification/definitions/SOL002VNFLifecycleManagementNotification_def.yaml @@ -98,7 +98,7 @@ definitions: operationState: description: > The state of the VNF LCM operation occurrence. - $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/LcmOperationStateType" + $ref: "../../VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml#/definitions/LcmOperationStateType" vnfInstanceId: description: > The identifier of the VNF instance affected. @@ -120,7 +120,7 @@ definitions: This attribute signals the verbosity of the notification. If it is not present, it shall default to the value "FULL". If the value is "SHORT", full change details can be obtained by performing a GET request on the "Individual LCM operation occurrence" resource that is signalled by the "vnfLcmOpOcc" child attribute of the "_links" attribute. - $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/LcmOpOccNotificationVerbosityType" + $ref: "../../VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml#/definitions/LcmOpOccNotificationVerbosityType" vnfLcmOpOccId: description: > The identifier of the VNF lifecycle management operation occurrence @@ -174,7 +174,7 @@ definitions: VIP CP instances that have been added, deleted or modified shall be provided. type: array items: - $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/AffectedVipCp" + $ref: "../../VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml#/definitions/AffectedVipCp" affectedVirtualCps: description: > Information about virtual CP instances that were affected during the execution of the @@ -182,7 +182,7 @@ definitions: management operation occurrence. type: array items: - $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/AffectedVirtualCp" + $ref: "../../VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml#/definitions/AffectedVirtualCp" changedExtConnectivity: description: > Information about changed external connectivity, if this @@ -193,14 +193,14 @@ definitions: Shall be absent otherwise. type: array items: - $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/ExtVirtualLinkInfo" + $ref: "../../VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml#/definitions/ExtVirtualLinkInfo" modificationsTriggeredByVnfPkgChange: description: > Information about performed changes of "VnfInstance" attributes triggered by changing the current VNF package. Shall be present if the "notificationStatus" is set to "RESULT", the "operation" attribute is equal to "CHANGE_VNFPKG", the "verbosity" attribute is set to "FULL" and the operation has performed any changes to "VnfInstance" attributes. Shall be absent otherwise. See note 3 - $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/ModificationsTriggeredByVnfPkgChange" + $ref: "../../VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml#/definitions/ModificationsTriggeredByVnfPkgChange" error: description: > Details of the latest error, if one has occurred during executing @@ -211,4 +211,4 @@ definitions: _links: description: > Links to resources related to this notification. - $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/LccnLinks" \ No newline at end of file + $ref: "../../VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml#/definitions/LccnLinks" \ No newline at end of file diff --git a/src/SOL003/VNFLifecycleManagement/VNFLifecycleManagement.yaml b/src/SOL003/VNFLifecycleManagement/VNFLifecycleManagement.yaml index ac15c647..f8fba884 100644 --- a/src/SOL003/VNFLifecycleManagement/VNFLifecycleManagement.yaml +++ b/src/SOL003/VNFLifecycleManagement/VNFLifecycleManagement.yaml @@ -1431,7 +1431,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/CreateVnfRequest" + $ref: "definitions/SOL003VNFLifecycleManagement_def.yaml#/definitions/CreateVnfRequest" required: true VnfInfoModificationRequest: @@ -1456,7 +1456,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/ScaleVnfRequest" + $ref: "definitions/SOL003VNFLifecycleManagement_def.yaml#/definitions/ScaleVnfRequest" required: true ScaleVnfToLevelRequest: @@ -1464,7 +1464,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/ScaleVnfToLevelRequest" + $ref: "definitions/SOL003VNFLifecycleManagement_def.yaml#/definitions/ScaleVnfToLevelRequest" required: true ChangeVnfFlavourRequest: @@ -1523,7 +1523,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/LccnSubscriptionRequest" + $ref: "definitions/SOL003VNFLifecycleManagement_def.yaml#/definitions/LccnSubscriptionRequest" required: true CreateVnfSnapshotRequest: @@ -3437,7 +3437,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/LccnSubscription" + $ref: "definitions/SOL003VNFLifecycleManagement_def.yaml#/definitions/LccnSubscription" Subscriptions.Post.303: description: | @@ -3486,22 +3486,14 @@ components: description: | 422 Unprocessable Entity - Shall be returned upon the following error: The - content type of the payload body is supported - and the payload body of a request contains - syntactically correct data but the data cannot be - processed. - The general cause for this error and its handling - is specified in clause 6.4 of ETSI - GS NFV-SOL 013 [8], including rules for the - presence of the response body. - Specifically in case of this resource, the response - code 422 shall also be returned if the VNFM has - tested the Notification endpoint as described in - clause 5.4.20.3.2 and the test has failed. - In this case, the "detail" attribute in the - "ProblemDetails" structure shall convey more - information about the error + Shall be returned upon the following error: The content type of the payload body is supported + and the payload body of a request contains syntactically correct data but the data cannot be processed. + The general cause for this error and its handling is specified in clause 6.4 of ETSI + GS NFV-SOL 013 [8], including rules for the presence of the response body. + Specifically in case of this resource, the response code 422 shall also be returned if the VNFM has + tested the Notification endpoint as described in clause 5.4.20.3.2 and the test has failed. + In this case, the "detail" attribute in the "ProblemDetails" structure shall convey more + information about the error. headers: Location: description: | @@ -3584,7 +3576,7 @@ components: schema: type: array items: - $ref: "../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/LccnSubscription" + $ref: "definitions/SOL003VNFLifecycleManagement_def.yaml#/definitions/LccnSubscription" IndividualSubscription.Get.200: description: | @@ -3617,7 +3609,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/LccnSubscription" + $ref: "definitions/SOL003VNFLifecycleManagement_def.yaml#/definitions/LccnSubscription" IndividualSubscription.Delete.204: description: | @@ -3678,23 +3670,15 @@ components: description: | 404 NOT FOUND - SShall be returned upon the following error: The API - producer did not find a current representation for - the target resource or is not willing to disclose that - one exists. - The general cause for this error and its handling is - specified in clause 6.4 of ETSI - GS NFV-SOL 013 [8], including rules for the - presence of the response body. - Specifically in case of this task resource, the - response code 404 shall also be returned if the task - is not supported for the VNF instance represented - by the parent resource, which means that the task - resource consequently does not exist. - In this case, the response body shall be present, - and shall contain a ProblemDetails structure, in - which the "detail" attribute shall convey more - information about the error + SShall be returned upon the following error: The API producer did not find a current representation for + the target resource or is not willing to disclose that one exists. + The general cause for this error and its handling is specified in clause 6.4 of ETSI + GS NFV-SOL 013 [8], including rules for the presence of the response body. + Specifically in case of this task resource, the response code 404 shall also be returned if the task + is not supported for the VNF instance represented by the parent resource, which means that the task + resource consequently does not exist. + In this case, the response body shall be present, and shall contain a ProblemDetails structure, in + which the "detail" attribute shall convey more information about the error headers: WWW-Authenticate: description: | @@ -4171,16 +4155,12 @@ components: description: | 412 Precondition Failed - Shall be returned upon the following error: A - precondition given in an HTTP request header is + Shall be returned upon the following error: A precondition given in an HTTP request header is not fulfilled. - Typically, this is due to an ETag mismatch, - indicating that the resource was modified by + Typically, this is due to an ETag mismatch, indicating that the resource was modified by another entity. - The response body should contain a - ProblemDetails structure, in which the "detail" - attribute should convey more information about the - error + The response body should contain a ProblemDetails structure, in which the "detail" + attribute should convey more information about the error. headers: WWW-Authenticate: description: | diff --git a/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml b/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml index dafdfd17..61d53d46 100644 --- a/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml +++ b/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml @@ -388,7 +388,7 @@ definitions: description: > The desired operational state (i.e. started or stopped) to change the VNF to. - $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/VnfOperationalStateType" + $ref: "#/definitions/VnfOperationalStateType" stopType: description: > It signals whether forceful or graceful stop is requested. See note. @@ -534,25 +534,21 @@ definitions: VnfInfoModificationRequest: description: > - This type represents attribute modifications for an - "Individual VNF instance" resource, i.e. modifications to a resource - representation based on the "VnfInstance" data type. + This type represents attribute modifications for an "Individual VNF instance" resource, i.e. + modifications to a resource representation based on the "VnfInstance" data type. type: object properties: vnfInstanceName: description: > - New value of the "vnfInstanceName" attribute in "VnfInstance", or - "null" to remove the attribute. + New value of the "vnfInstanceName" attribute in "VnfInstance", or "null" to remove the attribute. $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/String" vnfInstanceDescription: description: > - New value of the "vnfInstanceDescription" attribute in - "VnfInstance", or "null" to remove the attribute. + New value of the "vnfInstanceDescription" attribute in "VnfInstance", or "null" to remove the attribute. $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/String" - vnfPkgId: + vnfdId: description: > - New value of the "vnfPkgId" attribute in "VnfInstance". - The value "null" is not permitted. + New value of the "vnfdId" attribute in "VnfInstance". The value "null" is not permitted. $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" vnfConfigurableProperties: description: > @@ -574,9 +570,8 @@ definitions: $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" vimConnectionInfo: description: > - Modifications of the "vimConnectionInfo" attribute. If present, these - modifications shall be applied according to the rules of - JSON Merge Patch (see IETF RFC 7396 ). + Modifications of the "vimConnectionInfo" attribute. If present, these modifications shall be applied + according to the rules of JSON Merge Patch (see IETF RFC 7396 [5]). type: object additionalProperties: $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/VimConnectionInfo" @@ -852,7 +847,7 @@ definitions: vnfdVersion: description: > Identifies the version of the VNFD. The value is copied from the VNFD. - $ref: "../../..//definitions/SOL002SOL003_def.yaml#/definitions/Version" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Version" vnfConfigurableProperties: description: > Additional VNF-specific attributes that provide the current values of the configurable @@ -959,7 +954,7 @@ definitions: vnfState: description: > The state of the VNF instance. - $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/VnfOperationalStateType" + $ref: "#/definitions/VnfOperationalStateType" scaleStatus: description: > Scale status of the VNF, one entry per @@ -987,7 +982,7 @@ definitions: type: array minItems: 1 items: - $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/VnfExtCpInfo" + $ref: "#/definitions/VnfExtCpInfo" vipCpInfo: description: > VIP CPs that are part of the VNF instance. Shall be present when that particular VIP CP of the VNFC @@ -996,7 +991,7 @@ definitions: type: array minItems: 1 items: - $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/VipCpInfo" + $ref: "#/definitions/VipCpInfo" virtualCpInfo: description: > Virtual CPs that are part of the VNF instance. Shall be present when a particular Virtual CP @@ -1004,13 +999,13 @@ definitions: May be present otherwise. type: array items: - $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/VirtualCpInfo" + $ref: "#/definitions/VirtualCpInfo" extVirtualLinkInfo: description: > Information about the external VLs the VNF instance is connected to. type: array items: - $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/ExtVirtualLinkInfo" + $ref: "#/definitions/ExtVirtualLinkInfo" extManagedVirtualLinkInfo: description: > Information about the externally-managed internal VLs of the VNF instance. See notes 5 and 6. @@ -1022,7 +1017,7 @@ definitions: Active monitoring parameters. type: array items: - $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/MonitoringParameter" + $ref: "#/definitions/MonitoringParameter" localizationLanguage: description: > Information about localization language of the VNF (includes e.g. @@ -1058,7 +1053,7 @@ definitions: VDU for the VNF instance. type: array items: - $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/McioInfo" + $ref: "#/definitions/McioInfo" metadata: description: > @@ -1225,14 +1220,14 @@ definitions: Link ports of this VL. type: array items: - $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/VnfLinkPortInfo" + $ref: "#/definitions/VnfLinkPortInfo" vnfNetAttDefResource: description: > Network attachment definition resources that provide the specification of the interface to attach connection points to this VL. type: array items: - $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/NetAttDefResourceInfo" + $ref: "#/definitions/NetAttDefResourceInfo" extManagedMultisiteVirtualLinkId: description: > Identifier of the externally-managed multi-site VL instance. The identifier is assigned by the NFVMANO entity @@ -1395,7 +1390,7 @@ definitions: See note 3. type: array items: - $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/CpProtocolInfo" + $ref: "#/definitions/CpProtocolInfo" vnfLinkPortId: description: > Identifier of the "VnfLinkPortInfo" structure in the "VnfVirtualLinkResourceInfo" or "ExtManagedVirtualLinkInfo" structure. @@ -1694,7 +1689,7 @@ definitions: May be present otherwise. type: array items: - $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/VnfLinkPortInfo" + $ref: "#/definitions/VnfLinkPortInfo" metadata: description: > Metadata about this resource. @@ -1849,7 +1844,7 @@ definitions: operationState: description: > The state of the LCM operation. - $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/LcmOperationStateType" + $ref: "#/definitions/LcmOperationStateType" stateEnteredTime: description: > Date-time when the current state has been entered. @@ -1912,7 +1907,7 @@ definitions: description: > The mode of an ongoing cancellation. Shall be present when isCancelPending=true, and shall be absent otherwise. - $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/CancelModeType" + $ref: "#/definitions/CancelModeType" error: description: > If "operationState" is "FAILED_TEMP" or "FAILED" or "operationState" @@ -1967,19 +1962,19 @@ definitions: the execution of the lifecycle management operation. type: array items: - $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/AffectedVipCp" + $ref: "#/definitions/AffectedVipCp" changedExtConnectivity: description: > Information about changed external connectivity, if applicable. See note 1. type: array items: - $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/ExtVirtualLinkInfo" + $ref: "#/definitions/ExtVirtualLinkInfo" modificationsTriggeredByVnfPkgChange: description: > Information about performed changes of "VnfInstance" attributes triggered by changing the current VNF package, if applicable. Shall be absent if the "operation" attribute is different from "CHANGE_VNFPKG". See notes 1 and 2. - $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/ModificationsTriggeredByVnfPkgChange" + $ref: "#/definitions/ModificationsTriggeredByVnfPkgChange" vnfSnapshotInfoId: description: > Identifier of the "individual VNF snapshot" resource. Shall be present if applicable to the type of LCM operation, @@ -2287,7 +2282,7 @@ definitions: operationState: description: > The state of the VNF LCM operation occurrence. - $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/LcmOperationStateType" + $ref: "#/definitions/LcmOperationStateType" vnfInstanceId: description: > The identifier of the VNF instance affected. @@ -2309,7 +2304,7 @@ definitions: This attribute signals the verbosity of the notification. If it is not present, it shall default to the value "FULL". If the value is "SHORT", full change details can be obtained by performing a GET request on the "Individual LCM operation occurrence" resource that is signalled by the "vnfLcmOpOcc" child attribute of the "_links" attribute. - $ref: '../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/LcmOpOccNotificationVerbosityType' + $ref: '#/definitions/LcmOpOccNotificationVerbosityType' vnfLcmOpOccId: description: > The identifier of the VNF lifecycle management operation occurrence associated to the notification. Shall be @@ -2361,7 +2356,7 @@ definitions: Only information about VIP CP instances that have been added, deleted or modified shall be provided. type: array items: - $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/AffectedVipCp" + $ref: "#/definitions/AffectedVipCp" affectedVirtualCps: description: @@ -2374,7 +2369,7 @@ definitions: provided. type: array items: - $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/AffectedVirtualCp" + $ref: "#/definitions/AffectedVirtualCp" changedExtConnectivity: description: > Information about changed external connectivity, if this notification @@ -2386,14 +2381,14 @@ definitions: have been added or modified shall be provided. type: array items: - $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/ExtVirtualLinkInfo" + $ref: "#/definitions/ExtVirtualLinkInfo" modificationsTriggeredByVnfPkgChange: description: > Information about performed changes of "VnfInstance" attributes triggered by changing the current VNF package. Shall be present if the "notificationStatus" is set to "RESULT", the "operation" attribute is equal to "CHANGE_VNFPKG", the "verbosity" attribute is set to "FULL" and the operation has performed any changes to "VnfInstance" attributes. Shall be absent otherwise. See note 3. - $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/ModificationsTriggeredByVnfPkgChange" + $ref: "#/definitions/ModificationsTriggeredByVnfPkgChange" error: description: > Details of the latest error, if one has occurred during executing @@ -2407,7 +2402,7 @@ definitions: The link URIs in this structure shall be set to point to the resources identified by the corresponding identifier attributes in this notification. - $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/LccnLinks" + $ref: "#/definitions/LccnLinks" AffectedVirtualLink: description: > @@ -2597,4 +2592,1380 @@ definitions: provides the specification of the interface to attach the VNF internal CP created from the CPD identified by cpdId to a secondary container cluster network. See note. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" \ No newline at end of file + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + + CreateVnfRequest: + type: object + required: + - vnfdId + properties: + vnfdId: + description: > + Identifier that identifies the VNFD which defines the VNF instance to + be created. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + vnfInstanceName: + description: > + Human-readable name of the VNF instance to be created. + type: string + vnfInstanceDescription: + description: > + Human-readable description of the VNF instance to be created. + type: string + metadata: + description: > + If present, this attribute provides additional initial values, overriding those obtained from the VNFD, for + the "metadata" attribute in "VnfInstance", as defined in clause 5.5.2.2. Provisions for handling metadata + during the operation are defined in clause 5.4.2.3.1. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + + ScaleVnfRequest: + description: > + This type represents request parameters for the "Scale VNF" operation. It shall comply with the provisions defined in + table 5.5.2.5-1. See clause B.2 in annex B for an explanation of VNF scaling. + type: object + required: + - type + - aspectId + properties: + type: + description: > + Indicates the type of the scale operation requested. + Permitted values: + * SCALE_OUT: adding additional VNFC instances to the VNF to increase + capacity + * SCALE_IN: removing VNFC instances from the VNF in order to release + unused capacity. + type: string + enum: + - SCALE_OUT + - SCALE_IN + aspectId: + description: > + Identifier of the scaling aspect. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + numberOfSteps: + description: > + Number of scaling steps to be executed as part of this Scale VNF + operation. It shall be a positive number and the default value + shall be 1. + type: integer + default: 1 + additionalParams: + description: > + Additional parameters passed by the NFVO as input to the scaling + process, specific to the VNF being scaled, as declared in the VNFD + as part of "ScaleVnfOpConfig" defined in ETSI GS NFV-IFA 011 [7]. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + + ScaleVnfToLevelRequest: + description: > + This type represents request parameters for the "Scale VNF to Level" operation. + It shall comply with the provisions defined in table 5.5.2.6-1. See clause B.2 + for an explanation of VNF scaling. + + NOTE: Either the instantiationLevelId attribute or the scaleInfo attribute shall + be included. + type: object + anyOf: + - oneOf: + - required: + - instantiationLevelId + - required: + - scaleInfo + properties: + instantiationLevelId: + description: > + Identifier of the target instantiation level of the current + deployment flavour to which the VNF is requested to be scaled. + See note. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + scaleInfo: + description: > + For each scaling aspect of the current deployment flavour, indicates + the target scale level to which the VNF is to be scaled. + See note. + type: array + items: + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ScaleInfo" + additionalParams: + description: > + Additional parameters passed by the NFVO as input to the scaling + process, specific to the VNF being scaled, as declared in the + VNFD as part of "ScaleVnfToLevelOpConfig" defined in ETSI GS NFV-IFA 011 [7]. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + + CancelMode: + description: > + This type represents a parameter to select the mode of cancelling an + ongoing VNF LCM operation occurrence. + type: object + required: + - cancelMode + properties: + cancelMode: + description: > + Cancellation mode to apply. + $ref: "#/definitions/CancelModeType" + + LccnSubscriptionRequest: + description: > + This type represents a subscription request related to notifications + about VNF lifecycle changes. + type: object + required: + - callbackUri + properties: + filter: + description: > + Filter settings for this subscription, to define the subset of all + notifications this subscription relates to. A particular + notification is sent to the subscriber if the filter matches, or if + there is no filter. + $ref: "#/definitions/LifecycleChangeNotificationsFilter" + callbackUri: + description: > + The URI of the endpoint to send the notification to. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Uri" + authentication: + description: > + Authentication parameters to configure the use of Authorization when + sending notifications corresponding to this subscription, as defined + in clause 8.3.4 of ETSI GS NFV-SOL 013. + This attribute shall only be present if the subscriber requires + authorization of notifications. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/SubscriptionAuthentication" + verbosity: + description: > + This attribute signals the requested verbosity of LCM operation occurrence notifications. If it is not present, + it shall default to the value "FULL". + $ref: "#/definitions/LcmOpOccNotificationVerbosityType" + + LccnSubscription: + description: > + This type represents a subscription related to notifications about VNF + lifecycle changes. + type: object + required: + - id + - callbackUri + - verbosity + - _links + properties: + id: + description: > + Identifier of this subscription resource. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + filter: + description: > + Filter settings for this subscription, to define the subset of all + notifications this subscription relates to. A particular + notification is sent to the subscriber if the filter matches, or if + there is no filter. + $ref: "#/definitions/LifecycleChangeNotificationsFilter" + callbackUri: + description: > + The URI of the endpoint to send the notification to. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Uri" + verbosity: + description: > + This attribute signals the verbosity of LCM operation occurrence notifications. + $ref: "#/definitions/LcmOpOccNotificationVerbosityType" + _links: + description: > + Links to resources related to this resource. + type: object + required: + - self + properties: + self: + description: > + URI of this resource. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + + ExtVirtualLinkInfo: + description: > + This type represents information about an external VL. It shall comply with the provisions defined in table 5.5.3.2-1. + + NOTE: This attribute reflects the current configuration information that has resulted from merging into this attribute + the "VnfExtCpData" information which was passed as part of the "ExtVirtualLinkData" structure in the input of the + most recent VNF LCM operation such as "InstantiateVnfRequest", "ChangeExtVnfConnectivityRequest", "ChangeVnfFlavourRequest" + or "ChangeCurrentVnfPkgRequest", or in the Grant response. If applying such change results in an empty list of + "currentVnfExtCpData" structure instances, the affected instance of "ExtVirtualLinkInfo" shall be removed from its + parent data structure. + type: object + required: + - id + - resourceHandle + - currentVnfExtCpData + properties: + id: + description: > + Identifier of the external VL and the related external VL + information instance. + The identifier is assigned by the NFV-MANO entity that manages this + VL instance. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + resourceHandle: + description: > + Reference to the resource realizing this VL. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ResourceHandle" + extLinkPorts: + description: > + Link ports of this VL. + type: array + items: + $ref: "#/definitions/ExtLinkPortInfo" + currentVnfExtCpData: + description: > + Allows the API consumer to read the current CP configuration information for the connection of external CPs + to the external virtual link. See note. + type: array + items: + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/VnfExtCpData" + extNetAttDefResource: + description: > + Network attachment definition resources that provide the specification of the interface to attach connection points + to this VL. + type: array + items: + $ref: "#/definitions/NetAttDefResourceInfo" + + VnfLinkPortInfo: + description: > + This type represents a link port of an internal VL of a VNF. It shall comply with the provisions + defined in table 5.5.3.8 1. + + NOTE 1: Either cpInstanceId with cpInstanceType set to "EXT_CP" or any combination of cpInstanceId + with cpInstanceType set to "VNFC_CP" and vipCpInstanceId (i.e. one or both of them) shall be + present for a VnfLinkPortInfo. In case both cpInstanceId with cpInstanceType set to "VNFC_CP" + and vipCpInstanceId are present, the two different CP instances share the linkport. + NOTE 2: Annex A.4 of ETSI GS NFV-IFA 007 provides examples for configurations where both vipCpInstanceId + and vnfcCpInstanceId are present (UC#5 and UC#5-b), only vnfcCpInstanceId is present (UC#2), or + only vipCpInstanceId is present (UC6 and UC#6-b). + NOTE 3: The value of "trunkResourceId" is scoped by the value of "vimConnectionId" in the "resourceHandle" + attribute. + type: object + required: + - id + - resourceHandle + properties: + id: + description: > + Identifier of this link port as provided by the entity that has created the link port. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + resourceHandle: + description: > + Reference to the virtualised resource realizing this link + port. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ResourceHandle" + cpInstanceId: + description: > + When the link port is used for external connectivity by the VNF, this attribute represents the + identifier of the external CP associated with this link port. + + When the link port is used for internal connectivity in the VNF, this attribute represents the + identifier of the VNFC CP to be connected to this link port. + + Shall be present when the link port is used for external connectivity by the VNF. + May be present if used to reference a VNFC CP instance. + There shall be at most one link port associated with any external connection point instance or + internal connection point (i.e. VNFC CP) instance. + The value refers to an "extCpInfo" item in the VnfInstance or a "vnfcCpInfo" item of a "vnfcResourceInfo" + item in the VnfInstance. See note 1. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + cpInstanceType: + description: > + Type of the CP instance that is identified by cpInstanceId. + Shall be present if "cpInstanceId" is present and shall be absent otherwise. + + Permitted values: + - VNFC_CP: The link port is connected to a VNFC CP. + - EXT_CP: The link port is associated to an external CP. + See note 1. + type: string + enum: + - VNFC_CP + - EXT_CP + vipCpInstanceId: + description: > + VIP CP instance of the VNF connected to this link port. May be present. + See notes 1, and 2. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + trunkResourceId: + description: > + Identifier of the trunk resource in the VIM. + Shall be present if the present link port corresponds to the parent port that the trunk resource is associated with. + See note 3. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVim" + + ExtLinkPortInfo: + description: > + This type represents information about a link port of an external VL, i.e. a port providing connectivity for the VNF to + an NS VL. It shall comply with the provisions defined in table 5.5.3.9-1. + + NOTE 1: The use cases UC#4 and UC#5 in clause A.4 of ETSI GS NFV-IFA 007 provide examples for such a configuration. + NOTE 2: The value of "trunkResourceId" is scoped by the value of "vimConnectionId" in the "resourceHandle" attribute. + type: object + required: + - id + - resourceHandle + properties: + id: + description: > + Identifier of this link port as provided by the entity that has + created the link port. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + resourceHandle: + description: > + Reference to the virtualised resource realizing this link + port. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ResourceHandle" + cpInstanceId: + description: > + Identifier of the external CP of the VNF connected to this link + port. There shall be at most one link port associated with any + external connection point instance. The value refers to an + "extCpInfo" item in the VnfInstance. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + secondaryCpInstanceId: + description: > + Additional external CP of the VNF connected to this link port. + If present, this attribute shall refer to a "secondary" ExtCpInfo item in the VNF instance that exposes a virtual + IP CP instance which shares this linkport with the external CP instance referenced by the "cpInstanceId" attribute. + See note 1. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + trunkResourceId: + description: > + Identifier of the trunk resource in the VIM. + Shall be present if the present link port corresponds to the parent port that the trunk resource is associated with. + See note 2. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVim" + + CpProtocolInfo: + description: > + This type describes the protocol layer(s) that a CP uses together with protocol-related information, like addresses. + It shall comply with the provisions defined in table 5.5.3.9b-1. + + NOTE: This attribute allows to signal the addition of further types of layer and protocol in future versions of the + present document in a backwards-compatible way. In the current version of the present document, only IP over + Ethernet is supported. + type: object + required: + - layerProtocol + properties: + layerProtocol: + description: > + The identifier of layer(s) and protocol(s) associated to the network address information. + + Permitted values: + 1. IP_OVER_ETHERNET + 2. IP_FOR_VIRTUAL_CP + See note. + type: string + enum: + - IP_OVER_ETHERNET + ipOverEthernet: + description: > + IP addresses over Ethernet to assign to the extCP instance. Shall be + present if layerProtocol is equal to " IP_OVER_ETHERNET", and shall + be absent otherwise. + $ref: "#/definitions/IpOverEthernetAddressInfo" + virtualCpAddress: + description: > + IP address data assigned to an external CP instance exposing a virtual CP. It shall be present if + 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" + + IpOverEthernetAddressInfo: + description: > + This type represents information about a network address that has been assigned. + It shall comply with the provisions defined in table 5.5.3.10-1. + + NOTE 1: At least one of "macAddress" or "ipAddresses" shall be present. + NOTE 2: Exactly one of "addresses" or "addressRange" shall be present. + NOTE 3: If the Cp instance represents a subport in a trunk, segmentationId shall be present. + Otherwise it shall not be present. + NOTE 4: Depending on the NFVI networking infrastructure, the segmentationId may indicate the + actual network segment value (e.g. vlan Id, Vxlan segmentation id, etc.) used in the + transport header of the packets or it may be an identifier used between the application + and the NFVI networking infrastructure to identify the network sub-interface of the trunk + port in question. In the latter case the NFVI infrastructure will map this local segmentationId + to whatever segmentationId is actually used by the NFVI’s transport technology. + type: object + anyOf: + - required: + - macAddress + - required: + - ipAddresses + oneOf: + - required: + - addresses + - required: + - addressRange + properties: + macAddress: + description: > + MAC address, if assigned. See note 1. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/MacAddress" + segmentationId: + description: > + Identification of the network segment to which the Cp instance connects to. See notes 3 and 4. + type: string + ipAddresses: + description: > + Addresses assigned to the CP instance. Each entry represents IP addresses assigned by fixed or + dynamic IP address assignment per subnet. See note 1. + type: array + items: + type: object + required: + - type + properties: + type: + description: > + The type of the IP addresses. + Permitted values: IPV4, IPV6. + type: string + enum: + - IPV4 + - IPV6 + addresses: + description: > + Fixed addresses assigned (from the subnet defined by "subnetId" if provided). See note 2. + type: array + items: + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IpAddress" + isDynamic: + description: > + Indicates whether this set of addresses was assigned + dynamically (true) or based on address information provided as + input from the API consumer (false). Shall be present if + "addresses" is present and shall be absent otherwise. + type: boolean + addressRange: + description: > + An IP address range used, e.g. in case of egress connections. See note 2. + type: object + required: + - minAddress + - maxAddress + properties: + minAddress: + description: > + Lowest IP address belonging to the range. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IpAddress" + maxAddress: + description: > + Highest IP address belonging to the range + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IpAddress" + subnetId: + description: > + Subnet defined by the identifier of the subnet resource in + the VIM. + In case this attribute is present, IP addresses are bound + to that subnet. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVim" + + MonitoringParameter: + type: object + required: + - id + - performanceMetric + properties: + id: + description: > + Identifier of the monitoring parameter defined in the VNFD. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + vnfdId: + description: > + Identifier of the VNFD. + Shall be present in case the value differs from the vnfdId attribute of the VnfInstance (e.g. during a "Change + current VNF package" operation or due to its final failure). + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + name: + description: > + Human readable name of the monitoring parameter, as defined in the + VNFD. + type: string + performanceMetric: + description: > + Performance metric that is monitored. This attribute shall contain the + related "Measurement Name" value as defined in clause 7.2 of ETSI GS NFV-IFA 027. + type: string + + LifecycleChangeNotificationsFilter: + description: > + This type represents a subscription filter related to notifications about VNF lifecycle changes. + It shall comply with the provisions defined in table 5.5.3.12-1. + At a particular nesting level in the filter structure, the following applies: All attributes shall + match in order for the filter to match (logical "and" between different filter attributes). + If an attribute is an array, the attribute shall match if at least one of the values in the array + matches (logical "or" between the values of one filter attribute). + + NOTE: The permitted values of the "notificationTypes" attribute are spelled exactly as the names of + the notification types to facilitate automated code generation systems. + type: object + properties: + vnfInstanceSubscriptionFilter: + description: > + Filter criteria to select VNF instances about which to notify. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/VnfInstanceSubscriptionFilter" + notificationTypes: + description: > + Match particular notification types. + + Permitted values: + - VnfLcmOperationOccurrenceNotification + - VnfIdentifierCreationNotification + - VnfIdentifierDeletionNotification + See note. + type: array + items: + type: string + enum: + - VnfLcmOperationOccurrenceNotification + - VnfIdentifierCreationNotification + - VnfIdentifierDeletionNotification + operationTypes: + description: > + Match particular VNF lifecycle operation types for the notification + of type VnfLcmOperationOccurrenceNotification. + May be present if the "notificationTypes" attribute contains the + value "VnfLcmOperationOccurrenceNotification", and shall be absent + otherwise. + type: array + items: + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/LcmOperationType" + operationStates: + description: > + Match particular LCM operation state values as reported in + notifications of type VnfLcmOperationOccurrenceNotification. + May be present if the "notificationTypes" attribute contains the + value "VnfLcmOperationOccurrenceNotification", and shall be absent + otherwise. + type: array + items: + $ref: "#/definitions/LcmOperationStateType" + + LccnLinks: + description: > + This type represents the links to resources that a notification can + contain. + type: object + required: + - vnfInstance + - subscription + properties: + vnfInstance: + description: > + Link to the resource representing the VNF instance to which the + notified change applies. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/NotificationLink" + subscription: + description: > + Link to the related subscription. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/NotificationLink" + vnfLcmOpOcc: + description: > + Link to the VNF lifecycle management operation occurrence that this + notification is related to. Shall be present if there is a related + lifecycle operation occurrence. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/NotificationLink" + + VnfExtCpInfo: + description: > + This type represents information about an external CP of a VNF. + It shall comply with the provisions defined in table 5.5.3.17 1. + + NOTE 1: The attributes "associatedVnfcCpId", "associatedVipCpId", "associatedVirtualCpId" 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. + NOTE 3: Cardinality greater than 1 is only applicable for specific cases where more than one network + attachment definition resource is needed to fulfil the connectivity requirements of the external + CP, e.g. to build a link redundant mated pair in SR-IOV cases. + NOTE 4: When more than one netAttDefResourceId is indicated, all shall belong to the same namespace. + type: object + required: + - id + - cpdId + - cpConfigId + - cpProtocolInfo + oneOf: + - required: + - associatedVnfcCpId + - required: + - associatedVipCpId + - required: + - associatedVnfVirtualLinkId + properties: + id: + description: > + Identifier of the external CP instance and the related information instance. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + cpdId: + description: > + Identifier of the external CPD, VnfExtCpd, in the VNFD. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + cpConfigId: + description: > + Identifier that references the applied "VnfExtCpConfig" entry in the "cpConfig" map of the "currentVnfExtCpData" + in the "ExtVirtualLinkInfo" structure. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + vnfdId: + description: > + Identifier of the VNFD. + Shall be present in case the value differs from the vnfdId attribute of the VnfInstance (e.g. during a "Change + current VNF package" operation or due to its final failure). + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + cpProtocolInfo: + description: > + Network protocol information for this CP. + type: array + items: + $ref: "#/definitions/CpProtocolInfo" + extLinkPortId: + description: > + Identifier of the "ExtLinkPortInfo" structure inside the "ExtVirtualLinkInfo" structure. + Shall be present if the CP is associated to a link port. See note 2. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + metadata: + description: > + Metadata about this external CP. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + associatedVnfcCpId: + description: > + Identifier of the "vnfcCpInfo" structure in "VnfcResourceInfo" structure that represents the VNFC CP + which is exposed by this external CP instance, either directly or via a floating IP address. + Shall be present in case this CP instance maps to a VNFC CP. See note 1. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + associatedVipCpId: + description: > + Identifier of the VIP CP instance that is exposed as this VnfExtCp instance, either directly or via a + floating IP address, and the related "VipCpInfo" structure in "VnfInstance". Shall be present if the + cpdId of this VnfExtCp has a vipCpd attribute. See note 1. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + associatedVirtualCpId: + description: > + Identifier of the "VirtualCpInfo" structure that represents the Virtual CP that is exposed by this + external CP instance. Shall be present in case this CP instance maps to a Virtual CP. See note 1. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + associatedVnfVirtualLinkId: + description: > + Identifier of the "VnfVirtualLinkResourceInfo" structure that represents the internal VL or of the + "ExtManagedVirtualLinkInfo" structure that represents the externally-managed internal VL which is + exposed by this external CP instance. Shall be present in case this CP instance maps to an internal + VL (including externally-managed internal VL). See note 1. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + netAttDefResourceInfoId: + description: > + Identifier of the “NetAttDefResourceInfo” structure that provides the specification of the interface to attach the + connection point to a secondary container cluster network. See notes 3 and 4. + It shall be present if the external CP is associated to a VNFC realized by one or a set of OS containers and + is connected to a secondary container cluster network. It shall not be present otherwise. + type: array + items: + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + + VnfOperationalStateType: + description: > + STARTED: The VNF instance is up and running. + STOPPED: The VNF instance has been shut down. + type: string + enum: + - STARTED + - STOPPED + + LcmOperationStateType: + description: > + STARTING: The LCM operation is starting. + PROCESSING: The LCM operation is currently in execution. + COMPLETED: The LCM operation has been completed successfully. + FAILED_TEMP: The LCM operation has failed and execution has stopped, + but the execution of the operation is not considered to be closed. + FAILED: The LCM operation has failed and it cannot be retried or rolled back, + as it is determined that such action won't succeed. + ROLLING_BACK: The LCM operation is currently being rolled back. + ROLLED_BACK: The LCM operation has been successfully rolled back, + i.e. The state of the VNF prior to the original operation invocation has been restored as closely as possible. + type: string + enum: + - STARTING + - PROCESSING + - COMPLETED + - FAILED_TEMP + - FAILED + - ROLLING_BACK + - ROLLED_BACK + + CancelModeType: + description: > + Cancellation mode. + GRACEFUL: If the VNF LCM operation occurrence is in "PROCESSING" or + "ROLLING_BACK" state, the VNFM shall not start any new resource + management operation and shall wait for the ongoing resource management + operations in the underlying system, typically the VIM, to finish + execution or to time out. After that, the VNFM shall put the operation + occurrence into the FAILED_TEMP state. + If the VNF LCM operation occurrence is in "STARTING" state, the VNFM + shall not start any resource management operation and shall wait for + the granting request to finish execution or time out. After that, the + VNFM shall put the operation occurrence into the ROLLED_BACK state. + FORCEFUL: If the VNF LCM operation occurrence is in "PROCESSING" or + "ROLLING_BACK" state, the VNFM shall not start any new resource + management operation, shall cancel the ongoing resource management + operations in the underlying system, typically the VIM, and shall wait + for the cancellation to finish or to time out. After that, the VNFM + shall put the operation occurrence into the FAILED_TEMP state. + If the VNF LCM operation occurrence is in "STARTING" state, the VNFM + shall not start any resource management operation and put the operation + occurrence into the ROLLED_BACK state. + type: string + enum: + - GRACEFUL + - FORCEFUL + +######################################################################################################################## + VnfIdentifierCreationNotification: + description: > + This type represents a VNF identifier creation notification, which + informs the receiver of the creation of a new "Individual VNF instance" resource and + the associated VNF instance identifier. + This notification shall be triggered by the VNFM when it has created an + "Individual VNF instance" resource and the associated VNF instance identifier. + type: object + required: + - id + - notificationType + - subscriptionId + - timeStamp + - vnfInstanceId + - _links + properties: + id: + description: > + Identifier of the VNF instance. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + notificationType: + description: > + Discriminator for the different notification types. Shall be set to + "VnfIdentifierCreationNotification" for this notification type. + type: string + enum: + - VnfIdentifierCreationNotification + subscriptionId: + description: > + Identifier of the subscription that this notification relates to. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + timeStamp: + description: > + Date-time of the generation of the notification. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" + vnfInstanceId: + description: > + The created VNF instance identifier. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + _links: + description: > + Links to resources related to this notification. + $ref: "#/definitions/LccnLinks" + + VnfIdentifierDeletionNotification: + description: > + This type represents a VNF identifier deletion notification, which + informs the receiver of the deletion of a new "Individual VNF instance" resource and + the associated VNF instance identifier. + This notification shall be triggered by the VNFM when it has deleted an + "Individual VNF instance" resource and the associated VNF instance identifier. + type: object + required: + - id + - notificationType + - subscriptionId + - timeStamp + - vnfInstanceId + - _links + properties: + id: + description: > + Identifier of this notification. If a notification is sent multiple + times due to multiple subscriptions, the "id" attribute of all these + notifications shall have the same value. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + notificationType: + description: > + Discriminator for the different notification types. Shall be set to + "VnfIdentifierDeletionNotification" for this notification type. + type: string + enum: + - VnfIdentifierDeletionNotification + subscriptionId: + description: > + Identifier of the subscription that this notification relates to. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + timeStamp: + description: > + Date-time of the generation of the notification. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" + vnfInstanceId: + description: > + The deleted VNF instance identifier. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + _links: + description: > + Links to resources related to this notification. + $ref: "#/definitions/LccnLinks" + + VnfcInfoModifications: + description: > + This type represents modifications of an entry in an array of "VnfcInfo" objects. + * NOTE: The attribute "id" in this data type represents the same identifier as the attribute + "vnfcInstanceId" in other related data types in the present document. For reasons of backward + compatibility, this misalignment is not corrected. + type: object + required: + - id + - vnfcConfigurableProperties + properties: + id: + description: > + Identifier of the VNFC instance of which the information is to be modified. + The identifier references the "id" attribute in a "VnfcInfo" structure. See note. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + vnfcConfigurableProperties: + description: > + Changes of the configurable properties of the VNFC instance. + When this structure is part of a request, the modifications signalled in this attribute + shall be applied according to the rules of JSON Merge Patch (see IETF RFC 7396). + In addition, the provisions in clause 5.7 shall apply. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + + VnfcInfo: + description: > + This type represents the information about a VNFC instance that is part of a VNF instance. + * NOTE: This allows to represent the error condition that a VNFC instance has lost its resources. + type: object + required: + - id + - vduId + - vnfcState + properties: + id: + description: > + Identifier of the VNFC instance. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + vduId: + description: > + Reference to the applicable VDU information element in + the VNFD. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + vnfcResourceInfoId: + description: > + Identifier of the VnfcResourceInfo instance representing + the virtualised resources used by this VNFC instance. See note. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + vnfcState: + description: > + Identifier of the VnfcResourceInfo instance representing + the virtualised resources used by this VNFC instance. + State of the VNFC instance. + Permitted values: + • STARTED: The VNFC instance is up and + running. + • STOPPED: The VNFC instance has been shut down + type: string + enum: + - STARTED + - STOPPED + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + vnfcConfigurableProperties: + description: > + Current values of the configurable properties of the + VNFC instance. + Configurable properties referred in this attribute are + declared in the VNFD. + This attribute can be modified with the PATCH method. + In addition, the provisions in clause 5.7 shall apply. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + + ModificationsTriggeredByVnfPkgChange: + description: > + This type represents attribute modifications that were performed on an "Individual VNF instance" resource + when changing the current VNF package. The attributes that can be included consist of those requested to + be modified explicitly in the "ChangeCurrentVnfPkgRequest" data structure, and additional attributes of the + "VnfInstance" data structure that were modified implicitly during the operation. + The "ModificationsTriggeredByVnfPkgChange" data type shall comply with the provisions defined in table 5.5.3.21-1. + + NOTE 1: This attribute represents the delta (semantics as per IETF RFC 7396, JSON Merge Patch) between the value + of the attribute at the start of the "Change current VNF package" operation and the value of the attribute + at its completion. + NOTE 2: If present, this attribute (which depends on the value of the "vnfdId" attribute) was modified implicitly + during the related operation and contains a copy of the value of the related attribute from the VNFD in the + VNF Package identified by the "vnfdId" attribute. + type: object + properties: + vnfConfigurableProperties: + description: > + This attribute signals the modifications of the "vnfConfigurableProperties" attribute in "VnfInstance" performed + by the operation and shall be present if that attribute was modified during the operation. See note 1. + In addition, the provisions in clause 5.7 shall apply. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + metadata: + description: > + This attribute signals the modifications of the "metadata" attribute in "VnfInstance" performed by the operation and + shall be present if that attribute was modified during the operation. See note 1. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + extensions: + description: > + This attribute signals the modifications of the "extensions" attribute in "VnfInstance" performed by the operation and + shall be present if that attribute was modified during the operation. See note 1. + In addition, the provisions in clause 5.7 shall apply. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + vnfdId: + description: > + If present, this attribute signals the new value of the "vnfdId" attribute in "VnfInstance". + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + vnfProvider: + description: > + If present, this attribute signals the new value of the "vnfProvider" attribute in "VnfInstance". See note 2. + type: string + vnfProductName: + description: > + If present, this attribute signals the new value of the "vnfProductName" attribute in "VnfInstance". See note 2. + type: string + vnfSoftwareVersion: + description: > + If present, this attribute signals the new value of the "vnfSoftwareVersion" attribute in "VnfInstance". See note 2. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Version" + vnfdVersion: + description: > + If present, this attribute signals the new value of the "vnfdVersion" attribute in "VnfInstance". See note 2. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Version" + vimConnectionInfo: + description: > + If present, this attribute signals the changes to VIM connection info that were passed in the related + "ChangeCurrentVnfPkgRequest" structure. The provisions for sensitive information defined in clause + 4.4.1.6 apply. + type: object + additionalProperties: + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/VimConnectionInfo" + + LcmOpOccNotificationVerbosityType: + description: > + The enumeration LcmOpOccNotificationVerbosityType provides values to control the verbosity of LCM operation + occurrence notifications. + * FULL: This signals a full notification which contains all change details. + * SHORT: This signals a short notification which omits large-volume change details to reduce the size of data to + be sent via the notification mechanism. + type: string + enum: + - FULL + - SHORT + + McioTypeName: + description: > + The present type definition provides valid string values for the "mcioType" attribute of the "McioInfo" data type , and + the valid values are defined in table 5.5.4.9-1. + type: string + enum: + - Deployment + - Statefulset + + AffectedVipCp: + description: > + This type provides information about added, deleted and modified virtual IP CP instances. + type: object + required: + - cpInstanceId + - cpdId + - changeType + properties: + cpInstanceId: + description: > + Identifier of the virtual IP CP instance and the related "VipCpInfo" structure in "VnfInstance". + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + + cpdId: + description: > + Identifier of the VipCpd in the VNFD. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + + vnfdId: + description: > + Reference to the VNFD. + Shall be present in case of a "change current VNF Package" to + identify whether the affected virtual CP instance is associated + to a VipCpd which is referred from the source or destination VNFD. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + + changeType: + description: > + Signals the type of change. + Permitted values: + - ADDED + - REMOVED + - MODIFIED + type: string + enum: + - ADDED + - REMOVED + - MODIFIED + + VipCpInfo: + description: > + 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 1: It is possible that there is no associated VnfcCp because the VIP CP is available but not + associated yet. + NOTE 2: If only the value or the presence of this attribute is changed in the "VipCpInfo" structure + by an LCM operation occurrence, this does not represent a change that requires including a related + "AffectedVipCp" structure in the VNF LCM operation occurrence notifications or the "VnfLcmOpOcc" + structure related to this LCM operation occurrence. + type: object + required: + - cpInstanceId + - cpdId + properties: + cpInstanceId: + description: > + Identifier of this VIP CP instance and of this VipCpInfo information element. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + cpdId: + description: > + Identifier of the VIP Connection Point Descriptor, VipCpd, in the VNFD. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + vnfdId: + description: > + Identifier of the VNFD. + Shall be present in case the value differs from the vnfdId attribute of the VnfInstance + (e.g. during a "Change current VNF package" operation or due to its final failure). See note 2. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + vnfExtCpId: + description: > + When the VIP CP is exposed as external CP of the VNF, the identifier of this external VNF CP instance. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + cpProtocolInfo: + description: > + Protocol information for this CP. There shall be one cpProtocolInfo for layer 3. + There may be one cpProtocolInfo for layer 2. + type: array + items: + $ref: "#/definitions/CpProtocolInfo" + associatedVnfcCpIds: + description: > + Identifiers of the VnfcCps that share the virtual IP addresse allocated to the VIP CP instance. See note. + type: array + items: + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + vnfLinkPortId: + description: > + Identifier of the "VnfLinkPortInfo" structure in the "VnfVirtualLinkResourceInfo" or + "ExtManagedVirtualLinkInfo" structure. Shall be present if the CP is associated to a + link port on an internal VL (including externally-managed internal VL). + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + metadata: + description: > + Metadata about this VIP CP. + type: array + items: + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + + AffectedVirtualCp: + description: > + This type provides information about added, deleted and modified virtual CP instances. + type: object + required: + - cpInstanceId + - cpdId + - changeType + properties: + cpInstanceId: + description: > + dentifier of the virtual CP instance and the related "VirtualCpInfo" + structure in "VnfInstance". + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + cpdId: + description: > + Identifier of the VirtualCpd in the VNFD. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + vnfdId: + description: > + Reference to the VNFD. + Shall be present in case of a "change current VNF Package" to identify whether + the affected virtual CP instance is associated to a VirtualCpd which is referred + from the source or destination VNFD. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + changeType: + description: > + Signals the type of change. + + Permitted values: + - ADDED + - REMOVED + - MODIFIED + type: string + enum: + - ADDED + - REMOVED + - MODIFIED + + McioInfo: + description: > + This type provides information about an MCIO representing the set of VNFC instances realized by one + or a set of OS containers which have been created based on the same VDU. + Within the CISM, an MCIO controller monitors the actual state of an MCIO representing the set of VNFC + instances realized by one or a set of OS containers and compare it to the desired state as specified + in the respective declarative descriptor. It triggers actions toward the CIS to align the actual to + the desired state. Monitoring the actual state includes monitoring the number of MCIO instances available + at any specific point in time. In addition, an MCIO controller maintains properties and runtime information + on the MCIO instances which have been created based on the same VDU. + The McioInfo data structure provides the runtime information on the MCIOs obtained from the MCIO controller. + + NOTE: There are different types of MCIOs. The set of VNFC instances based on the same VDU is represented + by one MCIO, e.g. of type Deployment. Each individual VNFC instance is represented by another type + of MCIO, e.g. a POD. + + Runtime information of the set of OS containers realizing an individual VNFC instance is not part of the + McioInfo data structure; such runtime information is provided in the ResourceHandle data structure + referenced from the VnfcResourceInfo. The McioInfo does not provide runtime information of a constituent + VNFC instance created based on a specific VDU. + + NOTE 1: The type of MCIO as specified in the declarative descriptor of the MCIO, and that can be read from + the CISM. EXAMPLE: In case of MCIOs managed by Kubernetes®, the type of MCIO corresponds to the + “kind” property of the declarative descriptor. + NOTE 2: If the attribute additionalInfo is present, it may contain runtime information on the actual and + desired state of the MCIO(s). + NOTE 3: When the container infrastructure service is a Kubernetes® instance, the mcioId is the combined + values from the kind and name fields of the Kubernetes resource object, separated by a slash. + Example: "Deployment/abcd". + NOTE 4: When the container infrastructure service is a Kubernetes® instance, the mcioName is the name + field of the resource object. + type: object + required: + - mcioId + - mcioName + - mcioNamespace + - vduId + - cismId + - mcioType + - desiredInstances + - availableInstances + properties: + mcioId: + description: > + Identifier of this MCIO, created by the CISM. See note 3. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + mcioName: + description: > + Human readable name of this MCIO. See note 4. + type: string + mcioNamespace: + description: > + Namespace of this MCIO. + type: string + vduId: + description: > + Reference to the related VDU in the VNFD applicable to this resource. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + cismId: + description: > + Identifier of the CISM managing this MCIO. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + mcioType: + description: > + The type of MCIO. Specific values, their semantics and associated MCIO types are defined in clause + 5.5.4.9. Additional values are also permitted. + See note 1. + type: string + enum: + - Deployment + - Statefulset + desiredInstances: + description: > + Number of desired MCIO instances. + type: integer + availableInstances: + description: > + Number of available MCIO instances. + type: integer + additionalInfo: + decription: > + Additional information which is specific to the MCIO, its type, and which is available + from the CISM. + See note 2. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + + VirtualCpInfo: + description: > + This type provides information related to a virtual CP instance of a VNF. It shall comply with the provisions + in table 5.5.3.31-1. + + NOTE: A consumer of the VNF LCM interface can learn the actual VNFC instances implementing the service + accessible via the virtual CP instance by querying the "vnfcResourceInfo" from the "InstantiatedVnfInfo" + and filtering by corresponding "vduIds" values. + type: object + required: + - cpInstanceId + - cpdId + - resourceHandle + - vduIds + properties: + cpInstanceId: + description: > + Identifier of this virtual CP instance. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + cpdId: + description: > + Identifier of the VirtualCpd in the VNFD. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + resourceHandle: + description: > + Reference to the virtualised resource realizing this virtual CP. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ResourceHandle" + vnfExtCpId: + description: > + When the virtual CP is exposed as external CP of the VNF, the identifier of this external VNF CP instance. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + cpProtocolInfo: + description: > + Protocol information for this CP. There shall be one cpProtocolInfo for each layer protocol supported. + type: array + items: + $ref: "#/definitions/CpProtocolInfo" + vduIds: + description: > + Reference to the VDU(s) which implement the service accessible via the virtual CP instance. See note. + type: array + minItems: 1 + items: + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + additionalServiceInfo: + description: > + Additional service identification information of the virtual CP instance. + type: array + items: + $ref: "#/definitions/AdditionalServiceInfo" + metadata: + description: > + Metadata about this virtual CP instance. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + + AdditionalServiceInfo: + description: > + This type provides additional service information of the virtual CP instance used to expose properties of the + virtual CP to NFV-MANO. It shall comply with the provisions in table 5.5.3.32-1. + + NOTE: This attribute shall only be present if additional information is needed to identify the service + termination within the VNF, such as for example a URL path information in an HTTP request required + to allow a single virtual CP IP address to be used for several HTTP based services that use the + same port number. + type: object + required: + - portInfo + properties: + portInfo: + description: > + Service port numbers exposed by the virtual CP instance. + minItems: 1 + type: array + items: + $ref: "#/definitions/ServicePortInfo" + serviceInfo: + description: > + Service matching information exposed by the virtual CP instance. + See note. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + + ServicePortInfo: + description: > + This type describes the service identifying port properties exposed by the virtual CP instance. It shall + comply with the provisions in table 5.5.3.33-1. + type: object + required: + - name + - port + - portConfigurable + properties: + name: + description: > + The name of the port exposed by the virtual CP instance. + type: string + protocol: + description: > + The L4 protocol for this port exposed by the virtual CP instance. + + Permitted values: + - TCP + - UDP + - SCTP + type: string + enum: + - TCP + - UDP + - SCTP + port: + description: > + The L4 port number exposed by the virtual CP instance. + type: integer + portConfigurable: + description: + Specifies whether the port attribute value is allowed to be configurable. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Boolean" + + NetAttDefResourceInfo: + description: > + This type contains information related to a network attachment definition resource that provides the + specification of the interface used to connect one or multiple connection points to a secondary container + cluster network. It shall comply with the provisions defined in table 5.5.3.36-1. + type: object + required: + - netAttDefResourceInfoId + - netAttDefResource + properties: + netAttDefResourceInfoId: + description: > + Identifier of this network attachment definition resource as provided by the entity that has + created it. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + netAttDefResource: + description: > + Resource handle of the resource in the scope of the CISM. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ResourceHandle" + associatedExtCpId: + description: > + Identifier of the external CP associated to this network attachment definition resource. Shall be present + when the network attachment definition resource is used for external connectivity by the VNF. + type: array + items: + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + associatedVnfcCpId: + description: > + Identifier of the VNFC CP associated to this network attachment definition resource. May be present when + the network attachment definition resource is used for internal connectivity by the VNF. + type: array + items: + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + + VirtualCpAddressInfo: + description: > + This type represents information about a network address that has been assigned to a virtual CP. + type: object + required: + - type + properties: + type: + description: > + The type of the IP addresses. Permitted values: + - IPV4 + - IPV6 + type: string + enum: + - IPV4 + - IPV6 + loadBalancerIp: + description: > + Fixed addresses assigned to an external load balancer. + $ref: '../../../definitions/SOL002SOL003_def.yaml#/definitions/IpAddress' \ No newline at end of file diff --git a/src/SOL003/VNFLifecycleManagementNotification/VNFLifecycleManagementNotification.yaml b/src/SOL003/VNFLifecycleManagementNotification/VNFLifecycleManagementNotification.yaml index 9d5b3a2e..a405fce9 100644 --- a/src/SOL003/VNFLifecycleManagementNotification/VNFLifecycleManagementNotification.yaml +++ b/src/SOL003/VNFLifecycleManagementNotification/VNFLifecycleManagementNotification.yaml @@ -204,7 +204,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/VnfIdentifierCreationNotification" + $ref: "../VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml#/definitions/VnfIdentifierCreationNotification" required: true VnfIdentifierDeletionNotification: @@ -213,7 +213,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/VnfIdentifierDeletionNotification" + $ref: "../VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml#/definitions/VnfIdentifierDeletionNotification" required: true responses: diff --git a/src/definitions/SOL002SOL003VNFLifecycleManagement_def.yaml b/src/definitions/SOL002SOL003VNFLifecycleManagement_def.yaml deleted file mode 100644 index e91be6a4..00000000 --- a/src/definitions/SOL002SOL003VNFLifecycleManagement_def.yaml +++ /dev/null @@ -1,1450 +0,0 @@ -# Copyright (c) ETSI 2017. -# https://forge.etsi.org/etsi-forge-copyright-notice.txt - -definitions: - CreateVnfRequest: - type: object - required: - - vnfdId - properties: - vnfdId: - description: > - Identifier that identifies the VNFD which defines the VNF instance to - be created. - $ref: "SOL002SOL003_def.yaml#/definitions/Identifier" - vnfInstanceName: - description: > - Human-readable name of the VNF instance to be created. - type: string - vnfInstanceDescription: - description: > - Human-readable description of the VNF instance to be created. - type: string - metadata: - description: > - If present, this attribute provides additional initial values, overriding those obtained from the VNFD, for - the "metadata" attribute in "VnfInstance", as defined in clause 5.5.2.2. Provisions for handling metadata - during the operation are defined in clause 5.4.2.3.1. - $ref: "SOL002SOL003_def.yaml#/definitions/KeyValuePairs" - - ScaleVnfRequest: - description: > - This type represents request parameters for the "Scale VNF" operation. It shall comply with the provisions defined in - table 5.5.2.5-1. See clause B.2 in annex B for an explanation of VNF scaling. - type: object - required: - - type - - aspectId - properties: - type: - description: > - Indicates the type of the scale operation requested. - Permitted values: - * SCALE_OUT: adding additional VNFC instances to the VNF to increase - capacity - * SCALE_IN: removing VNFC instances from the VNF in order to release - unused capacity. - type: string - enum: - - SCALE_OUT - - SCALE_IN - aspectId: - description: > - Identifier of the scaling aspect. - $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" - numberOfSteps: - description: > - Number of scaling steps to be executed as part of this Scale VNF - operation. It shall be a positive number and the default value - shall be 1. - type: integer - default: 1 - additionalParams: - description: > - Additional parameters passed by the NFVO as input to the scaling - process, specific to the VNF being scaled, as declared in the VNFD - as part of "ScaleVnfOpConfig" defined in ETSI GS NFV-IFA 011 [7]. - $ref: "SOL002SOL003_def.yaml#/definitions/KeyValuePairs" - - ScaleVnfToLevelRequest: - description: > - This type represents request parameters for the "Scale VNF to Level" operation. - It shall comply with the provisions defined in table 5.5.2.6-1. See clause B.2 - for an explanation of VNF scaling. - - NOTE: Either the instantiationLevelId attribute or the scaleInfo attribute shall - be included. - type: object - anyOf: - - oneOf: - - required: - - instantiationLevelId - - required: - - scaleInfo - properties: - instantiationLevelId: - description: > - Identifier of the target instantiation level of the current - deployment flavour to which the VNF is requested to be scaled. - See note. - $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" - scaleInfo: - description: > - For each scaling aspect of the current deployment flavour, indicates - the target scale level to which the VNF is to be scaled. - See note. - type: array - items: - $ref: "SOL002SOL003_def.yaml#/definitions/ScaleInfo" - additionalParams: - description: > - Additional parameters passed by the NFVO as input to the scaling - process, specific to the VNF being scaled, as declared in the - VNFD as part of "ScaleVnfToLevelOpConfig" defined in ETSI GS NFV-IFA 011 [7]. - $ref: "SOL002SOL003_def.yaml#/definitions/KeyValuePairs" - - VnfInfoModificationRequest: - description: > - This type represents attribute modifications for an "Individual VNF instance" resource, - i.e. modifications to a resource representation based on the "VnfInstance" data type. - The attributes of "VnfInstance" that can be modified according to the provisions in clause 5.5.2.2 - are included in the "VnfInfoModificationRequest" data type. - The "VnfInfoModificationRequest" data type shall comply with the provisions defined in table 5.5.2.12-1. - type: object - properties: - vnfInstanceName: - description: > - New value of the "vnfInstanceName" attribute in "VnfInstance", or "null" to remove the attribute. - type: string - vnfInstanceDescription: - description: > - New value of the "vnfInstanceDescription" attribute in "VnfInstance", or "null" to remove the attribute. - type: string - vnfdId: - description: > - New value of the "vnfdId" attribute in "VnfInstance". The value "null" is not permitted. - $ref: "SOL002SOL003_def.yaml#/definitions/Identifier" - vnfConfigurableProperties: - description: > - Modifications of the "vnfConfigurableProperties" attribute in "VnfInstance". - If present, these modifications shall be applied according to the rules of - JSON Merge PATCH (see IETF RFC 7396 [15]). - $ref: "SOL002SOL003_def.yaml#/definitions/KeyValuePairs" - metadata: - description: > - Modifications of the "metadattametadata" attribute in "VnfInstance". - If present, these modifications shall be applied according to the rules of - JSON Merge PATCH (see IETF RFC 7396 [15]). - $ref: "SOL002SOL003_def.yaml#/definitions/KeyValuePairs" - extensions: - description: > - Modifications of the "extensions" attribute in "VnfInstance". - If present, these modifications shall be applied according to the rules of - JSON Merge PATCH (see IETF RFC 7396 [15]). - $ref: "SOL002SOL003_def.yaml#/definitions/KeyValuePairs" - vnfcInfoModifications: - description: > - Modifications of certain entries in the "vnfcInfo" attribute array in the - "instantiatedVnfInfo" attribute of "VnfInstance"." to be used as "newList" as defined below this table. - type: array - items: - $ref: "#/definitions/VnfcInfoModifications" - vnfcInfoModificationsDeleteIds: - description: > - List of identifiers entries to be deleted from the 'vnfcInfoModifications" attribute array - to be used as "deleteIdList" as defined below this table. - The following provisions shall apply when modifying an attribute that is an array of objects of type - "VnfcInfo" by supplying an array of objects of type "VnfcInfoModifications". - Assumptions: - 1) "oldList" is the "VnfcInfo" array to be modified and "newList" is the "VnfcInfoModifications" - array that contains the changes. - 2) "oldEntry" is an entry in "oldList" and "newEntry" is an entry in "newList". - 3) A "newEntry" has a "corresponding entry" if there exists an "oldEntry" that has the same content - of the "id" attribute as the "newEntry"; a "newEntry" has no corresponding entry if no such - "oldEntry" exists. - 4) In any array of "VnfcInfo" resp. "VnfcInfoModifications" structures, the content of "id" is unique - (i.e. there are no two entries with the same content of "id"). - Provisions: - 1) For each "newEntry" in "newList" that has no corresponding entry in "oldList", the "oldList" array - shall be modified by adding that "newEntry". - 2) For each "newEntry" in "newList" that has a corresponding "oldEntry" in "oldList", - the value of "oldEntry" shall be updated with the content of "newEntry" as specified - for the data type of "newEntry (refer to clause 5.5.3.24 for the data type "VnfcInfoModifications"). - type: array - items: - $ref: "SOL002SOL003_def.yaml#/definitions/Identifier" - - CancelMode: - description: > - This type represents a parameter to select the mode of cancelling an - ongoing VNF LCM operation occurrence. - type: object - required: - - cancelMode - properties: - cancelMode: - description: > - Cancellation mode to apply. - $ref: "#/definitions/CancelModeType" - - LccnSubscriptionRequest: - description: > - This type represents a subscription request related to notifications - about VNF lifecycle changes. - type: object - required: - - callbackUri - properties: - filter: - description: > - Filter settings for this subscription, to define the subset of all - notifications this subscription relates to. A particular - notification is sent to the subscriber if the filter matches, or if - there is no filter. - $ref: "#/definitions/LifecycleChangeNotificationsFilter" - callbackUri: - description: > - The URI of the endpoint to send the notification to. - $ref: "SOL002SOL003_def.yaml#/definitions/Uri" - authentication: - description: > - Authentication parameters to configure the use of Authorization when - sending notifications corresponding to this subscription, as defined - in clause 8.3.4 of ETSI GS NFV-SOL 013. - This attribute shall only be present if the subscriber requires - authorization of notifications. - $ref: "SOL002SOL003_def.yaml#/definitions/SubscriptionAuthentication" - verbosity: - description: > - This attribute signals the requested verbosity of LCM operation occurrence notifications. If it is not present, - it shall default to the value "FULL". - $ref: "#/definitions/LcmOpOccNotificationVerbosityType" - - LccnSubscription: - description: > - This type represents a subscription related to notifications about VNF - lifecycle changes. - type: object - required: - - id - - callbackUri - - verbosity - - _links - properties: - id: - description: > - Identifier of this subscription resource. - $ref: "SOL002SOL003_def.yaml#/definitions/Identifier" - filter: - description: > - Filter settings for this subscription, to define the subset of all - notifications this subscription relates to. A particular - notification is sent to the subscriber if the filter matches, or if - there is no filter. - $ref: "#/definitions/LifecycleChangeNotificationsFilter" - callbackUri: - description: > - The URI of the endpoint to send the notification to. - $ref: "SOL002SOL003_def.yaml#/definitions/Uri" - verbosity: - description: > - This attribute signals the verbosity of LCM operation occurrence notifications. - $ref: "#/definitions/LcmOpOccNotificationVerbosityType" - _links: - description: > - Links to resources related to this resource. - type: object - required: - - self - properties: - self: - description: > - URI of this resource. - $ref: "SOL002SOL003_def.yaml#/definitions/Link" - - ExtVirtualLinkInfo: - description: > - This type represents information about an external VL. It shall comply with the provisions defined in table 5.5.3.2-1. - - NOTE: This attribute reflects the current configuration information that has resulted from merging into this attribute - the "VnfExtCpData" information which was passed as part of the "ExtVirtualLinkData" structure in the input of the - most recent VNF LCM operation such as "InstantiateVnfRequest", "ChangeExtVnfConnectivityRequest", "ChangeVnfFlavourRequest" - or "ChangeCurrentVnfPkgRequest", or in the Grant response. If applying such change results in an empty list of - "currentVnfExtCpData" structure instances, the affected instance of "ExtVirtualLinkInfo" shall be removed from its - parent data structure. - type: object - required: - - id - - resourceHandle - - currentVnfExtCpData - properties: - id: - description: > - Identifier of the external VL and the related external VL - information instance. - The identifier is assigned by the NFV-MANO entity that manages this - VL instance. - $ref: "SOL002SOL003_def.yaml#/definitions/Identifier" - resourceHandle: - description: > - Reference to the resource realizing this VL. - $ref: "SOL002SOL003_def.yaml#/definitions/ResourceHandle" - extLinkPorts: - description: > - Link ports of this VL. - type: array - items: - $ref: "#/definitions/ExtLinkPortInfo" - currentVnfExtCpData: - description: > - Allows the API consumer to read the current CP configuration information for the connection of external CPs - to the external virtual link. See note. - type: array - items: - $ref: "SOL002SOL003_def.yaml#/definitions/VnfExtCpData" - extNetAttDefResource: - description: > - Network attachment definition resources that provide the specification of the interface to attach connection points - to this VL. - type: array - items: - $ref: "#/definitions/NetAttDefResourceInfo" - - VnfLinkPortInfo: - description: > - This type represents a link port of an internal VL of a VNF. It shall comply with the provisions - defined in table 5.5.3.8 1. - - NOTE 1: Either cpInstanceId with cpInstanceType set to "EXT_CP" or any combination of cpInstanceId - with cpInstanceType set to "VNFC_CP" and vipCpInstanceId (i.e. one or both of them) shall be - present for a VnfLinkPortInfo. In case both cpInstanceId with cpInstanceType set to "VNFC_CP" - and vipCpInstanceId are present, the two different CP instances share the linkport. - NOTE 2: Annex A.4 of ETSI GS NFV-IFA 007 provides examples for configurations where both vipCpInstanceId - and vnfcCpInstanceId are present (UC#5 and UC#5-b), only vnfcCpInstanceId is present (UC#2), or - only vipCpInstanceId is present (UC6 and UC#6-b). - NOTE 3: The value of "trunkResourceId" is scoped by the value of "vimConnectionId" in the "resourceHandle" - attribute. - type: object - required: - - id - - resourceHandle - properties: - id: - description: > - Identifier of this link port as provided by the entity that has created the link port. - $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" - resourceHandle: - description: > - Reference to the virtualised resource realizing this link - port. - $ref: "SOL002SOL003_def.yaml#/definitions/ResourceHandle" - cpInstanceId: - description: > - When the link port is used for external connectivity by the VNF, this attribute represents the - identifier of the external CP associated with this link port. - - When the link port is used for internal connectivity in the VNF, this attribute represents the - identifier of the VNFC CP to be connected to this link port. - - Shall be present when the link port is used for external connectivity by the VNF. - May be present if used to reference a VNFC CP instance. - There shall be at most one link port associated with any external connection point instance or - internal connection point (i.e. VNFC CP) instance. - The value refers to an "extCpInfo" item in the VnfInstance or a "vnfcCpInfo" item of a "vnfcResourceInfo" - item in the VnfInstance. See note 1. - $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" - cpInstanceType: - description: > - Type of the CP instance that is identified by cpInstanceId. - Shall be present if "cpInstanceId" is present and shall be absent otherwise. - - Permitted values: - - VNFC_CP: The link port is connected to a VNFC CP. - - EXT_CP: The link port is associated to an external CP. - See note 1. - type: string - enum: - - VNFC_CP - - EXT_CP - vipCpInstanceId: - description: > - VIP CP instance of the VNF connected to this link port. May be present. - See notes 1, and 2. - $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" - trunkResourceId: - description: > - Identifier of the trunk resource in the VIM. - Shall be present if the present link port corresponds to the parent port that the trunk resource is associated with. - See note 3. - $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVim" - - ExtLinkPortInfo: - description: > - This type represents information about a link port of an external VL, i.e. a port providing connectivity for the VNF to - an NS VL. It shall comply with the provisions defined in table 5.5.3.9-1. - - NOTE 1: The use cases UC#4 and UC#5 in clause A.4 of ETSI GS NFV-IFA 007 provide examples for such a configuration. - NOTE 2: The value of "trunkResourceId" is scoped by the value of "vimConnectionId" in the "resourceHandle" attribute. - type: object - required: - - id - - resourceHandle - properties: - id: - description: > - Identifier of this link port as provided by the entity that has - created the link port. - $ref: "SOL002SOL003_def.yaml#/definitions/Identifier" - resourceHandle: - description: > - Reference to the virtualised resource realizing this link - port. - $ref: "SOL002SOL003_def.yaml#/definitions/ResourceHandle" - cpInstanceId: - description: > - Identifier of the external CP of the VNF connected to this link - port. There shall be at most one link port associated with any - external connection point instance. The value refers to an - "extCpInfo" item in the VnfInstance. - $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" - secondaryCpInstanceId: - description: > - Additional external CP of the VNF connected to this link port. - If present, this attribute shall refer to a "secondary" ExtCpInfo item in the VNF instance that exposes a virtual - IP CP instance which shares this linkport with the external CP instance referenced by the "cpInstanceId" attribute. - See note 1. - $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" - trunkResourceId: - description: > - Identifier of the trunk resource in the VIM. - Shall be present if the present link port corresponds to the parent port that the trunk resource is associated with. - See note 2. - $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVim" - - CpProtocolInfo: - description: > - This type describes the protocol layer(s) that a CP uses together with protocol-related information, like addresses. - It shall comply with the provisions defined in table 5.5.3.9b-1. - - NOTE: This attribute allows to signal the addition of further types of layer and protocol in future versions of the - present document in a backwards-compatible way. In the current version of the present document, only IP over - Ethernet is supported. - type: object - required: - - layerProtocol - properties: - layerProtocol: - description: > - The identifier of layer(s) and protocol(s) associated to the network address information. - - Permitted values: - 1. IP_OVER_ETHERNET - 2. IP_FOR_VIRTUAL_CP - See note. - type: string - enum: - - IP_OVER_ETHERNET - ipOverEthernet: - description: > - IP addresses over Ethernet to assign to the extCP instance. Shall be - present if layerProtocol is equal to " IP_OVER_ETHERNET", and shall - be absent otherwise. - $ref: "#/definitions/IpOverEthernetAddressInfo" - virtualCpAddress: - description: > - IP address data assigned to an external CP instance exposing a virtual CP. It shall be present if - 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" - - IpOverEthernetAddressInfo: - description: > - This type represents information about a network address that has been assigned. - It shall comply with the provisions defined in table 5.5.3.10-1. - - NOTE 1: At least one of "macAddress" or "ipAddresses" shall be present. - NOTE 2: Exactly one of "addresses" or "addressRange" shall be present. - NOTE 3: If the Cp instance represents a subport in a trunk, segmentationId shall be present. - Otherwise it shall not be present. - NOTE 4: Depending on the NFVI networking infrastructure, the segmentationId may indicate the - actual network segment value (e.g. vlan Id, Vxlan segmentation id, etc.) used in the - transport header of the packets or it may be an identifier used between the application - and the NFVI networking infrastructure to identify the network sub-interface of the trunk - port in question. In the latter case the NFVI infrastructure will map this local segmentationId - to whatever segmentationId is actually used by the NFVI’s transport technology. - type: object - anyOf: - - required: - - macAddress - - required: - - ipAddresses - oneOf: - - required: - - addresses - - required: - - addressRange - properties: - macAddress: - description: > - MAC address, if assigned. See note 1. - $ref: "SOL002SOL003_def.yaml#/definitions/MacAddress" - segmentationId: - description: > - Identification of the network segment to which the Cp instance connects to. See notes 3 and 4. - type: string - ipAddresses: - description: > - Addresses assigned to the CP instance. Each entry represents IP addresses assigned by fixed or - dynamic IP address assignment per subnet. See note 1. - type: array - items: - type: object - required: - - type - properties: - type: - description: > - The type of the IP addresses. - Permitted values: IPV4, IPV6. - type: string - enum: - - IPV4 - - IPV6 - addresses: - description: > - Fixed addresses assigned (from the subnet defined by "subnetId" if provided). See note 2. - type: array - items: - $ref: "SOL002SOL003_def.yaml#/definitions/IpAddress" - isDynamic: - description: > - Indicates whether this set of addresses was assigned - dynamically (true) or based on address information provided as - input from the API consumer (false). Shall be present if - "addresses" is present and shall be absent otherwise. - type: boolean - addressRange: - description: > - An IP address range used, e.g. in case of egress connections. See note 2. - type: object - required: - - minAddress - - maxAddress - properties: - minAddress: - description: > - Lowest IP address belonging to the range. - $ref: "SOL002SOL003_def.yaml#/definitions/IpAddress" - maxAddress: - description: > - Highest IP address belonging to the range - $ref: "SOL002SOL003_def.yaml#/definitions/IpAddress" - subnetId: - description: > - Subnet defined by the identifier of the subnet resource in - the VIM. - In case this attribute is present, IP addresses are bound - to that subnet. - $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVim" - - MonitoringParameter: - type: object - required: - - id - - performanceMetric - properties: - id: - description: > - Identifier of the monitoring parameter defined in the VNFD. - $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" - vnfdId: - description: > - Identifier of the VNFD. - Shall be present in case the value differs from the vnfdId attribute of the VnfInstance (e.g. during a "Change - current VNF package" operation or due to its final failure). - $ref: "SOL002SOL003_def.yaml#/definitions/Identifier" - name: - description: > - Human readable name of the monitoring parameter, as defined in the - VNFD. - type: string - performanceMetric: - description: > - Performance metric that is monitored. This attribute shall contain the - related "Measurement Name" value as defined in clause 7.2 of ETSI GS NFV-IFA 027. - type: string - - LifecycleChangeNotificationsFilter: - description: > - This type represents a subscription filter related to notifications about VNF lifecycle changes. - It shall comply with the provisions defined in table 5.5.3.12-1. - At a particular nesting level in the filter structure, the following applies: All attributes shall - match in order for the filter to match (logical "and" between different filter attributes). - If an attribute is an array, the attribute shall match if at least one of the values in the array - matches (logical "or" between the values of one filter attribute). - - NOTE: The permitted values of the "notificationTypes" attribute are spelled exactly as the names of - the notification types to facilitate automated code generation systems. - type: object - properties: - vnfInstanceSubscriptionFilter: - description: > - Filter criteria to select VNF instances about which to notify. - $ref: "SOL002SOL003_def.yaml#/definitions/VnfInstanceSubscriptionFilter" - notificationTypes: - description: > - Match particular notification types. - - Permitted values: - - VnfLcmOperationOccurrenceNotification - - VnfIdentifierCreationNotification - - VnfIdentifierDeletionNotification - See note. - type: array - items: - type: string - enum: - - VnfLcmOperationOccurrenceNotification - - VnfIdentifierCreationNotification - - VnfIdentifierDeletionNotification - operationTypes: - description: > - Match particular VNF lifecycle operation types for the notification - of type VnfLcmOperationOccurrenceNotification. - May be present if the "notificationTypes" attribute contains the - value "VnfLcmOperationOccurrenceNotification", and shall be absent - otherwise. - type: array - items: - $ref: "SOL002SOL003_def.yaml#/definitions/LcmOperationType" - operationStates: - description: > - Match particular LCM operation state values as reported in - notifications of type VnfLcmOperationOccurrenceNotification. - May be present if the "notificationTypes" attribute contains the - value "VnfLcmOperationOccurrenceNotification", and shall be absent - otherwise. - type: array - items: - $ref: "#/definitions/LcmOperationStateType" - - LccnLinks: - description: > - This type represents the links to resources that a notification can - contain. - type: object - required: - - vnfInstance - - subscription - properties: - vnfInstance: - description: > - Link to the resource representing the VNF instance to which the - notified change applies. - $ref: "SOL002SOL003_def.yaml#/definitions/NotificationLink" - subscription: - description: > - Link to the related subscription. - $ref: "SOL002SOL003_def.yaml#/definitions/NotificationLink" - vnfLcmOpOcc: - description: > - Link to the VNF lifecycle management operation occurrence that this - notification is related to. Shall be present if there is a related - lifecycle operation occurrence. - $ref: "SOL002SOL003_def.yaml#/definitions/NotificationLink" - - VnfExtCpInfo: - description: > - This type represents information about an external CP of a VNF. - It shall comply with the provisions defined in table 5.5.3.17 1. - - NOTE 1: The attributes "associatedVnfcCpId", "associatedVipCpId", "associatedVirtualCpId" 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. - NOTE 3: Cardinality greater than 1 is only applicable for specific cases where more than one network - attachment definition resource is needed to fulfil the connectivity requirements of the external - CP, e.g. to build a link redundant mated pair in SR-IOV cases. - NOTE 4: When more than one netAttDefResourceId is indicated, all shall belong to the same namespace. - type: object - required: - - id - - cpdId - - cpConfigId - - cpProtocolInfo - oneOf: - - required: - - associatedVnfcCpId - - required: - - associatedVipCpId - - required: - - associatedVnfVirtualLinkId - properties: - id: - description: > - Identifier of the external CP instance and the related information instance. - $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" - cpdId: - description: > - Identifier of the external CPD, VnfExtCpd, in the VNFD. - $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" - cpConfigId: - description: > - Identifier that references the applied "VnfExtCpConfig" entry in the "cpConfig" map of the "currentVnfExtCpData" - in the "ExtVirtualLinkInfo" structure. - $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" - vnfdId: - description: > - Identifier of the VNFD. - Shall be present in case the value differs from the vnfdId attribute of the VnfInstance (e.g. during a "Change - current VNF package" operation or due to its final failure). - $ref: "SOL002SOL003_def.yaml#/definitions/Identifier" - cpProtocolInfo: - description: > - Network protocol information for this CP. - type: array - items: - $ref: "#/definitions/CpProtocolInfo" - extLinkPortId: - description: > - Identifier of the "ExtLinkPortInfo" structure inside the "ExtVirtualLinkInfo" structure. - Shall be present if the CP is associated to a link port. See note 2. - $ref: "SOL002SOL003_def.yaml#/definitions/Identifier" - metadata: - description: > - Metadata about this external CP. - $ref: "SOL002SOL003_def.yaml#/definitions/KeyValuePairs" - associatedVnfcCpId: - description: > - Identifier of the "vnfcCpInfo" structure in "VnfcResourceInfo" structure that represents the VNFC CP - which is exposed by this external CP instance, either directly or via a floating IP address. - Shall be present in case this CP instance maps to a VNFC CP. See note 1. - $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" - associatedVipCpId: - description: > - Identifier of the VIP CP instance that is exposed as this VnfExtCp instance, either directly or via a - floating IP address, and the related "VipCpInfo" structure in "VnfInstance". Shall be present if the - cpdId of this VnfExtCp has a vipCpd attribute. See note 1. - $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" - associatedVirtualCpId: - description: > - Identifier of the "VirtualCpInfo" structure that represents the Virtual CP that is exposed by this - external CP instance. Shall be present in case this CP instance maps to a Virtual CP. See note 1. - $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" - associatedVnfVirtualLinkId: - description: > - Identifier of the "VnfVirtualLinkResourceInfo" structure that represents the internal VL or of the - "ExtManagedVirtualLinkInfo" structure that represents the externally-managed internal VL which is - exposed by this external CP instance. Shall be present in case this CP instance maps to an internal - VL (including externally-managed internal VL). See note 1. - $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" - netAttDefResourceInfoId: - description: > - Identifier of the “NetAttDefResourceInfo” structure that provides the specification of the interface to attach the - connection point to a secondary container cluster network. See notes 3 and 4. - It shall be present if the external CP is associated to a VNFC realized by one or a set of OS containers and - is connected to a secondary container cluster network. It shall not be present otherwise. - type: array - items: - $ref: "SOL002SOL003_def.yaml#/definitions/Identifier" - - VnfOperationalStateType: - description: > - STARTED: The VNF instance is up and running. - STOPPED: The VNF instance has been shut down. - type: string - enum: - - STARTED - - STOPPED - - LcmOperationStateType: - description: > - STARTING: The LCM operation is starting. - PROCESSING: The LCM operation is currently in execution. - COMPLETED: The LCM operation has been completed successfully. - FAILED_TEMP: The LCM operation has failed and execution has stopped, - but the execution of the operation is not considered to be closed. - FAILED: The LCM operation has failed and it cannot be retried or rolled back, - as it is determined that such action won't succeed. - ROLLING_BACK: The LCM operation is currently being rolled back. - ROLLED_BACK: The LCM operation has been successfully rolled back, - i.e. The state of the VNF prior to the original operation invocation has been restored as closely as possible. - type: string - enum: - - STARTING - - PROCESSING - - COMPLETED - - FAILED_TEMP - - FAILED - - ROLLING_BACK - - ROLLED_BACK - - CancelModeType: - description: > - Cancellation mode. - GRACEFUL: If the VNF LCM operation occurrence is in "PROCESSING" or - "ROLLING_BACK" state, the VNFM shall not start any new resource - management operation and shall wait for the ongoing resource management - operations in the underlying system, typically the VIM, to finish - execution or to time out. After that, the VNFM shall put the operation - occurrence into the FAILED_TEMP state. - If the VNF LCM operation occurrence is in "STARTING" state, the VNFM - shall not start any resource management operation and shall wait for - the granting request to finish execution or time out. After that, the - VNFM shall put the operation occurrence into the ROLLED_BACK state. - FORCEFUL: If the VNF LCM operation occurrence is in "PROCESSING" or - "ROLLING_BACK" state, the VNFM shall not start any new resource - management operation, shall cancel the ongoing resource management - operations in the underlying system, typically the VIM, and shall wait - for the cancellation to finish or to time out. After that, the VNFM - shall put the operation occurrence into the FAILED_TEMP state. - If the VNF LCM operation occurrence is in "STARTING" state, the VNFM - shall not start any resource management operation and put the operation - occurrence into the ROLLED_BACK state. - type: string - enum: - - GRACEFUL - - FORCEFUL - -######################################################################################################################## - VnfIdentifierCreationNotification: - description: > - This type represents a VNF identifier creation notification, which - informs the receiver of the creation of a new "Individual VNF instance" resource and - the associated VNF instance identifier. - This notification shall be triggered by the VNFM when it has created an - "Individual VNF instance" resource and the associated VNF instance identifier. - type: object - required: - - id - - notificationType - - subscriptionId - - timeStamp - - vnfInstanceId - - _links - properties: - id: - description: > - Identifier of the VNF instance. - $ref: "SOL002SOL003_def.yaml#/definitions/Identifier" - notificationType: - description: > - Discriminator for the different notification types. Shall be set to - "VnfIdentifierCreationNotification" for this notification type. - type: string - enum: - - VnfIdentifierCreationNotification - subscriptionId: - description: > - Identifier of the subscription that this notification relates to. - $ref: "SOL002SOL003_def.yaml#/definitions/Identifier" - timeStamp: - description: > - Date-time of the generation of the notification. - $ref: "SOL002SOL003_def.yaml#/definitions/DateTime" - vnfInstanceId: - description: > - The created VNF instance identifier. - $ref: "SOL002SOL003_def.yaml#/definitions/Identifier" - _links: - description: > - Links to resources related to this notification. - $ref: "#/definitions/LccnLinks" - - VnfIdentifierDeletionNotification: - description: > - This type represents a VNF identifier deletion notification, which - informs the receiver of the deletion of a new "Individual VNF instance" resource and - the associated VNF instance identifier. - This notification shall be triggered by the VNFM when it has deleted an - "Individual VNF instance" resource and the associated VNF instance identifier. - type: object - required: - - id - - notificationType - - subscriptionId - - timeStamp - - vnfInstanceId - - _links - properties: - id: - description: > - Identifier of this notification. If a notification is sent multiple - times due to multiple subscriptions, the "id" attribute of all these - notifications shall have the same value. - $ref: "SOL002SOL003_def.yaml#/definitions/Identifier" - notificationType: - description: > - Discriminator for the different notification types. Shall be set to - "VnfIdentifierDeletionNotification" for this notification type. - type: string - enum: - - VnfIdentifierDeletionNotification - subscriptionId: - description: > - Identifier of the subscription that this notification relates to. - $ref: "SOL002SOL003_def.yaml#/definitions/Identifier" - timeStamp: - description: > - Date-time of the generation of the notification. - $ref: "SOL002SOL003_def.yaml#/definitions/DateTime" - vnfInstanceId: - description: > - The deleted VNF instance identifier. - $ref: "SOL002SOL003_def.yaml#/definitions/Identifier" - _links: - description: > - Links to resources related to this notification. - $ref: "#/definitions/LccnLinks" - - VnfcInfoModifications: - description: > - This type represents modifications of an entry in an array of "VnfcInfo" objects. - * NOTE: The attribute "id" in this data type represents the same identifier as the attribute - "vnfcInstanceId" in other related data types in the present document. For reasons of backward - compatibility, this misalignment is not corrected. - type: object - required: - - id - - vnfcConfigurableProperties - properties: - id: - description: > - Identifier of the VNFC instance of which the information is to be modified. - The identifier references the "id" attribute in a "VnfcInfo" structure. See note. - $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" - vnfcConfigurableProperties: - description: > - Changes of the configurable properties of the VNFC instance. - When this structure is part of a request, the modifications signalled in this attribute - shall be applied according to the rules of JSON Merge Patch (see IETF RFC 7396). - In addition, the provisions in clause 5.7 shall apply. - $ref: "SOL002SOL003_def.yaml#/definitions/KeyValuePairs" - - VnfcInfo: - description: > - This type represents the information about a VNFC instance that is part of a VNF instance. - * NOTE: This allows to represent the error condition that a VNFC instance has lost its resources. - type: object - required: - - id - - vduId - - vnfcState - properties: - id: - description: > - Identifier of the VNFC instance. - $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" - vduId: - description: > - Reference to the applicable VDU information element in - the VNFD. - $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" - vnfcResourceInfoId: - description: > - Identifier of the VnfcResourceInfo instance representing - the virtualised resources used by this VNFC instance. See note. - $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" - vnfcState: - description: > - Identifier of the VnfcResourceInfo instance representing - the virtualised resources used by this VNFC instance. - State of the VNFC instance. - Permitted values: - • STARTED: The VNFC instance is up and - running. - • STOPPED: The VNFC instance has been shut down - type: string - enum: - - STARTED - - STOPPED - $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" - vnfcConfigurableProperties: - description: > - Current values of the configurable properties of the - VNFC instance. - Configurable properties referred in this attribute are - declared in the VNFD. - This attribute can be modified with the PATCH method. - In addition, the provisions in clause 5.7 shall apply. - $ref: "SOL002SOL003_def.yaml#/definitions/KeyValuePairs" - - ModificationsTriggeredByVnfPkgChange: - description: > - This type represents attribute modifications that were performed on an "Individual VNF instance" resource - when changing the current VNF package. The attributes that can be included consist of those requested to - be modified explicitly in the "ChangeCurrentVnfPkgRequest" data structure, and additional attributes of the - "VnfInstance" data structure that were modified implicitly during the operation. - The "ModificationsTriggeredByVnfPkgChange" data type shall comply with the provisions defined in table 5.5.3.21-1. - - NOTE 1: This attribute represents the delta (semantics as per IETF RFC 7396, JSON Merge Patch) between the value - of the attribute at the start of the "Change current VNF package" operation and the value of the attribute - at its completion. - NOTE 2: If present, this attribute (which depends on the value of the "vnfdId" attribute) was modified implicitly - during the related operation and contains a copy of the value of the related attribute from the VNFD in the - VNF Package identified by the "vnfdId" attribute. - type: object - properties: - vnfConfigurableProperties: - description: > - This attribute signals the modifications of the "vnfConfigurableProperties" attribute in "VnfInstance" performed - by the operation and shall be present if that attribute was modified during the operation. See note 1. - In addition, the provisions in clause 5.7 shall apply. - $ref: "SOL002SOL003_def.yaml#/definitions/KeyValuePairs" - metadata: - description: > - This attribute signals the modifications of the "metadata" attribute in "VnfInstance" performed by the operation and - shall be present if that attribute was modified during the operation. See note 1. - $ref: "SOL002SOL003_def.yaml#/definitions/KeyValuePairs" - extensions: - description: > - This attribute signals the modifications of the "extensions" attribute in "VnfInstance" performed by the operation and - shall be present if that attribute was modified during the operation. See note 1. - In addition, the provisions in clause 5.7 shall apply. - $ref: "SOL002SOL003_def.yaml#/definitions/KeyValuePairs" - vnfdId: - description: > - If present, this attribute signals the new value of the "vnfdId" attribute in "VnfInstance". - $ref: "SOL002SOL003_def.yaml#/definitions/Identifier" - vnfProvider: - description: > - If present, this attribute signals the new value of the "vnfProvider" attribute in "VnfInstance". See note 2. - type: string - vnfProductName: - description: > - If present, this attribute signals the new value of the "vnfProductName" attribute in "VnfInstance". See note 2. - type: string - vnfSoftwareVersion: - description: > - If present, this attribute signals the new value of the "vnfSoftwareVersion" attribute in "VnfInstance". See note 2. - $ref: "SOL002SOL003_def.yaml#/definitions/Version" - vnfdVersion: - description: > - If present, this attribute signals the new value of the "vnfdVersion" attribute in "VnfInstance". See note 2. - $ref: "SOL002SOL003_def.yaml#/definitions/Version" - vimConnectionInfo: - description: > - If present, this attribute signals the changes to VIM connection info that were passed in the related - "ChangeCurrentVnfPkgRequest" structure. The provisions for sensitive information defined in clause - 4.4.1.6 apply. - type: object - additionalProperties: - $ref: "SOL002SOL003_def.yaml#/definitions/VimConnectionInfo" - - LcmOpOccNotificationVerbosityType: - description: > - The enumeration LcmOpOccNotificationVerbosityType provides values to control the verbosity of LCM operation - occurrence notifications. - * FULL: This signals a full notification which contains all change details. - * SHORT: This signals a short notification which omits large-volume change details to reduce the size of data to - be sent via the notification mechanism. - type: string - enum: - - FULL - - SHORT - - McioTypeName: - description: > - The present type definition provides valid string values for the "mcioType" attribute of the "McioInfo" data type , and - the valid values are defined in table 5.5.4.9-1. - type: string - enum: - - Deployment - - Statefulset - - AffectedVipCp: - description: > - This type provides information about added, deleted and modified virtual IP CP instances. - type: object - required: - - cpInstanceId - - cpdId - - changeType - properties: - cpInstanceId: - description: > - Identifier of the virtual IP CP instance and the related "VipCpInfo" structure in "VnfInstance". - $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" - - cpdId: - description: > - Identifier of the VipCpd in the VNFD. - $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" - - vnfdId: - description: > - Reference to the VNFD. - Shall be present in case of a "change current VNF Package" to - identify whether the affected virtual CP instance is associated - to a VipCpd which is referred from the source or destination VNFD. - $ref: "SOL002SOL003_def.yaml#/definitions/Identifier" - - changeType: - description: > - Signals the type of change. - Permitted values: - - ADDED - - REMOVED - - MODIFIED - type: string - enum: - - ADDED - - REMOVED - - MODIFIED - - VipCpInfo: - description: > - 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 1: It is possible that there is no associated VnfcCp because the VIP CP is available but not - associated yet. - NOTE 2: If only the value or the presence of this attribute is changed in the "VipCpInfo" structure - by an LCM operation occurrence, this does not represent a change that requires including a related - "AffectedVipCp" structure in the VNF LCM operation occurrence notifications or the "VnfLcmOpOcc" - structure related to this LCM operation occurrence. - type: object - required: - - cpInstanceId - - cpdId - properties: - cpInstanceId: - description: > - Identifier of this VIP CP instance and of this VipCpInfo information element. - $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" - cpdId: - description: > - Identifier of the VIP Connection Point Descriptor, VipCpd, in the VNFD. - $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" - vnfdId: - description: > - Identifier of the VNFD. - Shall be present in case the value differs from the vnfdId attribute of the VnfInstance - (e.g. during a "Change current VNF package" operation or due to its final failure). See note 2. - $ref: "SOL002SOL003_def.yaml#/definitions/Identifier" - vnfExtCpId: - description: > - When the VIP CP is exposed as external CP of the VNF, the identifier of this external VNF CP instance. - $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" - cpProtocolInfo: - description: > - Protocol information for this CP. There shall be one cpProtocolInfo for layer 3. - There may be one cpProtocolInfo for layer 2. - type: array - items: - $ref: "#/definitions/CpProtocolInfo" - associatedVnfcCpIds: - description: > - Identifiers of the VnfcCps that share the virtual IP addresse allocated to the VIP CP instance. See note. - type: array - items: - $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" - vnfLinkPortId: - description: > - Identifier of the "VnfLinkPortInfo" structure in the "VnfVirtualLinkResourceInfo" or - "ExtManagedVirtualLinkInfo" structure. Shall be present if the CP is associated to a - link port on an internal VL (including externally-managed internal VL). - $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" - metadata: - description: > - Metadata about this VIP CP. - type: array - items: - $ref: "SOL002SOL003_def.yaml#/definitions/KeyValuePairs" - - AffectedVirtualCp: - description: > - This type provides information about added, deleted and modified virtual CP instances. - type: object - required: - - cpInstanceId - - cpdId - - changeType - properties: - cpInstanceId: - description: > - dentifier of the virtual CP instance and the related "VirtualCpInfo" - structure in "VnfInstance". - $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" - cpdId: - description: > - Identifier of the VirtualCpd in the VNFD. - $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" - vnfdId: - description: > - Reference to the VNFD. - Shall be present in case of a "change current VNF Package" to identify whether - the affected virtual CP instance is associated to a VirtualCpd which is referred - from the source or destination VNFD. - $ref: "SOL002SOL003_def.yaml#/definitions/Identifier" - changeType: - description: > - Signals the type of change. - - Permitted values: - - ADDED - - REMOVED - - MODIFIED - type: string - enum: - - ADDED - - REMOVED - - MODIFIED - - McioInfo: - description: > - This type provides information about an MCIO representing the set of VNFC instances realized by one - or a set of OS containers which have been created based on the same VDU. - Within the CISM, an MCIO controller monitors the actual state of an MCIO representing the set of VNFC - instances realized by one or a set of OS containers and compare it to the desired state as specified - in the respective declarative descriptor. It triggers actions toward the CIS to align the actual to - the desired state. Monitoring the actual state includes monitoring the number of MCIO instances available - at any specific point in time. In addition, an MCIO controller maintains properties and runtime information - on the MCIO instances which have been created based on the same VDU. - The McioInfo data structure provides the runtime information on the MCIOs obtained from the MCIO controller. - - NOTE: There are different types of MCIOs. The set of VNFC instances based on the same VDU is represented - by one MCIO, e.g. of type Deployment. Each individual VNFC instance is represented by another type - of MCIO, e.g. a POD. - - Runtime information of the set of OS containers realizing an individual VNFC instance is not part of the - McioInfo data structure; such runtime information is provided in the ResourceHandle data structure - referenced from the VnfcResourceInfo. The McioInfo does not provide runtime information of a constituent - VNFC instance created based on a specific VDU. - - NOTE 1: The type of MCIO as specified in the declarative descriptor of the MCIO, and that can be read from - the CISM. EXAMPLE: In case of MCIOs managed by Kubernetes®, the type of MCIO corresponds to the - “kind” property of the declarative descriptor. - NOTE 2: If the attribute additionalInfo is present, it may contain runtime information on the actual and - desired state of the MCIO(s). - NOTE 3: When the container infrastructure service is a Kubernetes® instance, the mcioId is the combined - values from the kind and name fields of the Kubernetes resource object, separated by a slash. - Example: "Deployment/abcd". - NOTE 4: When the container infrastructure service is a Kubernetes® instance, the mcioName is the name - field of the resource object. - type: object - required: - - mcioId - - mcioName - - mcioNamespace - - vduId - - cismId - - mcioType - - desiredInstances - - availableInstances - properties: - mcioId: - description: > - Identifier of this MCIO, created by the CISM. See note 3. - $ref: "SOL002SOL003_def.yaml#/definitions/Identifier" - mcioName: - description: > - Human readable name of this MCIO. See note 4. - type: string - mcioNamespace: - description: > - Namespace of this MCIO. - type: string - vduId: - description: > - Reference to the related VDU in the VNFD applicable to this resource. - $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" - cismId: - description: > - Identifier of the CISM managing this MCIO. - $ref: "SOL002SOL003_def.yaml#/definitions/Identifier" - mcioType: - description: > - The type of MCIO. Specific values, their semantics and associated MCIO types are defined in clause - 5.5.4.9. Additional values are also permitted. - See note 1. - type: string - enum: - - Deployment - - Statefulset - desiredInstances: - description: > - Number of desired MCIO instances. - type: integer - availableInstances: - description: > - Number of available MCIO instances. - type: integer - additionalInfo: - decription: > - Additional information which is specific to the MCIO, its type, and which is available - from the CISM. - See note 2. - $ref: "SOL002SOL003_def.yaml#/definitions/KeyValuePairs" - - VirtualCpInfo: - description: > - This type provides information related to a virtual CP instance of a VNF. It shall comply with the provisions - in table 5.5.3.31-1. - - NOTE: A consumer of the VNF LCM interface can learn the actual VNFC instances implementing the service - accessible via the virtual CP instance by querying the "vnfcResourceInfo" from the "InstantiatedVnfInfo" - and filtering by corresponding "vduIds" values. - type: object - required: - - cpInstanceId - - cpdId - - resourceHandle - - vduIds - properties: - cpInstanceId: - description: > - Identifier of this virtual CP instance. - $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" - cpdId: - description: > - Identifier of the VirtualCpd in the VNFD. - $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" - resourceHandle: - description: > - Reference to the virtualised resource realizing this virtual CP. - $ref: "SOL002SOL003_def.yaml#/definitions/ResourceHandle" - vnfExtCpId: - description: > - When the virtual CP is exposed as external CP of the VNF, the identifier of this external VNF CP instance. - $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" - cpProtocolInfo: - description: > - Protocol information for this CP. There shall be one cpProtocolInfo for each layer protocol supported. - type: array - items: - $ref: "#/definitions/CpProtocolInfo" - vduIds: - description: > - Reference to the VDU(s) which implement the service accessible via the virtual CP instance. See note. - type: array - minItems: 1 - items: - $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" - additionalServiceInfo: - description: > - Additional service identification information of the virtual CP instance. - type: array - items: - $ref: "#/definitions/AdditionalServiceInfo" - metadata: - description: > - Metadata about this virtual CP instance. - $ref: "SOL002SOL003_def.yaml#/definitions/KeyValuePairs" - - AdditionalServiceInfo: - description: > - This type provides additional service information of the virtual CP instance used to expose properties of the - virtual CP to NFV-MANO. It shall comply with the provisions in table 5.5.3.32-1. - - NOTE: This attribute shall only be present if additional information is needed to identify the service - termination within the VNF, such as for example a URL path information in an HTTP request required - to allow a single virtual CP IP address to be used for several HTTP based services that use the - same port number. - type: object - required: - - portInfo - properties: - portInfo: - description: > - Service port numbers exposed by the virtual CP instance. - minItems: 1 - type: array - items: - $ref: "#/definitions/ServicePortInfo" - serviceInfo: - description: > - Service matching information exposed by the virtual CP instance. - See note. - $ref: "SOL002SOL003_def.yaml#/definitions/KeyValuePairs" - - ServicePortInfo: - description: > - This type describes the service identifying port properties exposed by the virtual CP instance. It shall - comply with the provisions in table 5.5.3.33-1. - type: object - required: - - name - - port - - portConfigurable - properties: - name: - description: > - The name of the port exposed by the virtual CP instance. - type: string - protocol: - description: > - The L4 protocol for this port exposed by the virtual CP instance. - - Permitted values: - - TCP - - UDP - - SCTP - type: string - enum: - - TCP - - UDP - - SCTP - port: - description: > - The L4 port number exposed by the virtual CP instance. - type: integer - portConfigurable: - description: - Specifies whether the port attribute value is allowed to be configurable. - $ref: "SOL002SOL003_def.yaml#/definitions/Boolean" - - NetAttDefResourceInfo: - description: > - This type contains information related to a network attachment definition resource that provides the - specification of the interface used to connect one or multiple connection points to a secondary container - cluster network. It shall comply with the provisions defined in table 5.5.3.36-1. - type: object - required: - - netAttDefResourceInfoId - - netAttDefResource - properties: - netAttDefResourceInfoId: - description: > - Identifier of this network attachment definition resource as provided by the entity that has - created it. - $ref: "SOL002SOL003_def.yaml#/definitions/Identifier" - netAttDefResource: - description: > - Resource handle of the resource in the scope of the CISM. - $ref: "SOL002SOL003_def.yaml#/definitions/ResourceHandle" - associatedExtCpId: - description: > - Identifier of the external CP associated to this network attachment definition resource. Shall be present - when the network attachment definition resource is used for external connectivity by the VNF. - type: array - items: - $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" - associatedVnfcCpId: - description: > - Identifier of the VNFC CP associated to this network attachment definition resource. May be present when - the network attachment definition resource is used for internal connectivity by the VNF. - type: array - items: - $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" - - VirtualCpAddressInfo: - description: > - This type represents information about a network address that has been assigned to a virtual CP. - type: object - required: - - type - properties: - type: - description: > - The type of the IP addresses. Permitted values: - - IPV4 - - IPV6 - type: string - enum: - - IPV4 - - IPV6 - loadBalancerIp: - description: > - Fixed addresses assigned to an external load balancer. - $ref: 'SOL002SOL003_def.yaml#/definitions/IpAddress' \ No newline at end of file -- GitLab From 1f06eabda6f88e0445ecd05c02e61c06705ccdfd Mon Sep 17 00:00:00 2001 From: muhammadh Date: Wed, 29 Jun 2022 15:42:49 +0500 Subject: [PATCH 29/41] Remove and separate common SOL002 SOL003 VNF Indicator API definitions --- src/SOL002/VNFIndicator/VNFIndicator.yaml | 14 +- .../definitions/SOL002VNFIndicator_def.yaml} | 50 +-- src/SOL003/VNFIndicator/VNFIndicator.yaml | 14 +- .../definitions/SOL003VNFIndicator_def.yaml | 302 ++++++++++++++++++ .../VNFIndicatorNotification.yaml | 4 +- 5 files changed, 343 insertions(+), 41 deletions(-) rename src/{definitions/SOL002SOL003VNFIndicator_def.yaml => SOL002/VNFIndicator/definitions/SOL002VNFIndicator_def.yaml} (82%) create mode 100644 src/SOL003/VNFIndicator/definitions/SOL003VNFIndicator_def.yaml diff --git a/src/SOL002/VNFIndicator/VNFIndicator.yaml b/src/SOL002/VNFIndicator/VNFIndicator.yaml index 9861cae2..f4b5c200 100644 --- a/src/SOL002/VNFIndicator/VNFIndicator.yaml +++ b/src/SOL002/VNFIndicator/VNFIndicator.yaml @@ -380,7 +380,7 @@ components: content: application/json: schema: - $ref: ../../definitions/SOL002SOL003VNFIndicator_def.yaml#/definitions/VnfIndicatorSubscriptionRequest + $ref: definitions/SOL002VNFIndicator_def.yaml#/definitions/VnfIndicatorSubscriptionRequest required: true responses: @@ -420,7 +420,7 @@ components: schema: type: array items: - $ref: ../../definitions/SOL002SOL003VNFIndicator_def.yaml#/definitions/VnfIndicator + $ref: definitions/SOL002VNFIndicator_def.yaml#/definitions/VnfIndicator VnfIndicators.Get.200: description: | @@ -458,7 +458,7 @@ components: schema: type: array items: - $ref: ../../definitions/SOL002SOL003VNFIndicator_def.yaml#/definitions/VnfIndicator + $ref: definitions/SOL002VNFIndicator_def.yaml#/definitions/VnfIndicator VnfIndividualIndicator.Get.200: description: | @@ -481,7 +481,7 @@ components: content: application/json: schema: - $ref: ../../definitions/SOL002SOL003VNFIndicator_def.yaml#/definitions/VnfIndicator + $ref: definitions/SOL002VNFIndicator_def.yaml#/definitions/VnfIndicator VnfIndicatorSubscriptions.Get.200: description: | @@ -519,7 +519,7 @@ components: schema: type: array items: - $ref: ../../definitions/SOL002SOL003VNFIndicator_def.yaml#/definitions/VnfIndicatorSubscription + $ref: definitions/SOL002VNFIndicator_def.yaml#/definitions/VnfIndicatorSubscription VnfIndicatorSubscription.Post.201: description: | @@ -560,7 +560,7 @@ components: schema: type: array items: - $ref: ../../definitions/SOL002SOL003VNFIndicator_def.yaml#/definitions/VnfIndicatorSubscription + $ref: definitions/SOL002VNFIndicator_def.yaml#/definitions/VnfIndicatorSubscription VnfIndicatorSubscription.Get.200: description: | @@ -583,7 +583,7 @@ components: content: application/json: schema: - $ref: ../../definitions/SOL002SOL003VNFIndicator_def.yaml#/definitions/VnfIndicatorSubscription + $ref: definitions/SOL002VNFIndicator_def.yaml#/definitions/VnfIndicatorSubscription VnfIndicatorSubscription.Delete.204: description: | diff --git a/src/definitions/SOL002SOL003VNFIndicator_def.yaml b/src/SOL002/VNFIndicator/definitions/SOL002VNFIndicator_def.yaml similarity index 82% rename from src/definitions/SOL002SOL003VNFIndicator_def.yaml rename to src/SOL002/VNFIndicator/definitions/SOL002VNFIndicator_def.yaml index 14ed7fdc..21cc352b 100644 --- a/src/definitions/SOL002SOL003VNFIndicator_def.yaml +++ b/src/SOL002/VNFIndicator/definitions/SOL002VNFIndicator_def.yaml @@ -1,7 +1,7 @@ # Copyright (c) ETSI 2017. # https://forge.etsi.org/etsi-forge-copyright-notice.txt -definitions: +definitions: VnfIndicator: description: > This type represents a VNF indicator value. It shall comply with the provisions defined in table 8.5.2.2-1. @@ -17,7 +17,7 @@ definitions: id: description: > Identifier of this VNF indicator. - $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" name: description: > Human readable name of the indicator. Shall be present if defined in @@ -30,7 +30,7 @@ definitions: vnfInstanceId: description: > Identifier of the "Individual VNF instance" which provides the indicator value. - $ref: "SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" _links: description: > Links for this resource. @@ -42,11 +42,11 @@ definitions: self: description: > URI of this resource. - $ref: "SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" vnfInstance: description: > Link to the related "Individual VNF instance" resource. - $ref: "SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" VnfIndicatorNotificationsFilter: description: > @@ -64,7 +64,7 @@ definitions: vnfInstanceSubscriptionFilter: description: > Filter criteria to select VNF instances about which to notify. - $ref: "SOL002SOL003_def.yaml#/definitions/VnfInstanceSubscriptionFilter" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/VnfInstanceSubscriptionFilter" notificationTypes: description: > Match particular notification types. @@ -82,7 +82,7 @@ definitions: Match particular VNF indicator identifiers. type: array items: - $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" VnfIndicatorSubscription: description: > @@ -97,7 +97,7 @@ definitions: id: description: > Identifier of this "Individual subscription" resource. - $ref: "SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" filter: description: > Filter settings for this subscription, to define the subset of all @@ -120,7 +120,7 @@ definitions: self: description: > URI of this resource. - $ref: "SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" VnfIndicatorSubscriptionRequest: description: > @@ -140,7 +140,7 @@ definitions: callbackUri: description: > The URI of the endpoint to send the notification to. - $ref: "SOL002SOL003_def.yaml#/definitions/Uri" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Uri" authentication: description: > Authentication parameters to configure the use of Authorization when @@ -148,7 +148,7 @@ definitions: in clause 8.3.4 of ETSI GS NFV-SOL 013. This attribute shall only be present if the subscriber requires authorization of notifications. - $ref: "SOL002SOL003_def.yaml#/definitions/SubscriptionAuthentication" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/SubscriptionAuthentication" VnfIndicatorValueChangeNotification: description: > @@ -172,7 +172,7 @@ definitions: Identifier of this notification. If a notification is sent multiple times due to multiple subscriptions, the "id" attribute of all these notifications shall have the same value. - $ref: "SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" notificationType: description: > Discriminator for the different notification types. Shall be set to @@ -183,15 +183,15 @@ definitions: subscriptionId: description: > Identifier of the subscription that this notification relates to. - $ref: "SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" timeStamp: description: > Date-time of the generation of the notification. - $ref: "SOL002SOL003_def.yaml#/definitions/DateTime" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" vnfIndicatorId: description: > Identifier of the VNF indicator whose value has changed. - $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" name: description: > Human readable name of the VNF indicator. Shall be present if @@ -204,7 +204,7 @@ definitions: vnfInstanceId: description: > Identifier of the VNF instance which provides the indicator value. - $ref: "SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" _links: description: > Links for this resource. @@ -217,11 +217,11 @@ definitions: description: > Link to the related "Individual VNF instance" resource. Shall be present if the VNF instance information is accessible as a resource. - $ref: "SOL002SOL003_def.yaml#/definitions/NotificationLink" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/NotificationLink" subscription: description: > Link to the related subscription. - $ref: "SOL002SOL003_def.yaml#/definitions/NotificationLink" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/NotificationLink" SupportedIndicatorsChangeNotification: description: > @@ -247,7 +247,7 @@ definitions: Identifier of this notification. If a notification is sent multiple times due to multiple subscriptions, the "id" attribute of all these notifications shall have the same value. - $ref: "SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" notificationType: description: > Discriminator for the different notification types. Shall be set to @@ -258,15 +258,15 @@ definitions: subscriptionId: description: > Identifier of the subscription that this notification relates to. - $ref: "SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" timeStamp: description: > Date-time of the generation of the notification. - $ref: "SOL002SOL003_def.yaml#/definitions/DateTime" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" vnfInstanceId: description: > Identifier of the VNF instance which provides the indicator value. - $ref: "SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" supportedIndicators: description: > Set of VNF indicators supported by the VNF instance. @@ -279,7 +279,7 @@ definitions: vnfIndicatorId: description: > Identifier of the VNF indicator whose value has changed. - $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" name: description: > Human readable name of the VNF indicator. Shall be present if defined in the VNFD. See note. @@ -295,8 +295,8 @@ definitions: description: > Link to the related "Individual VNF instance" resource. Shall be present if the VNF instance information is accessible as a resource. - $ref: "SOL002SOL003_def.yaml#/definitions/NotificationLink" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/NotificationLink" subscription: description: > Link to the related subscription. - $ref: "SOL002SOL003_def.yaml#/definitions/NotificationLink" \ No newline at end of file + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/NotificationLink" \ No newline at end of file diff --git a/src/SOL003/VNFIndicator/VNFIndicator.yaml b/src/SOL003/VNFIndicator/VNFIndicator.yaml index 4e9ed43a..622a5b4c 100644 --- a/src/SOL003/VNFIndicator/VNFIndicator.yaml +++ b/src/SOL003/VNFIndicator/VNFIndicator.yaml @@ -385,7 +385,7 @@ components: content: application/json: schema: - $ref: ../../definitions/SOL002SOL003VNFIndicator_def.yaml#/definitions/VnfIndicatorSubscriptionRequest + $ref: definitions/SOL003VNFIndicator_def.yaml#/definitions/VnfIndicatorSubscriptionRequest required: true responses: @@ -428,7 +428,7 @@ components: schema: type: array items: - $ref: ../../definitions/SOL002SOL003VNFIndicator_def.yaml#/definitions/VnfIndicator + $ref: definitions/SOL003VNFIndicator_def.yaml#/definitions/VnfIndicator VnfInstanceIndicators.Get.200: description: | @@ -470,7 +470,7 @@ components: schema: type: array items: - $ref: ../../definitions/SOL002SOL003VNFIndicator_def.yaml#/definitions/VnfIndicator + $ref: definitions/SOL003VNFIndicator_def.yaml#/definitions/VnfIndicator VnfInstanceIndividualIndicator.Get.200: description: | @@ -495,7 +495,7 @@ components: content: application/json: schema: - $ref: ../../definitions/SOL002SOL003VNFIndicator_def.yaml#/definitions/VnfIndicator + $ref: definitions/SOL003VNFIndicator_def.yaml#/definitions/VnfIndicator Subscriptions.Post.201: description: | @@ -532,7 +532,7 @@ components: schema: type: array items: - $ref: ../../definitions/SOL002SOL003VNFIndicator_def.yaml#/definitions/VnfIndicatorSubscription + $ref: definitions/SOL003VNFIndicator_def.yaml#/definitions/VnfIndicatorSubscription Subscriptions.Post.303: description: | @@ -657,7 +657,7 @@ components: schema: type: array items: - $ref: ../../definitions/SOL002SOL003VNFIndicator_def.yaml#/definitions/VnfIndicatorSubscription + $ref: definitions/SOL003VNFIndicator_def.yaml#/definitions/VnfIndicatorSubscription IndividualSubscription.Get.200: description: | @@ -683,7 +683,7 @@ components: content: application/json: schema: - $ref: ../../definitions/SOL002SOL003VNFIndicator_def.yaml#/definitions/VnfIndicatorSubscription + $ref: definitions/SOL003VNFIndicator_def.yaml#/definitions/VnfIndicatorSubscription IndividualSubscription.Delete.204: description: | diff --git a/src/SOL003/VNFIndicator/definitions/SOL003VNFIndicator_def.yaml b/src/SOL003/VNFIndicator/definitions/SOL003VNFIndicator_def.yaml new file mode 100644 index 00000000..21cc352b --- /dev/null +++ b/src/SOL003/VNFIndicator/definitions/SOL003VNFIndicator_def.yaml @@ -0,0 +1,302 @@ +# Copyright (c) ETSI 2017. +# https://forge.etsi.org/etsi-forge-copyright-notice.txt + +definitions: + VnfIndicator: + description: > + This type represents a VNF indicator value. It shall comply with the provisions defined in table 8.5.2.2-1. + + NOTE: ETSI GS NFV-SOL 001 specifies the structure and format of the VNFD based on TOSCA specifications. + type: object + required: + - id + - value + - vnfInstanceId + - _links + properties: + id: + description: > + Identifier of this VNF indicator. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + name: + description: > + Human readable name of the indicator. Shall be present if defined in + the VNFD. + type: string + value: + description: > + Provides the value of the indicator. The value format is defined in the VNFD. See note. + type: object + vnfInstanceId: + description: > + Identifier of the "Individual VNF instance" which provides the indicator value. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + _links: + description: > + Links for this resource. + type: object + required: + - self + - vnfInstance + properties: + self: + description: > + URI of this resource. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + vnfInstance: + description: > + Link to the related "Individual VNF instance" resource. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + + VnfIndicatorNotificationsFilter: + description: > + This type represents a subscription filter for notifications related to VNF indicators. + It shall comply with the provisions defined in table 8.5.3.2-1. + At a particular nesting level in the filter structure, the following applies: + All attributes shall match in order for the filter to match (logical "and" between different + filter attributes). If an attribute is an array, the attribute shall match if at least one of + the values in the array matches (logical "or" between the values of one filter attribute). + + NOTE: The permitted values of the "notificationTypes" attribute are spelled exactly as the names + of the notification types to facilitate automated code generation systems. + type: object + properties: + vnfInstanceSubscriptionFilter: + description: > + Filter criteria to select VNF instances about which to notify. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/VnfInstanceSubscriptionFilter" + notificationTypes: + description: > + Match particular notification types. + + Permitted values: + - VnfIndicatorValueChangeNotification + - SupportedIndicatorsChangeNotification + See note. + type: string + enum: + - VnfIndicatorValueChangeNotification + - SupportedIndicatorsChangeNotification + indicatorIds: + description: > + Match particular VNF indicator identifiers. + type: array + items: + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + + VnfIndicatorSubscription: + description: > + This type represents a subscription related to notifications about VNF + indicator value changes. + type: object + required: + - id + - callbackUri + - _links + properties: + id: + description: > + Identifier of this "Individual subscription" resource. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + filter: + description: > + Filter settings for this subscription, to define the subset of all + notifications this subscription relates to. A particular + notification is sent to the subscriber if the filter matches, or if + there is no filter. + $ref: "#/definitions/VnfIndicatorNotificationsFilter" + callbackUri: + description: > + The URI of the endpoint to send the notification to. + type: string + format: url + _links: + description: > + Links for this resource. + type: object + required: + - self + properties: + self: + description: > + URI of this resource. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + + VnfIndicatorSubscriptionRequest: + description: > + This type represents a subscription request related to VNF indicator + value change notifications. + type: object + required: + - callbackUri + properties: + filter: + description: > + Filter settings for this subscription, to define the subset of all + notifications this subscription relates to. A particular + notification is sent to the subscriber if the filter matches, or if + there is no filter. + $ref: "#/definitions/VnfIndicatorNotificationsFilter" + callbackUri: + description: > + The URI of the endpoint to send the notification to. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Uri" + authentication: + description: > + Authentication parameters to configure the use of Authorization when + sending notifications corresponding to this subscription, as defined + in clause 8.3.4 of ETSI GS NFV-SOL 013. + This attribute shall only be present if the subscriber requires + authorization of notifications. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/SubscriptionAuthentication" + + VnfIndicatorValueChangeNotification: + description: > + This type represents a VNF indicator value change notification. It shall comply with the provisions defined in table 8.5.2.5-1. + The notification shall be triggered by the VNFM when the value of an indicator has changed. + + NOTE: ETSI GS NFV-SOL 001 specifies the structure and format of the VNFD based on TOSCA specifications. + type: object + required: + - id + - notificationType + - subscriptionId + - timeStamp + - vnfIndicatorId + - value + - vnfInstanceId + - _links + properties: + id: + description: > + Identifier of this notification. If a notification is sent multiple + times due to multiple subscriptions, the "id" attribute of all these + notifications shall have the same value. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + notificationType: + description: > + Discriminator for the different notification types. Shall be set to + "VnfIndicatorValueChangeNotification" for this notification type. + type: string + enum: + - VnfIndicatorValueChangeNotification + subscriptionId: + description: > + Identifier of the subscription that this notification relates to. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + timeStamp: + description: > + Date-time of the generation of the notification. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" + vnfIndicatorId: + description: > + Identifier of the VNF indicator whose value has changed. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + name: + description: > + Human readable name of the VNF indicator. Shall be present if + defined in the VNFD. + type: string + value: + description: > + Provides the value of the VNF indicator. The value format is defined in the VNFD. See note. + type: object + vnfInstanceId: + description: > + Identifier of the VNF instance which provides the indicator value. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + _links: + description: > + Links for this resource. + type: object + required: + - vnfInstance + - subscription + properties: + vnfInstance: + description: > + Link to the related "Individual VNF instance" resource. Shall be present + if the VNF instance information is accessible as a resource. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/NotificationLink" + subscription: + description: > + Link to the related subscription. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/NotificationLink" + + SupportedIndicatorsChangeNotification: + description: > + This type represents a notification to inform the receiver that the set of indicators supported + by a VNF instance has changed. It shall comply with the provisions defined in table 8.5.2.6-1. + + The notification shall be triggered by the VNFM when the set of supported VNF indicators has changed + as a side effect of the "Change current VNF package" operation. It may be triggered by the VNFM when + a VNF has been instantiated. + + NOTE: ETSI GS NFV-SOL 001 specifies the structure and format of the VNFD based on TOSCA specifications. + type: object + required: + - id + - notificationType + - subscriptionId + - timeStamp + - vnfInstanceId + - _links + properties: + id: + description: > + Identifier of this notification. If a notification is sent multiple times + due to multiple subscriptions, the "id" attribute of all these notifications + shall have the same value. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + notificationType: + description: > + Discriminator for the different notification types. Shall be set to + "SupportedIndicatorsChangeNotification" for this notification type. + type: string + enum: + - VnfIndicatorValueChangeNotification + subscriptionId: + description: > + Identifier of the subscription that this notification relates to. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + timeStamp: + description: > + Date-time of the generation of the notification. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" + vnfInstanceId: + description: > + Identifier of the VNF instance which provides the indicator value. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + supportedIndicators: + description: > + Set of VNF indicators supported by the VNF instance. + type: array + items: + type: object + required: + - vnfIndicatorId + properties: + vnfIndicatorId: + description: > + Identifier of the VNF indicator whose value has changed. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + name: + description: > + Human readable name of the VNF indicator. Shall be present if defined in the VNFD. See note. + type: string + _links: + description: > + Links for this resource. + type: object + required: + - subscription + properties: + vnfInstance: + description: > + Link to the related "Individual VNF instance" resource. Shall be present + if the VNF instance information is accessible as a resource. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/NotificationLink" + subscription: + description: > + Link to the related subscription. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/NotificationLink" \ No newline at end of file diff --git a/src/SOL003/VNFIndicatorNotification/VNFIndicatorNotification.yaml b/src/SOL003/VNFIndicatorNotification/VNFIndicatorNotification.yaml index ffc14a43..c89a094a 100644 --- a/src/SOL003/VNFIndicatorNotification/VNFIndicatorNotification.yaml +++ b/src/SOL003/VNFIndicatorNotification/VNFIndicatorNotification.yaml @@ -93,8 +93,8 @@ components: application/json: schema: oneOf: - - $ref: ../../definitions/SOL002SOL003VNFIndicator_def.yaml#/definitions/VnfIndicatorValueChangeNotification - - $ref: ../../definitions/SOL002SOL003VNFIndicator_def.yaml#/definitions/SupportedIndicatorsChangeNotification + - $ref: ../VNFIndicator/definitions/SOL003VNFIndicator_def.yaml#/definitions/VnfIndicatorValueChangeNotification + - $ref: ../VNFIndicator/definitions/SOL003VNFIndicator_def.yaml#/definitions/SupportedIndicatorsChangeNotification required: true responses: -- GitLab From 93b14dd4dac1d21ba586ca60f3ce6324c9b5f846 Mon Sep 17 00:00:00 2001 From: muhammadh Date: Wed, 29 Jun 2022 16:32:25 +0500 Subject: [PATCH 30/41] Remove and separate common SOL002 SOL003 VNF Fault Mgmt API definitions --- .../VNFFaultManagement.yaml | 12 +- .../SOL002VNFFaultManagement_def.yaml | 359 +++++++++++++++++- .../VNFFaultManagementNotification.yaml | 4 +- .../VNFFaultManagement.yaml | 12 +- .../SOL003VNFFaultManagement_def.yaml | 359 +++++++++++++++++- .../VNFFaultManagementNotification.yaml | 4 +- .../SOL002SOL003VNFFaultManagement_def.yaml | 354 ----------------- 7 files changed, 726 insertions(+), 378 deletions(-) delete mode 100644 src/definitions/SOL002SOL003VNFFaultManagement_def.yaml diff --git a/src/SOL002/VNFFaultManagement/VNFFaultManagement.yaml b/src/SOL002/VNFFaultManagement/VNFFaultManagement.yaml index 6a7731fa..e0903024 100644 --- a/src/SOL002/VNFFaultManagement/VNFFaultManagement.yaml +++ b/src/SOL002/VNFFaultManagement/VNFFaultManagement.yaml @@ -406,7 +406,7 @@ components: content: application/json: schema: - $ref: ../../definitions/SOL002SOL003VNFFaultManagement_def.yaml#/definitions/AlarmModifications + $ref: definitions/SOL002VNFFaultManagement_def.yaml#/definitions/AlarmModifications required: true IndividualAlarmEscalateRequest: @@ -422,7 +422,7 @@ components: content: application/json: schema: - $ref: ../../definitions/SOL002SOL003VNFFaultManagement_def.yaml#/definitions/FmSubscriptionRequest + $ref: definitions/SOL002VNFFaultManagement_def.yaml#/definitions/FmSubscriptionRequest required: true responses: @@ -558,7 +558,7 @@ components: content: application/json: schema: - $ref: ../../definitions/SOL002SOL003VNFFaultManagement_def.yaml#/definitions/AlarmModifications + $ref: definitions/SOL002VNFFaultManagement_def.yaml#/definitions/AlarmModifications IndividualAlarm.Patch.409: description: | @@ -657,7 +657,7 @@ components: content: application/json: schema: - $ref: ../../definitions/SOL002SOL003VNFFaultManagement_def.yaml#/definitions/FmSubscription + $ref: definitions/SOL002VNFFaultManagement_def.yaml#/definitions/FmSubscription Subscriptions.Post.201: description: | @@ -697,7 +697,7 @@ components: content: application/json: schema: - $ref: ../../definitions/SOL002SOL003VNFFaultManagement_def.yaml#/definitions/FmSubscription + $ref: definitions/SOL002VNFFaultManagement_def.yaml#/definitions/FmSubscription IndividualSubscription.Get.200: description: | @@ -728,7 +728,7 @@ components: content: application/json: schema: - $ref: ../../definitions/SOL002SOL003VNFFaultManagement_def.yaml#/definitions/FmSubscription + $ref: definitions/SOL002VNFFaultManagement_def.yaml#/definitions/FmSubscription IndividualSubscription.Delete.204: description: | diff --git a/src/SOL002/VNFFaultManagement/definitions/SOL002VNFFaultManagement_def.yaml b/src/SOL002/VNFFaultManagement/definitions/SOL002VNFFaultManagement_def.yaml index 89777e08..2803e73c 100644 --- a/src/SOL002/VNFFaultManagement/definitions/SOL002VNFFaultManagement_def.yaml +++ b/src/SOL002/VNFFaultManagement/definitions/SOL002VNFFaultManagement_def.yaml @@ -61,7 +61,7 @@ definitions: description: > The virtualised resources that are causing the VNF fault. Shall be present if the alarm affects virtualised resources. See note 1. - $ref: "../../../definitions/SOL002SOL003VNFFaultManagement_def.yaml#/definitions/FaultyResourceInfo" + $ref: "#/definitions/FaultyResourceInfo" alarmRaisedTime: description: > Time stamp indicating when the alarm is raised by the managed @@ -96,7 +96,7 @@ definitions: perceivedSeverity: description: > Perceived severity of the managed object failure. - $ref: "../../../definitions/SOL002SOL003VNFFaultManagement_def.yaml#/definitions/PerceivedSeverityType" + $ref: "#/definitions/PerceivedSeverityType" eventTime: description: > Time stamp indicating when the fault was observed. See note 2. @@ -104,7 +104,7 @@ definitions: eventType: description: > Type of event. - $ref: "../../../definitions/SOL002SOL003VNFFaultManagement_def.yaml#/definitions/EventType" + $ref: "#/definitions/EventType" type: string faultType: description: > @@ -223,4 +223,355 @@ definitions: proposedPerceivedSeverity: description: > Indicates the proposed escalated perceived severity for an alarm. - $ref: "../../../definitions/SOL002SOL003VNFFaultManagement_def.yaml#/definitions/PerceivedSeverityType" \ No newline at end of file + $ref: "#/definitions/PerceivedSeverityType" + + FmSubscriptionRequest: + description: > + This type represents a subscription request related to notifications + about VNF faults. + type: object + required: + - callbackUri + properties: + filter: + description: > + Filter settings for this subscription, to define the subset of all + notifications this subscription relates to. A particular + notification is sent to the subscriber if the filter matches, or if + there is no filter. + $ref: "#/definitions/FmNotificationsFilter" + callbackUri: + description: > + The URI of the endpoint to send the notification to. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Uri" + authentication: + description: > + Authentication parameters to configure the use of Authorization when sending notifications + corresponding to this subscription, as defined in clause 8.3.4 of ETSI GS NFV-SOL 013. + This attribute shall only be present if the subscriber requires authorization of notifications. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/SubscriptionAuthentication" + + FmSubscription: + description: > + This type represents a subscription related to notifications about VNF + faults. + type: object + required: + - id + - callbackUri + - _links + properties: + id: + description: > + Identifier of this "Individual subscription" resource. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + filter: + description: > + Filter settings for this subscription, to define the subset of all + notifications this subscription relates to. A particular + notification is sent to the subscriber if the filter matches, or if + there is no filter. + $ref: "#/definitions/FmNotificationsFilter" + callbackUri: + description: > + The URI of the endpoint to send the notification to. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Uri" + _links: + description: > + Links for this resource. + type: object + required: + - self + properties: + self: + description: > + URI of this resource. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + + AlarmClearedNotification: + description: > + This type represents an alarm cleared notification about VNF faults. + The notification shall be triggered by the VNFM when an alarm has been + cleared. + type: object + required: + - id + - notificationType + - subscriptionId + - timeStamp + - alarmId + - alarmClearedTime + - _links + properties: + id: + description: > + Identifier of this notification. If a notification is sent multiple + times due to multiple subscriptions, the "id" attribute of all these + notifications shall have the same value. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + notificationType: + description: > + Discriminator for the different notification types. Shall be set to + "AlarmClearedNotification" for this notification type. + type: string + enum: + - AlarmClearedNotification + subscriptionId: + description: > + Identifier of the subscription that this notification relates to. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + timeStamp: + description: > + Date-time of the generation of the notification. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" + alarmId: + description: > + Alarm identifier. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + alarmClearedTime: + description: > + The time stamp indicating when the alarm was cleared. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" + _links: + description: > + Links to resources related to this notification. + type: object + required: + - subscription + - alarm + properties: + subscription: + description: > + Link to the related subscription. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/NotificationLink" + alarm: + description: > + Link to the resource that represents the related alarm. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/NotificationLink" + + AlarmListRebuiltNotification: + description: > + This type represents a notification that the alarm list has been + rebuilt, e.g. if the VNFM detects its storage holding the alarm + list is corrupted. + The notification shall be triggered by the VNFM when the alarm list has + been rebuilt, e.g. because the VNFM has detected that its storage + holding the alarm list was corrupted. + type: object + required: + - id + - notificationType + - subscriptionId + - timeStamp + - _links + properties: + id: + description: > + Identifier of this notification. If a notification is sent multiple + times due to multiple subscriptions, the "id" attribute of all these + notifications shall have the same value. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + notificationType: + description: > + Discriminator for the different notification types. Shall be set to + "AlarmListRebuiltNotification" for this notification type. + type: string + enum: + - AlarmListRebuiltNotification + subscriptionId: + description: > + Identifier of the subscription that this notification relates to. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + timeStamp: + description: > + Date-time of the generation of the notification. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" + _links: + description: > + Links to resources related to this notification. + type: object + required: + - subscription + - alarms + properties: + subscription: + description: > + Link to the related subscription. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/NotificationLink" + alarms: + description: > + Link to the alarm list, i.e. the "Alarms" resource. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/NotificationLink" + + AlarmModifications: + description: > + This type represents attribute modifications for an "Individual alarm" + resource, i.e. modifications to a resource representation based on the + "Alarm" data type. The attributes of "Alarm" that can be modified + are included in the "AlarmModifications" data type. + type: object + required: + - ackState + properties: + ackState: + description: > + New value of the "ackState" attribute in "Alarm". + Permitted values: + * ACKNOWLEDGED + * UNACKNOWLEDGED + type: string + enum: + - ACKNOWLEDGED + - UNACKNOWLEDGED + + EventType: + description: > + The enumeration EventType represents those types of events that trigger + an alarm. + * COMMUNICATIONS_ALARM: An alarm of this type is associated with the + procedure and/or process required conveying information from one point + to another (ITU-T Recommendation X.733). + * PROCESSING_ERROR_ALARM: An alarm of this type is associated with a + software or processing fault (ITU-T Recommendation X.733). + * ENVIRONMENTAL_ALARM: An alarm of this type is associated with a + condition related to an enclosure in which the equipment resides + (ITU-T Recommendation X.733). + * QOS_ALARM: An alarm of this type is associated with degradation in the + quality of a service (ITU-T Recommendation X.733). + * EQUIPMENT_ALARM: An alarm of this type is associated with an equipment + fault (ITU-T Recommendation X.733). + type: string + enum: + - COMMUNICATIONS_ALARM + - PROCESSING_ERROR_ALARM + - ENVIRONMENTAL_ALARM + - QOS_ALARM + - EQUIPMENT_ALARM + + FaultyResourceInfo: + description: > + This type represents the faulty virtual resources that have a negative + impact on a VNF. + type: object + required: + - faultyResource + - faultyResourceType + properties: + faultyResource: + description: > + Information that identifies the faulty resource instance and its + managing entity. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ResourceHandle" + faultyResourceType: + description: > + Type of the faulty resource. + $ref: "#/definitions/FaultyResourceType" + + FaultyResourceType: + description: > + The enumeration FaultyResourceType represents those types of faulty + resource. + type: string + enum: + - COMPUTE + - STORAGE + - NETWORK + + FmNotificationsFilter: + description: > + This type represents a subscription filter related to notifications about VNF faults. + It shall comply with the provisions defined in table 7.5.3.2-1. + At a particular nesting level in the filter structure, the following applies: All attributes + shall match in order for the filter to match (logical "and" between different filter attributes). + If an attribute is an array, the attribute shall match if at least one of the values in the array + matches (logical "or" between the values of one filter attribute). + + NOTE: The permitted values of the "notificationTypes" attribute are spelled exactly as the names + of the notification types to facilitate automated code generation systems. + type: object + properties: + vnfInstanceSubscriptionFilter: + description: > + Filter criteria to select VNF instances about which to notify. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/VnfInstanceSubscriptionFilter" + notificationTypes: + description: > + Match particular notification types. + + Permitted values: + - AlarmNotification + - AlarmClearedNotification + - AlarmListRebuiltNotification + See note. + type: array + items: + type: string + enum: + - AlarmNotification + - AlarmClearedNotification + - AlarmListRebuiltNotification + faultyResourceTypes: + description: > + Match VNF alarms with a faulty resource type listed in this + attribute. + type: array + items: + $ref: "#/definitions/FaultyResourceType" + perceivedSeverities: + description: > + Match VNF alarms with a perceived severity listed in this attribute. + type: array + items: + $ref: "#/definitions/PerceivedSeverityType" + eventTypes: + description: > + Match VNF alarms with an event type listed in this attribute. + type: array + items: + $ref: "#/definitions/EventType" + probableCauses: + description: > + Match VNF alarms with a probable cause listed in this attribute. + type: array + items: + type: string + + PerceivedSeverityType: + description: > + Indicates the relative level of urgency for operator attention. + * CRITICAL: The Critical severity level indicates that a service + affecting condition has occurred and an immediate corrective action + is required. Such a severity can be reported, for example, when a + managed object becomes totally out of service and its capability needs + to be restored (ITU-T Recommendation X.733). + * MAJOR: The Major severity level indicates that a service affecting + condition has developed and an urgent corrective action is required. + Such a severity can be reported, for example, when there is a severe + degradation in the capability of the managed object and its full + capability needs to be restored (ITU-T Recommendation X.733). + * MINOR: The Minor severity level indicates the existence of a + non-service affecting fault condition and that corrective action + should be taken in order to prevent a more serious (for example, + service affecting) fault. Such a severity can be reported, for + example, when the detected alarm condition is not currently degrading + the capacity of the managed object (ITU-T Recommendation X.733). + * WARNING: The Warning severity level indicates the detection of a + potential or impending service affecting fault, before any significant + effects have been felt. Action should be taken to further diagnose (if + necessary) and correct the problem in order to prevent it from + becoming a more serious service affecting fault (ITU-T Recommendation + X.733). + * INDETERMINATE: The Indeterminate severity level indicates that the + severity level cannot be determined (ITU-T Recommendation X.733). + * CLEARED: The Cleared severity level indicates the clearing of one or + more previously reported alarms. This alarm clears all alarms for this + managed object that have the same Alarm type, Probable cause and + Specific problems (if given) (ITU-T Recommendation X.733). + type: string + enum: + - CRITICAL + - MAJOR + - MINOR + - WARNING + - INDETERMINATE + - CLEARED \ No newline at end of file diff --git a/src/SOL002/VNFFaultManagementNotification/VNFFaultManagementNotification.yaml b/src/SOL002/VNFFaultManagementNotification/VNFFaultManagementNotification.yaml index 255db4dc..a72c7e70 100644 --- a/src/SOL002/VNFFaultManagementNotification/VNFFaultManagementNotification.yaml +++ b/src/SOL002/VNFFaultManagementNotification/VNFFaultManagementNotification.yaml @@ -200,7 +200,7 @@ components: content: application/json: schema: - $ref: ../../definitions/SOL002SOL003VNFFaultManagement_def.yaml#/definitions/AlarmClearedNotification + $ref: ../VNFFaultManagement/definitions/SOL002VNFFaultManagement_def.yaml#/definitions/AlarmClearedNotification required: true AlarmListRebuiltNotification: @@ -209,7 +209,7 @@ components: content: application/json: schema: - $ref: ../../definitions/SOL002SOL003VNFFaultManagement_def.yaml#/definitions/AlarmListRebuiltNotification + $ref: ../VNFFaultManagement/definitions/SOL002VNFFaultManagement_def.yaml#/definitions/AlarmListRebuiltNotification required: true responses: diff --git a/src/SOL003/VNFFaultManagement/VNFFaultManagement.yaml b/src/SOL003/VNFFaultManagement/VNFFaultManagement.yaml index 098ccf8c..0e792b32 100644 --- a/src/SOL003/VNFFaultManagement/VNFFaultManagement.yaml +++ b/src/SOL003/VNFFaultManagement/VNFFaultManagement.yaml @@ -352,7 +352,7 @@ components: content: application/json: schema: - $ref: ../../definitions/SOL002SOL003VNFFaultManagement_def.yaml#/definitions/AlarmModifications + $ref: "definitions/SOL003VNFFaultManagement_def.yaml#/definitions/AlarmModifications" required: true FmSubscriptionRequest: @@ -360,7 +360,7 @@ components: content: application/json: schema: - $ref: ../../definitions/SOL002SOL003VNFFaultManagement_def.yaml#/definitions/FmSubscriptionRequest + $ref: "definitions/SOL003VNFFaultManagement_def.yaml#/definitions/FmSubscriptionRequest" required: true responses: @@ -494,7 +494,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003VNFFaultManagement_def.yaml#/definitions/AlarmModifications" + $ref: "definitions/SOL003VNFFaultManagement_def.yaml#/definitions/AlarmModifications" IndividualAlarm.Patch.409: description: | @@ -617,7 +617,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003VNFFaultManagement_def.yaml#/definitions/FmSubscription" + $ref: "definitions/SOL003VNFFaultManagement_def.yaml#/definitions/FmSubscription" Subscriptions.Post.200: description: | @@ -659,7 +659,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003VNFFaultManagement_def.yaml#/definitions/FmSubscription" + $ref: "definitions/SOL003VNFFaultManagement_def.yaml#/definitions/FmSubscription" Subscriptions.Post.303: description: | @@ -780,7 +780,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003VNFFaultManagement_def.yaml#/definitions/FmSubscription" + $ref: "definitions/SOL003VNFFaultManagement_def.yaml#/definitions/FmSubscription" IndividualSubscription.Delete.204: description: | diff --git a/src/SOL003/VNFFaultManagement/definitions/SOL003VNFFaultManagement_def.yaml b/src/SOL003/VNFFaultManagement/definitions/SOL003VNFFaultManagement_def.yaml index 63f84870..fefce1a9 100644 --- a/src/SOL003/VNFFaultManagement/definitions/SOL003VNFFaultManagement_def.yaml +++ b/src/SOL003/VNFFaultManagement/definitions/SOL003VNFFaultManagement_def.yaml @@ -48,7 +48,7 @@ definitions: description: > The virtualised resources that are causing the VNF fault. Shall be present if the alarm affects virtualised resources. See note 1. - $ref: "../../../definitions/SOL002SOL003VNFFaultManagement_def.yaml#/definitions/FaultyResourceInfo" + $ref: "#/definitions/FaultyResourceInfo" alarmRaisedTime: description: > Time stamp indicating when the alarm is raised by the managed @@ -82,7 +82,7 @@ definitions: perceivedSeverity: description: > Perceived severity of the managed object failure. - $ref: "../../../definitions/SOL002SOL003VNFFaultManagement_def.yaml#/definitions/PerceivedSeverityType" + $ref: "#/definitions/PerceivedSeverityType" eventTime: description: > Time stamp indicating when the fault was observed. See note 2. @@ -90,7 +90,7 @@ definitions: eventType: description: > Type of event. - $ref: "../../../definitions/SOL002SOL003VNFFaultManagement_def.yaml#/definitions/EventType" + $ref: "#/definitions/EventType" faultType: description: > Additional information to clarify the type of the fault. @@ -197,4 +197,355 @@ definitions: subscription: description: > Link to the related subscription. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/NotificationLink" \ No newline at end of file + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/NotificationLink" + + FmSubscriptionRequest: + description: > + This type represents a subscription request related to notifications + about VNF faults. + type: object + required: + - callbackUri + properties: + filter: + description: > + Filter settings for this subscription, to define the subset of all + notifications this subscription relates to. A particular + notification is sent to the subscriber if the filter matches, or if + there is no filter. + $ref: "#/definitions/FmNotificationsFilter" + callbackUri: + description: > + The URI of the endpoint to send the notification to. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Uri" + authentication: + description: > + Authentication parameters to configure the use of Authorization when sending notifications + corresponding to this subscription, as defined in clause 8.3.4 of ETSI GS NFV-SOL 013. + This attribute shall only be present if the subscriber requires authorization of notifications. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/SubscriptionAuthentication" + + FmSubscription: + description: > + This type represents a subscription related to notifications about VNF + faults. + type: object + required: + - id + - callbackUri + - _links + properties: + id: + description: > + Identifier of this "Individual subscription" resource. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + filter: + description: > + Filter settings for this subscription, to define the subset of all + notifications this subscription relates to. A particular + notification is sent to the subscriber if the filter matches, or if + there is no filter. + $ref: "#/definitions/FmNotificationsFilter" + callbackUri: + description: > + The URI of the endpoint to send the notification to. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Uri" + _links: + description: > + Links for this resource. + type: object + required: + - self + properties: + self: + description: > + URI of this resource. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + + AlarmClearedNotification: + description: > + This type represents an alarm cleared notification about VNF faults. + The notification shall be triggered by the VNFM when an alarm has been + cleared. + type: object + required: + - id + - notificationType + - subscriptionId + - timeStamp + - alarmId + - alarmClearedTime + - _links + properties: + id: + description: > + Identifier of this notification. If a notification is sent multiple + times due to multiple subscriptions, the "id" attribute of all these + notifications shall have the same value. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + notificationType: + description: > + Discriminator for the different notification types. Shall be set to + "AlarmClearedNotification" for this notification type. + type: string + enum: + - AlarmClearedNotification + subscriptionId: + description: > + Identifier of the subscription that this notification relates to. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + timeStamp: + description: > + Date-time of the generation of the notification. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" + alarmId: + description: > + Alarm identifier. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + alarmClearedTime: + description: > + The time stamp indicating when the alarm was cleared. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" + _links: + description: > + Links to resources related to this notification. + type: object + required: + - subscription + - alarm + properties: + subscription: + description: > + Link to the related subscription. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/NotificationLink" + alarm: + description: > + Link to the resource that represents the related alarm. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/NotificationLink" + + AlarmListRebuiltNotification: + description: > + This type represents a notification that the alarm list has been + rebuilt, e.g. if the VNFM detects its storage holding the alarm + list is corrupted. + The notification shall be triggered by the VNFM when the alarm list has + been rebuilt, e.g. because the VNFM has detected that its storage + holding the alarm list was corrupted. + type: object + required: + - id + - notificationType + - subscriptionId + - timeStamp + - _links + properties: + id: + description: > + Identifier of this notification. If a notification is sent multiple + times due to multiple subscriptions, the "id" attribute of all these + notifications shall have the same value. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + notificationType: + description: > + Discriminator for the different notification types. Shall be set to + "AlarmListRebuiltNotification" for this notification type. + type: string + enum: + - AlarmListRebuiltNotification + subscriptionId: + description: > + Identifier of the subscription that this notification relates to. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + timeStamp: + description: > + Date-time of the generation of the notification. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" + _links: + description: > + Links to resources related to this notification. + type: object + required: + - subscription + - alarms + properties: + subscription: + description: > + Link to the related subscription. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/NotificationLink" + alarms: + description: > + Link to the alarm list, i.e. the "Alarms" resource. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/NotificationLink" + + AlarmModifications: + description: > + This type represents attribute modifications for an "Individual alarm" + resource, i.e. modifications to a resource representation based on the + "Alarm" data type. The attributes of "Alarm" that can be modified + are included in the "AlarmModifications" data type. + type: object + required: + - ackState + properties: + ackState: + description: > + New value of the "ackState" attribute in "Alarm". + Permitted values: + * ACKNOWLEDGED + * UNACKNOWLEDGED + type: string + enum: + - ACKNOWLEDGED + - UNACKNOWLEDGED + + EventType: + description: > + The enumeration EventType represents those types of events that trigger + an alarm. + * COMMUNICATIONS_ALARM: An alarm of this type is associated with the + procedure and/or process required conveying information from one point + to another (ITU-T Recommendation X.733). + * PROCESSING_ERROR_ALARM: An alarm of this type is associated with a + software or processing fault (ITU-T Recommendation X.733). + * ENVIRONMENTAL_ALARM: An alarm of this type is associated with a + condition related to an enclosure in which the equipment resides + (ITU-T Recommendation X.733). + * QOS_ALARM: An alarm of this type is associated with degradation in the + quality of a service (ITU-T Recommendation X.733). + * EQUIPMENT_ALARM: An alarm of this type is associated with an equipment + fault (ITU-T Recommendation X.733). + type: string + enum: + - COMMUNICATIONS_ALARM + - PROCESSING_ERROR_ALARM + - ENVIRONMENTAL_ALARM + - QOS_ALARM + - EQUIPMENT_ALARM + + FaultyResourceInfo: + description: > + This type represents the faulty virtual resources that have a negative + impact on a VNF. + type: object + required: + - faultyResource + - faultyResourceType + properties: + faultyResource: + description: > + Information that identifies the faulty resource instance and its + managing entity. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ResourceHandle" + faultyResourceType: + description: > + Type of the faulty resource. + $ref: "#/definitions/FaultyResourceType" + + FaultyResourceType: + description: > + The enumeration FaultyResourceType represents those types of faulty + resource. + type: string + enum: + - COMPUTE + - STORAGE + - NETWORK + + FmNotificationsFilter: + description: > + This type represents a subscription filter related to notifications about VNF faults. + It shall comply with the provisions defined in table 7.5.3.2-1. + At a particular nesting level in the filter structure, the following applies: All attributes + shall match in order for the filter to match (logical "and" between different filter attributes). + If an attribute is an array, the attribute shall match if at least one of the values in the array + matches (logical "or" between the values of one filter attribute). + + NOTE: The permitted values of the "notificationTypes" attribute are spelled exactly as the names + of the notification types to facilitate automated code generation systems. + type: object + properties: + vnfInstanceSubscriptionFilter: + description: > + Filter criteria to select VNF instances about which to notify. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/VnfInstanceSubscriptionFilter" + notificationTypes: + description: > + Match particular notification types. + + Permitted values: + - AlarmNotification + - AlarmClearedNotification + - AlarmListRebuiltNotification + See note. + type: array + items: + type: string + enum: + - AlarmNotification + - AlarmClearedNotification + - AlarmListRebuiltNotification + faultyResourceTypes: + description: > + Match VNF alarms with a faulty resource type listed in this + attribute. + type: array + items: + $ref: "#/definitions/FaultyResourceType" + perceivedSeverities: + description: > + Match VNF alarms with a perceived severity listed in this attribute. + type: array + items: + $ref: "#/definitions/PerceivedSeverityType" + eventTypes: + description: > + Match VNF alarms with an event type listed in this attribute. + type: array + items: + $ref: "#/definitions/EventType" + probableCauses: + description: > + Match VNF alarms with a probable cause listed in this attribute. + type: array + items: + type: string + + PerceivedSeverityType: + description: > + Indicates the relative level of urgency for operator attention. + * CRITICAL: The Critical severity level indicates that a service + affecting condition has occurred and an immediate corrective action + is required. Such a severity can be reported, for example, when a + managed object becomes totally out of service and its capability needs + to be restored (ITU-T Recommendation X.733). + * MAJOR: The Major severity level indicates that a service affecting + condition has developed and an urgent corrective action is required. + Such a severity can be reported, for example, when there is a severe + degradation in the capability of the managed object and its full + capability needs to be restored (ITU-T Recommendation X.733). + * MINOR: The Minor severity level indicates the existence of a + non-service affecting fault condition and that corrective action + should be taken in order to prevent a more serious (for example, + service affecting) fault. Such a severity can be reported, for + example, when the detected alarm condition is not currently degrading + the capacity of the managed object (ITU-T Recommendation X.733). + * WARNING: The Warning severity level indicates the detection of a + potential or impending service affecting fault, before any significant + effects have been felt. Action should be taken to further diagnose (if + necessary) and correct the problem in order to prevent it from + becoming a more serious service affecting fault (ITU-T Recommendation + X.733). + * INDETERMINATE: The Indeterminate severity level indicates that the + severity level cannot be determined (ITU-T Recommendation X.733). + * CLEARED: The Cleared severity level indicates the clearing of one or + more previously reported alarms. This alarm clears all alarms for this + managed object that have the same Alarm type, Probable cause and + Specific problems (if given) (ITU-T Recommendation X.733). + type: string + enum: + - CRITICAL + - MAJOR + - MINOR + - WARNING + - INDETERMINATE + - CLEARED \ No newline at end of file diff --git a/src/SOL003/VNFFaultManagementNotification/VNFFaultManagementNotification.yaml b/src/SOL003/VNFFaultManagementNotification/VNFFaultManagementNotification.yaml index e8274430..68394808 100644 --- a/src/SOL003/VNFFaultManagementNotification/VNFFaultManagementNotification.yaml +++ b/src/SOL003/VNFFaultManagementNotification/VNFFaultManagementNotification.yaml @@ -210,7 +210,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003VNFFaultManagement_def.yaml#/definitions/AlarmClearedNotification" + $ref: "../VNFFaultManagement/definitions/SOL003VNFFaultManagement_def.yaml#/definitions/AlarmClearedNotification" required: true AlarmListRebuiltNotification: @@ -218,7 +218,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003VNFFaultManagement_def.yaml#/definitions/AlarmListRebuiltNotification" + $ref: "../VNFFaultManagement/definitions/SOL003VNFFaultManagement_def.yaml#/definitions/AlarmListRebuiltNotification" required: true responses: diff --git a/src/definitions/SOL002SOL003VNFFaultManagement_def.yaml b/src/definitions/SOL002SOL003VNFFaultManagement_def.yaml deleted file mode 100644 index 88dcbf32..00000000 --- a/src/definitions/SOL002SOL003VNFFaultManagement_def.yaml +++ /dev/null @@ -1,354 +0,0 @@ -# Copyright (c) ETSI 2017. -# https://forge.etsi.org/etsi-forge-copyright-notice.txt - -definitions: - FmSubscriptionRequest: - description: > - This type represents a subscription request related to notifications - about VNF faults. - type: object - required: - - callbackUri - properties: - filter: - description: > - Filter settings for this subscription, to define the subset of all - notifications this subscription relates to. A particular - notification is sent to the subscriber if the filter matches, or if - there is no filter. - $ref: "#/definitions/FmNotificationsFilter" - callbackUri: - description: > - The URI of the endpoint to send the notification to. - $ref: "SOL002SOL003_def.yaml#/definitions/Uri" - authentication: - description: > - Authentication parameters to configure the use of Authorization when sending notifications - corresponding to this subscription, as defined in clause 8.3.4 of ETSI GS NFV-SOL 013. - This attribute shall only be present if the subscriber requires authorization of notifications. - $ref: "SOL002SOL003_def.yaml#/definitions/SubscriptionAuthentication" - - FmSubscription: - description: > - This type represents a subscription related to notifications about VNF - faults. - type: object - required: - - id - - callbackUri - - _links - properties: - id: - description: > - Identifier of this "Individual subscription" resource. - $ref: "SOL002SOL003_def.yaml#/definitions/Identifier" - filter: - description: > - Filter settings for this subscription, to define the subset of all - notifications this subscription relates to. A particular - notification is sent to the subscriber if the filter matches, or if - there is no filter. - $ref: "#/definitions/FmNotificationsFilter" - callbackUri: - description: > - The URI of the endpoint to send the notification to. - $ref: "SOL002SOL003_def.yaml#/definitions/Uri" - _links: - description: > - Links for this resource. - type: object - required: - - self - properties: - self: - description: > - URI of this resource. - $ref: "SOL002SOL003_def.yaml#/definitions/Link" - - AlarmClearedNotification: - description: > - This type represents an alarm cleared notification about VNF faults. - The notification shall be triggered by the VNFM when an alarm has been - cleared. - type: object - required: - - id - - notificationType - - subscriptionId - - timeStamp - - alarmId - - alarmClearedTime - - _links - properties: - id: - description: > - Identifier of this notification. If a notification is sent multiple - times due to multiple subscriptions, the "id" attribute of all these - notifications shall have the same value. - $ref: "SOL002SOL003_def.yaml#/definitions/Identifier" - notificationType: - description: > - Discriminator for the different notification types. Shall be set to - "AlarmClearedNotification" for this notification type. - type: string - enum: - - AlarmClearedNotification - subscriptionId: - description: > - Identifier of the subscription that this notification relates to. - $ref: "SOL002SOL003_def.yaml#/definitions/Identifier" - timeStamp: - description: > - Date-time of the generation of the notification. - $ref: "SOL002SOL003_def.yaml#/definitions/DateTime" - alarmId: - description: > - Alarm identifier. - $ref: "SOL002SOL003_def.yaml#/definitions/Identifier" - alarmClearedTime: - description: > - The time stamp indicating when the alarm was cleared. - $ref: "SOL002SOL003_def.yaml#/definitions/DateTime" - _links: - description: > - Links to resources related to this notification. - type: object - required: - - subscription - - alarm - properties: - subscription: - description: > - Link to the related subscription. - $ref: "SOL002SOL003_def.yaml#/definitions/NotificationLink" - alarm: - description: > - Link to the resource that represents the related alarm. - $ref: "SOL002SOL003_def.yaml#/definitions/NotificationLink" - - AlarmListRebuiltNotification: - description: > - This type represents a notification that the alarm list has been - rebuilt, e.g. if the VNFM detects its storage holding the alarm - list is corrupted. - The notification shall be triggered by the VNFM when the alarm list has - been rebuilt, e.g. because the VNFM has detected that its storage - holding the alarm list was corrupted. - type: object - required: - - id - - notificationType - - subscriptionId - - timeStamp - - _links - properties: - id: - description: > - Identifier of this notification. If a notification is sent multiple - times due to multiple subscriptions, the "id" attribute of all these - notifications shall have the same value. - $ref: "SOL002SOL003_def.yaml#/definitions/Identifier" - notificationType: - description: > - Discriminator for the different notification types. Shall be set to - "AlarmListRebuiltNotification" for this notification type. - type: string - enum: - - AlarmListRebuiltNotification - subscriptionId: - description: > - Identifier of the subscription that this notification relates to. - $ref: "SOL002SOL003_def.yaml#/definitions/Identifier" - timeStamp: - description: > - Date-time of the generation of the notification. - $ref: "SOL002SOL003_def.yaml#/definitions/DateTime" - _links: - description: > - Links to resources related to this notification. - type: object - required: - - subscription - - alarms - properties: - subscription: - description: > - Link to the related subscription. - $ref: "SOL002SOL003_def.yaml#/definitions/NotificationLink" - alarms: - description: > - Link to the alarm list, i.e. the "Alarms" resource. - $ref: "SOL002SOL003_def.yaml#/definitions/NotificationLink" - - AlarmModifications: - description: > - This type represents attribute modifications for an "Individual alarm" - resource, i.e. modifications to a resource representation based on the - "Alarm" data type. The attributes of "Alarm" that can be modified - are included in the "AlarmModifications" data type. - type: object - required: - - ackState - properties: - ackState: - description: > - New value of the "ackState" attribute in "Alarm". - Permitted values: - * ACKNOWLEDGED - * UNACKNOWLEDGED - type: string - enum: - - ACKNOWLEDGED - - UNACKNOWLEDGED - - EventType: - description: > - The enumeration EventType represents those types of events that trigger - an alarm. - * COMMUNICATIONS_ALARM: An alarm of this type is associated with the - procedure and/or process required conveying information from one point - to another (ITU-T Recommendation X.733). - * PROCESSING_ERROR_ALARM: An alarm of this type is associated with a - software or processing fault (ITU-T Recommendation X.733). - * ENVIRONMENTAL_ALARM: An alarm of this type is associated with a - condition related to an enclosure in which the equipment resides - (ITU-T Recommendation X.733). - * QOS_ALARM: An alarm of this type is associated with degradation in the - quality of a service (ITU-T Recommendation X.733). - * EQUIPMENT_ALARM: An alarm of this type is associated with an equipment - fault (ITU-T Recommendation X.733). - type: string - enum: - - COMMUNICATIONS_ALARM - - PROCESSING_ERROR_ALARM - - ENVIRONMENTAL_ALARM - - QOS_ALARM - - EQUIPMENT_ALARM - - FaultyResourceInfo: - description: > - This type represents the faulty virtual resources that have a negative - impact on a VNF. - type: object - required: - - faultyResource - - faultyResourceType - properties: - faultyResource: - description: > - Information that identifies the faulty resource instance and its - managing entity. - $ref: "SOL002SOL003_def.yaml#/definitions/ResourceHandle" - faultyResourceType: - description: > - Type of the faulty resource. - $ref: "#/definitions/FaultyResourceType" - - FaultyResourceType: - description: > - The enumeration FaultyResourceType represents those types of faulty - resource. - type: string - enum: - - COMPUTE - - STORAGE - - NETWORK - - FmNotificationsFilter: - description: > - This type represents a subscription filter related to notifications about VNF faults. - It shall comply with the provisions defined in table 7.5.3.2-1. - At a particular nesting level in the filter structure, the following applies: All attributes - shall match in order for the filter to match (logical "and" between different filter attributes). - If an attribute is an array, the attribute shall match if at least one of the values in the array - matches (logical "or" between the values of one filter attribute). - - NOTE: The permitted values of the "notificationTypes" attribute are spelled exactly as the names - of the notification types to facilitate automated code generation systems. - type: object - properties: - vnfInstanceSubscriptionFilter: - description: > - Filter criteria to select VNF instances about which to notify. - $ref: "SOL002SOL003_def.yaml#/definitions/VnfInstanceSubscriptionFilter" - notificationTypes: - description: > - Match particular notification types. - - Permitted values: - - AlarmNotification - - AlarmClearedNotification - - AlarmListRebuiltNotification - See note. - type: array - items: - type: string - enum: - - AlarmNotification - - AlarmClearedNotification - - AlarmListRebuiltNotification - faultyResourceTypes: - description: > - Match VNF alarms with a faulty resource type listed in this - attribute. - type: array - items: - $ref: "SOL002SOL003VNFFaultManagement_def.yaml#/definitions/FaultyResourceType" - perceivedSeverities: - description: > - Match VNF alarms with a perceived severity listed in this attribute. - type: array - items: - $ref: "SOL002SOL003VNFFaultManagement_def.yaml#/definitions/PerceivedSeverityType" - eventTypes: - description: > - Match VNF alarms with an event type listed in this attribute. - type: array - items: - $ref: "SOL002SOL003VNFFaultManagement_def.yaml#/definitions/EventType" - probableCauses: - description: > - Match VNF alarms with a probable cause listed in this attribute. - type: array - items: - type: string - - PerceivedSeverityType: - description: > - Indicates the relative level of urgency for operator attention. - * CRITICAL: The Critical severity level indicates that a service - affecting condition has occurred and an immediate corrective action - is required. Such a severity can be reported, for example, when a - managed object becomes totally out of service and its capability needs - to be restored (ITU-T Recommendation X.733). - * MAJOR: The Major severity level indicates that a service affecting - condition has developed and an urgent corrective action is required. - Such a severity can be reported, for example, when there is a severe - degradation in the capability of the managed object and its full - capability needs to be restored (ITU-T Recommendation X.733). - * MINOR: The Minor severity level indicates the existence of a - non-service affecting fault condition and that corrective action - should be taken in order to prevent a more serious (for example, - service affecting) fault. Such a severity can be reported, for - example, when the detected alarm condition is not currently degrading - the capacity of the managed object (ITU-T Recommendation X.733). - * WARNING: The Warning severity level indicates the detection of a - potential or impending service affecting fault, before any significant - effects have been felt. Action should be taken to further diagnose (if - necessary) and correct the problem in order to prevent it from - becoming a more serious service affecting fault (ITU-T Recommendation - X.733). - * INDETERMINATE: The Indeterminate severity level indicates that the - severity level cannot be determined (ITU-T Recommendation X.733). - * CLEARED: The Cleared severity level indicates the clearing of one or - more previously reported alarms. This alarm clears all alarms for this - managed object that have the same Alarm type, Probable cause and - Specific problems (if given) (ITU-T Recommendation X.733). - type: string - enum: - - CRITICAL - - MAJOR - - MINOR - - WARNING - - INDETERMINATE - - CLEARED -- GitLab From e3c7795eea90ff3720110b350067716a35355a9c Mon Sep 17 00:00:00 2001 From: muhammadh Date: Thu, 30 Jun 2022 12:44:22 +0500 Subject: [PATCH 31/41] Remove and separate common SOL002 SOL003 VNF Performance Mgmt API definitions --- .../VNFPerformanceManagement.yaml | 26 +- .../SOL002VNFPerformanceManagement_def.yaml} | 104 ++- .../VNFPerformanceManagementNotification.yaml | 4 +- .../VNFPerformanceManagement.yaml | 22 +- .../SOL003VNFPerformanceManagement_def.yaml | 716 ++++++++++++++++++ .../VNFPerformanceManagementNotification.yaml | 4 +- 6 files changed, 794 insertions(+), 82 deletions(-) rename src/{definitions/SOL002SOL003VNFPerformanceManagement_def.yaml => SOL002/VNFPerformanceManagement/definitions/SOL002VNFPerformanceManagement_def.yaml} (86%) create mode 100644 src/SOL003/VNFPerformanceManagement/definitions/SOL003VNFPerformanceManagement_def.yaml diff --git a/src/SOL002/VNFPerformanceManagement/VNFPerformanceManagement.yaml b/src/SOL002/VNFPerformanceManagement/VNFPerformanceManagement.yaml index cb0abff2..658522bc 100644 --- a/src/SOL002/VNFPerformanceManagement/VNFPerformanceManagement.yaml +++ b/src/SOL002/VNFPerformanceManagement/VNFPerformanceManagement.yaml @@ -532,7 +532,7 @@ components: content: application/json: schema: - $ref: ../../definitions/SOL002SOL003VNFPerformanceManagement_def.yaml#/definitions/CreatePmJobRequest + $ref: definitions/SOL002VNFPerformanceManagement_def.yaml#/definitions/CreatePmJobRequest required: true PmJobModificationRequest: @@ -540,7 +540,7 @@ components: content: application/json: schema: - $ref: ../../definitions/SOL002SOL003VNFPerformanceManagement_def.yaml#/definitions/PmJobModifications + $ref: definitions/SOL002VNFPerformanceManagement_def.yaml#/definitions/PmJobModifications required: true ThresholdCreationRequest: @@ -549,7 +549,7 @@ components: content: application/json: schema: - $ref: ../../definitions/SOL002SOL003VNFPerformanceManagement_def.yaml#/definitions/CreateThresholdRequest + $ref: definitions/SOL002VNFPerformanceManagement_def.yaml#/definitions/CreateThresholdRequest required: true ThresholdModificationRequest: @@ -557,7 +557,7 @@ components: content: application/json: schema: - $ref: ../../definitions/SOL002SOL003VNFPerformanceManagement_def.yaml#/definitions/ThresholdModifications + $ref: definitions/SOL002VNFPerformanceManagement_def.yaml#/definitions/ThresholdModifications required: true responses: @@ -605,7 +605,7 @@ components: schema: type: array items: - $ref: ../../definitions/SOL002SOL003VNFPerformanceManagement_def.yaml#/definitions/PmJob + $ref: definitions/SOL002VNFPerformanceManagement_def.yaml#/definitions/PmJob PmJobs.Post.201: description: | @@ -644,7 +644,7 @@ components: content: application/json: schema: - $ref: ../../definitions/SOL002SOL003VNFPerformanceManagement_def.yaml#/definitions/PmJob + $ref: definitions/SOL002VNFPerformanceManagement_def.yaml#/definitions/PmJob IndividualPmJob.Get.200: description: | @@ -690,7 +690,7 @@ components: content: application/json: schema: - $ref: ../../definitions/SOL002SOL003VNFPerformanceManagement_def.yaml#/definitions/PmJob + $ref: definitions/SOL002VNFPerformanceManagement_def.yaml#/definitions/PmJob IndividualPmJob.Delete.204: description: | @@ -763,7 +763,7 @@ components: content: application/json: schema: - $ref: ../../definitions/SOL002SOL003VNFPerformanceManagement_def.yaml#/definitions/PmJobModifications + $ref: definitions/SOL002VNFPerformanceManagement_def.yaml#/definitions/PmJobModifications IndividualPmJobReport.Get.200: description: | @@ -794,7 +794,7 @@ components: content: application/json: schema: - $ref: ../../definitions/SOL002SOL003VNFPerformanceManagement_def.yaml#/definitions/PerformanceReport + $ref: definitions/SOL002VNFPerformanceManagement_def.yaml#/definitions/PerformanceReport Thresholds.Get.200: description: | @@ -839,7 +839,7 @@ components: schema: type: array items: - $ref: ../../definitions/SOL002SOL003VNFPerformanceManagement_def.yaml#/definitions/Threshold + $ref: definitions/SOL002VNFPerformanceManagement_def.yaml#/definitions/Threshold Thresholds.Post.201: description: | @@ -878,7 +878,7 @@ components: content: application/json: schema: - $ref: ../../definitions/SOL002SOL003VNFPerformanceManagement_def.yaml#/definitions/Threshold + $ref: definitions/SOL002VNFPerformanceManagement_def.yaml#/definitions/Threshold IndividualThreshold.Get.200: description: | @@ -924,7 +924,7 @@ components: content: application/json: schema: - $ref: ../../definitions/SOL002SOL003VNFPerformanceManagement_def.yaml#/definitions/Threshold + $ref: definitions/SOL002VNFPerformanceManagement_def.yaml#/definitions/Threshold IndividualThreshold.Delete.204: description: | @@ -991,4 +991,4 @@ components: content: application/json: schema: - $ref: ../../definitions/SOL002SOL003VNFPerformanceManagement_def.yaml#/definitions/ThresholdModifications \ No newline at end of file + $ref: definitions/SOL002VNFPerformanceManagement_def.yaml#/definitions/ThresholdModifications \ No newline at end of file diff --git a/src/definitions/SOL002SOL003VNFPerformanceManagement_def.yaml b/src/SOL002/VNFPerformanceManagement/definitions/SOL002VNFPerformanceManagement_def.yaml similarity index 86% rename from src/definitions/SOL002SOL003VNFPerformanceManagement_def.yaml rename to src/SOL002/VNFPerformanceManagement/definitions/SOL002VNFPerformanceManagement_def.yaml index 5a94574d..32ce5a5e 100644 --- a/src/definitions/SOL002SOL003VNFPerformanceManagement_def.yaml +++ b/src/SOL002/VNFPerformanceManagement/definitions/SOL002VNFPerformanceManagement_def.yaml @@ -1,7 +1,4 @@ -# Copyright (c) ETSI 2017. -# https://forge.etsi.org/etsi-forge-copyright-notice.txt - -definitions: +definitions: CreateThresholdRequest: description: > This type represents a request to create a threshold. @@ -21,7 +18,7 @@ definitions: objectInstanceId: description: > Identifier of the VNF instance associated with this threshold. - $ref: "SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" subObjectInstanceIds: description: > Identifiers of the sub-object instances of the measured @@ -34,7 +31,7 @@ definitions: the measured object instance. type: array items: - $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" criteria: description: > Criteria that define this threshold. @@ -42,7 +39,7 @@ definitions: callbackUri: description: > The URI of the endpoint to send the notification to. - $ref: "SOL002SOL003_def.yaml#/definitions/Uri" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Uri" authentication: description: > Authentication parameters to configure the use of Authorization @@ -50,7 +47,7 @@ definitions: as defined in clause 8.3.4 of ETSI GS NFV-SOL 013. This attribute shall only be present if the API consumer requires authorization of notifications. - $ref: "SOL002SOL003_def.yaml#/definitions/SubscriptionAuthentication" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/SubscriptionAuthentication" CreatePmJobRequest: description: > @@ -65,8 +62,7 @@ definitions: objectType: description: > Type of the measured object. - The applicable measured object type for a measurement - is defined in clause 7.2 of ETSI GS NFV-IFA 027. + The applicable measured object type for a measurement is defined in clause 7.2 of ETSI GS NFV-IFA 027. type: string objectInstanceIds: description: > @@ -74,7 +70,7 @@ definitions: which performance information is requested to be collected. type: array items: - $ref: "SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" subObjectInstanceIds: description: > Identifiers of the sub-object instances of the measured @@ -88,7 +84,7 @@ definitions: will be taken for all sub-object instances of the measured object instance. type: array items: - $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" criteria: description: > Criteria of the collection of performance information. @@ -96,7 +92,7 @@ definitions: callbackUri: description: > The URI of the endpoint to send the notification to. - $ref: "SOL002SOL003_def.yaml#/definitions/Uri" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Uri" authentication: description: > Authentication parameters to configure the use of Authorization @@ -104,7 +100,7 @@ definitions: in clause 8.3.4 of ETSI GS NFV-SOL 013. This attribute shall only be present if the API consumer requires authorization of notifications. - $ref: "SOL002SOL003_def.yaml#/definitions/SubscriptionAuthentication" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/SubscriptionAuthentication" CrossingDirectionType: type: string @@ -135,7 +131,7 @@ definitions: Identifier of this notification. If a notification is sent multiple times due to multiple subscriptions, the "id" attribute of all these notifications shall have the same value. - $ref: "SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" notificationType: description: > Discriminator for the different notification types. Shall be set to @@ -147,11 +143,11 @@ definitions: timeStamp: description: > Date and time of the generation of the notification. - $ref: "SOL002SOL003_def.yaml#/definitions/DateTime" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" pmJobId: description: > Identifier of the PM job for which performance information is available. - $ref: "SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" objectType: description: > Type of the measured object. @@ -161,7 +157,7 @@ definitions: objectInstanceId: description: > Identifier of the measured object instance. as per clause 6.2 of ETSI GS NFV-IFA 027. - $ref: "SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" subObjectInstanceIds: description: > Identifiers of the sub-object instances of the measured @@ -169,11 +165,11 @@ definitions: Shall be present if the related PM job has been set up to measure only a subset of all sub-object instances of the measured object instance and a sub-object is defined in clause - 6.2 of ETSI GS NFV-IFA 027 for the related measured object type. + 6.2 of ETSI GS NFV-IFA 027 for the related measured object type. Shall be absent otherwise. type: array items: - $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" _links: description: > Links to resources related to this notification. @@ -187,18 +183,18 @@ definitions: Link to the resource representing the measured object instance to which the notification applies. Shall be present if the measured object instance information is accessible as a resource. - $ref: "SOL002SOL003_def.yaml#/definitions/NotificationLink" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/NotificationLink" pmJob: description: > Link to the resource that represents the PM job for which performance information is available. - $ref: "SOL002SOL003_def.yaml#/definitions/NotificationLink" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/NotificationLink" performanceReport: description: > Link from which the available performance information of data type "PerformanceReport" can be obtained. This link should point to an "Individual performance report" resource. - $ref: "SOL002SOL003_def.yaml#/definitions/NotificationLink" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/NotificationLink" PerformanceReport: description: > @@ -240,13 +236,13 @@ definitions: objectInstanceId: description: > Identifier of the measured object instance for which the performance metric is reported - $ref: "SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" subObjectInstanceId: description: > Identifier of the sub-object instance of the measured object instance for which the performance metric is reported. Shall be present if this is required in clause 6.2 of ETSI GS NFV-IFA 027 for the related measured object type. See note. - $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" performanceMetric: description: > Name of the metric collected. This attribute shall contain the related "Measurement Name" @@ -265,7 +261,7 @@ definitions: timeStamp: description: > Time stamp indicating when the data has been collected. - $ref: "SOL002SOL003_def.yaml#/definitions/DateTime" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" value: description: > Value of the metric collected. @@ -277,7 +273,7 @@ definitions: Measurement context information related to the measured value. The set of applicable keys is defined per measurement in the related "Measurement Context" in clause 7.2 of ETSI GS NFV-IFA 027. - $ref: "SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" PmJob: description: > @@ -294,7 +290,7 @@ definitions: id: description: > Identifier of this PM job. - $ref: "SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" objectType: description: > Type of the measured object. @@ -307,7 +303,7 @@ definitions: is collected. type: array items: - $ref: "SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" subObjectInstanceIds: description: > Identifiers of the sub-object instances of the measured object @@ -321,7 +317,7 @@ definitions: be taken for all sub-object instances of the measured object instance. type: array items: - $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" criteria: description: > Criteria of the collection of performance information. @@ -329,7 +325,7 @@ definitions: callbackUri: description: > The URI of the endpoint to send the notification to. - $ref: "SOL002SOL003_def.yaml#/definitions/Uri" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Uri" reports: description: > Information about available reports collected by this PM job. @@ -346,11 +342,11 @@ definitions: readyTime: description: > The time when the report was made available. - $ref: "SOL002SOL003_def.yaml#/definitions/DateTime" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" expiryTime: description: > The time when the report will expire. - $ref: "SOL002SOL003_def.yaml#/definitions/DateTime" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" fileSize: description: > The size of the report file in bytes, if known. @@ -369,7 +365,7 @@ definitions: self: description: > URI of this resource. - $ref: "SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" objects: description: > Links to resources representing the measure @@ -379,7 +375,7 @@ definitions: accessible as a resource. type: array items: - $ref: "SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" PmJobModifications: description: > @@ -396,7 +392,7 @@ definitions: callbackUri: description: > New value of the "callbackUri" attribute. The value "null" is not permitted. See note. - $ref: "SOL002SOL003_def.yaml#/definitions/Uri" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Uri" authentication: description: > New value of the "authentication" attribute, or "null" to remove the attribute. If present @@ -404,7 +400,7 @@ definitions: Patch (see IETF RFC 7396). This attribute shall not be present in response bodies. See note. - $ref: "SOL002SOL003_def.yaml#/definitions/SubscriptionAuthentication" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/SubscriptionAuthentication" PmJobCriteria: description: > @@ -463,7 +459,7 @@ definitions: Identifies a time boundary after which the reporting will stop. The boundary shall allow a single reporting as well as periodic reporting up to the boundary. - $ref: "SOL002SOL003_def.yaml#/definitions/DateTime" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" Threshold: description: > @@ -480,7 +476,7 @@ definitions: id: description: > Identifier of this threshold resource. - $ref: "SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" objectType: description: > Type of the measured object. @@ -490,7 +486,7 @@ definitions: objectInstanceId: description: > Identifier of the VNF instance associated with the threshold. - $ref: "SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" subObjectInstanceIds: description: > Identifiers of the sub-object instances of the measured object @@ -503,7 +499,7 @@ definitions: measured object instance. type: array items: - $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" criteria: description: > Criteria that define this threshold. @@ -511,7 +507,7 @@ definitions: callbackUri: description: > The URI of the endpoint to send the notification to. - $ref: "SOL002SOL003_def.yaml#/definitions/Uri" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Uri" _links: description: > Links for this resource. @@ -522,13 +518,13 @@ definitions: self: description: > URI of this resource. - $ref: "SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" object: description: > Link to a resource representing the measured object instance for which performance information is collected. Shall be present if the measured object instance information is accessible as a resource. - $ref: "SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" ThresholdModifications: description: > @@ -545,14 +541,14 @@ definitions: callbackUri: description: > New value of the "callbackUri" attribute. The value "null" is not permitted. See note. - $ref: "SOL002SOL003_def.yaml#/definitions/Uri" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Uri" authentication: description: > New value of the "authentication" attribute, or "null" to remove the attribute. If present in a request body, these modifications shall be applied according to the rules of JSON Merge Patch (see IETF RFC 7396). This attribute shall not be present in response bodies. See note. - $ref: "SOL002SOL003_def.yaml#/definitions/SubscriptionAuthentication" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/SubscriptionAuthentication" ThresholdCriteria: description: > @@ -645,7 +641,7 @@ definitions: Identifier of this notification. If a notification is sent multiple times due to multiple subscriptions, the "id" attribute of all these notifications shall have the same value. - $ref: "SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" notificationType: description: > Discriminator for the different notification types. Shall be set to @@ -656,11 +652,11 @@ definitions: timeStamp: description: > Date and time of the generation of the notification. - $ref: "SOL002SOL003_def.yaml#/definitions/DateTime" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" thresholdId: description: > Identifier of the threshold which has been crossed. - $ref: "SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" crossingDirection: description: > An indication of whether the threshold was crossed in upward or @@ -674,14 +670,14 @@ definitions: objectInstanceId: description: > Identifier that identifies a VNF instance. - $ref: "SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" subObjectInstanceId: description: > Identifier of the sub-object of the measured object to which the measurement applies. Shall be present if this is required in clause 6.2 of ETSI GS NFV-IFA 027 for the related measured object type. See note. - $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" performanceMetric: description: > Performance metric associated with the threshold. @@ -699,7 +695,7 @@ definitions: Measurement context information related to the measured value. The set of applicable keys is defined per measurement in the related "Measurement Context" in clause 7.2 of ETSI GS NFV-IFA 027. - $ref: "SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" _links: description: > Links to resources related to this notification. @@ -712,9 +708,9 @@ definitions: Link to the resource representing the measured object instance to which the notified change applies. Shall be present if the measured object instance information is accessible as a resource. - $ref: "SOL002SOL003_def.yaml#/definitions/NotificationLink" + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/NotificationLink" threshold: description: > Link to the resource that represents the threshold that was crossed. - $ref: "SOL002SOL003_def.yaml#/definitions/NotificationLink" \ No newline at end of file + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/NotificationLink" \ No newline at end of file diff --git a/src/SOL002/VNFPerformanceManagementNotification/VNFPerformanceManagementNotification.yaml b/src/SOL002/VNFPerformanceManagementNotification/VNFPerformanceManagementNotification.yaml index 9b50eee1..cba62b39 100644 --- a/src/SOL002/VNFPerformanceManagementNotification/VNFPerformanceManagementNotification.yaml +++ b/src/SOL002/VNFPerformanceManagementNotification/VNFPerformanceManagementNotification.yaml @@ -139,7 +139,7 @@ components: content: application/json: schema: - $ref: ../../definitions/SOL002SOL003VNFPerformanceManagement_def.yaml#/definitions/PerformanceInformationAvailableNotification + $ref: "../VNFPerformanceManagement/definitions/SOL002VNFPerformanceManagement_def.yaml#/definitions/PerformanceInformationAvailableNotification" required: true ThresholdCrossedNotification: @@ -148,7 +148,7 @@ components: content: application/json: schema: - $ref: ../../definitions/SOL002SOL003VNFPerformanceManagement_def.yaml#/definitions/ThresholdCrossedNotification + $ref: "../VNFPerformanceManagement/definitions/SOL002VNFPerformanceManagement_def.yaml#/definitions/ThresholdCrossedNotification" required: true responses: diff --git a/src/SOL003/VNFPerformanceManagement/VNFPerformanceManagement.yaml b/src/SOL003/VNFPerformanceManagement/VNFPerformanceManagement.yaml index 432b983d..9d1f306a 100644 --- a/src/SOL003/VNFPerformanceManagement/VNFPerformanceManagement.yaml +++ b/src/SOL003/VNFPerformanceManagement/VNFPerformanceManagement.yaml @@ -502,7 +502,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003VNFPerformanceManagement_def.yaml#/definitions/CreatePmJobRequest" + $ref: "definitions/SOL003VNFPerformanceManagement_def.yaml#/definitions/CreatePmJobRequest" required: true CreateThresholdRequest: @@ -510,7 +510,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003VNFPerformanceManagement_def.yaml#/definitions/CreateThresholdRequest" + $ref: "definitions/SOL003VNFPerformanceManagement_def.yaml#/definitions/CreateThresholdRequest" required: true responses: @@ -548,7 +548,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003VNFPerformanceManagement_def.yaml#/definitions/PmJob" + $ref: "definitions/SOL003VNFPerformanceManagement_def.yaml#/definitions/PmJob" PmJobs.Post.422: description: | @@ -643,7 +643,7 @@ components: schema: type: array items: - $ref: "../../definitions/SOL002SOL003VNFPerformanceManagement_def.yaml#/definitions/PmJob" + $ref: "definitions/SOL003VNFPerformanceManagement_def.yaml#/definitions/PmJob" IndividualPmJob.Get.200: description: | @@ -677,7 +677,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003VNFPerformanceManagement_def.yaml#/definitions/PmJob" + $ref: "definitions/SOL003VNFPerformanceManagement_def.yaml#/definitions/PmJob" IndividualPmJob.Patch.200: description: | @@ -726,7 +726,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003VNFPerformanceManagement_def.yaml#/definitions/PmJobModifications" + $ref: "definitions/SOL003VNFPerformanceManagement_def.yaml#/definitions/PmJobModifications" IndividualPmJob.Patch.412: description: | @@ -862,7 +862,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003VNFPerformanceManagement_def.yaml#/definitions/PerformanceReport" + $ref: "definitions/SOL003VNFPerformanceManagement_def.yaml#/definitions/PerformanceReport" Thresholds.Post.201: description: | @@ -905,7 +905,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003VNFPerformanceManagement_def.yaml#/definitions/Threshold" + $ref: "definitions/SOL003VNFPerformanceManagement_def.yaml#/definitions/Threshold" Thresholds.Post.422: description: | @@ -1014,7 +1014,7 @@ components: schema: type: array items: - $ref: "../../definitions/SOL002SOL003VNFPerformanceManagement_def.yaml#/definitions/Threshold" + $ref: "definitions/SOL003VNFPerformanceManagement_def.yaml#/definitions/Threshold" IndividualThreshold.Get.200: description: | @@ -1063,7 +1063,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003VNFPerformanceManagement_def.yaml#/definitions/Threshold" + $ref: "definitions/SOL003VNFPerformanceManagement_def.yaml#/definitions/Threshold" IndividualThreshold.Patch.200: description: | @@ -1111,7 +1111,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003VNFPerformanceManagement_def.yaml#/definitions/ThresholdModifications" + $ref: "definitions/SOL003VNFPerformanceManagement_def.yaml#/definitions/ThresholdModifications" IndividualThreshold.Patch.412: description: | diff --git a/src/SOL003/VNFPerformanceManagement/definitions/SOL003VNFPerformanceManagement_def.yaml b/src/SOL003/VNFPerformanceManagement/definitions/SOL003VNFPerformanceManagement_def.yaml new file mode 100644 index 00000000..32ce5a5e --- /dev/null +++ b/src/SOL003/VNFPerformanceManagement/definitions/SOL003VNFPerformanceManagement_def.yaml @@ -0,0 +1,716 @@ +definitions: + CreateThresholdRequest: + description: > + This type represents a request to create a threshold. + type: object + required: + - objectType + - objectInstanceId + - criteria + - callbackUri + properties: + objectType: + description: > + Type of the measured object. + The applicable measured object type for a measurement + is defined in clause 7.2 of ETSI GS NFV-IFA 027. + type: string + objectInstanceId: + description: > + Identifier of the VNF instance associated with this threshold. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + subObjectInstanceIds: + description: > + Identifiers of the sub-object instances of the measured + object instance associated with this threshold. + May be present if a sub-object is defined in clause 6.2 + of ETSI GS NFV-IFA 027 for the related measured object type. + If this attribute is absent and a sub-object is defined in + clause 6.2 of ETSI GS NFV-IFA 027 for the measured object type, + measurements will be taken for all sub-object instances of + the measured object instance. + type: array + items: + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + criteria: + description: > + Criteria that define this threshold. + $ref: "#/definitions/ThresholdCriteria" + callbackUri: + description: > + The URI of the endpoint to send the notification to. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Uri" + authentication: + description: > + Authentication parameters to configure the use of Authorization + when sending notifications corresponding to this threshold, + as defined in clause 8.3.4 of ETSI GS NFV-SOL 013. + This attribute shall only be present if the API consumer requires + authorization of notifications. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/SubscriptionAuthentication" + + CreatePmJobRequest: + description: > + This type represents a request to create a PM job. + type: object + required: + - objectType + - objectInstanceIds + - criteria + - callbackUri + properties: + objectType: + description: > + Type of the measured object. + The applicable measured object type for a measurement is defined in clause 7.2 of ETSI GS NFV-IFA 027. + type: string + objectInstanceIds: + description: > + Identifiers of the measured object instances for + which performance information is requested to be collected. + type: array + items: + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + subObjectInstanceIds: + description: > + Identifiers of the sub-object instances of the measured + object instance for which performance information is requested to be collected. + May be present if a sub-object is defined in clause 6.2 + of ETSI GS NFV-IFA 027for the related measured object type. + If this attribute is present, the cardinality of the "objectInstanceIds" + attribute shall be 1. + If this attribute is absent and a sub-object is defined in clause 6.2 + of ETSI GS NFV IFA 027 for the related measured object type, measurements + will be taken for all sub-object instances of the measured object instance. + type: array + items: + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + criteria: + description: > + Criteria of the collection of performance information. + $ref: "#/definitions/PmJobCriteria" + callbackUri: + description: > + The URI of the endpoint to send the notification to. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Uri" + authentication: + description: > + Authentication parameters to configure the use of Authorization + when sending notifications corresponding to this PM job, as defined + in clause 8.3.4 of ETSI GS NFV-SOL 013. + This attribute shall only be present if the API consumer + requires authorization of notifications. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/SubscriptionAuthentication" + + CrossingDirectionType: + type: string + enum: + - UP + - DOWN + + PerformanceInformationAvailableNotification: + description: > + This notification informs the receiver that performance information is + available. + The notification shall be triggered by the VNFM when new performance + information collected by a PM job is available. + The periodicity of triggering this notification is influenced by the + "reportingPeriod" attribute in the "PmJobCriteria" data structure. + type: object + required: + - id + - notificationType + - timeStamp + - pmJobId + - objectType + - objectInstanceId + - _links + properties: + id: + description: > + Identifier of this notification. If a notification is sent multiple + times due to multiple subscriptions, the "id" attribute of all these + notifications shall have the same value. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + notificationType: + description: > + Discriminator for the different notification types. Shall be set to + "PerformanceInformationAvailableNotification" for this notification + type. + type: string + enum: + - PerformanceInformationAvailableNotification + timeStamp: + description: > + Date and time of the generation of the notification. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" + pmJobId: + description: > + Identifier of the PM job for which performance information is available. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + objectType: + description: > + Type of the measured object. + The applicable measured object type for a measurement + is defined in clause 7.2 of ETSI GS NFV-IFA 027. + type: string + objectInstanceId: + description: > + Identifier of the measured object instance. as per clause 6.2 of ETSI GS NFV-IFA 027. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + subObjectInstanceIds: + description: > + Identifiers of the sub-object instances of the measured + object instance for which the measurements have been taken. + Shall be present if the related PM job has been set up to + measure only a subset of all sub-object instances of the + measured object instance and a sub-object is defined in clause + 6.2 of ETSI GS NFV-IFA 027 for the related measured object type. + Shall be absent otherwise. + type: array + items: + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + _links: + description: > + Links to resources related to this notification. + type: object + required: + - pmJob + - performanceReport + properties: + objectInstance: + description: > + Link to the resource representing the measured object instance to which the + notification applies. Shall be present if the measured object instance + information is accessible as a resource. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/NotificationLink" + pmJob: + description: > + Link to the resource that represents the PM job for which + performance information is available. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/NotificationLink" + performanceReport: + description: > + Link from which the available performance information of data + type "PerformanceReport" can be obtained. This link should point + to an "Individual performance report" resource. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/NotificationLink" + + PerformanceReport: + description: > + This type defines the format of a performance report provided by the VNFM to the NFVO as a result of collecting + performance information as part of a PM job. The type shall comply with the provisions defined in table 6.5.2.10-1. + + NOTE: The sub-object allows to structure the measured object but is not to be confused with sub-counters which allow + to structure the measurement value. + + EXAMPLE: + Measured object: VnfInstanceXYZ + Sub-object: VnfcInstance1 + Measurement: vCPU_utilization + Sub-counters: vCPU utilization of each of the vCPUs of VnfcInstance1 (vCPU utilization.vCPU1, vCPU_utilization.vCPU2, etc.). + type: object + required: + - entries + properties: + entries: + description: > + List of performance information entries. Each performance report + entry is for a given metric of a given object (i.e. VNF instance), + but can include multiple collected values. + type: array + items: + type: object + required: + - objectType + - objectInstanceId + - performanceMetric + - performanceValue + properties: + objectType: + description: > + Type of the measured object. + The applicable measured object type for a measurement is defined + in clause 7.2 of ETSI GS NFV-IFA 027. + type: string + objectInstanceId: + description: > + Identifier of the measured object instance for which the performance metric is reported + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + subObjectInstanceId: + description: > + Identifier of the sub-object instance of the measured object instance for which the performance + metric is reported. Shall be present if this is required in clause 6.2 of ETSI GS NFV-IFA 027 + for the related measured object type. See note. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + performanceMetric: + description: > + Name of the metric collected. This attribute shall contain the related "Measurement Name" + value as defined in clause 7.2 of ETSI GS NFV-IFA 027. + type: string + performanceValues: + description: > + List of performance values with associated timestamp. + type: array + items: + type: object + required: + - timeStamp + - value + properties: + timeStamp: + description: > + Time stamp indicating when the data has been collected. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" + value: + description: > + Value of the metric collected. + The type of this attribute shall correspond to the related "Measurement Unit" + as defined in clause 7.2. of ETSI GS NFV-IFA 027. + type: object + context: + description: > + Measurement context information related to the measured value. + The set of applicable keys is defined per measurement in the + related "Measurement Context" in clause 7.2 of ETSI GS NFV-IFA 027. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + + PmJob: + description: > + This type represents a PM job. + type: object + required: + - id + - objectType + - objectInstanceIds + - criteria + - callbackUri + - _links + properties: + id: + description: > + Identifier of this PM job. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + objectType: + description: > + Type of the measured object. + The applicable measured object type for a measurement + is defined in clause 7.2 of ETSI GS NFV-IFA 027. + type: string + objectInstanceIds: + description: > + Identifiers of the VNF instances for which performance information + is collected. + type: array + items: + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + subObjectInstanceIds: + description: > + Identifiers of the sub-object instances of the measured object + instance for which performance information is requested to be collected. + May be present if a sub-object is defined in clause 6.2 of + ETSI GS NFV-IFA 027 for the related measured object type. + If this attribute is present, the cardinality of the "objectInstanceIds" + attribute shall be 1. + If this attribute is absent and a sub-object is defined in clause 6.2 of + ETSI GS NFV IFA 027 for the related measured object type, measurements will + be taken for all sub-object instances of the measured object instance. + type: array + items: + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + criteria: + description: > + Criteria of the collection of performance information. + $ref: "#/definitions/PmJobCriteria" + callbackUri: + description: > + The URI of the endpoint to send the notification to. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Uri" + reports: + description: > + Information about available reports collected by this PM job. + type: object + required: + - href + - readyTime + properties: + href: + description: > + The URI where the report can be obtained. + type: string + format: url + readyTime: + description: > + The time when the report was made available. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" + expiryTime: + description: > + The time when the report will expire. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" + fileSize: + description: > + The size of the report file in bytes, if known. + type: integer + minimum: 0 + maximum: 1024 + # TODO: How to express unsigned int? + # Done using min and max params to set a range for positive int. + _links: + description: > + Links for this resource. + type: object + required: + - self + properties: + self: + description: > + URI of this resource. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + objects: + description: > + Links to resources representing the measure + object instances for which performance + information is collected. Shall be present if the + measured object instance information is + accessible as a resource. + type: array + items: + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + + PmJobModifications: + description: > + This type represents modifications to a PM job. It shall comply with the provisions defined in table 6.5.2.12-1. + + NOTE: At least one of the attributes defined in this type shall be present in request bodies. + type: object + oneOf: + - required: + - callbackUri + - required: + - authentication + properties: + callbackUri: + description: > + New value of the "callbackUri" attribute. The value "null" is not permitted. See note. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Uri" + authentication: + description: > + New value of the "authentication" attribute, or "null" to remove the attribute. If present + in a request body, these modifications shall be applied according to the rules of JSON Merge + Patch (see IETF RFC 7396). + + This attribute shall not be present in response bodies. See note. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/SubscriptionAuthentication" + + PmJobCriteria: + description: > + This type represents collection criteria for PM jobs. It shall comply with the provisions defined in table 6.5.3.3-1. + + NOTE 1: At the end of each reportingPeriod, the API producer will inform the API consumer about availability of the + performance data collected for each completed collection period during this reportingPeriod. + The reportingPeriod should be equal to or a multiple of the collectionPeriod. In the latter case, the performance + data for the collection periods within one reporting period are reported together. + NOTE 2: In particular when choosing short collection and reporting periods, the number of PM jobs that can be supported + depends on the capability of the producing entity. + type: object + required: + - collectionPeriod + - reportingPeriod + properties: + performanceMetric: + description: > + This defines the types of performance metrics for the specified object instances. + Valid values are specified as "Measurement Name" values in clause 7.2 of ETSI GS NFV-IFA 027. + At least one of the two attributes (performance metric or group) shall be present. + type: array + items: + type: string + performanceMetricGroup: + description: > + Group of performance metrics. A metric group is a pre-defined list + of metrics, known to the API producer that it can decompose to + individual metrics. Valid values are specified as "Measurement Group" + values in clause 7.2 of ETSI GS NFV-IFA 027. + At least one of the two attributes (performance metric or group) + shall be present. + type: array + items: + type: string + collectionPeriod: + description: > + SSpecifies the periodicity at which the API producer will collect performance information. + The unit shall be seconds. See notes 1 and 2. + type: integer + minimum: 0 + maximum: 1024 + # TODO: How to express unsigned int? + # Done using min and max params to set a range for positive int. + reportingPeriod: + description: > + Specifies the periodicity at which the API producer will report to the API consumer + about performance information. The unit shall be seconds. See notes 1 and 2. + type: integer + minimum: 0 + maximum: 1024 + # TODO: How to express unsigned int? + # Done using min and max params to set a range for positive int. + reportingBoundary: + description: > + Identifies a time boundary after which the reporting will stop. + The boundary shall allow a single reporting as well as periodic + reporting up to the boundary. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" + + Threshold: + description: > + This type represents a threshold. + type: object + required: + - id + - objectType + - objectInstanceId + - criteria + - callbackUri + - _links + properties: + id: + description: > + Identifier of this threshold resource. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + objectType: + description: > + Type of the measured object. + The applicable measured object type for a measurement + is defined in clause 7.2 of ETSI GS NFV-IFA 027. + type: string + objectInstanceId: + description: > + Identifier of the VNF instance associated with the threshold. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + subObjectInstanceIds: + description: > + Identifiers of the sub-object instances of the measured object + instance associated with the threshold. + May be present if a sub-object is defined in clause 6.2 of + ETSI GS NFV-IFA 027 for the related measurement type. + If this attribute is absent and a sub-object is defined in clause 6.2 + of ETSI GS NFV-IFA 027 for the related measured object type, + measurements will be taken for all sub-object instances of the + measured object instance. + type: array + items: + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + criteria: + description: > + Criteria that define this threshold. + $ref: "#/definitions/ThresholdCriteria" + callbackUri: + description: > + The URI of the endpoint to send the notification to. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Uri" + _links: + description: > + Links for this resource. + type: object + required: + - self + properties: + self: + description: > + URI of this resource. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + object: + description: > + Link to a resource representing the measured object instance for which + performance information is collected. Shall be present if the + measured object instance information is accessible as a resource. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + + ThresholdModifications: + description: > + This type represents modifications to a threshold. It shall comply with the provisions defined in table 6.5.2.11-1. + + NOTE: At least one of the attributes defined in this type shall be present in request bodies. + type: object + oneOf: + - required: + - callbackUri + - required: + - authentication + properties: + callbackUri: + description: > + New value of the "callbackUri" attribute. The value "null" is not permitted. See note. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Uri" + authentication: + description: > + New value of the "authentication" attribute, or "null" to remove the attribute. If present + in a request body, these modifications shall be applied according to the rules of JSON Merge + Patch (see IETF RFC 7396). + This attribute shall not be present in response bodies. See note. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/SubscriptionAuthentication" + + ThresholdCriteria: + description: > + This type represents criteria that define a threshold. It shall comply with the provisions defined in table 6.5.3.4-1. + + NOTE 1: In the present document, simple thresholds are defined. The definition of additional threshold types is left for + future specification. + NOTE 2: The hysteresis is defined to prevent storms of threshold crossing notifications. When processing a request to create + a threshold, implementations should enforce a suitable minimum value for this attribute (e.g. override the value or + reject the request). + type: object + required: + - performanceMetric + - thresholdType + properties: + performanceMetric: + description: > + Defines the performance metric associated with the threshold. + Valid values are specified as "Measurement Name" values in clause 7.2 of ETSI GS NFV-IFA 027. + type: string + thresholdType: + description: > + Type of threshold. This attribute determines which other attributes are present in the data structure. + + Permitted values: + - SIMPLE: Single-valued static threshold. + See note 1. + type: string + enum: + - SIMPLE + simpleThresholdDetails: + description: > + Details of a simple threshold. Shall be present if + thresholdType="SIMPLE". + type: object + required: + - thresholdValue + - hysteresis + properties: + thresholdValue: + description: > + The threshold value. Shall be represented as a floating point + number. + # TODO: This should be floating. + # Done using Number type and floating formate + type: number + format: float + hysteresis: + description: > + The hysteresis of the threshold. + Shall be represented as a non-negative floating point number. + + A notification with crossing direction "UP" will be generated if the measured value reaches or exceeds + "thresholdValue" + "hysteresis". A notification with crossing direction "DOWN" will be generated if the + measured value reaches or undercuts "thresholdValue" - "hysteresis". See note 2. + # TODO: This should be floating. + # Done using Number type and floating format. + type: number + minimum: 0 + maximum: 1024 + format: float + + ThresholdCrossedNotification: + description: > + This type represents a notification that is sent when a threshold has been crossed. + It shall comply with the provisions defined in table 6.5.2.4-1. + + NOTE: The timing of sending this notification is determined by the capability of the + producing entity to evaluate the threshold crossing condition. + + The notification shall be triggered by the VNFM when a threshold has been crossed. + + NOTE: The sub-object allows to structure the measured object, but is not to be confused + with sub-counters which allow to structure the measurement. + type: object + required: + - id + - notificationType + - timeStamp + - thresholdId + - crossingDirection + - objectType + - objectInstanceId + - performanceMetric + - performanceValue + - _links + properties: + id: + description: > + Identifier of this notification. If a notification is sent multiple + times due to multiple subscriptions, the "id" attribute of all these + notifications shall have the same value. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + notificationType: + description: > + Discriminator for the different notification types. Shall be set to + "ThresholdCrossedNotification" for this notification type. + type: string + enum: + - ThresholdCrossedNotification + timeStamp: + description: > + Date and time of the generation of the notification. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" + thresholdId: + description: > + Identifier of the threshold which has been crossed. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + crossingDirection: + description: > + An indication of whether the threshold was crossed in upward or + downward direction. + $ref: "#/definitions/CrossingDirectionType" + objectType: + description: > + Type of the measured object. + The applicable measured object type for a measurement is defined in clause 7.2 of ETSI GS NFV-IFA 027. + type: string + objectInstanceId: + description: > + Identifier that identifies a VNF instance. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + subObjectInstanceId: + description: > + Identifier of the sub-object of the measured object to which the measurement applies. + Shall be present if this is required in clause 6.2 of ETSI GS NFV-IFA 027 for the related + measured object type. + See note. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + performanceMetric: + description: > + Performance metric associated with the threshold. + This attribute shall contain the related "Measurement Name" + value as defined in clause 7.2 of ETSI GS NFV-IFA 027. + type: string + performanceValue: + description: > + Value of the metric that resulted in threshold crossing. + The type of this attribute shall correspond to the related + "Measurement Unit" as defined in clause 7.2 of ETSI GS NFV-IFA 027. + type: object + context: + description: > + Measurement context information related to the measured value. + The set of applicable keys is defined per measurement in the + related "Measurement Context" in clause 7.2 of ETSI GS NFV-IFA 027. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + _links: + description: > + Links to resources related to this notification. + type: object + required: + - threshold + properties: + objectInstance: + description: > + Link to the resource representing the measured object instance to which the + notified change applies. Shall be present if the measured object instance + information is accessible as a resource. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/NotificationLink" + threshold: + description: > + Link to the resource that represents the threshold that was + crossed. + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/NotificationLink" \ No newline at end of file diff --git a/src/SOL003/VNFPerformanceManagementNotification/VNFPerformanceManagementNotification.yaml b/src/SOL003/VNFPerformanceManagementNotification/VNFPerformanceManagementNotification.yaml index 1f423b28..e98b9e6c 100644 --- a/src/SOL003/VNFPerformanceManagementNotification/VNFPerformanceManagementNotification.yaml +++ b/src/SOL003/VNFPerformanceManagementNotification/VNFPerformanceManagementNotification.yaml @@ -149,7 +149,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003VNFPerformanceManagement_def.yaml#/definitions/PerformanceInformationAvailableNotification" + $ref: "../VNFPerformanceManagement/definitions/SOL003VNFPerformanceManagement_def.yaml#/definitions/PerformanceInformationAvailableNotification" required: true ThresholdCrossedNotification: @@ -158,7 +158,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003VNFPerformanceManagement_def.yaml#/definitions/ThresholdCrossedNotification" + $ref: "../VNFPerformanceManagement/definitions/SOL003VNFPerformanceManagement_def.yaml#/definitions/ThresholdCrossedNotification" required: true responses: -- GitLab From 0de04f553b209236b0216c15049dcd6cc1f7e7bb Mon Sep 17 00:00:00 2001 From: muhammadh Date: Thu, 30 Jun 2022 13:15:30 +0500 Subject: [PATCH 32/41] separate common definitions file for both SOL002 and SOL003 --- .../General_Definitions/SOL002_def.yaml} | 0 .../SOL002VNFConfiguration_def.yaml | 40 +- .../VNFFaultManagement.yaml | 2 +- .../SOL002VNFFaultManagement_def.yaml | 70 +- .../definitions/SOL002VNFIndicator_def.yaml | 48 +- .../SOL002VNFIndicatorNotification_def.yaml | 28 +- .../VNFLifecycleCoordination.yaml | 8 +- .../SOL002VNFLifecycleCoordination_def.yaml | 36 +- .../VNFLifecycleManagement.yaml | 36 +- .../SOL002VNFLifecycleManagement_def.yaml | 540 ++++---- ...NFLifecycleManagementNotification_def.yaml | 14 +- .../SOL002VNFPerformanceManagement_def.yaml | 94 +- .../General_Definitions/SOL003_def.yaml | 1197 +++++++++++++++++ .../VNFFaultManagement.yaml | 4 +- .../SOL003VNFFaultManagement_def.yaml | 66 +- src/SOL003/VNFIndicator/VNFIndicator.yaml | 2 +- .../definitions/SOL003VNFIndicator_def.yaml | 48 +- .../VNFLifecycleManagement.yaml | 68 +- .../SOL003VNFLifecycleManagement_def.yaml | 626 ++++----- .../VNFLifecycleOperationGranting.yaml | 4 +- ...L003VNFLifecycleOperationGranting_def.yaml | 134 +- .../VNFPackageManagement.yaml | 22 +- .../SOL003VNFPackageManagement_def.yaml | 86 +- ...3VNFPackageManagementNotification_def.yaml | 28 +- .../VNFPerformanceManagement.yaml | 8 +- .../SOL003VNFPerformanceManagement_def.yaml | 94 +- .../VNFSnapshotPackageManagement.yaml | 4 +- ...OL003VNFSnapshotPackageManagement_def.yaml | 74 +- ...edResourcesQuotaAvailableNotification.yaml | 2 +- ...sourcesQuotaAvailableNotification_def.yaml | 16 +- src/endpoints/SOL002SOL003_endpoints.yaml | 2 +- src/responses/SOL002SOL003_resp.yaml | 34 +- 32 files changed, 2316 insertions(+), 1119 deletions(-) rename src/{definitions/SOL002SOL003_def.yaml => SOL002/General_Definitions/SOL002_def.yaml} (100%) create mode 100644 src/SOL003/General_Definitions/SOL003_def.yaml diff --git a/src/definitions/SOL002SOL003_def.yaml b/src/SOL002/General_Definitions/SOL002_def.yaml similarity index 100% rename from src/definitions/SOL002SOL003_def.yaml rename to src/SOL002/General_Definitions/SOL002_def.yaml diff --git a/src/SOL002/VNFConfiguration/definitions/SOL002VNFConfiguration_def.yaml b/src/SOL002/VNFConfiguration/definitions/SOL002VNFConfiguration_def.yaml index 8103bb3d..a873c3ff 100644 --- a/src/SOL002/VNFConfiguration/definitions/SOL002VNFConfiguration_def.yaml +++ b/src/SOL002/VNFConfiguration/definitions/SOL002VNFConfiguration_def.yaml @@ -30,20 +30,20 @@ definitions: Modifying an attribute that is an array of objects of type "VnfcConfigurationData". Assumptions: 1) "oldList" is the "VnfcConfigurationData" array to be modified and "newList" - is the "VnfcConfigurationData" array that contains the changes. + is the "VnfcConfigurationData" array that contains the changes. 2) "oldEntry" is an entry in "oldList" and "newEntry" is an entry in "newList". - 3) A "newEntry" has a "corresponding entry" if there exists an "oldEntry" that - has the same content of the "vnfcInstanceId" attribute as the "newEntry"; - a "newEntry" has no corresponding entry if no such "oldEntry" exists. - 4) In any array of "VnfcConfigurationData" structures, the content of "vnfcInstanceId" - is unique (i.e. there shall be no two entries with the same content of "vnfcInstanceId"). + 3) A "newEntry" has a "corresponding entry" if there exists an "oldEntry" that + has the same content of the "vnfcInstanceId" attribute as the "newEntry"; + a "newEntry" has no corresponding entry if no such "oldEntry" exists. + 4) In any array of "VnfcConfigurationData" structures, the content of "vnfcInstanceId" + is unique (i.e. there shall be no two entries with the same content of "vnfcInstanceId"). Provisions: - 1) For each "newEntry" in "newList" that has no corresponding entry in "oldList", - the "oldList" array shall be modified by adding that "newEntry". + 1) For each "newEntry" in "newList" that has no corresponding entry in "oldList", + the "oldList" array shall be modified by adding that "newEntry". - 2) For each "newEntry" in "newList" that has a corresponding "oldEntry" in "oldList", - the value of "oldEntry" shall be updated with the value of "newEntry" according to - the rules of JSON Merge PATCH (see IETF RFC 7396 ). + 2) For each "newEntry" in "newList" that has a corresponding "oldEntry" in "oldList", + the value of "oldEntry" shall be updated with the value of "newEntry" according to + the rules of JSON Merge PATCH (see IETF RFC 7396 ). type: array items: $ref: '#/definitions/VnfcConfigurationData' @@ -53,7 +53,7 @@ definitions: as "deleteIdList" as defined below this table. type: array items: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" VnfConfiguration: description: > @@ -90,7 +90,7 @@ definitions: description: > Additional configurable properties of the VNF instance declared in the VNFD as "VnfConfigurableProperties". see note. - $ref: '../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs' + $ref: '../../General_Definitions/SOL002_def.yaml#/definitions/KeyValuePairs' VnfcConfigurationData: description: > @@ -105,7 +105,7 @@ definitions: description: > Identifier of a VNFC instance to which this set of configuration data applies. The identifier references the "id" attribute in a "VnfcInfo" structure. - $ref: '../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf' + $ref: '../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnf' intCpConfig: description: > Configuration parameters for the internal CPs of the VNFC instance. @@ -116,12 +116,12 @@ definitions: description: > IP address of the DHCP server that the VNF instance can use to obtain IP addresses to be assigned to its external CPs. - $ref: '../../../definitions/SOL002SOL003_def.yaml#/definitions/IpAddress' + $ref: '../../General_Definitions/SOL002_def.yaml#/definitions/IpAddress' vnfcSpecificData: description: > Additional configurable properties of the VNFC instance declared in the VNFD as "VnfcConfigurableProperties". See note. - $ref: '../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs' + $ref: '../../General_Definitions/SOL002_def.yaml#/definitions/KeyValuePairs' CpConfiguration: description: > @@ -135,11 +135,11 @@ definitions: cpId: description: > Identifier of a CP instance within the namespace of a specific VNF instance or a VNFC instance. - $ref: '../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf' + $ref: '../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnf' cpdId: description: > Identifier of the CPD in the VNFD. - $ref: '../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd' + $ref: '../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnfd' addresses: description: > Network address and port assigned to the CP. @@ -172,11 +172,11 @@ definitions: macAddress: description: > Mac address. See NOTE 2. - $ref: '../../../definitions/SOL002SOL003_def.yaml#/definitions/MacAddress' + $ref: '../../General_Definitions/SOL002_def.yaml#/definitions/MacAddress' ipAddress: description: > IP address. See NOTE 2. - $ref: '../../../definitions/SOL002SOL003_def.yaml#/definitions/IpAddress' + $ref: '../../General_Definitions/SOL002_def.yaml#/definitions/IpAddress' useDynamicAddress: description: > Set to true if an address shall be assigned dynamically. Otherwise set to false. diff --git a/src/SOL002/VNFFaultManagement/VNFFaultManagement.yaml b/src/SOL002/VNFFaultManagement/VNFFaultManagement.yaml index e0903024..2c04b5ec 100644 --- a/src/SOL002/VNFFaultManagement/VNFFaultManagement.yaml +++ b/src/SOL002/VNFFaultManagement/VNFFaultManagement.yaml @@ -600,7 +600,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" IndividualAlarmEscalate.Post.204: description: | diff --git a/src/SOL002/VNFFaultManagement/definitions/SOL002VNFFaultManagement_def.yaml b/src/SOL002/VNFFaultManagement/definitions/SOL002VNFFaultManagement_def.yaml index 2803e73c..087c5e16 100644 --- a/src/SOL002/VNFFaultManagement/definitions/SOL002VNFFaultManagement_def.yaml +++ b/src/SOL002/VNFFaultManagement/definitions/SOL002VNFFaultManagement_def.yaml @@ -44,11 +44,11 @@ definitions: id: description: > Identifier of this Alarm information element. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" managedObjectId: description: > Identifier of the affected VNF instance. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" vnfcInstanceIds: description: > Identifiers of the affected VNFC instances. Each identifier references the @@ -56,7 +56,7 @@ definitions: at least one VNFC instance. type: array items: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnf" rootCauseFaultyResource: description: > The virtualised resources that are causing the VNF fault. Shall be present if the alarm affects @@ -66,23 +66,23 @@ definitions: description: > Time stamp indicating when the alarm is raised by the managed object. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/DateTime" alarmChangedTime: description: > Time stamp indicating when the alarm was last changed. It shall be present if the alarm has been updated. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/DateTime" alarmClearedTime: description: > Time stamp indicating when the alarm was cleared. It shall be present if the alarm has been cleared. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/DateTime" alarmAcknowledgedTime: description: > Time stamp indicating when the alarm was acknowledged. It shall be present if the alarm has been acknowledged. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/DateTime" ackState: description: > Acknowledgement state of the alarm. @@ -100,7 +100,7 @@ definitions: eventTime: description: > Time stamp indicating when the fault was observed. See note 2. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/DateTime" eventType: description: > Type of event. @@ -128,13 +128,13 @@ definitions: Attribute indicating if this fault is the root for other correlated alarms. If TRUE, then the alarms listed in the attribute CorrelatedAlarmId are caused by this fault. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Boolean" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Boolean" correlatedAlarmIds: description: > List of identifiers of other alarms correlated to this fault. type: array items: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" faultDetails: description: > Provides additional information about the fault. See notes 1 and 2. @@ -151,13 +151,13 @@ definitions: self: description: > URI of this resource. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Link" objectInstance: description: > Link to the resource representing the VNF instance to which the notified alarm is correlated. Shall be present if the VNF instance information is accessible as a resource. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Link" AlarmNotification: description: > @@ -180,7 +180,7 @@ definitions: Identifier of this notification. If a notification is sent multiple times due to multiple subscriptions, the "id" attribute of all these notifications shall have the same value. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" notificationType: description: > Discriminator for the different notification types. Shall be set to @@ -191,11 +191,11 @@ definitions: subscriptionId: description: > Identifier of the subscription that this notification relates to. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" timeStamp: description: > Date-time of the generation of the notification. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/DateTime" alarm: description: > Information about an alarm including AlarmId, affected VNF @@ -211,7 +211,7 @@ definitions: subscription: description: > Link to the related subscription. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/NotificationLink" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/NotificationLink" PerceivedSeverityRequest: description: > @@ -243,13 +243,13 @@ definitions: callbackUri: description: > The URI of the endpoint to send the notification to. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Uri" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Uri" authentication: description: > Authentication parameters to configure the use of Authorization when sending notifications corresponding to this subscription, as defined in clause 8.3.4 of ETSI GS NFV-SOL 013. This attribute shall only be present if the subscriber requires authorization of notifications. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/SubscriptionAuthentication" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/SubscriptionAuthentication" FmSubscription: description: > @@ -264,7 +264,7 @@ definitions: id: description: > Identifier of this "Individual subscription" resource. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" filter: description: > Filter settings for this subscription, to define the subset of all @@ -275,7 +275,7 @@ definitions: callbackUri: description: > The URI of the endpoint to send the notification to. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Uri" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Uri" _links: description: > Links for this resource. @@ -286,7 +286,7 @@ definitions: self: description: > URI of this resource. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Link" AlarmClearedNotification: description: > @@ -308,7 +308,7 @@ definitions: Identifier of this notification. If a notification is sent multiple times due to multiple subscriptions, the "id" attribute of all these notifications shall have the same value. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" notificationType: description: > Discriminator for the different notification types. Shall be set to @@ -319,19 +319,19 @@ definitions: subscriptionId: description: > Identifier of the subscription that this notification relates to. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" timeStamp: description: > Date-time of the generation of the notification. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/DateTime" alarmId: description: > Alarm identifier. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" alarmClearedTime: description: > The time stamp indicating when the alarm was cleared. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/DateTime" _links: description: > Links to resources related to this notification. @@ -343,11 +343,11 @@ definitions: subscription: description: > Link to the related subscription. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/NotificationLink" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/NotificationLink" alarm: description: > Link to the resource that represents the related alarm. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/NotificationLink" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/NotificationLink" AlarmListRebuiltNotification: description: > @@ -370,7 +370,7 @@ definitions: Identifier of this notification. If a notification is sent multiple times due to multiple subscriptions, the "id" attribute of all these notifications shall have the same value. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" notificationType: description: > Discriminator for the different notification types. Shall be set to @@ -381,11 +381,11 @@ definitions: subscriptionId: description: > Identifier of the subscription that this notification relates to. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" timeStamp: description: > Date-time of the generation of the notification. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/DateTime" _links: description: > Links to resources related to this notification. @@ -397,11 +397,11 @@ definitions: subscription: description: > Link to the related subscription. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/NotificationLink" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/NotificationLink" alarms: description: > Link to the alarm list, i.e. the "Alarms" resource. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/NotificationLink" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/NotificationLink" AlarmModifications: description: > @@ -461,7 +461,7 @@ definitions: description: > Information that identifies the faulty resource instance and its managing entity. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ResourceHandle" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/ResourceHandle" faultyResourceType: description: > Type of the faulty resource. @@ -493,7 +493,7 @@ definitions: vnfInstanceSubscriptionFilter: description: > Filter criteria to select VNF instances about which to notify. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/VnfInstanceSubscriptionFilter" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/VnfInstanceSubscriptionFilter" notificationTypes: description: > Match particular notification types. diff --git a/src/SOL002/VNFIndicator/definitions/SOL002VNFIndicator_def.yaml b/src/SOL002/VNFIndicator/definitions/SOL002VNFIndicator_def.yaml index 21cc352b..c59c4ce0 100644 --- a/src/SOL002/VNFIndicator/definitions/SOL002VNFIndicator_def.yaml +++ b/src/SOL002/VNFIndicator/definitions/SOL002VNFIndicator_def.yaml @@ -17,7 +17,7 @@ definitions: id: description: > Identifier of this VNF indicator. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnfd" name: description: > Human readable name of the indicator. Shall be present if defined in @@ -30,7 +30,7 @@ definitions: vnfInstanceId: description: > Identifier of the "Individual VNF instance" which provides the indicator value. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" _links: description: > Links for this resource. @@ -42,11 +42,11 @@ definitions: self: description: > URI of this resource. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Link" vnfInstance: description: > Link to the related "Individual VNF instance" resource. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Link" VnfIndicatorNotificationsFilter: description: > @@ -64,7 +64,7 @@ definitions: vnfInstanceSubscriptionFilter: description: > Filter criteria to select VNF instances about which to notify. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/VnfInstanceSubscriptionFilter" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/VnfInstanceSubscriptionFilter" notificationTypes: description: > Match particular notification types. @@ -82,7 +82,7 @@ definitions: Match particular VNF indicator identifiers. type: array items: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnfd" VnfIndicatorSubscription: description: > @@ -97,7 +97,7 @@ definitions: id: description: > Identifier of this "Individual subscription" resource. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" filter: description: > Filter settings for this subscription, to define the subset of all @@ -120,7 +120,7 @@ definitions: self: description: > URI of this resource. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Link" VnfIndicatorSubscriptionRequest: description: > @@ -140,7 +140,7 @@ definitions: callbackUri: description: > The URI of the endpoint to send the notification to. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Uri" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Uri" authentication: description: > Authentication parameters to configure the use of Authorization when @@ -148,7 +148,7 @@ definitions: in clause 8.3.4 of ETSI GS NFV-SOL 013. This attribute shall only be present if the subscriber requires authorization of notifications. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/SubscriptionAuthentication" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/SubscriptionAuthentication" VnfIndicatorValueChangeNotification: description: > @@ -172,7 +172,7 @@ definitions: Identifier of this notification. If a notification is sent multiple times due to multiple subscriptions, the "id" attribute of all these notifications shall have the same value. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" notificationType: description: > Discriminator for the different notification types. Shall be set to @@ -183,15 +183,15 @@ definitions: subscriptionId: description: > Identifier of the subscription that this notification relates to. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" timeStamp: description: > Date-time of the generation of the notification. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/DateTime" vnfIndicatorId: description: > Identifier of the VNF indicator whose value has changed. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnfd" name: description: > Human readable name of the VNF indicator. Shall be present if @@ -204,7 +204,7 @@ definitions: vnfInstanceId: description: > Identifier of the VNF instance which provides the indicator value. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" _links: description: > Links for this resource. @@ -217,11 +217,11 @@ definitions: description: > Link to the related "Individual VNF instance" resource. Shall be present if the VNF instance information is accessible as a resource. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/NotificationLink" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/NotificationLink" subscription: description: > Link to the related subscription. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/NotificationLink" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/NotificationLink" SupportedIndicatorsChangeNotification: description: > @@ -247,7 +247,7 @@ definitions: Identifier of this notification. If a notification is sent multiple times due to multiple subscriptions, the "id" attribute of all these notifications shall have the same value. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" notificationType: description: > Discriminator for the different notification types. Shall be set to @@ -258,15 +258,15 @@ definitions: subscriptionId: description: > Identifier of the subscription that this notification relates to. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" timeStamp: description: > Date-time of the generation of the notification. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/DateTime" vnfInstanceId: description: > Identifier of the VNF instance which provides the indicator value. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" supportedIndicators: description: > Set of VNF indicators supported by the VNF instance. @@ -279,7 +279,7 @@ definitions: vnfIndicatorId: description: > Identifier of the VNF indicator whose value has changed. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnfd" name: description: > Human readable name of the VNF indicator. Shall be present if defined in the VNFD. See note. @@ -295,8 +295,8 @@ definitions: description: > Link to the related "Individual VNF instance" resource. Shall be present if the VNF instance information is accessible as a resource. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/NotificationLink" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/NotificationLink" subscription: description: > Link to the related subscription. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/NotificationLink" \ No newline at end of file + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/NotificationLink" \ No newline at end of file diff --git a/src/SOL002/VNFIndicatorNotification/definitions/SOL002VNFIndicatorNotification_def.yaml b/src/SOL002/VNFIndicatorNotification/definitions/SOL002VNFIndicatorNotification_def.yaml index f0dc8fcc..373266c6 100644 --- a/src/SOL002/VNFIndicatorNotification/definitions/SOL002VNFIndicatorNotification_def.yaml +++ b/src/SOL002/VNFIndicatorNotification/definitions/SOL002VNFIndicatorNotification_def.yaml @@ -23,7 +23,7 @@ definitions: Identifier of this notification. If a notification is sent multiple times due to multiple subscriptions, the "id" attribute of all these notifications shall have the same value. - $ref: '../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier' + $ref: '../../General_Definitions/SOL002_def.yaml#/definitions/Identifier' notificationType: description: > Discriminator for the different notification types. @@ -32,15 +32,15 @@ definitions: subscriptionId: description: > Identifier of the subscription that this notification relates to. - $ref: '../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier' + $ref: '../../General_Definitions/SOL002_def.yaml#/definitions/Identifier' timeStamp: description: > Date-time of the generation of the notification. - $ref: '../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime' + $ref: '../../General_Definitions/SOL002_def.yaml#/definitions/DateTime' vnfIndicatorId: description: > Identifier of the VNF indicator whose value has changed. - $ref: '../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd' + $ref: '../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnfd' name: description: > Human readable name of the VNF indicator. Shall be present if defined in the VNFD. @@ -53,7 +53,7 @@ definitions: vnfInstanceId: description: > Identifier of the VNF instance which provides the indicator value. - $ref: '../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier' + $ref: '../../General_Definitions/SOL002_def.yaml#/definitions/Identifier' _links: description: > Links to resources related to this resource. @@ -66,11 +66,11 @@ definitions: vnfInstance: description: > Link to the related "Individual VNF instance" resource. - $ref: '../../../definitions/SOL002SOL003_def.yaml#/definitions/Link' + $ref: '../../General_Definitions/SOL002_def.yaml#/definitions/Link' subscription: description: > Link to the related subscription. - $ref: '../../../definitions/SOL002SOL003_def.yaml#/definitions/Link' + $ref: '../../General_Definitions/SOL002_def.yaml#/definitions/Link' SupportedIndicatorsChangeNotification: description: | @@ -91,7 +91,7 @@ definitions: Identifier of this notification. If a notification is sent multiple times due to multiple subscriptions, the "id" attribute of all these notifications shall have the same value. - $ref: '../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier' + $ref: '../../General_Definitions/SOL002_def.yaml#/definitions/Identifier' notificationType: description: | Discriminator for the different notification types. Shall be set to "SupportedIndicatorsChangeNotification" @@ -100,15 +100,15 @@ definitions: subscriptionId: description: | Identifier of the subscription that this notification relates to. - $ref: '../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier' + $ref: '../../General_Definitions/SOL002_def.yaml#/definitions/Identifier' timeStamp: description: | Date-time of the generation of the notification. - $ref: '../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime' + $ref: '../../General_Definitions/SOL002_def.yaml#/definitions/DateTime' vnfInstanceId: description: | Identifier of the VNF instance which provides the indicator value. - $ref: '../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier' + $ref: '../../General_Definitions/SOL002_def.yaml#/definitions/Identifier' supportedIndicators: description: | Set of VNF indicators supported by the VNF instance. @@ -121,7 +121,7 @@ definitions: vnfIndicatorId: description: | Identifier of the VNF indicator whose value has changed. - $ref: '../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf' + $ref: '../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnf' name: description: | Human readable name of the VNF indicator. Shall be present if defined in the VNFD. @@ -138,8 +138,8 @@ definitions: description: | Link to the related "Individual VNF instance" resource. Shall be present if the VNF instance information is accessible as a resource. - $ref: '../../../definitions/SOL002SOL003_def.yaml#/definitions/NotificationLink' + $ref: '../../General_Definitions/SOL002_def.yaml#/definitions/NotificationLink' subscription: description: | Link to the related subscription. - $ref: '../../../definitions/SOL002SOL003_def.yaml#/definitions/NotificationLink' \ No newline at end of file + $ref: '../../General_Definitions/SOL002_def.yaml#/definitions/NotificationLink' \ No newline at end of file diff --git a/src/SOL002/VNFLifecycleCoordination/VNFLifecycleCoordination.yaml b/src/SOL002/VNFLifecycleCoordination/VNFLifecycleCoordination.yaml index fa7a4476..ead6e13f 100644 --- a/src/SOL002/VNFLifecycleCoordination/VNFLifecycleCoordination.yaml +++ b/src/SOL002/VNFLifecycleCoordination/VNFLifecycleCoordination.yaml @@ -307,7 +307,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" Coordination.Post.409: description: > @@ -345,7 +345,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" Coordination.Post.503: description: > @@ -387,7 +387,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" LcmCoord.Get.200: description: | @@ -536,4 +536,4 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" diff --git a/src/SOL002/VNFLifecycleCoordination/definitions/SOL002VNFLifecycleCoordination_def.yaml b/src/SOL002/VNFLifecycleCoordination/definitions/SOL002VNFLifecycleCoordination_def.yaml index ce9dbbe9..1a2dc0b8 100644 --- a/src/SOL002/VNFLifecycleCoordination/definitions/SOL002VNFLifecycleCoordination_def.yaml +++ b/src/SOL002/VNFLifecycleCoordination/definitions/SOL002VNFLifecycleCoordination_def.yaml @@ -18,26 +18,26 @@ definitions: id: description: > Identifier of this coordination result. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" coordinationResult: description: > The result of executing the coordination action which also implies the action to be performed by the VNFM as the result of this coordination. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/LcmCoordResultType" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/LcmCoordResultType" vnfInstanceId: description: > Identifier of the VNF instance which this coordination request is related to. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" vnfLcmOpOccId: description: > The identifier of the VNF lifecycle management operation occurrence related to the coordination. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" lcmOperationType: description: > Indicates the type of the LCM operation with which coordination is requested. Shall be the same as the value of the "operation" attribute in the LcmOpOcc structure that is referenced by the "vnfLcmOpOccId". - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/LcmOperationForCoordType" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/LcmOperationForCoordType" coordinationActionName: description: > Indicates the actual LCM coordination action. @@ -47,7 +47,7 @@ definitions: description: > Additional parameters returned by the coordination action, e.g. on the reason for the indicated coordinationResult. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/KeyValuePairs" warnings: description: > Warning messages that were generated while the operation was executing. @@ -61,7 +61,7 @@ definitions: If provided, the error information should be represented in the "error" attribute of the related VnfLcmOpOcc data structure. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" _links: description: > Links to resources related to this resource. @@ -74,15 +74,15 @@ definitions: self: description: > URI of this resource - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Link" vnfLcmOpOcc: description: > Related lifecycle management operation occurrence. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Link" vnfInstance: description: > Related VNF instance. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Link" LcmCoordRequest: type: object @@ -96,26 +96,26 @@ definitions: vnfInstanceId: description: > Identifier of the VNF instance which this coordination request is related to. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" vnfLcmOpOccId: description: > The identifier of the VNF lifecycle management operation occurrence related to the coordination. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" lcmOperationType: description: > Indicates the type of the LCM operation with which coordination is requested. Shall be the same as the value of the "operation" attribute in the LcmOpOcc structure that is referenced by the "vnfLcmOpOccId". - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/LcmOperationForCoordType" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/LcmOperationForCoordType" coordinationActionName: description: > Indicates the LCM coordination action. The coordination actions that a VNF supports are declared in the VNFD. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnfd" inputParams: description: > Additional parameters passed as input to the coordination action. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/KeyValuePairs" _links: description: > Links to resources related to this request. @@ -127,11 +127,11 @@ definitions: vnfLcmOpOcc: description: > Related lifecycle management operation occurrence. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Link" vnfInstance: description: > Related VNF instance. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Link" inputParams: type: object @@ -141,4 +141,4 @@ definitions: vnfcInstanceIds: description: > Identifier of the VNF instance which this coordination request is related to. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" diff --git a/src/SOL002/VNFLifecycleManagement/VNFLifecycleManagement.yaml b/src/SOL002/VNFLifecycleManagement/VNFLifecycleManagement.yaml index f842ac7f..a6f44c6a 100644 --- a/src/SOL002/VNFLifecycleManagement/VNFLifecycleManagement.yaml +++ b/src/SOL002/VNFLifecycleManagement/VNFLifecycleManagement.yaml @@ -1673,7 +1673,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" IndividualVnfInstance.Patch.202: description: | @@ -1752,7 +1752,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" InstantiateVnfInstance.Post.202: description: | @@ -1832,7 +1832,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" ScaleVnfInstance.Post.202: description: | @@ -1913,7 +1913,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" ScaleVnfInstanceToLevel.Post.202: description: | @@ -1995,7 +1995,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" VnfInstanceChangeFlavour.Post.202: description: | @@ -2079,7 +2079,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" TerminateVnfInstance.Post.202: description: | @@ -2161,7 +2161,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" HealVnfInstance.Post.202: description: | @@ -2243,7 +2243,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" OperateVnfInstance.Post.202: description: | @@ -2325,7 +2325,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" VnfInstanceChangeExtConn.Post.202: description: | @@ -2406,7 +2406,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" VnfInstanceChangeVnfPkg.Post.202: description: | @@ -2486,7 +2486,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" VnfLcmOpOccs.Get.200: description: | @@ -2623,7 +2623,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" VnfLcmOpOccRollback.Post.202: description: | @@ -2687,7 +2687,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" VnfLcmOpOccFail.Post.200: description: | @@ -2760,7 +2760,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" VnfLcmOpOccCancel.Post.202: description: | @@ -2823,7 +2823,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" Subscriptions.Get.200: description: | @@ -3026,7 +3026,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" VnfInstanceRevertToSnapshot.Post.202: description: | @@ -3106,7 +3106,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" VnfSnapshots.Post.201: description: | @@ -3287,4 +3287,4 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" \ No newline at end of file + $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" \ No newline at end of file diff --git a/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml b/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml index 35d3a431..c5a73714 100644 --- a/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml +++ b/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml @@ -46,7 +46,7 @@ definitions: id: description: > Identifier of the VNF instance. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" vnfInstanceName: description: > Name of the VNF instance. @@ -60,7 +60,7 @@ definitions: vnfdId: description: > Identifier of the VNFD on which the VNF instance is based. See note 1. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" vnfProvider: description: > Provider of the VNF and the VNFD. The value is copied from the VNFD. @@ -72,11 +72,11 @@ definitions: vnfSoftwareVersion: description: > Software version of the VNF. The value is copied from the VNFD. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Version" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Version" vnfdVersion: description: > Identifies the version of the VNFD. The value is copied from the VNFD. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Version" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Version" vnfConfigurableProperties: description: > Additional VNF-specific attributes that provide the current values @@ -109,7 +109,7 @@ definitions: LCM operations, such as the InstantiateVnfRequest structure. Further, these configurable properties can be created, modified or deleted with the PATCH method. In addition, the provisions in clause 5.7 shall apply. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/KeyValuePairs" instantiationState: description: > The instantiation state of the VNF. @@ -131,7 +131,7 @@ definitions: flavourId: description: > Identifier of the VNF deployment flavour applied to this VNF instance. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnfd" vnfState: description: > The state of the VNF instance. @@ -144,14 +144,14 @@ definitions: See clause B.2 for an explanation of VNF scaling. type: array items: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ScaleInfo" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/ScaleInfo" maxScaleLevels: description: > Maximum allowed scale levels of the VNF, one entry per aspect. This attribute shall be present if the VNF supports scaling. type: array items: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ScaleInfo" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/ScaleInfo" extCpInfo: description: > Information about the external CPs exposed by the VNF instance. When trunking is enabled, the list of @@ -262,7 +262,7 @@ definitions: passed in the CreateVnfRequest structure (see clause 5.5.2.3). These attributes can be created, modified or removed with the PATCH method. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/KeyValuePairs" extensions: description: > Additional VNF specific attributes that affect the lifecycle management of this VNF instance. @@ -288,7 +288,7 @@ definitions: Further, these attributes can be created, modified or deleted with the PATCH method. In addition, the provisions in clause 5.7 shall apply. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/KeyValuePairs" _links: description: > Links to resources related to this resource. @@ -298,81 +298,81 @@ definitions: properties: self: description: URI of this resource. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Link" indicators: description: Indicators related to this VNF instance, if applicable. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Link" instantiate: description: > Link to the "Instantiate VNF task" resource, if the related operation is possible based on the current status of this VNF instance resource (i.e. VNF instance in NOT_INSTANTIATED state). - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Link" terminate: description: > Link to the "Terminate VNF task" resource, if the related operation is possible based on the current status of this VNF instance resource (i.e. VNF instance is in INSTANTIATED state). - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Link" scale: description: > Link to the "Scale VNF task" resource, if the related operation is supported for this VNF instance, and is possible based on the current status of this VNF instance resource (i.e. VNF instance is in INSTANTIATED state). - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Link" scaleToLevel: description: > Link to the "Scale VNF to Level task" resource, if the related operation is supported for this VNF instance, and is possible based on the current status of this VNF instance resource (i.e. VNF instance is in INSTANTIATED state). - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Link" changeFlavour: description: > Link to the "Change VNF flavour task" resource, if the related operation is supported for this VNF instance, and is possible based on the current status of this VNF instance resource (i.e. VNF instance is in INSTANTIATED state). - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Link" heal: description: > Link to the "Heal VNF task" resource, if the related operation is supported for this VNF instance, and is possible based on the current status of this VNF instance resource (i.e. VNF instance is in INSTANTIATED state). - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Link" operate: description: > Link to the "Operate VNF task" resource, if the related operation is supported for this VNF instance, and is possible based on the current status of this VNF instance resource (i.e. VNF instance is in INSTANTIATED state). - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Link" changeExtConn: description: > Link to the "Change external VNF connectivity task" resource, if the related operation is possible based on the current status of this VNF instance resource (i.e. VNF instance is in INSTANTIATED state). - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Link" createSnapshot: description: > Link to the "Create VNF snapshot task" resource, if the related operation is supported for this VNF instance and is possible based on the current status of this VNF instance resource (i.e., VNF instance is in INSTANTIATED state). - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Link" revertToSnapshot: description: > Link to the "Revert to VNF snapshot task" resource, if the related operation is supported for this VNF instance and is possible based on the current status of this VNF instance resource (i.e., VNF instance is in INSTANTIATED state). - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Link" changeCurrentVnfPkg: description: > Link to the "Change current VNF package task" resource, if the related operation is possible based on the current status of this VNF instance resource (i.e. VNF instance is in INSTANTIATED state). - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Link" InstantiateVnfRequest: description: > @@ -396,12 +396,12 @@ definitions: flavourId: description: > Identifier of the VNF deployment flavour to be instantiated. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnfd" instantiationLevelId: description: > Identifier of the instantiation level of the deployment flavour to be instantiated. See note 2. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnfd" targetScaleLevelInfo: description: > This attribute is applicable if VNF supports target scale level instantiation. @@ -410,7 +410,7 @@ definitions: and 3. type: array items: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ScaleInfo" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/ScaleInfo" extVirtualLinks: description: > Information about external VLs to connect the VNF to, including configuration information @@ -421,7 +421,7 @@ definitions: aspects, to the external VLs. type: array items: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ExtVirtualLinkData" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/ExtVirtualLinkData" extManagedVirtualLinks: description: > Information about external VLs to connect the VNF to. See note 1. @@ -438,19 +438,19 @@ definitions: Additional input parameters for the instantiation process, specific to the VNF being instantiated, as declared in the VNFD as part of "InstantiateVnfOpConfig" defined in ETSI GS NFV-IFA 011 [7]. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/KeyValuePairs" extensions: description: > If present, this attribute provides modifications to the default values, as obtained from the VNFD, of the "extensions" attribute in "VnfInstance", as defined in clause 5.5.2.2. Provisions for handling extensions during the operation are defined in clause 5.4.4.3.1. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/KeyValuePairs" vnfConfigurableProperties: description: > If present, this attribute provides modifications to the default values, as obtained from the VNFD, of the "vnfConfigurableProperties" attribute in "VnfInstance", as defined in clause 5.5.2.2. Provisions for handling configurable properties during the operation are defined in clause 5.4.4.3.1. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/KeyValuePairs" ChangeVnfFlavourRequest: description: > @@ -476,12 +476,12 @@ definitions: newFlavourId: description: > Identifier of the VNF deployment flavour to be instantiated. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnfd" instantiationLevelId: description: > Identifier of the instantiation level of the deployment flavour to be instantiated. See note 2. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnfd" targetScaleLevelInfo: description: > This attribute is applicable if VNF supports target scale level instantiation. @@ -490,7 +490,7 @@ definitions: and 3. type: array items: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ScaleInfo" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/ScaleInfo" extVirtualLinks: description: > Information about external VLs to connect the VNF to, including configuration information @@ -504,7 +504,7 @@ definitions: instance, fully scaled out in all scaling aspects, to the external VLs. type: array items: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ExtVirtualLinkData" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/ExtVirtualLinkData" extManagedVirtualLinks: description: > Information about external VLs to connect the VNF to. See note 1. @@ -516,19 +516,19 @@ definitions: Additional input parameters for the instantiation process, specific to the VNF being instantiated, as declared in the VNFD as part of "InstantiateVnfOpConfig" defined in ETSI GS NFV-IFA 011 [7]. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/KeyValuePairs" extensions: description: > If present, this attribute provides modifications to the values of the "extensions" attribute in "VnfInstance", as defined in clause 5.5.2.2. Provisions for handling extensions during the operation, are defined in clause 5.4.7.3.1. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/KeyValuePairs" vnfConfigurableProperties: description: > If present, this attribute provides modifications to the values of the “vnfConfigurableProperties” attribute in "VnfInstance", as defined in clause 5.5.2.2. Provisions for handling VNF configurable properties during the operation, are defined in clause 5.4.7.3.1. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/KeyValuePairs" TerminateVnfRequest: description: > @@ -568,7 +568,7 @@ definitions: Additional parameters passed by the EM as input to the termination process, specific to the VNF being terminated, as declared in the VNFD as part of "TerminateVnfOpConfig" defined in ETSI GS NFV-IFA 011 [7]. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/KeyValuePairs" HealVnfRequest: type: object @@ -580,7 +580,7 @@ definitions: whole VNF and not a specific VNFC instance. type: array items: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" cause: description: > Indicates the reason why a healing procedure is required. @@ -590,7 +590,7 @@ definitions: Additional parameters passed by the EM as input to the healing process, specific to the VNF being healed as declared in the VNFD as part of "HealVnfOpConfig" defined in ETSI GS NFV-IFA 011 [7]. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/KeyValuePairs" healScript: description: > Provides link to a script that should be executed as part @@ -617,7 +617,7 @@ definitions: Cardinality can be "0" to denote that the request applies to the whole VNF and not a specific VNFC instance. type: array items: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" changeStateTo: description: > The desired operational state (i.e. started or stopped) to change @@ -640,7 +640,7 @@ definitions: Additional parameters passed by the EM as input to the process, specific to the VNF of which the operation status is changed, as declared in the VNFD as part of "OperateVnfOpConfig" defined in ETSI GS NFV-IFA 011 [7]. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/KeyValuePairs" ChangeExtVnfConnectivityRequest: description: > @@ -663,13 +663,13 @@ definitions: external VLs. type: array items: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ExtVirtualLinkData" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/ExtVirtualLinkData" additionalParams: description: > Additional parameters passed by the EM as input to the process, specific to the VNF of which the external connectivity is changed, as declared in the VNFD as part of "ChangeExtVnfConnectivityOpConfig" defined in ETSI GS NFV-IFA 011 [7]. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/KeyValuePairs" ChangeCurrentVnfPkgRequest: description: > @@ -687,7 +687,7 @@ definitions: vnfdId: description: > Identifier of the VNFD which defines the destination VNF Package for the change. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" extVirtualLinks: description: > Information about external VLs to connect the VNF to, including configuration information for @@ -701,7 +701,7 @@ definitions: external VLs. type: array items: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ExtVirtualLinkData" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/ExtVirtualLinkData" extManagedVirtualLinks: description: > Information about internal VLs that are managed by other entities than the VNFM. See note. @@ -713,19 +713,19 @@ definitions: Additional parameters passed by the EM as input to the process, specific to the VNF of which the underlying VNF package is changed, as declared in the VNFD as part of "ChangeCurrentVnfPkgOpConfig" defined in ETSI GS NFV-IFA 011 [7]. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/KeyValuePairs" extensions: description: > If present, this attribute provides modifications to the values of the "extensions" attribute in "VnfInstance", as defined in clause 5.5.2.2. Provisions for handling extensions during the operation, and needed passed parameter values in case of conflicts, are defined in clause 5.4.11a.3.1. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/KeyValuePairs" vnfConfigurableProperties: description: > If present, this attribute provides modifications to the values of the “vnfConfigurableProperties” attribute in "VnfInstance", as defined in clause 5.5.2.2. Provisions for handling VNF configurable properties during the operation, and needed passed parameter values in case of conflicts, are defined in clause 5.4.11a.3.1. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/KeyValuePairs" VnfInfoModificationRequest: description: > @@ -746,25 +746,25 @@ definitions: vnfdId: description: > New value of the "vnfdId" attribute in "VnfInstance". The value "null" is not permitted. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" vnfConfigurableProperties: description: > Modifications of the "vnfConfigurableProperties" attribute in "VnfInstance". If present, these modifications shall be applied according to the rules of JSON Merge PATCH (see IETF RFC 7396 [15]). - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/KeyValuePairs" metadata: description: > Modifications of the "metadattametadata" attribute in "VnfInstance". If present, these modifications shall be applied according to the rules of JSON Merge PATCH (see IETF RFC 7396 [15]). - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/KeyValuePairs" extensions: description: > Modifications of the "extensions" attribute in "VnfInstance". If present, these modifications shall be applied according to the rules of JSON Merge PATCH (see IETF RFC 7396 [15]). - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/KeyValuePairs" vnfcInfoModifications: description: > Modifications of certain entries in the "vnfcInfo" attribute array in the @@ -799,22 +799,22 @@ definitions: vnfSnapshotInfoId: description: > Identifier of the individual VNF snapshot resource to which the VNF Snapshot is to be associated. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" vnfcInstanceId: description: > Identifier of the VNFC instance to be snapshotted. Each identifier references the "id" attribute in a "VnfcInfo" structure. If this attribute is provided, only a snapshot of the referred VNFC instance shall be created. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnf" additionalParams: description: > Additional input parameters for the snapshot creation process, specific for the VNF being “snapshotted”, as declared in the VNFD as part of "CreateSnapshotVnfOpConfig" defined in ETSI GS NFV-IFA 011 [7]. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/KeyValuePairs" userDefinedData: description: > User defined data for the VNF snapshot. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/KeyValuePairs" RevertToVnfSnapshotRequest: description: > @@ -824,22 +824,22 @@ definitions: vnfSnapshotInfoId: description: > Identifier of the “individual VNF snapshot” resource with the information of the VNF snapshot to be reverted to. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" vnfcInstanceId: description: > List of identifiers of the VNFC instance to be reverted. Each identifier references the "id" attribute in a "VnfcInfo" structure. Shall be present if the request is for reverting a specific VNFC instance. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" vnfcSnapshotInfoId: description: > Identifier of the VNFC snapshot information with the information of the VNFC snapshot to be reverted to. Shall only be present if the "vnfcInstanceId" is present. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" additionalParams: description: > Additional input parameters for the revert to VNF snapshot process, specific for the VNF being “reverted”, as declared in the VNFD as part of “RevertToSnapshotVnfOpConfig” defined in ETSI GS NFV-IFA 011 [7]. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/KeyValuePairs" CreateVnfSnapshotInfoRequest: description: | @@ -853,7 +853,7 @@ definitions: vnfSnapshotPkgId: description: | Identifier of the VNF snapshot package information held by the NFVO. See note. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" VnfSnapshotInfo: description: > @@ -865,12 +865,12 @@ definitions: id: description: > Identifier of the individual VNF snapshot resource. This identifier is allocated by the VNFM. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" vnfSnapshotPkgId: description: | Identifier of the VNF snapshot package information held by the EM. Shall be present when the “Individual VNF snapshot" resource is created from a VNF snapshot package extraction. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" vnfSnapshot: description: > Information about the VNF snapshot, content and/or references to its content. Shall be present when the @@ -887,13 +887,13 @@ definitions: self: description: > URI of this resource. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Link" takenFrom: description: > Link to the VNF instance from which this snapshot was taken. Shall be present when the "Individual VNF snapshot" resource is associated to a VNF snapshot created via the corresponding "Create VNF snapshot" task resource. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Link" VnfSnapshot: description: > @@ -910,24 +910,24 @@ definitions: id: description: > Identifier of the VNF Snapshot. This identifier is allocated by the VNFM. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" vnfInstanceId: description: > Identifier of the snapshotted VNF instance. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" creationStartedAt: description: > Timestamp indicating when the VNF snapshot creation has been started by the VNFM. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/DateTime" creationFinishedAt: description: > Timestamp indicating when the VNF snapshot has been completed by the VNFM. Shall be present once the VNF snapshot creation has been completed. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/DateTime" vnfdId: description: > Identifier of the VNFD in use at the time the snapshot of the VNF instance has been created. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" vnfInstance: description: > VNF Instance information of the snapshotted VNF instance. This is a copy of the individual VNF instance resource. @@ -941,7 +941,7 @@ definitions: userDefinedData: description: > User defined data for the VNF snapshot. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/KeyValuePairs" VnfcSnapshotInfo: description: > @@ -967,21 +967,21 @@ definitions: the VNFM and is unique within the scope of a VNF snapshot. The attribute also identifies the compute snapshot image associated to this VNFC snapshot within the context of a referred VNF snapshot. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" vnfcInstanceId: description: > Identifier of the snapshotted VNFC instance. The identifier references the "id" attribute in a "VnfcInfo" structure. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnf" creationStartedAt: description: > Timestamp indicating when the VNF snapshot creation has been started by the VNFM. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/DateTime" creationFinishedAt: description: > Timestamp indicating when the VNFC snapshot has been completed. Shall be present once the VNFC snapshot creation has been completed by the VNFM. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/DateTime" vnfcResourceInfoId: description: > Reference to the "VnfcResourceInfo" structure in the "VnfInstance" structure that represents the resources of @@ -991,7 +991,7 @@ definitions: computeSnapshotResource: description: > Reference to a compute snapshot resource. See note 1. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ResourceHandle" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/ResourceHandle" storageSnapshotResources: description: > Mapping of the storage resources associated to the VNFC with the storage snapshot resources. @@ -1004,15 +1004,15 @@ definitions: Reference to the "VirtualStorageResourceInfo" structure in the "VnfInstance" structure that represents the virtual storage resource. The attribute also identifies the storage snapshot image associated to this VNFC snapshot within the context of a referred VNF snapshot - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnf" storageSnapshotResource: description: > Reference to a storage snapshot resource. See note 2. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ResourceHandle" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/ResourceHandle" userDefinedData: description: > User defined data for the VNF snapshot. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/KeyValuePairs" StopType: description: > @@ -1042,29 +1042,29 @@ definitions: The identifier of the externally-managed internal VL instance. The identifier is assigned by the NFV-MANO entity that manages this VL instance. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" vnfVirtualLinkDescId: description: > The identifier of the VLD in the VNFD for this VL. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnfd" vimConnectionId: 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. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" resourceProviderId: description: > Identifies the entity responsible for the management of this resource. This attribute shall only be supported and present if VNF-related resource management in indirect mode is applicable. The identification scheme is outside the scope of the present document. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" resourceId: description: > The identifier of the resource in the scope of the VIM or the resource provider. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVim" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVim" ExtManagedVirtualLinkInfo: description: > @@ -1082,21 +1082,21 @@ definitions: externally-managed VL information instance. The identifier is assigned by the NFV-MANO entity that manages this VL instance. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" vnfVirtualLinkDescId: description: > Identifier of the VNF Virtual Link Descriptor (VLD) in the VNFD. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnf" vnfdId: description: > Identifier of the VNFD. Shall be present in case the value differs from the vnfdId attribute of the VnfInstance (e.g. during a "Change current VNF package" operation or due to its final failure). - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" networkResource: description: > Reference to the VirtualNetwork resource providing this VL. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ResourceHandle" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/ResourceHandle" vnfLinkPorts: description: > Link ports of this VL. @@ -1146,33 +1146,33 @@ definitions: id: description: > Identifier of this VnfcResourceInfo instance. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnf" vduId: description: > Reference to the applicable VDU in the VNFD. See note 1. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnfd" vnfdId: description: > Identifier of the VNFD. Shall be present in case the value differs from the vnfdId attribute of the VnfInstance (e.g. during a "Change current VNF package" operation or due to its final failure). See note 4. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" computeResource: description: > Reference to the VirtualCompute resource or reference to a Compute MCIO. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ResourceHandle" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/ResourceHandle" storageResourceIds: description: > References to the VirtualStorage resources or references to Storage MCIO(s). The value refers to a VirtualStorageResourceInfo item in the VnfInstance. type: array items: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnf" reservationId: description: > The reservation identifier applicable to the resource. It shall be present when an applicable reservation exists. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" vnfcCpInfo: description: > All the CPs of the VNFC instance. @@ -1187,16 +1187,16 @@ definitions: description: > Identifier of this VNFC CP instance and the associated array entry. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnf" cpdId: description: > Identifier of the VDU CPD, cpdId, in the VNFD. See note 1. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnfd" vnfExtCpId: description: > Identifier of the related external CP. Shall be present when the VNFC CP is exposed as an external CP of the VNF instance or connected to an external CP of the VNF instance (see note 2) and shall be absent otherwise. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnf" cpProtocolInfo: description: > Network protocol information for this CP. May be omitted if the VNFC CP is exposed as an external CP. @@ -1211,17 +1211,17 @@ definitions: or "ExtManagedVirtualLinkInfo" structure. Shall be present if the CP is associated to a link port on an internal VL (including externally-managed internal VL) of the VNF instance and shall be absent otherwise. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnf" parentCpId: description: > Identifier of another VNFC CP instance that corresponds to the parent port of a trunk that the present VNFC CP instance participates in. Shall be provided if the present CP instance participates in a trunk as subport. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnf" metadata: description: > Metadata about this CP. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/KeyValuePairs" netAttDefResourceId: description: > Identifier of the “NetAttDefResourceInfo” structure that provides the specification of the interface @@ -1230,11 +1230,11 @@ definitions: containers and is connected to a secondary container cluster network. It shall not be present otherwise. type: array items: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" metadata: description: > Metadata about this resource. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/KeyValuePairs" VnfVirtualLinkResourceInfo: description: > @@ -1254,26 +1254,26 @@ definitions: id: description: > Identifier of this VnfVirtualLinkResourceInfo instance. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnf" vnfVirtualLinkDescId: description: > Identifier of the VNF Virtual Link Descriptor (VLD) in the VNFD. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnfd" vnfdId: description: > Identifier of the VNFD. Shall be present in case the value differs from the vnfdId attribute of the VnfInstance (e.g. during a "Change current VNF package" operation or due to its final failure). See note. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" networkResource: description: > Reference to the VirtualNetwork resource or reference to a Network MCIO. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ResourceHandle" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/ResourceHandle" reservationId: description: > The reservation identifier applicable to the resource. It shall be present when an applicable reservation exists. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" vnfLinkPorts: description: > Links ports of this VL. @@ -1286,7 +1286,7 @@ definitions: metadata: description: > Metadata about this resource. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/KeyValuePairs" VirtualStorageResourceInfo: description: > @@ -1306,30 +1306,30 @@ definitions: id: description: > Identifier of this VirtualStorageResourceInfo instance. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnf" virtualStorageDescId: description: > Identifier of the VirtualStorageDesc in the VNFD. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnfd" vnfdId: description: > Identifier of the VNFD. Shall be present in case the value differs from the vnfdId attribute of the VnfInstance (e.g. during a "Change current VNF package" operation or due to its final failure). See note. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" storageResource: description: > Reference to the VirtualStorage resource or reference to a Storage MCIO. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ResourceHandle" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/ResourceHandle" reservationId: description: > The reservation identifier applicable to the resource. It shall be present when an applicable reservation exists. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" metadata: description: > Metadata about this resource. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/KeyValuePairs" AffectedVnfc: description: > @@ -1346,17 +1346,17 @@ definitions: description: > Identifier of the Vnfc instance, identifying the applicable "vnfcResourceInfo" entry in the "VnfInstance" data type. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnf" vduId: description: > Identifier of the related VDU in the VNFD. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnfd" vnfdId: description: > Identifier of the VNFD. Shall be present in case of a "change current VNF Package" to identify whether the affected VNFC instance is associated to a VDU which is referred from the source or destination VNFD. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" changeType: description: > Signals the type of change. Permitted values: @@ -1377,13 +1377,13 @@ definitions: Reference to the VirtualCompute resource. Detailed information is (for new and modified resources) or has been (for removed resources) available from the VIM. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ResourceHandle" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/ResourceHandle" metadata: description: > Metadata about this resource. The content of this attribute shall be a copy of the content of the "metadata" attribute of the VnfcResourceInfo structure. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/KeyValuePairs" affectedVnfcCpIds: description: > Identifiers of CP(s) of the VNFC instance that were affected by the @@ -1393,7 +1393,7 @@ definitions: May be present for further affected CPs of the VNFC instance. type: array items: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnf" addedStorageResourceIds: description: > References to VirtualStorage resources that have been added. Each @@ -1402,7 +1402,7 @@ definitions: least one storage resource was added to the VNFC. type: array items: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnf" removedStorageResourceIds: description: > References to VirtualStorage resources that have been removed. @@ -1413,7 +1413,7 @@ definitions: from the VNFC. type: array items: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnf" AffectedVirtualLink: description: > @@ -1435,17 +1435,17 @@ definitions: description: > Identifier of the virtual link instance, identifying the applicable "vnfVirtualLinkResourceInfo" or "extManagedVirtualLinkInfo" entry in the "VnfInstance" data type. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnf" vnfVirtualLinkDescId: description: > Identifier of the related VLD in the VNFD. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnfd" vnfdId: description: > Identifier of the VNFD. Shall be present in case of a "change current VNF Package" to identify whether the affected VL instance is associated to a VLD which is referred from the source or destination VNFD. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" changeType: description: > Signals the type of change. Permitted values: @@ -1474,7 +1474,7 @@ definitions: Reference to the VirtualNetwork resource. Detailed information is (for new and modified resources) or has been (for removed resources) available from the VIM. See note. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ResourceHandle" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/ResourceHandle" vnfLinkPortIds: description: > Identifiers of the link ports of the affected VL related to the change. Each identifier references a @@ -1487,14 +1487,14 @@ definitions: See note. type: array items: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnfd" metadata: description: > Metadata about this resource. The content of this attribute shall be a copy of the content of the "metadata" attribute of the applicable "VnfVirtualLinkResourceInfo" structure if such structure is referenced by the "id" attribute and it has metadata. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/KeyValuePairs" AffectedVirtualStorage: description: > @@ -1511,17 +1511,17 @@ definitions: description: > Identifier of the storage instance, identifying the applicable "virtualStorageResourceInfo" entry in the "VnfInstance" data type. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnf" virtualStorageDescId: description: > Identifier of the related VirtualStorage descriptor in the VNFD. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnfd" vnfdId: description: > Identifier of the VNFD. Shall be present in case of a "change current VNF Package" to identify whether the affected virtual storage instance is associated to a VirtualStorage descriptor which is referred from the source or destination VNFD. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" changeType: description: > Signals the type of change. Permitted values: @@ -1542,13 +1542,13 @@ definitions: Reference to the VirtualStorage resource. Detailed information is (for new and modified resources) or has been (for removed resources) available from the VIM. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ResourceHandle" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/ResourceHandle" metadata: description: > Metadata about this resource. The content of this attribute shall be a copy of the content of the "metadata" attribute of the VirtualStorageResourceInfo structure. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/KeyValuePairs" VnfLcmOpOcc: description: > @@ -1589,7 +1589,7 @@ definitions: id: description: > Identifier of this VNF lifecycle management operation occurrence. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" operationState: description: > The state of the LCM operation. @@ -1597,34 +1597,34 @@ definitions: stateEnteredTime: description: > Date-time when the current state has been entered. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/DateTime" startTime: description: > Date-time of the start of the operation. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/DateTime" vnfInstanceId: description: > Identifier of the VNF instance to which the operation applies - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" grantId: description: > Identifier of the grant related to this VNF LCM operation occurrence. Shall be set to the value of the "id" attribute in the "Grant" representing the associated "Individual Grant", if such grant exists. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" operation: description: > Type of the actual LCM operation represented by this VNF LCM operation occurrence. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/LcmOperationType" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/LcmOperationType" isAutomaticInvocation: description: > Set to true if this VNF LCM operation occurrence has been triggered by an automated procedure inside the VNFM (i.e. ScaleVnf / ScaleVnfToLevel triggered by auto-scale, or HealVnf triggered by auto-heal). Set to false otherwise. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Boolean" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Boolean" operationParams: description: > Input parameters of the LCM operation. This attribute shall be @@ -1649,7 +1649,7 @@ definitions: If the VNF LCM operation occurrence is in "STARTING", "PROCESSING" or "ROLLING_BACK" state and the operation is being cancelled, this attribute shall be set to true. Otherwise, it shall be set to false. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Boolean" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Boolean" cancelMode: description: > The mode of an ongoing cancellation. Shall be present when @@ -1662,7 +1662,7 @@ definitions: "operationState" was "FAILED_TEMP", this attribute shall be present and contain error information, unless it has been requested to be excluded via an attribute selector. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" resourceChanges: description: > This attribute contains information about the cumulative changes to @@ -1726,7 +1726,7 @@ definitions: description: > Identifier of the "individual VNF snapshot" resource. Shall be present if applicable to the type of LCM operation, i.e., if the value of the "operation" attribute is either "CREATE_SNAPSHOT" or "REVERT_TO_SNAPSHOT". - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" lcmCoordinations: description: > Information about LCM coordination actions (see clause 10) related to this LCM operation occurrence. @@ -1745,27 +1745,27 @@ definitions: this attribute refers to the {coordinationId} URI variable in the "Location" header of the "202 Accepted" HTTP response to the POST request that has initiated the coordination action (see clause 10.4.2.3.1). - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" coordinationActionName: description: > Indicator of the actual coordination action. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" coordinationResult: description: > The result of executing the coordination action which also implies the action to be performed by the VNFM as the result of this coordination. See note 4. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/LcmCoordResultType" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/LcmCoordResultType" startTime: description: > The time when the VNFM has received the confirmation that the coordination action has been started. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/DateTime" endTime: description: > 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. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/DateTime" endpointType: description: > The endpoint type used by this coordination action. @@ -1781,7 +1781,7 @@ definitions: 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" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/DateTime" rejectedLcmCoordinations: description: > Information about LCM coordination actions (see clause 10) that were rejected by 503 error which @@ -1796,11 +1796,11 @@ definitions: coordinationActionName: description: > Indicator of the actual coordination action. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_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" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/DateTime" endpointType: description: > The endpoint type used by this coordination action. @@ -1814,7 +1814,7 @@ definitions: delay: description: > The end of the delay period, as calculated from the startTime and "Retry-After" header. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/DateTime" warnings: description: > Warning messages that were generated while the operation was executing. @@ -1835,44 +1835,44 @@ definitions: self: description: > URI of this resource. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Link" vnfInstance: description: > Link to the VNF instance that the operation applies to. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Link" grant: description: > Link to the grant for this operation, if one exists. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Link" cancel: description: > Link to the task resource that represents the "cancel" operation for this VNF LCM operation occurrence, if cancelling is currently allowed. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Link" retry: description: > Link to the task resource that represents the "retry" operation for this VNF LCM operation occurrence, if retrying is currently allowed. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Link" rollback: description: > Link to the task resource that represents the "rollback" operation for this VNF LCM operation occurrence, if rolling back is currently allowed. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Link" fail: description: > Link to the task resource that represents the "fail" operation for this VNF LCM operation occurrence, if declaring as failed is currently allowed. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Link" vnfSnapshot: description: > Link to the VNF snapshot resource, if the VNF LCM operation occurrence is related to a VNF snapshot. Shall be present if operation="CREATE_SNAPSHOT" or operation="REVERT_TO_SNAPSHOT". - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Link" AffectedExtLinkPort: description: > @@ -1888,7 +1888,7 @@ definitions: description: > Identifier of the link port, identifying the applicable "extLinkPorts" entry in the "ExtVirtualLinkInfo" data type (see clause 5.5.3.2). - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" changeType: description: > Signals the type of change. @@ -1903,12 +1903,12 @@ definitions: extCpInstanceId: description: > Identifier of the related external CP instance. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnf" resourceHandle: description: > Reference to the link port resource. Detailed information is (for added resources) or has been (for removed resources) available from the VIM. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ResourceHandle" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/ResourceHandle" VnfInfoModifications: description: > @@ -1939,23 +1939,23 @@ definitions: If present, this attribute signals modifications of the "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" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/KeyValuePairs" metadata: description: > If present, this attribute signals modifications of the "metadata" attribute in "VnfInstance" , as defined in clause 5.5.2.12.. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/KeyValuePairs" extensions: description: > If present, this attribute signals modifications of the "extensions" 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" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/KeyValuePairs" vnfdId: description: > If present, this attribute signals modifications of the "vnfdId" attribute in "VnfInstance", as defined in clause 5.5.2.12.. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" vnfProvider: description: > If present, this attribute signals modifications of the @@ -1970,12 +1970,12 @@ definitions: description: > If present, this attribute signals modifications of the "vnfSoftwareVersion" attribute in "VnfInstance". See note. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Version" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Version" vnfdVersion: description: > If present, this attribute signals modifications of the "vnfdVersion" attribute in "VnfInstance". See note. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Version" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Version" vnfcInfoModifications: description: > If present, this attribute signals modifications of certain @@ -1995,7 +1995,7 @@ definitions: description: > Identifier that identifies the VNFD which defines the VNF instance to be created. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" vnfInstanceName: description: > Human-readable name of the VNF instance to be created. @@ -2009,7 +2009,7 @@ definitions: If present, this attribute provides additional initial values, overriding those obtained from the VNFD, for the "metadata" attribute in "VnfInstance", as defined in clause 5.5.2.2. Provisions for handling metadata during the operation are defined in clause 5.4.2.3.1. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/KeyValuePairs" ScaleVnfRequest: description: > @@ -2035,7 +2035,7 @@ definitions: aspectId: description: > Identifier of the scaling aspect. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnfd" numberOfSteps: description: > Number of scaling steps to be executed as part of this Scale VNF @@ -2048,7 +2048,7 @@ definitions: Additional parameters passed by the NFVO as input to the scaling process, specific to the VNF being scaled, as declared in the VNFD as part of "ScaleVnfOpConfig" defined in ETSI GS NFV-IFA 011 [7]. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/KeyValuePairs" ScaleVnfToLevelRequest: description: > @@ -2071,7 +2071,7 @@ definitions: Identifier of the target instantiation level of the current deployment flavour to which the VNF is requested to be scaled. See note. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnfd" scaleInfo: description: > For each scaling aspect of the current deployment flavour, indicates @@ -2079,13 +2079,13 @@ definitions: See note. type: array items: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ScaleInfo" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/ScaleInfo" additionalParams: description: > Additional parameters passed by the NFVO as input to the scaling process, specific to the VNF being scaled, as declared in the VNFD as part of "ScaleVnfToLevelOpConfig" defined in ETSI GS NFV-IFA 011 [7]. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/KeyValuePairs" CancelMode: description: > @@ -2118,7 +2118,7 @@ definitions: callbackUri: description: > The URI of the endpoint to send the notification to. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Uri" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Uri" authentication: description: > Authentication parameters to configure the use of Authorization when @@ -2126,7 +2126,7 @@ definitions: in clause 8.3.4 of ETSI GS NFV-SOL 013. This attribute shall only be present if the subscriber requires authorization of notifications. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/SubscriptionAuthentication" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/SubscriptionAuthentication" verbosity: description: > This attribute signals the requested verbosity of LCM operation occurrence notifications. If it is not present, @@ -2147,7 +2147,7 @@ definitions: id: description: > Identifier of this subscription resource. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" filter: description: > Filter settings for this subscription, to define the subset of all @@ -2158,7 +2158,7 @@ definitions: callbackUri: description: > The URI of the endpoint to send the notification to. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Uri" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Uri" verbosity: description: > This attribute signals the verbosity of LCM operation occurrence notifications. @@ -2173,7 +2173,7 @@ definitions: self: description: > URI of this resource. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Link" ExtVirtualLinkInfo: description: > @@ -2197,11 +2197,11 @@ definitions: information instance. The identifier is assigned by the NFV-MANO entity that manages this VL instance. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" resourceHandle: description: > Reference to the resource realizing this VL. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ResourceHandle" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/ResourceHandle" extLinkPorts: description: > Link ports of this VL. @@ -2214,7 +2214,7 @@ definitions: to the external virtual link. See note. type: array items: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/VnfExtCpData" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/VnfExtCpData" extNetAttDefResource: description: > Network attachment definition resources that provide the specification of the interface to attach connection points @@ -2245,12 +2245,12 @@ definitions: id: description: > Identifier of this link port as provided by the entity that has created the link port. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnf" resourceHandle: description: > Reference to the virtualised resource realizing this link port. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ResourceHandle" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/ResourceHandle" cpInstanceId: description: > When the link port is used for external connectivity by the VNF, this attribute represents the @@ -2265,7 +2265,7 @@ definitions: internal connection point (i.e. VNFC CP) instance. The value refers to an "extCpInfo" item in the VnfInstance or a "vnfcCpInfo" item of a "vnfcResourceInfo" item in the VnfInstance. See note 1. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnf" cpInstanceType: description: > Type of the CP instance that is identified by cpInstanceId. @@ -2283,13 +2283,13 @@ definitions: description: > VIP CP instance of the VNF connected to this link port. May be present. See notes 1, and 2. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnf" trunkResourceId: description: > Identifier of the trunk resource in the VIM. Shall be present if the present link port corresponds to the parent port that the trunk resource is associated with. See note 3. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVim" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVim" ExtLinkPortInfo: description: > @@ -2307,32 +2307,32 @@ definitions: description: > Identifier of this link port as provided by the entity that has created the link port. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" resourceHandle: description: > Reference to the virtualised resource realizing this link port. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ResourceHandle" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/ResourceHandle" cpInstanceId: description: > Identifier of the external CP of the VNF connected to this link port. There shall be at most one link port associated with any external connection point instance. The value refers to an "extCpInfo" item in the VnfInstance. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnf" secondaryCpInstanceId: description: > Additional external CP of the VNF connected to this link port. If present, this attribute shall refer to a "secondary" ExtCpInfo item in the VNF instance that exposes a virtual IP CP instance which shares this linkport with the external CP instance referenced by the "cpInstanceId" attribute. See note 1. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnf" trunkResourceId: description: > Identifier of the trunk resource in the VIM. Shall be present if the present link port corresponds to the parent port that the trunk resource is associated with. See note 2. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVim" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVim" CpProtocolInfo: description: > @@ -2400,7 +2400,7 @@ definitions: macAddress: description: > MAC address, if assigned. See note 1. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/MacAddress" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/MacAddress" segmentationId: description: > Identification of the network segment to which the Cp instance connects to. See notes 3 and 4. @@ -2428,7 +2428,7 @@ definitions: Fixed addresses assigned (from the subnet defined by "subnetId" if provided). See note 2. type: array items: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IpAddress" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IpAddress" isDynamic: description: > Indicates whether this set of addresses was assigned @@ -2447,18 +2447,18 @@ definitions: minAddress: description: > Lowest IP address belonging to the range. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IpAddress" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IpAddress" maxAddress: description: > Highest IP address belonging to the range - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IpAddress" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IpAddress" subnetId: description: > Subnet defined by the identifier of the subnet resource in the VIM. In case this attribute is present, IP addresses are bound to that subnet. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVim" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVim" MonitoringParameter: type: object @@ -2469,13 +2469,13 @@ definitions: id: description: > Identifier of the monitoring parameter defined in the VNFD. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnfd" vnfdId: description: > Identifier of the VNFD. Shall be present in case the value differs from the vnfdId attribute of the VnfInstance (e.g. during a "Change current VNF package" operation or due to its final failure). - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" name: description: > Human readable name of the monitoring parameter, as defined in the @@ -2503,7 +2503,7 @@ definitions: vnfInstanceSubscriptionFilter: description: > Filter criteria to select VNF instances about which to notify. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/VnfInstanceSubscriptionFilter" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/VnfInstanceSubscriptionFilter" notificationTypes: description: > Match particular notification types. @@ -2529,7 +2529,7 @@ definitions: otherwise. type: array items: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/LcmOperationType" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/LcmOperationType" operationStates: description: > Match particular LCM operation state values as reported in @@ -2554,17 +2554,17 @@ definitions: description: > Link to the resource representing the VNF instance to which the notified change applies. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/NotificationLink" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/NotificationLink" subscription: description: > Link to the related subscription. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/NotificationLink" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/NotificationLink" vnfLcmOpOcc: description: > Link to the VNF lifecycle management operation occurrence that this notification is related to. Shall be present if there is a related lifecycle operation occurrence. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/NotificationLink" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/NotificationLink" VnfExtCpInfo: description: > @@ -2596,22 +2596,22 @@ definitions: id: description: > Identifier of the external CP instance and the related information instance. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnf" cpdId: description: > Identifier of the external CPD, VnfExtCpd, in the VNFD. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnfd" cpConfigId: description: > Identifier that references the applied "VnfExtCpConfig" entry in the "cpConfig" map of the "currentVnfExtCpData" in the "ExtVirtualLinkInfo" structure. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnf" vnfdId: description: > Identifier of the VNFD. Shall be present in case the value differs from the vnfdId attribute of the VnfInstance (e.g. during a "Change current VNF package" operation or due to its final failure). - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" cpProtocolInfo: description: > Network protocol information for this CP. @@ -2622,35 +2622,35 @@ definitions: description: > Identifier of the "ExtLinkPortInfo" structure inside the "ExtVirtualLinkInfo" structure. Shall be present if the CP is associated to a link port. See note 2. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" metadata: description: > Metadata about this external CP. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/KeyValuePairs" associatedVnfcCpId: description: > Identifier of the "vnfcCpInfo" structure in "VnfcResourceInfo" structure that represents the VNFC CP which is exposed by this external CP instance, either directly or via a floating IP address. Shall be present in case this CP instance maps to a VNFC CP. See note 1. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnf" associatedVipCpId: description: > Identifier of the VIP CP instance that is exposed as this VnfExtCp instance, either directly or via a floating IP address, and the related "VipCpInfo" structure in "VnfInstance". Shall be present if the cpdId of this VnfExtCp has a vipCpd attribute. See note 1. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnf" associatedVirtualCpId: description: > Identifier of the "VirtualCpInfo" structure that represents the Virtual CP that is exposed by this external CP instance. Shall be present in case this CP instance maps to a Virtual CP. See note 1. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnfd" associatedVnfVirtualLinkId: description: > Identifier of the "VnfVirtualLinkResourceInfo" structure that represents the internal VL or of the "ExtManagedVirtualLinkInfo" structure that represents the externally-managed internal VL which is exposed by this external CP instance. Shall be present in case this CP instance maps to an internal VL (including externally-managed internal VL). See note 1. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnf" netAttDefResourceInfoId: description: > Identifier of the “NetAttDefResourceInfo” structure that provides the specification of the interface to attach the @@ -2659,7 +2659,7 @@ definitions: is connected to a secondary container cluster network. It shall not be present otherwise. type: array items: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" VnfOperationalStateType: description: > @@ -2739,7 +2739,7 @@ definitions: id: description: > Identifier of the VNF instance. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" notificationType: description: > Discriminator for the different notification types. Shall be set to @@ -2750,15 +2750,15 @@ definitions: subscriptionId: description: > Identifier of the subscription that this notification relates to. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" timeStamp: description: > Date-time of the generation of the notification. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/DateTime" vnfInstanceId: description: > The created VNF instance identifier. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" _links: description: > Links to resources related to this notification. @@ -2785,7 +2785,7 @@ definitions: Identifier of this notification. If a notification is sent multiple times due to multiple subscriptions, the "id" attribute of all these notifications shall have the same value. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" notificationType: description: > Discriminator for the different notification types. Shall be set to @@ -2796,15 +2796,15 @@ definitions: subscriptionId: description: > Identifier of the subscription that this notification relates to. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" timeStamp: description: > Date-time of the generation of the notification. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/DateTime" vnfInstanceId: description: > The deleted VNF instance identifier. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" _links: description: > Links to resources related to this notification. @@ -2825,14 +2825,14 @@ definitions: description: > Identifier of the VNFC instance of which the information is to be modified. The identifier references the "id" attribute in a "VnfcInfo" structure. See note. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnf" vnfcConfigurableProperties: description: > Changes of the configurable properties of the VNFC instance. When this structure is part of a request, the modifications signalled in this attribute shall be applied according to the rules of JSON Merge Patch (see IETF RFC 7396). In addition, the provisions in clause 5.7 shall apply. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/KeyValuePairs" VnfcInfo: description: > @@ -2847,17 +2847,17 @@ definitions: id: description: > Identifier of the VNFC instance. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnf" vduId: description: > Reference to the applicable VDU information element in the VNFD. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnf" vnfcResourceInfoId: description: > Identifier of the VnfcResourceInfo instance representing the virtualised resources used by this VNFC instance. See note. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnf" vnfcState: description: > Identifier of the VnfcResourceInfo instance representing @@ -2871,7 +2871,7 @@ definitions: enum: - STARTED - STOPPED - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnf" vnfcConfigurableProperties: description: > Current values of the configurable properties of the @@ -2880,7 +2880,7 @@ definitions: declared in the VNFD. This attribute can be modified with the PATCH method. In addition, the provisions in clause 5.7 shall apply. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/KeyValuePairs" ModificationsTriggeredByVnfPkgChange: description: > @@ -2903,22 +2903,22 @@ definitions: This attribute signals the modifications of the "vnfConfigurableProperties" attribute in "VnfInstance" performed by the operation and shall be present if that attribute was modified during the operation. See note 1. In addition, the provisions in clause 5.7 shall apply. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/KeyValuePairs" metadata: description: > This attribute signals the modifications of the "metadata" attribute in "VnfInstance" performed by the operation and shall be present if that attribute was modified during the operation. See note 1. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/KeyValuePairs" extensions: description: > This attribute signals the modifications of the "extensions" attribute in "VnfInstance" performed by the operation and shall be present if that attribute was modified during the operation. See note 1. In addition, the provisions in clause 5.7 shall apply. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/KeyValuePairs" vnfdId: description: > If present, this attribute signals the new value of the "vnfdId" attribute in "VnfInstance". - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" vnfProvider: description: > If present, this attribute signals the new value of the "vnfProvider" attribute in "VnfInstance". See note 2. @@ -2930,11 +2930,11 @@ definitions: vnfSoftwareVersion: description: > If present, this attribute signals the new value of the "vnfSoftwareVersion" attribute in "VnfInstance". See note 2. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Version" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Version" vnfdVersion: description: > If present, this attribute signals the new value of the "vnfdVersion" attribute in "VnfInstance". See note 2. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Version" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Version" vimConnectionInfo: description: > If present, this attribute signals the changes to VIM connection info that were passed in the related @@ -2942,7 +2942,7 @@ definitions: 4.4.1.6 apply. type: object additionalProperties: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/VimConnectionInfo" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/VimConnectionInfo" LcmOpOccNotificationVerbosityType: description: > @@ -2977,12 +2977,12 @@ definitions: cpInstanceId: description: > Identifier of the virtual IP CP instance and the related "VipCpInfo" structure in "VnfInstance". - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnf" cpdId: description: > Identifier of the VipCpd in the VNFD. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnfd" vnfdId: description: > @@ -2990,7 +2990,7 @@ definitions: Shall be present in case of a "change current VNF Package" to identify whether the affected virtual CP instance is associated to a VipCpd which is referred from the source or destination VNFD. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" changeType: description: > @@ -3024,21 +3024,21 @@ definitions: cpInstanceId: description: > Identifier of this VIP CP instance and of this VipCpInfo information element. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnf" cpdId: description: > Identifier of the VIP Connection Point Descriptor, VipCpd, in the VNFD. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnfd" vnfdId: description: > Identifier of the VNFD. Shall be present in case the value differs from the vnfdId attribute of the VnfInstance (e.g. during a "Change current VNF package" operation or due to its final failure). See note 2. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" vnfExtCpId: description: > When the VIP CP is exposed as external CP of the VNF, the identifier of this external VNF CP instance. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnf" cpProtocolInfo: description: > Protocol information for this CP. There shall be one cpProtocolInfo for layer 3. @@ -3051,19 +3051,19 @@ definitions: Identifiers of the VnfcCps that share the virtual IP addresse allocated to the VIP CP instance. See note. type: array items: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnf" vnfLinkPortId: description: > Identifier of the "VnfLinkPortInfo" structure in the "VnfVirtualLinkResourceInfo" or "ExtManagedVirtualLinkInfo" structure. Shall be present if the CP is associated to a link port on an internal VL (including externally-managed internal VL). - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnf" metadata: description: > Metadata about this VIP CP. type: array items: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/KeyValuePairs" AffectedVirtualCp: description: > @@ -3078,18 +3078,18 @@ definitions: description: > dentifier of the virtual CP instance and the related "VirtualCpInfo" structure in "VnfInstance". - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnf" cpdId: description: > Identifier of the VirtualCpd in the VNFD. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnfd" vnfdId: description: > Reference to the VNFD. Shall be present in case of a "change current VNF Package" to identify whether the affected virtual CP instance is associated to a VirtualCpd which is referred from the source or destination VNFD. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" changeType: description: > Signals the type of change. @@ -3149,7 +3149,7 @@ definitions: mcioId: description: > Identifier of this MCIO, created by the CISM. See note 3. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" mcioName: description: > Human readable name of this MCIO. See note 4. @@ -3161,11 +3161,11 @@ definitions: vduId: description: > Reference to the related VDU in the VNFD applicable to this resource. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnfd" cismId: description: > Identifier of the CISM managing this MCIO. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" mcioType: description: > The type of MCIO. Specific values, their semantics and associated MCIO types are defined in clause @@ -3188,7 +3188,7 @@ definitions: Additional information which is specific to the MCIO, its type, and which is available from the CISM. See note 2. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/KeyValuePairs" VirtualCpInfo: description: > @@ -3208,19 +3208,19 @@ definitions: cpInstanceId: description: > Identifier of this virtual CP instance. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnf" cpdId: description: > Identifier of the VirtualCpd in the VNFD. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnfd" resourceHandle: description: > Reference to the virtualised resource realizing this virtual CP. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ResourceHandle" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/ResourceHandle" vnfExtCpId: description: > When the virtual CP is exposed as external CP of the VNF, the identifier of this external VNF CP instance. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnf" cpProtocolInfo: description: > Protocol information for this CP. There shall be one cpProtocolInfo for each layer protocol supported. @@ -3233,7 +3233,7 @@ definitions: type: array minItems: 1 items: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnfd" additionalServiceInfo: description: > Additional service identification information of the virtual CP instance. @@ -3243,7 +3243,7 @@ definitions: metadata: description: > Metadata about this virtual CP instance. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/KeyValuePairs" AdditionalServiceInfo: description: > @@ -3269,7 +3269,7 @@ definitions: description: > Service matching information exposed by the virtual CP instance. See note. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/KeyValuePairs" ServicePortInfo: description: > @@ -3305,7 +3305,7 @@ definitions: portConfigurable: description: Specifies whether the port attribute value is allowed to be configurable. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Boolean" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Boolean" NetAttDefResourceInfo: description: > @@ -3321,25 +3321,25 @@ definitions: description: > Identifier of this network attachment definition resource as provided by the entity that has created it. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" netAttDefResource: description: > Resource handle of the resource in the scope of the CISM. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ResourceHandle" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/ResourceHandle" associatedExtCpId: description: > Identifier of the external CP associated to this network attachment definition resource. Shall be present when the network attachment definition resource is used for external connectivity by the VNF. type: array items: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnf" associatedVnfcCpId: description: > Identifier of the VNFC CP associated to this network attachment definition resource. May be present when the network attachment definition resource is used for internal connectivity by the VNF. type: array items: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnf" VirtualCpAddressInfo: description: > @@ -3360,4 +3360,4 @@ definitions: loadBalancerIp: description: > Fixed addresses assigned to an external load balancer. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IpAddress" \ No newline at end of file + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IpAddress" \ No newline at end of file diff --git a/src/SOL002/VNFLifecycleManagementNotification/definitions/SOL002VNFLifecycleManagementNotification_def.yaml b/src/SOL002/VNFLifecycleManagementNotification/definitions/SOL002VNFLifecycleManagementNotification_def.yaml index 268a54e3..6062b486 100644 --- a/src/SOL002/VNFLifecycleManagementNotification/definitions/SOL002VNFLifecycleManagementNotification_def.yaml +++ b/src/SOL002/VNFLifecycleManagementNotification/definitions/SOL002VNFLifecycleManagementNotification_def.yaml @@ -66,7 +66,7 @@ definitions: Identifier of this notification. If a notification is sent multiple times due to multiple subscriptions, the "id" attribute of all these notifications shall have the same value. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" notificationType: description: > Discriminator for the different notification types. Shall be set to @@ -77,11 +77,11 @@ definitions: subscriptionId: description: > Identifier of the subscription that this notification relates to. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" timeStamp: description: > Date-time of the generation of the notification. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/DateTime" notificationStatus: description: > Indicates whether this notification reports about the start of a @@ -102,11 +102,11 @@ definitions: vnfInstanceId: description: > The identifier of the VNF instance affected. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" operation: description: > The lifecycle management operation. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/LcmOperationType" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/LcmOperationType" isAutomaticInvocation: description: > Set to true if this VNF LCM operation occurrence has been triggered @@ -125,7 +125,7 @@ definitions: description: > The identifier of the VNF lifecycle management operation occurrence associated to the notification. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" affectedVnfcs: description: > Information about VNFC instances that were affected during the @@ -207,7 +207,7 @@ definitions: the LCM operation. Shall be present if the "operationState" attribute is "FAILED_TEMP" or "FAILED", and shall be absent otherwise. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" _links: description: > Links to resources related to this notification. diff --git a/src/SOL002/VNFPerformanceManagement/definitions/SOL002VNFPerformanceManagement_def.yaml b/src/SOL002/VNFPerformanceManagement/definitions/SOL002VNFPerformanceManagement_def.yaml index 32ce5a5e..28ca82d8 100644 --- a/src/SOL002/VNFPerformanceManagement/definitions/SOL002VNFPerformanceManagement_def.yaml +++ b/src/SOL002/VNFPerformanceManagement/definitions/SOL002VNFPerformanceManagement_def.yaml @@ -18,7 +18,7 @@ definitions: objectInstanceId: description: > Identifier of the VNF instance associated with this threshold. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" subObjectInstanceIds: description: > Identifiers of the sub-object instances of the measured @@ -31,7 +31,7 @@ definitions: the measured object instance. type: array items: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnf" criteria: description: > Criteria that define this threshold. @@ -39,7 +39,7 @@ definitions: callbackUri: description: > The URI of the endpoint to send the notification to. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Uri" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Uri" authentication: description: > Authentication parameters to configure the use of Authorization @@ -47,7 +47,7 @@ definitions: as defined in clause 8.3.4 of ETSI GS NFV-SOL 013. This attribute shall only be present if the API consumer requires authorization of notifications. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/SubscriptionAuthentication" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/SubscriptionAuthentication" CreatePmJobRequest: description: > @@ -70,7 +70,7 @@ definitions: which performance information is requested to be collected. type: array items: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" subObjectInstanceIds: description: > Identifiers of the sub-object instances of the measured @@ -84,7 +84,7 @@ definitions: will be taken for all sub-object instances of the measured object instance. type: array items: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnf" criteria: description: > Criteria of the collection of performance information. @@ -92,7 +92,7 @@ definitions: callbackUri: description: > The URI of the endpoint to send the notification to. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Uri" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Uri" authentication: description: > Authentication parameters to configure the use of Authorization @@ -100,7 +100,7 @@ definitions: in clause 8.3.4 of ETSI GS NFV-SOL 013. This attribute shall only be present if the API consumer requires authorization of notifications. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/SubscriptionAuthentication" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/SubscriptionAuthentication" CrossingDirectionType: type: string @@ -131,7 +131,7 @@ definitions: Identifier of this notification. If a notification is sent multiple times due to multiple subscriptions, the "id" attribute of all these notifications shall have the same value. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" notificationType: description: > Discriminator for the different notification types. Shall be set to @@ -143,11 +143,11 @@ definitions: timeStamp: description: > Date and time of the generation of the notification. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/DateTime" pmJobId: description: > Identifier of the PM job for which performance information is available. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" objectType: description: > Type of the measured object. @@ -157,7 +157,7 @@ definitions: objectInstanceId: description: > Identifier of the measured object instance. as per clause 6.2 of ETSI GS NFV-IFA 027. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" subObjectInstanceIds: description: > Identifiers of the sub-object instances of the measured @@ -169,7 +169,7 @@ definitions: Shall be absent otherwise. type: array items: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnf" _links: description: > Links to resources related to this notification. @@ -183,18 +183,18 @@ definitions: Link to the resource representing the measured object instance to which the notification applies. Shall be present if the measured object instance information is accessible as a resource. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/NotificationLink" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/NotificationLink" pmJob: description: > Link to the resource that represents the PM job for which performance information is available. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/NotificationLink" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/NotificationLink" performanceReport: description: > Link from which the available performance information of data type "PerformanceReport" can be obtained. This link should point to an "Individual performance report" resource. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/NotificationLink" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/NotificationLink" PerformanceReport: description: > @@ -236,13 +236,13 @@ definitions: objectInstanceId: description: > Identifier of the measured object instance for which the performance metric is reported - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" subObjectInstanceId: description: > Identifier of the sub-object instance of the measured object instance for which the performance metric is reported. Shall be present if this is required in clause 6.2 of ETSI GS NFV-IFA 027 for the related measured object type. See note. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnf" performanceMetric: description: > Name of the metric collected. This attribute shall contain the related "Measurement Name" @@ -261,7 +261,7 @@ definitions: timeStamp: description: > Time stamp indicating when the data has been collected. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/DateTime" value: description: > Value of the metric collected. @@ -273,7 +273,7 @@ definitions: Measurement context information related to the measured value. The set of applicable keys is defined per measurement in the related "Measurement Context" in clause 7.2 of ETSI GS NFV-IFA 027. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/KeyValuePairs" PmJob: description: > @@ -290,7 +290,7 @@ definitions: id: description: > Identifier of this PM job. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" objectType: description: > Type of the measured object. @@ -303,7 +303,7 @@ definitions: is collected. type: array items: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" subObjectInstanceIds: description: > Identifiers of the sub-object instances of the measured object @@ -317,7 +317,7 @@ definitions: be taken for all sub-object instances of the measured object instance. type: array items: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnf" criteria: description: > Criteria of the collection of performance information. @@ -325,7 +325,7 @@ definitions: callbackUri: description: > The URI of the endpoint to send the notification to. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Uri" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Uri" reports: description: > Information about available reports collected by this PM job. @@ -342,11 +342,11 @@ definitions: readyTime: description: > The time when the report was made available. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/DateTime" expiryTime: description: > The time when the report will expire. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/DateTime" fileSize: description: > The size of the report file in bytes, if known. @@ -365,7 +365,7 @@ definitions: self: description: > URI of this resource. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Link" objects: description: > Links to resources representing the measure @@ -375,7 +375,7 @@ definitions: accessible as a resource. type: array items: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Link" PmJobModifications: description: > @@ -392,7 +392,7 @@ definitions: callbackUri: description: > New value of the "callbackUri" attribute. The value "null" is not permitted. See note. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Uri" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Uri" authentication: description: > New value of the "authentication" attribute, or "null" to remove the attribute. If present @@ -400,7 +400,7 @@ definitions: Patch (see IETF RFC 7396). This attribute shall not be present in response bodies. See note. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/SubscriptionAuthentication" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/SubscriptionAuthentication" PmJobCriteria: description: > @@ -459,7 +459,7 @@ definitions: Identifies a time boundary after which the reporting will stop. The boundary shall allow a single reporting as well as periodic reporting up to the boundary. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/DateTime" Threshold: description: > @@ -476,7 +476,7 @@ definitions: id: description: > Identifier of this threshold resource. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" objectType: description: > Type of the measured object. @@ -486,7 +486,7 @@ definitions: objectInstanceId: description: > Identifier of the VNF instance associated with the threshold. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" subObjectInstanceIds: description: > Identifiers of the sub-object instances of the measured object @@ -499,7 +499,7 @@ definitions: measured object instance. type: array items: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnf" criteria: description: > Criteria that define this threshold. @@ -507,7 +507,7 @@ definitions: callbackUri: description: > The URI of the endpoint to send the notification to. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Uri" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Uri" _links: description: > Links for this resource. @@ -518,13 +518,13 @@ definitions: self: description: > URI of this resource. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Link" object: description: > Link to a resource representing the measured object instance for which performance information is collected. Shall be present if the measured object instance information is accessible as a resource. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Link" ThresholdModifications: description: > @@ -541,14 +541,14 @@ definitions: callbackUri: description: > New value of the "callbackUri" attribute. The value "null" is not permitted. See note. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Uri" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Uri" authentication: description: > New value of the "authentication" attribute, or "null" to remove the attribute. If present in a request body, these modifications shall be applied according to the rules of JSON Merge Patch (see IETF RFC 7396). This attribute shall not be present in response bodies. See note. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/SubscriptionAuthentication" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/SubscriptionAuthentication" ThresholdCriteria: description: > @@ -641,7 +641,7 @@ definitions: Identifier of this notification. If a notification is sent multiple times due to multiple subscriptions, the "id" attribute of all these notifications shall have the same value. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" notificationType: description: > Discriminator for the different notification types. Shall be set to @@ -652,11 +652,11 @@ definitions: timeStamp: description: > Date and time of the generation of the notification. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/DateTime" thresholdId: description: > Identifier of the threshold which has been crossed. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" crossingDirection: description: > An indication of whether the threshold was crossed in upward or @@ -670,14 +670,14 @@ definitions: objectInstanceId: description: > Identifier that identifies a VNF instance. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" subObjectInstanceId: description: > Identifier of the sub-object of the measured object to which the measurement applies. Shall be present if this is required in clause 6.2 of ETSI GS NFV-IFA 027 for the related measured object type. See note. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnf" performanceMetric: description: > Performance metric associated with the threshold. @@ -695,7 +695,7 @@ definitions: Measurement context information related to the measured value. The set of applicable keys is defined per measurement in the related "Measurement Context" in clause 7.2 of ETSI GS NFV-IFA 027. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/KeyValuePairs" _links: description: > Links to resources related to this notification. @@ -708,9 +708,9 @@ definitions: Link to the resource representing the measured object instance to which the notified change applies. Shall be present if the measured object instance information is accessible as a resource. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/NotificationLink" + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/NotificationLink" threshold: description: > Link to the resource that represents the threshold that was crossed. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/NotificationLink" \ No newline at end of file + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/NotificationLink" \ No newline at end of file diff --git a/src/SOL003/General_Definitions/SOL003_def.yaml b/src/SOL003/General_Definitions/SOL003_def.yaml new file mode 100644 index 00000000..859a0a6b --- /dev/null +++ b/src/SOL003/General_Definitions/SOL003_def.yaml @@ -0,0 +1,1197 @@ +# Copyright (c) ETSI 2017. +# https://forge.etsi.org/etsi-forge-copyright-notice.txt + +definitions: + Link: + description: > + This type represents a link to a resource using an absolute URI. + type: object + required: + - href + properties: + href: + description: > + URI of another resource referenced from a resource. + Shall be an absolute URI (i.e. a UTI that contains {apiRoot}). + $ref: "#/definitions/Uri" + + NotificationLink: + description: > + This type represents a link to a resource in a notification, using an absolute or relative URI. + type: object + required: + - href + properties: + href: + description: > + URI of a resource referenced from a notification. + Should be an absolute URI (i.e. a URI that contains + {apiRoot}), however, may be a relative URI (i.e. a URI + where the {apiRoot} part is omitted) if the {apiRoot} + information is not available. + $ref: "#/definitions/Uri" + + KeyValuePairs: + description: > + This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, + a set of keyvalue pairs is represented as an object. It shall comply with the provisions defined in clause 4 + of IETF RFC 8259. In the following example, a list of key-value pairs with four keys ("aString", "aNumber", + "anArray" and "anObject") is provided to illustrate that the values associated with different keys can be of + different type. + type: object + + ApiVersionInformation: + description: > + This type represents API version information. + type: object + required: + - uriPrefix + - apiVersions + properties: + uriPrefix: + description: > + Specifies the URI prefix for the API, in the following + form {apiRoot}/{apiName}/{apiMajorVersion}/. + type: string + apiVersions: + description: > + Version(s) supported for the API signaled by the + uriPrefix attribute. + type: array + items: + type: object + required: + - version + properties: + version: + description: > + Identifies a supported version. The value of the + version attribute shall be a version identifier as + specified in clause 9.1 (SOL013). + type: string + isDeprecated: + description: > + If such information is available, this attribute indicates + whether use of the version signaled by the version + attribute is deprecated (true) or not (false). + + A deprecated version is still supported by the API producer but is recommended + not to be used any longer. + When a version is no longer supported, it does not appear in the response body. + type: boolean + retirementDate: + description: > + The date and time after which the API version will no + longer be supported. + This attribute may be included if the value of the + isDeprecated attribute is set to true and shall be + absent otherwise. + $ref: "#/definitions/DateTime" + + VnfInstanceSubscriptionFilter: + description: > + This type represents subscription filter criteria to match VNF + instances. + * NOTE 1: The attributes "vnfdIds" and "vnfProductsFromProviders" are alternatives to reference to VNF instances + that are based on certain VNFDs in a filter. They should not be used both in the same filter instance, + but one alternative should be chosen. + NOTE 2: The attributes "vnfInstanceIds" and "vnfInstanceNames" are alternatives to reference to particular VNF + instances in a filter. They should not be used both in the same filter instance, but one alternative + should be chosen. + type: object + anyOf: + - oneOf: + - required: + - vnfdId + - required: + - vnfProductsFromProviders + - oneOf: + - required: + - vnfInstanceIds + - required: + - vnfInstanceNames + properties: + vnfdIds: + description: > + If present, match VNF instances that were created based on a VNFD + identified by one of the vnfdId values listed in this attribute. See note 1. + type: array + items: + $ref: "#/definitions/Identifier" + vnfProductsFromProviders: + description: > + If present, match VNF instances that belong to VNF products from + certain providers. See note 1. + type: array + items: + type: object + required: + - vnfProvider + properties: + vnfProvider: + description: > + Name of the VNF provider to match. + type: string + vnfProducts: + description: > + If present, match VNF instances that belong to VNF products + with certain product names, from one particular provider. + type: array + items: + type: object + required: + - vnfProductName + properties: + vnfProductName: + description: > + Name of the VNF product to match. + type: string + versions: + description: > + If present, match VNF instances that belong to VNF + products with certain versions and a certain product + name, from one particular provider. + type: array + items: + type: object + required: + - vnfSoftwareVersion + properties: + vnfSoftwareVersion: + description: > + Software version to match. + $ref: "#/definitions/Version" + vnfdVersions: + description: > + If present, match VNF instances that belong to VNF + products with certain VNFD versions, a certain + software version and a certain product name, from + one particular provider. + type: array + items: + $ref: "#/definitions/Version" + vnfInstanceIds: + description: > + If present, match VNF instances with an instance identifier listed + in this attribute. See note 2. + type: array + items: + $ref: "#/definitions/Identifier" + vnfInstanceNames: + description: > + If present, match VNF instances with a VNF Instance Name listed in + this attribute. See note 2. + type: array + items: + type: string + + VimConnectionInfo: + description: > + This type represents parameters to connect to a VIM, a CISM, a CIR or a MCIOP repository for managing + the resources of a VNF instance. It shall comply with the provisions defined in table 4.4.1.6-1. + + This structure is used to convey VIM-related, CISM-related, CIR-related, or MCIOP-repository-relate + dparameters over the Or-Vnfm interface. Additional parameters for a VIM, a CISM, a CIR or a MCIOP + repository may be configured into the VNFM by means outside the scope of the present document and + bound to the identifier of that VIM. + + * NOTE 1: If applicable, this attribute also provides information about the resourceGroupIds + that are accessible using a particular set of credentials. See definition of + "resourceGroupId" in clause 9.5.3.3. + * NOTE 2: Once the connectivity between VNFM and VIM, CISM, CIR or MCIOP repository is provided + through a secure connection over HTTP Secure (HTTP over SSL/TLS), and the connection might also be + established through a VPN (for example TLS-based VPN tunnelling) for site-to-site connection, the + "accessInfo" JSON data structure, and the sensitive data related information ("username"/"password" as + required properties for authentication purpose), will be transmitted as plain text through a TLS tunnel + without additional encoding/encryption before transmitting it, making the sensitive data visible to the + endpoint. The base64 encoded certificates are only used by the VNFM to verify the authenticity of the + interface endpoint of the VIM., CISM, CIR or MCIOP repository. + type: object + required: + - vimType + properties: + vimId: + description: > + The identifier of the VIM, CISM, CIR or MCIOP repository + instance. This identifier is managed by the NFVO. + Shall be present to address additional information about + the VIM, CISM, CIR or MCIOP repository if such + information has been configured into the VNFM by + means outside the scope of the present document and + should be absent otherwise. + $ref: "#/definitions/Identifier" + vimType: + description: > + Discriminator for the different types of the VIM + information. + The value of this attribute determines the structure of the + "interfaceInfo" and "accessInfo" attributes, based on the + type of the VIM., CISM, CIR or MCIOP repository. + The set of permitted values is expected to change over + time as new types or versions of VIMs become available. + The ETSI NFV registry of VIM-related information [i.3] + provides access to information about VimConnectionInfo + definitions for various VIM, CISM, CIR or MCIOP + repository types. The structure of the registry is defined in + annex C. + type: string + interfaceInfo: + description: > + Information about the interface or interfaces to the VIM, + CISM, CIR or MCIOP repository, if applicable, such as + the URI of an interface endpoint to communicate with the + VIM, CISM, CIR or MCIOP repository. The applicable + keys are dependent on the content of vimType. + Alternatively, such information may have been configured + into the VNFM and bound to the vimId. + $ref: "#/definitions/KeyValuePairs" + accessInfo: + description: > + Authentication credentials for accessing the VIM, CISM, + CIR or MCIOP repository and other access-related + information such as tenants or infrastructure resource + groups (see note 1). The applicable keys are dependent + on the content of vimType. + If the VimConnectionInfo structure is part of an HTTP + response payload body, sensitive attributes that are + children of this attributes (such as passwords) shall not + be included. + If the VimConnectionInfo structure is part of an HTTP + request payload body, sensitive attributes that are + children of this attribute (such as passwords) shall be + present if they have not been provisioned out of band. + See note 2. + $ref: "#/definitions/KeyValuePairs" + extra: + description: > + VIM, CISM, CIR or MCIOP repository type specific + additional information. The applicable structure, and + whether or not this attribute is available, is dependent on + the content of vimType. + $ref: "#/definitions/KeyValuePairs" + + ResourceHandle: + required: + - resourceId + type: object + description: > + This type represents the information that allows addressing a virtualised + resource that is used by a VNF instance. Information about the resource + is available from the VIM. + + * NOTE 1: The information about the VIM or CISM connection referenced by the VIM connection id is + known to the VNFM. Moreover, the identifier of the VIM connection provides scope to the + resourceId. (This applies in case of SOL002) + + * NOTE 2: The value set of the "vimLevelResourceType" attribute is within the scope of the VIM + or CISM or the resource provider and can be used as information that complements the + ResourceHandle. This value set is different from the value set of the "type" attribute + in the ResourceDefinition (refer to clause 9.5.3.2). When the container infrastructure + service management is a Kubernetes® instance the vimLevelResourceType is the type of + resource, as would correspond to the 'kind' field if the resource is declared in its own + Kubernetes® manifest, e.g.: Pod, PersistentVolumeClaim, NetworkAttachmentDefinition. + + * NOTE 3: When the container infrastructure service management is a Kubernetes® instance the resourceId shall be + populated in the following way: + - For a compute MCIO, it is the instance identifier that Kubernetes® assigns, which is unique cluster wide + per resource type. + - For a storage MCIO modelled as a persistent volume claim, it is the name of the persistent volume claim, + i.e. the value of the 'claimName' field in the Kubernetes® manifest, or a compound name built by + Kubernetes® if the persistent volume claim is defined inline in another template instead of in its own + manifest. + - For a network MCIO representing a NetworkAttachme. + properties: + vimConnectionId: + description: > + Identifier of the VIM or CISM connection to manage the + resource. + This attribute shall be supported when the resource is + managed by a CISM. + When the resource is managed by a VIM, this attribute + shall only be supported and present if VNF--related + resource management in direct mode is applicable. + The applicable "VimConnectionInfo" structure, which is + referenced by vimConnectionId, can be obtained from + the "vimConnectionInfo" attribute of the "VnfInstance" + structure. (This applies in case of SOL003) + See note 1. (This applies in case of SOL002) + $ref: "#/definitions/Identifier" + resourceProviderId: + description: > + Identifier of the entity responsible for the management of the + resource. This attribute shall only be supported and present when + VNF-related resource management in indirect mode is applicable. The + identification scheme is outside the scope of the present document. + $ref: "#/definitions/Identifier" + resourceId: + description: > + Identifier of the resource in the scope of the VIM or the + CISM or the resource provider. See note 3. + $ref: "#/definitions/IdentifierInVim" + vimLevelResourceType: + description: > + Type of the resource in the scope of the VIM or the CISM + or the resource provider. See note 2. + type: string + vimLevelAdditionalResourceInfo: + description: > + Additional resource information which is specific to this + resource and its type, and which is available from the + VIM or the CISM or the resource provider. + $ref: "#/definitions/AdditionalResourceInfo" + containerNamespace: + description: > + The value of the namespace in which the MCIO + corresponding to the resource is deployed. + This attribute shall be present if the resource is managed + by a CISM and it shall be absent otherwise. + type: string + + VnfExtCpData: + description: > + This type represents configuration information for external CPs created. + * NOTE 1: In case this identifier refers to a CPD with trunking enabled, the external CP instances created + from this CPD will represent ports in a trunk. + * NOTE 2: Within one VNF instance, all VNFC instances created from a particular VDU have the same external + connectivity. Thus, given a particular value of the "cpdId" attribute, there shall be one + "cpConfig" entry for each VNFC instance that has been or can be created from a VDU which includes + a CPD identified by the "cpdId" attribute. If the cpConfig represents a subport in a trunk, + all "cpConfig" entries in this list shall have the same segmentationId, which means they are + connected to the same set of external VLs via the trunk. + * NOTE 3: The map entry value shall be set to "null" in order to delete a "VnfExtCpConfig" entry identified + by a particular key value from the map, i.e. for the disconnection of an existing external + CP instance addressed by cpInstanceId in the deleted map entry from a particular external + virtual link, and deletion of that instance in case it represents a subport. Deleting the + last key from the map removes the affected instance of the "VnfExtCpData" structure from + its parent data structure. + * NOTE 4: If, as defined by the input parameters of a "ChangeVnfFlavour", "ChangeExtVnfConnectivity" or + "ChangeCurrentVnfPkg" operation or as part of the Grant response for any of these operations, a + cpConfig map entry identified by a particular map key value is moved into another "ExtVirtualLinkData" + or "VnfExtCpData" structure, this particular cpConfig map entry may be used by an external CP instance + different than the one that has used it before the operation, or by no external CP instance at all. + Renaming a CPD identifier during the "changeCurrentVnfPkg" operation does not count as moving the + related "cpConfig" map entries to a new "extCpData" structure. + type: object + required: + - cpdId + properties: + cpdId: + description: > + The identifier of the CPD in the VNFD. See note 1. + $ref: "#/definitions/IdentifierInVnfd" + cpConfig: + 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 and 4. + type: object + additionalProperties: + $ref: "#/definitions/VnfExtCpConfig" + + VnfExtCpConfig: + description: > + This type represents an externally provided link port, or a network attachment definition resource of secondary + container cluster network, or network address information per instance of an external connection point. + In the case of VM-based deployment of the VNFC exposing the external CP: + 1. In case a link port is provided, the VNFM shall use that link port when connecting the external CP to the + external VL. + 2. In case a link port is not provided, the VNFM shall create a link port on the external VL and use that link port + to connect the external CP to the external VL. + In the case of container-based deployment of the VNFC exposing the external CP, the VNFM shall use the network + attachment definition resource of secondary container cluster network when connecting the CP to the external VL. + + * NOTE 1: The following conditions apply to the attributes "linkPortId" and "cpProtocolData" for an external CP + instance connected or to be connected to a virtual network not categorized as secondary container cluster network: + 1) Void. + 2) At least one of the "linkPortId" and "cpProtocolData" attributes shall be present for an external CP instance + representing a subport that is to be created, or an external CP instance that is to be created by creating the + corresponding VNFC or VNF instance during the current or a subsequent LCM operation, or for an existing + external CP instance that is to be re-configured or added to a particular external virtual link. + 3) If the "linkPortId" attribute is absent, the VNFM shall create a link port. + 4) If the "cpProtocolData" attribute is absent, the "linkPortId" attribute shall be provided referencing a + precreated link port, and the VNFM can use means outside the scope of the present document to obtain the + pre-configured address information for the connection point from the resource representing the link port. + 5) If both "cpProtocolData" and "linkportId" are provided, the NFVO shall ensure that the + cpProtocolData can be used with the pre-created link port referenced by "linkPortId". + + * NOTE 2: The following conditions apply to the attributes “netAttDefResourceId” and “cpProtocolData” for an external CP + instance connected or to be connected to a secondary container cluster network: + 1) The "netAttDefResourceId" and "cpProtocolData" attributes shall both be absent for the deletion of an + existing external CP instance addressed by cpInstanceId. + 2) The "netAttDefResourceId" attribute shall be present and the "cpProtocolData" attribute may be present for + a to-be-created external CP instance or an existing external CP instance. + * NOTE 3: Cardinality greater than 1 is only applicable for specific cases where more than one network attachment + definition resource is needed to fulfil the connectivity requirements of the external CP, e.g. to build a link + redundant mated pair in SR-IOV cases. When more than one netAttDefResourceId is indicated, all shall belong + to the same namespace as defined by the corresponding "netAttDefResourceNamespace" attribute in the + "NetAttDefResourceData". + * NOTE 4: Either linkPortId or netAttDefResourceId may be included, but not both. + anyOf: + - required: + - linkPortId + - required: + - cpProtocolData + type: object + properties: + parentCpConfigId: + description: > + 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. + $ref: "#/definitions/IdentifierInVnf" + linkPortId: + description: > + Identifier of a pre-configured link port to which the external CP + will be associated. See notes 1 and 4. + $ref: "#/definitions/Identifier" + + createExtLinkPort: + 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 + + netAttDefResourceId: + description: > + Identifier of the “NetAttDefResourceData” structure that + provides the specification of the interface to attach the + external CP to a secondary container cluster network. + It is only applicable if the external CP is connected or to + be connected to a secondary container cluster network. It + shall not be present if the external CP is related to a + virtual network not categorized as secondary container + cluster network. + See notes 2, 3 and 4. + type: array + items: + $ref: "#/definitions/Identifier" + cpProtocolData: + description: > + Parameters for configuring the network protocols on the + link port that connects the CP to a VL. See notes 1 and 2. + type: array + items: + $ref: "#/definitions/CpProtocolData" + + CpProtocolData: + description: > + This type represents network protocol data. + * NOTE: This attribute allows to signal the addition of further types of layer and protocol + in future versions of the present document in a backwards-compatible way. In the current + version of the present document, only IP over Ethernet is supported. + type: object + required: + - layerProtocol + properties: + layerProtocol: + description: > + Identifier of layer(s) and protocol(s). + Permitted values: + - IP_OVER_ETHERNET. + - IP_FOR_VIRTUAL_CP + See note + type: string + enum: + - IP_OVER_ETHERNET + ipOverEthernet: + description: > + Network address data for IP over Ethernet to assign to the external CP + instance. Shall be present if layerProtocol is equal to + "IP_OVER_ETHERNET", and shall be absent otherwise. + $ref: "#/definitions/IpOverEthernetAddressData" + virtualCpAddress: + description: > + IP address data to assign to an external CP + instance exposing a virtual CP. It shall be + present if 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/VirtualCpAddressData" + + IpOverEthernetAddressData: + description: > + This type represents network address data for IP over Ethernet. + * NOTE 1: At least one of "macAddress" or "ipAddresses" shall be present. + * NOTE 2: Exactly one of "fixedAddresses", "numDynamicAddresses" or "ipAddressRange" shall be present. + * NOTE 3: If the CP instance represents a subport in a trunk, segmentationId shall be present. + Otherwise it shall not be present. + * NOTE 4: Depending on the NFVI networking infrastructure, the segmentationId may indicate the actual + network segment value (e.g. vlan Id, Vxlan segmentation id, etc.) used in the transport header + of the packets or it may be an identifier used between the application and the NFVI networking + infrastructure to identify the network sub-interface of the trunk port in question. In the latter + case the NFVI infrastructure will map this local segmentationId to whatever segmentationId is + actually used by the NFVI’s transport technology. + type: object + anyOf: + - required: + - macAddress + - required: + - ipAddresses + oneOf: + - required: + - fixedAddresses + - required: + - numDynamicAddresses + - required: + - ipAddressRange + properties: + macAddress: + description: > + MAC address. If this attribute is not present, it shall be chosen by + the VIM. See note 1. + $ref: "#/definitions/MacAddress" + segmentationType: + description: > + Specifies the encapsulation type for the traffics coming in and out of the trunk subport. + Permitted values: + - VLAN: the subport uses VLAN as encapsulation type. + - INHERIT: the subport gets its segmentation type from the network it’s connected to. + This attribute may be present for CP instances that represent subports in a trunk and shall be + absent otherwise. If this attribute is not present for a subport CP instance, default value VLAN shall be used. + type: string + enum: + - VLAN + - INHERIT + + segmentationId: + description: > + Identification of the network segment to which the CP instance connects to. See note 3 and note 4. + type: string + ipAddresses: + description: > + List of IP addresses to assign to the CP instance. Each entry + represents IP address data for fixed or dynamic IP address + assignment per subnet. + If this attribute is not present, no IP address shall be assigned. See note 1. + type: array + items: + type: object + required: + - type + properties: + type: + description: > + The type of the IP addresses. + Permitted values: IPV4, IPV6. + type: string + enum: + - IPV4 + - IPV6 + fixedAddresses: + description: > + Fixed addresses to assign (from the subnet defined by + "subnetId" if provided). See note 2. + type: array + items: + $ref: "#/definitions/IpAddress" + numDynamicAddresses: + description: > + Number of dynamic addresses to assign (from the subnet defined + by "subnetId" if provided). See note 2. + type: integer + addressRange: + description: > + An IP address range to be used, e.g. in case of egress + connections. + In case this attribute is present, IP addresses from the range + will be used. See note 2. + type: object + required: + - minAddress + - maxAddress + properties: + minAddress: + description: > + Lowest IP address belonging to the range. + $ref: "#/definitions/IpAddress" + maxAddress: + description: > + Highest IP address belonging to the range. + $ref: "#/definitions/IpAddress" + subnetId: + description: > + Subnet defined by the identifier of the subnet resource in the + VIM. + In case this attribute is present, IP addresses from that + subnet will be assigned; otherwise, IP addresses not bound to + a subnet will be assigned. + $ref: "#/definitions/IdentifierInVim" + + VirtualCpAddressData: + description: > + This type represents network address data for a virtual CP. It shall comply with the provisions defined in + table 4.4.1.10d-1. + + This type represents information about a link port of an external VL, i.e. a port providing connectivity + for the VNF to an NS VL. It shall comply with the provisions defined in table 5.5.3.6d-1. (This applies in case of SOL002) + + * NOTE 1: If the container cluster is set up to be able to configure an external load balancer this address will be used, + otherwise it will be ignored by the CISM. + + * NOTE 2: In case the cluster can configure an external load balancer but no loadBalancerIp is provided the container + cluster will assign an IP address. + type: object + required: + - type + properties: + type: + description: > + The type of the IP addresses. + Permitted values: IPV4, IPV6. + type: string + enum: + - IPV4 + - IPV6 + loadBalancerIp: + description: > + Fixed address to assign to an external load balancer. + See notes 1 and 2. + $ref: "#/definitions/IpAddress" + + 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. (This applies in case of SOL002) + + * NOTE 2: 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 an external CP: + 1.1 No dedicated IP address is allocated as VIP address, as indicated in the VNFD. + 1.2 A dedicated IP address is allocated as VIP address, but the NFVO indicates that no port is needed + (createExtLinkPort in VnfExtCpConfig set to false). + 2 For a VIP CP exposed as an external CP via a floating IP address: + 2.1 No dedicated IP address is allocated as VIP address, as indicated in the VNFD, and the VNFC CP + associated to the VIP CP is also exposed via a floating IP address. + 3 For a VIRTUAL CP exposed as an external CP. + 4 For a VNFC CP exposed as an external CP in a secondary container cluster external network or a + secondary container cluster internal network. + + * 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). + type: object + required: + - id + - resourceId + - extCps + properties: + id: + description: > + The identifier of the external VL instance. The identifier is + assigned by the NFV-MANO entity that manages this VL instance. + $ref: "#/definitions/Identifier" + vimConnectionId: + 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. + $ref: "#/definitions/Identifier" + resourceProviderId: + description: > + Identifies the entity responsible for the management of this + resource. This attribute shall only be supported and present + if VNF-related resource management in indirect mode is applicable. + The identification scheme is outside the scope of the present + document. + $ref: "#/definitions/Identifier" + resourceId: + description: > + The identifier of the resource in the scope of the VIM or the + resource provider. + $ref: "#/definitions/IdentifierInVim" + extCps: + 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. + type: array + items: + $ref: "#/definitions/VnfExtCpData" + extLinkPorts: + description: > + Externally provided link ports to be used to connect + external connection points to this external VL. If this + attribute is not present, the VNFM shall create the link + ports on the external VL except in the cases defined + below. See note 2. + type: array + items: + $ref: "#/definitions/ExtLinkPortData" + extNetAttDefResourceData: + description: > + Externally provided network attachment definition + resource(s) that provide the specification of the interface + to attach external CPs to this external VL. See note 3. + It is only applicable if the external VL is realized by a + secondary container cluster network. It shall not be + present otherwise. + type: array + items: + $ref: "#/definitions/NetAttDefResourceData" + + ScaleInfo: + description: > + This type represents the scale level of a VNF instance related to a scaling aspect. + type: object + required: + - aspectId + - scaleLevel + properties: + aspectId: + description: > + Identifier of the scaling aspect. + $ref: "#/definitions/IdentifierInVnfd" + vnfdId: + description: > + Identifier of the VNFD. + Shall be present in case the value differs from the vnfdId + attribute of the VnfInstance (e.g. during a "Change + current VNF package" operation or due to its final + failure). + $ref: "#/definitions/IdentifierInVnfd" + scaleToLevel: + description: > + Indicates the scale level. The minimum value shall be 0 + and the maximum value shall be ≤ maxScaleLevel as + described in the VNFD. + $ref: "#/definitions/Identifier" + + AdditionalResourceInfo: + description: > + This type represents additional resource information which resource and resource type + specific, and which is available from the VIM or the CISM or the resource provider. + type: object + properties: + hostName: + description: > + Name of the host where the resource is allocated. It shall + be present for compute resources in the scope of the + CISM and shall be absent otherwise. See note. + type: string + persistentVolume: + description: > + Name of the persistent volume to which the persistent + volume claim representing the storage resource is bound. + It may be present for storage resources in the scope of + the CISM and shall be absent otherwise. See note. + type: string + AdditionalResourceInfo: + description: > + Information related to other properties directly owned by + the resource and available from the VIM or CISM or the + resource provider. See note. + $ref: "#/definitions/KeyValuePairs" + + NetAttDefResourceData: + description: > + This type represents a network attachment definition resource that provides the specification of + the interface to be used to connect one or multiple connection points to a secondary container + cluster network realizing a VL. + type: object + required: + - netAttDefResourceId + - resourceHandle + properties: + netAttDefResourceId: + description: > + Identifier of this network attachment definition resource + as provided by the entity that has created it. + $ref: "#/definitions/Identifier" + resourceHandle: + description: > + Resource handle of the resource identifying the network + attachment definition resource that provides the + specification of the interface to attach the connection + points to a secondary container cluster network. + $ref: "#/definitions/ResourceHandle" + Identifier: + description: > + An identifier with the intention of being globally unique. + type: string + + DateTime: + description: > + Date-time stamp. + Representation: String formatted according to IETF RFC 3339. + type: string + format: date-time + + Uri: + description: > + String formatted according to IETF RFC 3986. + type: string + + Boolean: + description: > + The Boolean is a data type having two values (true and false). + type: boolean + + MacAddress: + description: > + A MAC address. Representation: string that consists of groups of two hexadecimal digits, + separated by hyphens or colons. + type: string + format: MAC + + IpAddress: + description: > + An IPV4 or IPV6 address. Representation: In case of an IPV4 address, string that consists of four decimal + integers separated by dots, each integer ranging from 0 to 255. In case of an IPV6 address, string that + consists of groups of zero to four hexadecimal digits, separated by colons. + type: string + format: IP + + Version: + description: > + A version. + type: string + + String: + description: > + A string defined in IETF RFC 8259. + type: string + + Number: + description: > + A number defined in IETF RFC 8259. + type: number + + UnsignedInt: + description: > + Unsigned integer number + type: integer + minimum: 0 + + IdentifierInVnfd: + description: > + An identifier that is unique within a VNF descriptor. + type: string + + IdentifierInVim: + description: > + An identifier maintained by the VIM or the CISM or other resource provider. It is + expected to be unique within the VIM instance. + type: string + + IdentifierInVnf: + description: > + An identifier that is unique for the respective type within a VNF + instance, but may not be globally unique. + type: string + + IdentifierLocal: + description: > + An identifier that is unique within a limited local scope other than above listed identifiers, + such as within a complex data structure or within a request-response pair. + Representation: string of variable length. + type: string + + Checksum: #no definition found + description: > + Cheksum description + type: string + +######################################################################################################################## +# TO CHECK IF INCLUDE THESE DATA TYPES IN ANOTHER DEF FILES + + VnfLinkPortData: + description: > + This type represents an externally provided link port to be used to connect a VNFC connection point + to an exernally managed VL. + type: object + required: + - vnfLinkPortId + - resourceHandle + properties: + vnfLinkPortId: + description: > + Identifier of this link port as provided by the entity that has created the link port. + $ref: "#/definitions/Identifier" + resourceHandle: + description: > + Resource handle of the virtualised resource that realizes the link port. + $ref: "#/definitions/ResourceHandle" + + ExtLinkPortData: + description: > + This type represents an externally provided link port to be used to + connect an external connection point to an external VL. + * NOTE: The value of "trunkResourceId" is scoped by the value of "vimConnectionId" in the "resourceHandle" attribute. + type: object + required: + - id + - resourceHandle + properties: + id: + description: > + Identifier of this link port as provided by the entity that has + created the link port. + $ref: "#/definitions/Identifier" + resourceHandle: + description: > + Reference to the virtualised resource realizing this link port. + $ref: "#/definitions/ResourceHandle" + + trunkResourceId: + description: > + Identifier of the trunk resource in the VIM. + Shall be present if the present link port corresponds to the parent + port that the trunk resource is associated with. See note. + $ref: "#/definitions/IdentifierInVim" + + GrantedLcmOperationType: + description: > + The enumeration GrantedLcmOperationType defines the permitted values + to represent VNF lifecycle operation types in grant requests. + Value | Description + ------|------------ + INSTANTIATE | Represents the "Instantiate VNF" LCM operation. + SCALE | Represents the "Scale VNF" LCM operation. + SCALE_TO_LEVEL | Represents the "Scale VNF to Level" LCM operation. + CHANGE_FLAVOUR | Represents the "Change VNF Flavour" LCM operation. + TERMINATE | Represents the "Terminate VNF" LCM operation. + HEAL | Represents the "Heal VNF" LCM operation. + OPERATE | Represents the "Operate VNF" LCM operation. + CHANGE_EXT_CONN | Represents the "Change external VNF connectivity" LCM operation. + CHANGE_VNFPKG | Represents the "Change current VNF package" LCM operation. + CREATE_SNAPSHOT | Represents the "Create VNF snapshot" LCM operation. + REVERT_TO_SNAPSHOT | Represents the "Revert to VNF snapshot" LCM operation. + type: string + enum: + - INSTANTIATE + - SCALE + - SCALE_TO_LEVEL + - CHANGE_FLAVOUR + - TERMINATE + - HEAL + - OPERATE + - CHANGE_EXT_CONN + - CHANGE_VNFPKG + - CREATE_SNAPSHOT + - REVERT_TO_SNAPSHOT + + LcmOperationType: + description: > + The enumeration LcmOpType defines the permitted values to represent + VNF lifecycle operation types in VNF lifecycle management operation + occurrence resources and VNF lifecycle management operation occurrence + notifications. + It shall comply with the provisions defined in table 5.5.4.5-1. + + Value | Description + ------|------------ + INSTANTIATE | Represents the "Instantiate VNF" LCM operation. + SCALE | Represents the "Scale VNF" LCM operation. + SCALE_TO_LEVEL | Represents the "Scale VNF to Level" LCM operation. + CHANGE_FLAVOUR | Represents the "Change VNF Flavour" LCM operation. + TERMINATE | Represents the "Terminate VNF" LCM operation. + HEAL | Represents the "Heal VNF" LCM operation. + OPERATE | Represents the "Operate VNF" LCM operation. + CHANGE_EXT_CONN | Represents the "Change external VNF connectivity" LCM operation. + MODIFY_INFO | Represents the "Modify VNF Information" LCM operation. + CREATE_SNAPSHOT | Represents the "Create VNF Snapshot" LCM operation. + REVERT_TO_SNAPSHOT | Represents the “Revert-To VNF Snapshot" LCM operation. + CHANGE_VNFPKG | Represents the "Change current VNF package" LCM operation. + type: string + enum: + - INSTANTIATE + - SCALE + - SCALE_TO_LEVEL + - CHANGE_FLAVOUR + - TERMINATE + - HEAL + - OPERATE + - CHANGE_EXT_CONN + - MODIFY_INFO + - CREATE_SNAPSHOT + - REVERT_TO_SNAPSHOT + - CHANGE_VNFPKG + + ProblemDetails: + #SOL003 location: 4.3.5.3 + description: > + The definition of the general "ProblemDetails" data structure from + IETF RFC 7807 is reproduced inthis structure. Compared to the + general framework defined in IETF RFC 7807, the "status" and + "detail" attributes are mandated to be included by the present document, + to ensure that the response contains additional textual information about + an error. IETF RFC 7807 foresees extensibility of the + "ProblemDetails" type. It is possible that particular APIs in the present + document, or particular implementations, define extensions to define + additional attributes that provide more information about the error. + The description column only provides some explanation of the meaning to + Facilitate understanding of the design. For a full description, see + IETF RFC 7807. + type: object + required: + - status + - detail + properties: + type: + description: > + A URI reference according to IETF RFC 3986 that identifies the + problem type. It is encouraged that the URI provides human-readable + documentation for the problem (e.g. using HTML) when dereferenced. + When this member is not present, its value is assumed to be + "about:blank". + type: string + format: URI + title: + description: > + A short, human-readable summary of the problem type. It should not + change from occurrence to occurrence of the problem, except for + purposes of localization. If type is given and other than + "about:blank", this attribute shall also be provided. + A short, human-readable summary of the problem + type. It SHOULD NOT change from occurrence to occurrence of the + problem, except for purposes of localization (e.g., using + proactive content negotiation; see [RFC7231], Section 3.4). + type: string + status: + description: > + The HTTP status code for this occurrence of the problem. + The HTTP status code ([RFC7231], Section 6) generated by the origin + server for this occurrence of the problem. + type: integer + detail: + description: > + A human-readable explanation specific to this occurrence of the + problem. + type: string + instance: + description: > + A URI reference that identifies the specific occurrence of the + problem. It may yield further information if dereferenced. + type: string + format: URI + #TODO: How to express "any additional attributes"? + + SubscriptionAuthentication: + description: > + * NOTE: The clientId and clientPassword passed in a subscription shall not be the same as the clientId and + clientPassword that are used to obtain authorization for API requests. Client credentials may differ between + subscriptions. The value of clientPassword should be generated by a random process + type: object + required: + - authType + properties: + authType: + description: > + Defines the types of Authentication / Authorization which the API + consumer is willing to accept when receiving a notification. + Permitted values: + * BASIC: In every HTTP request to the notification endpoint, use + HTTP Basic authentication with the client credentials. + * OAUTH2_CLIENT_CREDENTIALS: In every HTTP request to the + notification endpoint, use an OAuth 2.0 Bearer token, obtained + using the client credentials grant type. + * TLS_CERT: Every HTTP request to the notification endpoint is sent + over a mutually authenticated TLS session, i.e. not only the + server is authenticated, but also the client is authenticated + during the TLS tunnel setup. + type: array + items: + type: string + enum: + - BASIC + - OAUTH2_CLIENT_CREDENTIALS + - TLS_CERT + paramsBasic: + description: > + Parameters for authentication/authorization using BASIC. + Shall be present if authType is "BASIC" and the contained + information has not been provisioned out of band. + Shall be absent otherwise. + type: object + properties: + userName: + description: > + Username to be used in HTTP Basic authentication. Shall be + present if it has not been provisioned out of band. + type: string + password: + description: > + Password to be used in HTTP Basic authentication. Shall be + present if it has not been provisioned out of band. + type: string + paramsOauth2ClientCredentials: + description: > + Parameters for authentication/authorization using + OAUTH2_CLIENT_CREDENTIALS. + Shall be present if authType is "OAUTH2_CLIENT_CREDENTIALS" and the + contained information has not been provisioned out of band. + Shall be absent otherwise. + type: object + properties: + clientId: + description: > + Client identifier to be used in the access token request of the + OAuth 2.0 client credentials grant type. + Shall be present if it has not been provisioned out of band. See note. + type: string + clientPassword: + description: > + Client password to be used in the access token request of the + OAuth 2.0 client credentials grant type. + Shall be present if it has not been provisioned out of band. See note. + type: string + tokenEndpoint: + description: > + The token endpoint from which the access token can be obtained. + Shall be present if it has not been provisioned out of band. + $ref: "#/definitions/Uri" + LcmCoordResultType: + description: > + The enumeration LcmCoordResultType defines the permitted values + to represent the result of executing an LCM coordination action. + The coordination result also implies the action to be performed by + the VNFM as the follow-up to this coordination. + Value | Description + ------|------------ + CONTINUE | The related LCM operation shall be continued, staying in the state "PROCESSING". + ABORT | The related LCM operation shall be aborted by transitioning into the state "FAILED_TEMP". + CANCELLED | The coordination action has been cancelled upon request of the API consumer, i.e. the VNFM. + The related LCM operation shall be aborted by transitioning into the state "FAILED_TEMP". + type: string + enum: + - CONTINUE + - ABORT + - CANCELLED + + LcmOperationForCoordType: + description: > + The enumeration LcmOperationForCoordType defines the permitted values to + represent VNF lifecycle operation types in VNF LCM operation coordination actions. + * INSTANTIATE: Represents the "Instantiate VNF" LCM operation. + * SCALE: Represents the "Scale VNF" LCM operation. + * SCALE_TO_LEVEL: Represents the "Scale VNF to Level" LCM operation. + * CHANGE_FLAVOUR: Represents the "Change VNF Flavour" LCM operation. + * TERMINATE: Represents the "Terminate VNF" LCM operation. + * HEAL: Represents the "Heal VNF" LCM operation. + * OPERATE: Represents the "Operate VNF" LCM operation. + * CHANGE_EXT_CONN: Represents the "Change external VNF connectivity" LCM operation. + * MODIFY_INFO: Represents the "Modify VNF Information" LCM operation. + * CREATE_SNAPSHOT: Represents the "Create VNF Snapshot" LCM operation. + * REVERT_TO_SNAPSHOT: Represents the "Revert To VNF Snapshot" LCM operation. + * CHANGE_VNFPKG: Represents the "Change current VNF package" LCM operation. + type: string + enum: + - INSTANTIATE + - SCALE + - SCALE_TO_LEVEL + - CHANGE_FLAVOUR + - TERMINATE + - HEAL + - OPERATE + - CHANGE_EXT_CONN + - MODIFY_INFO + - CREATE_SNAPSHOT + - REVERT_TO_SNAPSHOT + - CHANGE_VNFPKG \ No newline at end of file diff --git a/src/SOL003/VNFFaultManagement/VNFFaultManagement.yaml b/src/SOL003/VNFFaultManagement/VNFFaultManagement.yaml index 0e792b32..22d7bd15 100644 --- a/src/SOL003/VNFFaultManagement/VNFFaultManagement.yaml +++ b/src/SOL003/VNFFaultManagement/VNFFaultManagement.yaml @@ -536,7 +536,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" IndividualAlarm.Patch.412: description: | @@ -747,7 +747,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" IndividualSubscription.Get.200: description: | diff --git a/src/SOL003/VNFFaultManagement/definitions/SOL003VNFFaultManagement_def.yaml b/src/SOL003/VNFFaultManagement/definitions/SOL003VNFFaultManagement_def.yaml index fefce1a9..69e61cff 100644 --- a/src/SOL003/VNFFaultManagement/definitions/SOL003VNFFaultManagement_def.yaml +++ b/src/SOL003/VNFFaultManagement/definitions/SOL003VNFFaultManagement_def.yaml @@ -39,11 +39,11 @@ definitions: id: description: > Identifier of this Alarm information element. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" managedObjectId: description: > Identifier of the affected VNF instance. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" rootCauseFaultyResource: description: > The virtualised resources that are causing the VNF fault. @@ -53,22 +53,22 @@ definitions: description: > Time stamp indicating when the alarm is raised by the managed object. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/DateTime" alarmChangedTime: description: > Time stamp indicating when the alarm was last changed. It shall be present if the alarm has been updated. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/DateTime" alarmClearedTime: description: > Time stamp indicating when the alarm was cleared. It shall be present if the alarm has been cleared. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/DateTime" alarmAcknowledgedTime: description: > Time stamp indicating when the alarm was acknowledged. It shall be present if the alarm has been acknowledged. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/DateTime" ackState: description: > Acknowledgement state of the alarm. @@ -86,7 +86,7 @@ definitions: eventTime: description: > Time stamp indicating when the fault was observed. See note 2. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/DateTime" eventType: description: > Type of event. @@ -120,7 +120,7 @@ definitions: List of identifiers of other alarms correlated to this fault. type: array items: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" faultDetails: description: > Provides additional information about the fault. See notes 1 and 2. @@ -137,13 +137,13 @@ definitions: self: description: > URI of this resource. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Link" objectInstance: description: > Link to the resource representing the VNF instance to which the notified alarm is correlated. Shall be present if the VNF instance information is accessible as a resource. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Link" AlarmNotification: description: > @@ -166,7 +166,7 @@ definitions: Identifier of this notification. If a notification is sent multiple times due to multiple subscriptions, the "id" attribute of all these notifications shall have the same value. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" notificationType: description: > Discriminator for the different notification types. Shall be set to @@ -177,11 +177,11 @@ definitions: subscriptionId: description: > Identifier of the subscription that this notification relates to. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" timeStamp: description: > Date-time of the generation of the notification. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/DateTime" alarm: description: > Information about an alarm including AlarmId, affected VNF @@ -197,7 +197,7 @@ definitions: subscription: description: > Link to the related subscription. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/NotificationLink" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/NotificationLink" FmSubscriptionRequest: description: > @@ -217,13 +217,13 @@ definitions: callbackUri: description: > The URI of the endpoint to send the notification to. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Uri" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Uri" authentication: description: > Authentication parameters to configure the use of Authorization when sending notifications corresponding to this subscription, as defined in clause 8.3.4 of ETSI GS NFV-SOL 013. This attribute shall only be present if the subscriber requires authorization of notifications. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/SubscriptionAuthentication" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/SubscriptionAuthentication" FmSubscription: description: > @@ -238,7 +238,7 @@ definitions: id: description: > Identifier of this "Individual subscription" resource. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" filter: description: > Filter settings for this subscription, to define the subset of all @@ -249,7 +249,7 @@ definitions: callbackUri: description: > The URI of the endpoint to send the notification to. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Uri" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Uri" _links: description: > Links for this resource. @@ -260,7 +260,7 @@ definitions: self: description: > URI of this resource. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Link" AlarmClearedNotification: description: > @@ -282,7 +282,7 @@ definitions: Identifier of this notification. If a notification is sent multiple times due to multiple subscriptions, the "id" attribute of all these notifications shall have the same value. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" notificationType: description: > Discriminator for the different notification types. Shall be set to @@ -293,19 +293,19 @@ definitions: subscriptionId: description: > Identifier of the subscription that this notification relates to. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" timeStamp: description: > Date-time of the generation of the notification. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/DateTime" alarmId: description: > Alarm identifier. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" alarmClearedTime: description: > The time stamp indicating when the alarm was cleared. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/DateTime" _links: description: > Links to resources related to this notification. @@ -317,11 +317,11 @@ definitions: subscription: description: > Link to the related subscription. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/NotificationLink" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/NotificationLink" alarm: description: > Link to the resource that represents the related alarm. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/NotificationLink" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/NotificationLink" AlarmListRebuiltNotification: description: > @@ -344,7 +344,7 @@ definitions: Identifier of this notification. If a notification is sent multiple times due to multiple subscriptions, the "id" attribute of all these notifications shall have the same value. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" notificationType: description: > Discriminator for the different notification types. Shall be set to @@ -355,11 +355,11 @@ definitions: subscriptionId: description: > Identifier of the subscription that this notification relates to. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" timeStamp: description: > Date-time of the generation of the notification. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/DateTime" _links: description: > Links to resources related to this notification. @@ -371,11 +371,11 @@ definitions: subscription: description: > Link to the related subscription. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/NotificationLink" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/NotificationLink" alarms: description: > Link to the alarm list, i.e. the "Alarms" resource. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/NotificationLink" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/NotificationLink" AlarmModifications: description: > @@ -435,7 +435,7 @@ definitions: description: > Information that identifies the faulty resource instance and its managing entity. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ResourceHandle" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/ResourceHandle" faultyResourceType: description: > Type of the faulty resource. @@ -467,7 +467,7 @@ definitions: vnfInstanceSubscriptionFilter: description: > Filter criteria to select VNF instances about which to notify. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/VnfInstanceSubscriptionFilter" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/VnfInstanceSubscriptionFilter" notificationTypes: description: > Match particular notification types. diff --git a/src/SOL003/VNFIndicator/VNFIndicator.yaml b/src/SOL003/VNFIndicator/VNFIndicator.yaml index 622a5b4c..72b8d958 100644 --- a/src/SOL003/VNFIndicator/VNFIndicator.yaml +++ b/src/SOL003/VNFIndicator/VNFIndicator.yaml @@ -608,7 +608,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" Subscriptions.Get.200: description: | 200 OK diff --git a/src/SOL003/VNFIndicator/definitions/SOL003VNFIndicator_def.yaml b/src/SOL003/VNFIndicator/definitions/SOL003VNFIndicator_def.yaml index 21cc352b..c8a7b713 100644 --- a/src/SOL003/VNFIndicator/definitions/SOL003VNFIndicator_def.yaml +++ b/src/SOL003/VNFIndicator/definitions/SOL003VNFIndicator_def.yaml @@ -17,7 +17,7 @@ definitions: id: description: > Identifier of this VNF indicator. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnfd" name: description: > Human readable name of the indicator. Shall be present if defined in @@ -30,7 +30,7 @@ definitions: vnfInstanceId: description: > Identifier of the "Individual VNF instance" which provides the indicator value. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" _links: description: > Links for this resource. @@ -42,11 +42,11 @@ definitions: self: description: > URI of this resource. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Link" vnfInstance: description: > Link to the related "Individual VNF instance" resource. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Link" VnfIndicatorNotificationsFilter: description: > @@ -64,7 +64,7 @@ definitions: vnfInstanceSubscriptionFilter: description: > Filter criteria to select VNF instances about which to notify. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/VnfInstanceSubscriptionFilter" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/VnfInstanceSubscriptionFilter" notificationTypes: description: > Match particular notification types. @@ -82,7 +82,7 @@ definitions: Match particular VNF indicator identifiers. type: array items: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnfd" VnfIndicatorSubscription: description: > @@ -97,7 +97,7 @@ definitions: id: description: > Identifier of this "Individual subscription" resource. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" filter: description: > Filter settings for this subscription, to define the subset of all @@ -120,7 +120,7 @@ definitions: self: description: > URI of this resource. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Link" VnfIndicatorSubscriptionRequest: description: > @@ -140,7 +140,7 @@ definitions: callbackUri: description: > The URI of the endpoint to send the notification to. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Uri" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Uri" authentication: description: > Authentication parameters to configure the use of Authorization when @@ -148,7 +148,7 @@ definitions: in clause 8.3.4 of ETSI GS NFV-SOL 013. This attribute shall only be present if the subscriber requires authorization of notifications. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/SubscriptionAuthentication" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/SubscriptionAuthentication" VnfIndicatorValueChangeNotification: description: > @@ -172,7 +172,7 @@ definitions: Identifier of this notification. If a notification is sent multiple times due to multiple subscriptions, the "id" attribute of all these notifications shall have the same value. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" notificationType: description: > Discriminator for the different notification types. Shall be set to @@ -183,15 +183,15 @@ definitions: subscriptionId: description: > Identifier of the subscription that this notification relates to. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" timeStamp: description: > Date-time of the generation of the notification. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/DateTime" vnfIndicatorId: description: > Identifier of the VNF indicator whose value has changed. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnfd" name: description: > Human readable name of the VNF indicator. Shall be present if @@ -204,7 +204,7 @@ definitions: vnfInstanceId: description: > Identifier of the VNF instance which provides the indicator value. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" _links: description: > Links for this resource. @@ -217,11 +217,11 @@ definitions: description: > Link to the related "Individual VNF instance" resource. Shall be present if the VNF instance information is accessible as a resource. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/NotificationLink" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/NotificationLink" subscription: description: > Link to the related subscription. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/NotificationLink" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/NotificationLink" SupportedIndicatorsChangeNotification: description: > @@ -247,7 +247,7 @@ definitions: Identifier of this notification. If a notification is sent multiple times due to multiple subscriptions, the "id" attribute of all these notifications shall have the same value. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" notificationType: description: > Discriminator for the different notification types. Shall be set to @@ -258,15 +258,15 @@ definitions: subscriptionId: description: > Identifier of the subscription that this notification relates to. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" timeStamp: description: > Date-time of the generation of the notification. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/DateTime" vnfInstanceId: description: > Identifier of the VNF instance which provides the indicator value. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" supportedIndicators: description: > Set of VNF indicators supported by the VNF instance. @@ -279,7 +279,7 @@ definitions: vnfIndicatorId: description: > Identifier of the VNF indicator whose value has changed. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnfd" name: description: > Human readable name of the VNF indicator. Shall be present if defined in the VNFD. See note. @@ -295,8 +295,8 @@ definitions: description: > Link to the related "Individual VNF instance" resource. Shall be present if the VNF instance information is accessible as a resource. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/NotificationLink" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/NotificationLink" subscription: description: > Link to the related subscription. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/NotificationLink" \ No newline at end of file + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/NotificationLink" \ No newline at end of file diff --git a/src/SOL003/VNFLifecycleManagement/VNFLifecycleManagement.yaml b/src/SOL003/VNFLifecycleManagement/VNFLifecycleManagement.yaml index f8fba884..59696f76 100644 --- a/src/SOL003/VNFLifecycleManagement/VNFLifecycleManagement.yaml +++ b/src/SOL003/VNFLifecycleManagement/VNFLifecycleManagement.yaml @@ -1659,7 +1659,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" VNFInstances.Get.200: description: | @@ -1838,7 +1838,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" IndividualVnfInstance.Patch.412: description: | @@ -1937,7 +1937,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" InstantiateVnfInstance.Post.202: description: | @@ -2011,7 +2011,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" ScaleVnfInstance.Post.202: description: | @@ -2091,7 +2091,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" ScaleVnfInstance.Post.409: description: | @@ -2133,7 +2133,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" ScaleToLevelVnfInstance.Post.202: description: | @@ -2214,7 +2214,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" ScaleToLevelVnfInstance.Post.409: description: | 409 CONFLICT @@ -2255,7 +2255,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" ChangeFlavourVnfInstance.Post.202: description: | @@ -2336,7 +2336,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" ChangeFlavourVnfInstance.Post.409: description: | @@ -2379,7 +2379,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" TerminateVnfInstance.Post.202: description: | @@ -2454,7 +2454,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" HealVnfInstance.Post.202: description: | @@ -2534,7 +2534,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" HealVnfInstance.Post.409: description: | @@ -2576,7 +2576,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" OperateVnfInstance.Post.202: description: | @@ -2657,7 +2657,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" OperateVnfInstance.Post.409: description: | @@ -2700,7 +2700,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" ChangeExtConnVnfInstance.Post.202: description: | @@ -2777,7 +2777,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" ChangeVnfpkgVnfInstance.Post.202: description: | @@ -2851,7 +2851,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" VnfLcmOpOccs.Get.200: description: | @@ -3003,7 +3003,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" RollbackVnfLcmOpOcc.Post.409: description: | @@ -3045,7 +3045,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" RetryVnfLcmOpOcc.Post.202: description: | @@ -3114,7 +3114,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" RetryVnfLcmOpOcc.Post.409: description: | @@ -3156,7 +3156,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" FailVnfLcmOpOcc.Post.200: description: | @@ -3240,7 +3240,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" FailVnfLcmOpOcc.Post.409: description: | @@ -3282,7 +3282,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" CancelVnfLcmOpOcc.Post.202: description: | @@ -3353,7 +3353,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" CancelVnfLcmOpOcc.Post.409: description: | @@ -3394,7 +3394,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" Subscriptions.Post.201: description: | @@ -3527,7 +3527,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" Subscriptions.Get.200: description: | @@ -3704,7 +3704,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" CreateVnfSnapshotTask.Post.409: description: | @@ -3745,7 +3745,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" CreateVnfSnapshotTask.Post.422: description: | @@ -3791,7 +3791,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" RevertToVnfSnapshotTask.Post.202: description: | @@ -3872,7 +3872,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" RevertToVnfSnapshotTask.Post.409: description: | @@ -3913,7 +3913,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" VnfSnapshots.Post.201: description: | @@ -4149,7 +4149,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" IndividualVnfSnapshot.Patch.412: description: | @@ -4246,7 +4246,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" IndividualVnfSnapshotState.Get.200: description: | @@ -4363,7 +4363,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" IndividualVnfSnapshotState.Get.416: description: | diff --git a/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml b/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml index 61d53d46..9cf02644 100644 --- a/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml +++ b/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml @@ -32,12 +32,12 @@ definitions: flavourId: description: > Identifier of the VNF deployment flavour to be instantiated. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnfd" instantiationLevelId: description: > Identifier of the instantiation level of the deployment flavour to be instantiated. See note 3. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnfd" targetScaleLevelInfo: description: > This attribute is applicable if VNF supports target @@ -48,7 +48,7 @@ definitions: notes 3 and 4. type: array items: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ScaleInfo" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/ScaleInfo" extVirtualLinks: description: > Information about external VLs to connect the VNF @@ -65,7 +65,7 @@ definitions: the external VLs. type: array items: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ExtVirtualLinkData" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/ExtVirtualLinkData" extManagedVirtualLinks: description: > Information about internal VLs that are managed by the NFVO. See note 1 and note 2. @@ -91,33 +91,33 @@ definitions: IETF RFC 7396 [5]). type: object additionalProperties: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/VimConnectionInfo" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/VimConnectionInfo" localizationLanguage: description: > Localization language of the VNF to be instantiated. The value shall comply with the format defined in IETF RFC 5646. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/String" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/String" additionalParams: description: > Additional input parameters for the instantiation process, specific to the VNF being instantiated, as declared in the VNFD as part of "InstantiateVnfOpConfig" defined in ETSI GS NFVIFA 011 [10]. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/KeyValuePairs" extensions: description: > If present, this attribute provides modifications to the default values, as obtained from the VNFD, of the "extensions" attribute in "VnfInstance", as defined in clause 5.5.2.2. Provisions for handling extensions during the operation are defined in clause 5.4.4.3.1. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/KeyValuePairs" vnfConfigurableProperties: description: > If present, this attribute provides modifications to the default values, as obtained from the VNFD, of the "vnfConfigurableProperties" attribute in "VnfInstance", as defined in clause 5.5.2.2. Provisions for handling configurable properties during the operation are defined in clause 5.4.4.3.1. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/KeyValuePairs" ExtManagedVirtualLinkData: description: > @@ -140,29 +140,29 @@ definitions: The identifier of the externally-managed internal VL instance. The identifier is assigned by the NFV-MANO entity that manages this VL instance. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" vnfVirtualLinkDescId: description: > The identifier of the VLD in the VNFD for this VL. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnfd" vimConnectionId: 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. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" resourceProviderId: description: > Identifies the entity responsible for the management of this resource. This attribute shall only be supported and present if VNF-related resource management in indirect mode is applicable. The identification scheme is outside the scope of the present document. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" resourceId: description: > The identifier of the resource in the scope of the VIM or the resource provider. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVim" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVim" netAttDefResourceData: description: > Externally provided network attachment definition @@ -171,7 +171,7 @@ definitions: See notes 1 and 3. type: array items: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/NetAttDefResourceData" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/NetAttDefResourceData" intCp: description: > Internal CPs of the VNF to be connected to this @@ -186,7 +186,7 @@ definitions: externally-managed VL. See note 2. type: array items: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/VnfLinkPortData" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/VnfLinkPortData" extManagedMultisiteVirtualLinkId: description: > Identifier of the externally-managed multi-site VL instance. The identifier is assigned by the NFVMANO @@ -195,7 +195,7 @@ definitions: in support of multi-site VNF spanning several VIMs. All externally-managed internal VL instances corresponding to an internal VL created based on the same virtualLinkDescId shall refer to the same extManagedMultisiteVirtualLinkId. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" ChangeVnfFlavourRequest: description: > @@ -226,13 +226,13 @@ definitions: newFlavourId: description: > Identifier of the VNF deployment flavour to be instantiated. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnfd" instantiationLevelId: description: > Identifier of the instantiation level of the deployment flavour to be instantiated. See note 3. If not present, the default instantiation level as declared in the VNFD is instantiated. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnfd" targetScaleLevelInfo: description: > This attribute is applicable if VNF supports target scale @@ -243,7 +243,7 @@ definitions: notes 3 and 4. type: array items: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ScaleInfo" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/ScaleInfo" extVirtualLinks: description: > Information about external VLs to connect the VNF to, including configuration information @@ -259,7 +259,7 @@ definitions: aspects, to the external VLs. type: array items: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ExtVirtualLinkData" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/ExtVirtualLinkData" extManagedVirtualLinks: description: > Information about internal VLs that are managed by the NFVO. See notes 1 and 2. @@ -285,25 +285,25 @@ definitions: RFC 7396 [5]). type: object additionalProperties: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/VimConnectionInfo" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/VimConnectionInfo" additionalParams: description: > Additional input parameters for the instantiation process, specific to the VNF being instantiated, as declared in the VNFD as part of "InstantiateVnfOpConfig" defined in ETSI GS NFV-IFA 011 [10]. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/KeyValuePairs" extensions: description: > If present, this attribute provides modifications to the values of the "extensions" attribute in "VnfInstance", as defined in clause 5.5.2.2. Provisions for handling extensions during the operation, are defined in clause 5.4.7.3.1. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/KeyValuePairs" vnfConfigurableProperties: description: > If present, this attribute provides modifications to the values of the "vnfConfigurableProperties" attribute in "VnfInstance", as defined in clause 5.5.2.2. Provisions for handling VNF configurable properties during the operation, are defined in clause 5.4.7.3.1. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/KeyValuePairs" TerminateVnfRequest: description: > @@ -351,7 +351,7 @@ definitions: Additional parameters passed by the NFVO as input to the termination process, specific to the VNF being terminated, as declared in the VNFD as part of "TerminateVnfOpConfig" defined in ETSI GS NFV-IFA 011 [10]. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/KeyValuePairs" HealVnfRequest: type: object @@ -359,13 +359,13 @@ definitions: cause: description: > Indicates the reason why a healing procedure is required. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/String" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/String" additionalParams: description: > Additional parameters passed by the NFVO as input to the healing process, specific to the VNF being healed, as declared in the VNFD as part of "HealVnfOpConfig" defined in ETSI GS NFV-IFA 011 [10]. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/KeyValuePairs" OperateVnfRequest: description: > @@ -403,7 +403,7 @@ definitions: Additional parameters passed by the NFVO as input to the process, specific to the VNF of which the operation status is changed, as declared in the VNFD as part of "OperateVnfOpConfig" defined in ETSI GS NFV-IFA 011 [10]. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/KeyValuePairs" ChangeExtVnfConnectivityRequest: description: > @@ -429,7 +429,7 @@ definitions: all scaling aspects, to the external VLs. type: array items: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ExtVirtualLinkData" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/ExtVirtualLinkData" vimConnectionInfo: description: > Information about VIM or CISM connections to be used for managing the resources for the VNF instance, or @@ -445,13 +445,13 @@ definitions: according to the rules of JSON Merge Patch (see IETF RFC 7396 [5]). type: object additionalProperties: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/VimConnectionInfo" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/VimConnectionInfo" additionalParams: description: > Additional input parameters for the instantiation process, specific to the VNF being instantiated, as declared in the VNFD as part of "ChangeExtVnfConnectivityOpConfig" defined in ETSI GS NFV-IFA 011 [10]. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/KeyValuePairs" ChangeCurrentVnfPkgRequest: description: > @@ -477,7 +477,7 @@ definitions: description: > Identifier of the VNFD which defines the destination VNF Package for the change. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" extVirtualLinks: description: > Information about external VLs to connect the VNF to, including configuration information for @@ -492,7 +492,7 @@ definitions: out in all scaling aspects, to the external VLs. type: array items: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ExtVirtualLinkData" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/ExtVirtualLinkData" extManagedVirtualLinks: description: > Information about internal VLs that are managed by the NFVO. See notes 1 and 2. @@ -511,26 +511,26 @@ definitions: "VnfInstance" according to the rules of JSON Merge Patch (see IETF RFC 7396 [5]). type: object additionalProperties: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/VimConnectionInfo" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/VimConnectionInfo" additionalParams: description: > Additional parameters passed by the NFVO as input to the process, specific to the VNF of which the underlying VNF package is changed, as declared in the VNFD as part of "ChangeCurrentVnfPkgOpConfig" " defined in ETSI GS NFV-IFA 011 [10]. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/KeyValuePairs" extensions: description: > If present, this attribute provides modifications to the values of the "extensions" attribute in "VnfInstance", as defined in clause 5.5.2.2. Provisions for handling extensions during the operation, and needed passed parameter values in case of conflicts, are defined in clause 5.4.11a.3.1. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/KeyValuePairs" vnfConfigurableProperties: description: > If present, this attribute provides modifications to the values of the "vnfConfigurableProperties" attribute in "VnfInstance", as defined in clause 5.5.2.2. Provisions for handling VNF configurable properties during the operation, and needed passed parameter values in case of conflicts, are defined in clause 5.4.11a.3.1. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/KeyValuePairs" VnfInfoModificationRequest: description: > @@ -541,40 +541,40 @@ definitions: vnfInstanceName: description: > New value of the "vnfInstanceName" attribute in "VnfInstance", or "null" to remove the attribute. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/String" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/String" vnfInstanceDescription: description: > New value of the "vnfInstanceDescription" attribute in "VnfInstance", or "null" to remove the attribute. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/String" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/String" vnfdId: description: > New value of the "vnfdId" attribute in "VnfInstance". The value "null" is not permitted. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" vnfConfigurableProperties: description: > Modifications of the "vnfConfigurableProperties" attribute in "VnfInstance". If present, these modifications shall be applied according to the rules of JSON Merge Patch (see IETF RFC 7396). - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/KeyValuePairs" metadata: description: > Modifications of the "metadata" attribute in "VnfInstance". If present, these modifications shall be applied according to the rules of JSON Merge Patch (see IETF RFC 7396). - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/KeyValuePairs" extensions: description: > Modifications of the "extensions" attribute in "VnfInstance". If present, these modifications shall be applied according to the rules of JSON Merge Patch (see IETF RFC 7396). - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/KeyValuePairs" vimConnectionInfo: description: > Modifications of the "vimConnectionInfo" attribute. If present, these modifications shall be applied according to the rules of JSON Merge Patch (see IETF RFC 7396 [5]). type: object additionalProperties: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/VimConnectionInfo" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/VimConnectionInfo" VnfInfoModifications: description: > @@ -596,63 +596,63 @@ definitions: description: > If present, this attribute signals modifications of the "vnfInstanceName" attribute in "VnfInstance". - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/String" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/String" vnfInstanceDescription: description: > If present, this attribute signals modifications of the "vnfInstanceDescription" attribute in "VnfInstance". - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/String" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/String" vnfConfigurableProperties: description: > If present, this attribute signals modifications of the "vnfConfigurableProperties" attribute in "VnfInstance". In addition, the provisions in clause 5.7 shall apply. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/KeyValuePairs" metadata: description: > If present, this attribute signals modifications of the "metadata" attribute in "VnfInstance". - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/KeyValuePairs" extensions: description: > If present, this attribute signals modifications of the "extensions" attribute in "VnfInstance". In addition, the provisions in clause 5.7 shall apply. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/KeyValuePairs" vimConnectionInfo: description: > If present, this attribute signals modifications the "vimConnectionInfo" attribute array in "VnfInstance". type: object additionalProperties: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/VimConnectionInfo" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/VimConnectionInfo" vnfdId: description: > If present, this attribute signals modifications of the "vnfdId" attribute in "VnfInstance". - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" vnfProvider: description: > If present, this attribute signals modifications of the "vnfProvider" attribute in "VnfInstance". See note. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/String" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/String" vnfProductName: description: > If present, this attribute signals modifications of the "vnfProductName" attribute in "VnfInstance". See note. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/String" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/String" vnfSoftwareVersion: description: > If present, this attribute signals modifications of the "vnfSoftwareVersion" attribute in "VnfInstance". See note. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Version" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Version" vnfdVersion: description: > If present, this attribute signals modifications of the "vnfdVersion" attribute in "VnfInstance". See note. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Version" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Version" StopType: description: > @@ -682,17 +682,17 @@ definitions: description: > Identifier of the "Individual VNF snapshot" resource to which the VNF snapshot is to be associated. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" additionalParams: description: > Additional input parameters for the snapshot creation process, specific for the VNF being “snapshotted”, as declared in the VNFD as part of “CreateSnapshotVnfOpConfig” defined in ETSI GS NFV-IFA 011 [10]. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/KeyValuePairs" userDefinedData: description: > User defined data for the VNF snapshot. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/KeyValuePairs" CreateVnfSnapshotInfoRequest: description: | @@ -708,7 +708,7 @@ definitions: vnfSnapshotPkgId: description: | Identifier of the VNF snapshot package information held by the NFVO. See note. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" vnfSnapshot: description: | Information about the VNF snapshot, content and/or reference to its content. @@ -725,12 +725,12 @@ definitions: description: > Identifier of the "Individual VNF snapshot" resource with the information of the VNF snapshot to be reverted to. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" additionalParams: description: > Additional input parameters for the revert to VNF snapshot process, specific for the VNF being “reverted”, as declared in the VNFD as part of “RevertToSnapshotVnfOpConfig” defined in ETSI GS NFV-IFA 011 [10]. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/KeyValuePairs" VnfSnapshotInfoModificationRequest: description: | @@ -745,7 +745,7 @@ definitions: description: | New value of the "vnfSnapshotPkgId" attribute in "VnfSnapshotInfo". The value "null" is not permitted. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" vnfSnapshot: description: | New value of the "vnfSnapshot" attribute in "VnfSnapshotInfo". @@ -765,7 +765,7 @@ definitions: description: | If present, this attribute signals modifications of the "vnfSnapshotPkgId" attribute in "VnfSnapshotInfo" as defined in clause 5.5.2.22. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" vnfSnapshot: description: | If present, this attribute signals modifications of the "vnfSnapshot" attribute in @@ -817,7 +817,7 @@ definitions: id: description: > Identifier of the VNF instance. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" vnfInstanceName: description: > Name of the VNF instance. @@ -831,7 +831,7 @@ definitions: vnfdId: description: > Identifier of the VNFD on which the VNF instance is based. See note 1. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" vnfProvider: description: > Provider of the VNF and the VNFD. The value is copied from the VNFD. @@ -843,11 +843,11 @@ definitions: vnfSoftwareVersion: description: > Software version of the VNF. The value is copied from the VNFD. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Version" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Version" vnfdVersion: description: > Identifies the version of the VNFD. The value is copied from the VNFD. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Version" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Version" vnfConfigurableProperties: description: > Additional VNF-specific attributes that provide the current values of the configurable @@ -881,7 +881,7 @@ definitions: Further, these configurable properties can be created, modified or deleted with the PATCH method. In addition, the provisions in clause 5.7 shall apply. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/KeyValuePairs" vimConnectionInfo: description: > Information about VIM or CISM connections @@ -904,7 +904,7 @@ definitions: PATCH method. type: object additionalProperties: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/VimConnectionInfo" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/VimConnectionInfo" cirConnectionInfo: description: > Information about the CIR connection for @@ -915,7 +915,7 @@ definitions: shall be absent otherwise. type: object additionalProperties: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/VimConnectionInfo" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/VimConnectionInfo" mciopRepositoryInfo: description: > Information about the MCIOP repository for @@ -926,7 +926,7 @@ definitions: See note 1. type: object additionalProperties: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/VimConnectionInfo" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/VimConnectionInfo" instantiationState: description: > The instantiation state of the VNF. @@ -950,7 +950,7 @@ definitions: flavourId: description: > Identifier of the VNF deployment flavour applied to this VNF instance. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnfd" vnfState: description: > The state of the VNF instance. @@ -966,14 +966,14 @@ definitions: See clause B.2 for an explanation of VNF scaling. type: array items: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ScaleInfo" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/ScaleInfo" maxScaleLevels: description: > Maximum allowed scale levels of the VNF, one entry per aspect. This attribute shall be present if the VNF supports scaling. type: array items: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ScaleInfo" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/ScaleInfo" extCpInfo: description: > Information about the external CPs exposed by the VNF instance. When trunking is enabled, @@ -1074,7 +1074,7 @@ definitions: passed in the CreateVnfRequest structure (see clause 5.4.2.3.1). These attributes can be created, modified or removed with the PATCH method. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/KeyValuePairs" extensions: description: > Additional VNF-specific attributes that affect the lifecycle management of this VNF instance. @@ -1101,7 +1101,7 @@ definitions: Further, these attributes can be created, modified or deleted with the PATCH method. In addition, the provisions in clause 5.7 shall apply. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/KeyValuePairs" _links: description: > Links to resources related to this resource. @@ -1111,81 +1111,81 @@ definitions: properties: self: description: URI of this resource. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Link" indicators: description: Indicators related to this VNF instance, if applicable. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Link" instantiate: description: > Link to the "Instantiate VNF task" resource, if the related operation is possible based on the current status of this VNF instance resource (i.e. VNF instance in NOT_INSTANTIATED state). - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Link" terminate: description: > Link to the "Terminate VNF task" resource, if the related operation is possible based on the current status of this VNF instance resource (i.e. VNF instance is in INSTANTIATED state). - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Link" scale: description: > Link to the "Scale VNF task" resource, if the related operation is supported for this VNF instance, and is possible based on the current status of this VNF instance resource (i.e. VNF instance is in INSTANTIATED state). - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Link" scaleToLevel: description: > Link to the "Scale VNF to level task" resource, if the related operation is supported for this VNF instance, and is possible based on the current status of this VNF instance resource (i.e. VNF instance is in INSTANTIATED state). - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Link" changeFlavour: description: > Link to the "Change VNF flavour task" resource, if the related operation is supported for this VNF instance, and is possible based on the current status of this VNF instance resource (i.e. VNF instance is in INSTANTIATED state). - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Link" heal: description: > Link to the "Heal VNF task" resource, if the related operation is supported for this VNF instance, and is possible based on the current status of this VNF instance resource (i.e. VNF instance is in INSTANTIATED state). - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Link" operate: description: > Link to the "Operate VNF task" resource, if the related operation is supported for this VNF instance, and is possible based on the current status of this VNF instance resource (i.e. VNF instance is in INSTANTIATED state). - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Link" changeExtConn: description: > Link to the "Change external VNF connectivity task" resource, if the related operation is possible based on the current status of this VNF instance resource (i.e. VNF instance is in INSTANTIATED state). - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Link" createSnapshot: description: > Link to the "Create VNF snapshot task" resource, if the related operation is supported for this VNF instance and is possible based on the current status of this VNF instance resource (i.e., VNF instance is in INSTANTIATED state). - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Link" revertToSnapshot: description: > Link to the "Revert to VNF snapshot task" resource, if the related operation is supported for this VNF instance and is possible based on the current status of this VNF instance resource (i.e., VNF instance is in INSTANTIATED state). - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Link" changeCurrentVnfPkg: description: > Link to the "Change current VNF package task" resource, if the related operation is possible based on the current status of this VNF instance resource (i.e. VNF instance is in INSTANTIATED state). - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Link" ExtManagedVirtualLinkInfo: type: object @@ -1200,21 +1200,21 @@ definitions: externally-managed VL information instance. The identifier is assigned by the NFV-MANO entity that manages this VL instance. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" vnfVirtualLinkDescId: description: > Identifier of the VNF Virtual Link Descriptor (VLD) in the VNFD. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnf" vnfdId: description: > Identifier of the VNFD. Shall be present in case the value differs from the vnfdId attribute of the VnfInstance (e.g. during a "Change current VNF package" operation or due to its final failure). - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" networkResource: description: > Reference to the VirtualNetwork resource providing this VL. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ResourceHandle" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/ResourceHandle" vnfLinkPorts: description: > Link ports of this VL. @@ -1235,7 +1235,7 @@ definitions: internal VL is part of a multi-site VL, e.g., in support of multi-site VNF spanning several VIMs. All externally-managed internal VL instances corresponding to an internal VL created based on the same virtualLinkDescId shall refer to the same extManagedMultisiteVirtualLinkId. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" VirtualStorageResourceInfo: description: > @@ -1255,37 +1255,37 @@ definitions: id: description: > Identifier of this VirtualStorageResourceInfo instance. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnf" virtualStorageDescId: description: > Identifier of the VirtualStorageDesc in the VNFD. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnfd" vnfdId: description: > Identifier of the VNFD. Shall be present in case the value differs from the vnfdId attribute of the VnfInstance (e.g. during a "Change current VNF package" operation or due to its final failure). See note. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" storageResource: description: > Reference to the VirtualStorage resource or reference to a Storage MCIO. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ResourceHandle" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/ResourceHandle" zoneId: description: > The identifier of the resource zone, as managed by the resource management layer (typically, the VIM), where the referenced VirtualStorage resource is placed. Shall be provided if this information is available from the VIM. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" reservationId: description: > The reservation identifier applicable to the resource. It shall be present when an applicable reservation exists. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" metadata: description: > Metadata about this resource. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/KeyValuePairs" VnfcResourceInfo: description: > @@ -1323,40 +1323,40 @@ definitions: id: description: > Identifier of this VnfcResourceInfo instance. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnf" vduId: description: > Reference to the applicable VDU in the VNFD. See note 1. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnfd" vnfdId: description: > Identifier of the VNFD. Shall be present in case the value differs from the vnfdId attribute of the VnfInstance (e.g. during a "Change current VNF package" operation or due to its final failure). See note 4. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" computeResource: description: > Reference to the VirtualCompute resource or reference to a Compute MCIO. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ResourceHandle" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/ResourceHandle" zoneId: description: > The identifier of the resource zone, as managed by the resource management layer (typically, the VIM), where the referenced VirtualCompute resource is placed. Shall be provided if this information is available from the VIM. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" storageResourceIds: description: > References to the VirtualStorage resources or references to Storage MCIOs. The value refers to a VirtualStorageResourceInfo item in the VnfInstance. type: array items: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnf" reservationId: description: > The reservation identifier applicable to the resource. It shall be present when an applicable reservation exists. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" vnfcCpInfo: description: > CPs of the VNFC instance. Shall be present when that particular CP of the VNFC instance @@ -1373,17 +1373,17 @@ definitions: description: > Identifier of this VNFC CP instance and the associated array entry. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnf" cpdId: description: > Identifier of the VDU CPD, cpdId, in the VNFD. See note 1. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnfd" vnfExtCpId: description: > Identifier of the related external CP. Shall be present when the VNFC CP is exposed as an external CP of the VNF instance or connected to an external CP of the VNF instance (see note 2) and shall be absent otherwise. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnf" cpProtocolInfo: description: > Network protocol information for this CP. May be omitted if the VNFC CP is exposed as an external CP. @@ -1396,18 +1396,18 @@ definitions: Identifier of the "VnfLinkPortInfo" structure in the "VnfVirtualLinkResourceInfo" or "ExtManagedVirtualLinkInfo" structure. Shall be present if the CP is associated to a link port on an internal VL (including externally-managed internal VL) of the VNF instance and shall be absent otherwise. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnf" metadata: description: > Metadata about this CP. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/KeyValuePairs" parentCpId: description: > Identifier of another VNFC CP instance that corresponds to the parent port of a trunk that the present VNFC CP instance participates in. Shall be provided if the present CP instance participates in a trunk as subport, and the referred VNFC CP instances are also present in the vnfcCpInfo attribute. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnf" netAttDefResourceInfoId: description: > @@ -1417,12 +1417,12 @@ definitions: connected to a secondary container cluster network. It shall not be present otherwise. type: array items: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" metadata: description: > Metadata about this resource. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/KeyValuePairs" VnfSnapshotInfo: description: > @@ -1436,12 +1436,12 @@ definitions: id: description: > Identifier of the "Individual VNF snapshot" resource. This identifier is allocated by the VNFM. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" vnfSnapshotPkgId: description: > Identifier of the VNF snapshot package information held by the NFVO. Shall be present when the “Individual VNF snapshot" resource is created from a VNF snapshot package extraction. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" vnfSnapshot: description: > Information about the VNF snapshot, content and/or references to its content. Shall be present @@ -1458,13 +1458,13 @@ definitions: self: description: > URI of this resource. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Link" takenFrom: description: > Link to the VNF instance from which this snapshot was taken. Shall be present when the "Individual VNF snapshot" resource is associated to a VNF snapshot created via the corresponding "Create VNF snapshot" task resource. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Link" VnfStateSnapshotInfo: description: > @@ -1478,15 +1478,15 @@ definitions: description: > Checksum of the VNF state snapshot file. Hash algorithms applicable to VNF snapshot package artifacts are defined in ETSI GS NFV-SOL 010. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Checksum" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Checksum" isEncrypted: description: > Reflects whether the VNF state snapshot content is encrypted (true) or not (false). - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Boolean" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Boolean" metadata: description: > The metadata with additional information such as content type, size, creation date, etc. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/KeyValuePairs" VnfSnapshot: description: > @@ -1504,24 +1504,24 @@ definitions: id: description: > Identifier of the VNF Snapshot. This identifier is allocated by the VNFM. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" vnfInstanceId: description: > Identifier of the snapshotted VNF instance. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" creationStartedAt: description: > Timestamp indicating when the VNF snapshot creation has been started by the VNFM. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/DateTime" creationFinishedAt: description: > Timestamp indicating when the VNF snapshot has been completed by the VNFM. Shall be present once the VNF snapshot creation has been completed. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/DateTime" vnfdId: description: > Identifier of the VNFD in use at the time the snapshot of the VNF instance has been created. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" vnfInstance: description: > VNF Instance information of the snapshotted VNF instance. This is a copy of the "ndividual VNF instance" resource. @@ -1542,7 +1542,7 @@ definitions: userDefinedData: description: > User defined data for the VNF snapshot. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/KeyValuePairs" _links: description: > Links to resources related to this resource. @@ -1553,14 +1553,14 @@ definitions: self: description: > URI of this resource. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Link" vnfStateSnapshot: description: > Link to the "VNF state snapshot" resource. This attribute shall not be present before the VNF snapshot has been completed. Otherwise, this attribute shall be present if the VNF snapshot has associated additional VNFspecific state data. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Link" VnfcSnapshotInfo: description: > @@ -1587,30 +1587,30 @@ definitions: the VNFM and is unique within the scope of a VNF snapshot. The attribute also identifies the compute snapshot image associated to this VNFC snapshot within the context of a referred VNF snapshot. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierLocal" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierLocal" vnfcInstanceId: description: > Identifier of the snapshotted VNFC instance. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnf" creationStartedAt: description: > Timestamp indicating when the VNF snapshot creation has been started by the VNFM. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/DateTime" creationFinishedAt: description: > Timestamp indicating when the VNFC snapshot has been completed. Shall be present once the VNFC snapshot creation has been completed by the VNFM. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/DateTime" vnfcResourceInfoId: description: > Reference to the "VnfcResourceInfo" structure in the "VnfInstance" structure that represents the resource of the snapshotted VNFC instance. A snapshot of that structure is available in the "vnfInstance" attribute of the "VnfSnapshot" structure. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnf" computeSnapshotResource: description: > Reference to a compute snapshot resource. See note 1. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ResourceHandle" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/ResourceHandle" storageSnapshotResources: description: > Mapping of the storage resources associated to the VNFC with the storage snapshot resources. @@ -1626,15 +1626,15 @@ definitions: that represents the virtual storage resource. The attribute also identifies the storage snapshot image associated to this VNFC snapshot within the context of a referred VNF snapshot. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnf" storageSnapshotResource: description: > Reference to a storage snapshot resource. See note 2. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/KeyValuePairs" userDefinedData: description: > User defined data for the VNFC snapshot. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/KeyValuePairs" VnfVirtualLinkResourceInfo: description: > @@ -1654,33 +1654,33 @@ definitions: id: description: > Identifier of this VnfVirtualLinkResourceInfo instance. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnf" vnfVirtualLinkDescId: description: > Identifier of the VNF Virtual Link Descriptor (VLD) in the VNFD. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnfd" vnfdId: description: > Identifier of the VNFD. Shall be present in case the value differs from the vnfdId attribute of the VnfInstance (e.g. during a "Change current VNF package" operation or due to its final failure). See note. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" networkResource: description: > Reference to the VirtualNetwork resource or reference to a Network MCIO. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ResourceHandle" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/ResourceHandle" zoneId: description: > The identifier of the resource zone, as managed by the resource management layer (typically, the VIM), where the referenced VirtualNetwork resource is placed. Shall be provided if this information is available from the VIM. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" reservationId: description: > The reservation identifier applicable to the resource. It shall be present when an applicable reservation exists. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" vnfLinkPorts: description: > Links ports of this VL. @@ -1693,7 +1693,7 @@ definitions: metadata: description: > Metadata about this resource. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/KeyValuePairs" AffectedVnfc: description: > @@ -1716,17 +1716,17 @@ definitions: description: > Identifier of the Vnfc instance, identifying the applicable "vnfcResourceInfo" entry in the "VnfInstance" data type. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnf" vduId: description: > Identifier of the related VDU in the VNFD. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnfd" vnfdId: description: > Identifier of the VNFD. Shall be present in case of a "change current VNF Package" to identify whether the affected VNFC instance is associated to a VDU which is referred from the source or destination VNFD. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" changeType: description: > Signals the type of change. Permitted values: @@ -1747,24 +1747,24 @@ definitions: Reference to the VirtualCompute resource. Detailed information is (for new and modified resources) or has been (for removed resources) available from the VIM. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ResourceHandle" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/ResourceHandle" resourceDefinitionId: description: > The identifier of the "ResourceDefinition" in the granting exchange related to the LCM operation occurrence. It shall be present when an applicable GrantInfo for thegranted resource exists. See note. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierLocal" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierLocal" zoneId: description: > The identifier of the resource zone, as managed by the resource management layer (typically, the VIM), where the referenced VirtualCompute resource is placed. Shall be provided if this information is available from the VIM. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" metadata: description: > Metadata about this resource. The content of this attribute shall be a copy of the content of the "metadata" attribute of the VnfcResourceInfo structure. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/KeyValuePairs" affectedVnfcCpIds: description: > Identifiers of CP(s) of the VNFC instance that were affected by the @@ -1774,7 +1774,7 @@ definitions: May be present for further affected CPs of the VNFC instance. type: array items: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnf" addedStorageResourceIds: description: > References to VirtualStorage resources that have been added. Each @@ -1783,7 +1783,7 @@ definitions: least one storage resource was added to the VNFC. type: array items: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnf" removedStorageResourceIds: description: > References to VirtualStorage resources that have been removed. @@ -1794,7 +1794,7 @@ definitions: from the VNFC. type: array items: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnf" VnfLcmOpOcc: description: > @@ -1840,7 +1840,7 @@ definitions: id: description: > Identifier of this VNF lifecycle management operation occurrence. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" operationState: description: > The state of the LCM operation. @@ -1848,34 +1848,34 @@ definitions: stateEnteredTime: description: > Date-time when the current state has been entered. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/DateTime" startTime: description: > Date-time of the start of the operation. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/DateTime" vnfInstanceId: description: > Identifier of the VNF instance to which the operation applies - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" grantId: description: > Identifier of the grant related to this VNF LCM operation occurrence. Shall be set to the value of the "id" attribute in the "Grant" representing the associated "Individual Grant", if such grant exists. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" operation: description: > Type of the actual LCM operation represented by this VNF LCM operation occurrence. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/LcmOperationType" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/LcmOperationType" isAutomaticInvocation: description: > Set to true if this VNF LCM operation occurrence has been triggered by an automated procedure inside the VNFM (i.e. ScaleVnf / ScaleVnfToLevel triggered by auto-scale, or HealVnf triggered by auto-heal). Set to false otherwise. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Boolean" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Boolean" operationParams: description: > Input parameters of the LCM operation. This attribute shall be @@ -1902,7 +1902,7 @@ definitions: If the VNF LCM operation occurrence is in "STARTING", "PROCESSING" or "ROLLING_BACK" state and the operation is being cancelled, this attribute shall be set to true. Otherwise, it shall be set to false. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Boolean" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Boolean" cancelMode: description: > The mode of an ongoing cancellation. Shall be present when @@ -1915,7 +1915,7 @@ definitions: "operationState" was "FAILED_TEMP", this attribute shall be present and contain error information, unless it has been requested to be excluded via an attribute selector. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/ProblemDetails" resourceChanges: description: > This attribute contains information about the cumulative changes to @@ -1979,7 +1979,7 @@ definitions: description: > Identifier of the "individual VNF snapshot" resource. Shall be present if applicable to the type of LCM operation, i.e., if the value of the "operation" attribute is either "CREATE_SNAPSHOT" or "REVERT_TO_SNAPSHOT". - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" lcmCoordinations: description: > Information about LCM coordination actions (see clause 10 in ETSI GS NFV-SOL002) related to this LCM operation occurrence. @@ -1995,11 +1995,11 @@ definitions: id: description: > Identifier of this coordination action. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" coordinationActionName: description: > Indicator of the actual coordination action. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" coordinationResult: description: > The result of executing the coordination action which also implies the action to be performed by the VNFM as @@ -2007,23 +2007,23 @@ definitions: Shall be present if the coordination has been finished. Shall be absent if the coordination is ongoing or has timed out (see note 4). - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/LcmCoordResultType" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/LcmCoordResultType" startTime: description: > The time when the VNFM has received the confirmation that the coordination action has been started. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/DateTime" endTime: description: > 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" + $ref: "../../General_Definitions/SOL003_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" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/DateTime" endpointType: description: > The endpoint type used by this coordination action. @@ -2050,15 +2050,15 @@ definitions: coordinationActionName: description: > Indicator of the actual coordination action. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_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" + $ref: "../../General_Definitions/SOL003_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" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/DateTime" endpointType: description: > The endpoint type used by this coordination action. @@ -2089,44 +2089,44 @@ definitions: self: description: > URI of this resource. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Link" vnfInstance: description: > Link to the VNF instance that the operation applies to. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Link" grant: description: > Link to the grant for this operation, if one exists. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Link" cancel: description: > Link to the task resource that represents the "cancel" operation for this VNF LCM operation occurrence, if cancelling is currently allowed. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Link" retry: description: > Link to the task resource that represents the "retry" operation for this VNF LCM operation occurrence, if retrying is currently allowed. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Link" rollback: description: > Link to the task resource that represents the "rollback" operation for this VNF LCM operation occurrence, if rolling back is currently allowed. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Link" fail: description: > Link to the task resource that represents the "fail" operation for this VNF LCM operation occurrence, if declaring as failed is currently allowed. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Link" vnfSnapshot: description: > Link to the VNF snapshot resource, if the VNF LCM operation occurrence is related to a VNF snapshot. Shall be present if operation="CREATE_SNAPSHOT" or operation="REVERT_TO_SNAPSHOT". - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Link" AffectedExtLinkPort: description: > @@ -2148,7 +2148,7 @@ definitions: description: > Identifier of the link port, identifying the applicable "extLinkPorts" entry in the "ExtVirtualLinkInfo" data type (see clause 5.5.3.2). - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" changeType: description: > Signals the type of change. @@ -2163,17 +2163,17 @@ definitions: extCpInstanceId: description: > Identifier of the related external CP instance. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnf" resourceHandle: description: > Reference to the link port resource. Detailed information is (for added resources) or has been (for removed resources) available from the VIM. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ResourceHandle" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/ResourceHandle" resourceDefinitionId: description: > The identifier of the "ResourceDefinition" in the granting exchange related to the LCM operation occurrence. It shall be present when an applicable GrantInfo for the granted resource exists. See note. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierLocal" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierLocal" VnfLcmOperationOccurrenceNotification: description: > @@ -2249,7 +2249,7 @@ definitions: Identifier of this notification. If a notification is sent multiple times due to multiple subscriptions, the "id" attribute of all these notifications shall have the same value. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" notificationType: description: > Discriminator for the different notification types. Shall be set to @@ -2261,11 +2261,11 @@ definitions: description: > Identifier of the subscription that this notification relates to.Shall be set to the value of the "id" attribute of the "LccnSubscription" representing the associated "Individual subscription" resource. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" timeStamp: description: > Date-time of the generation of the notification. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/DateTime" notificationStatus: description: > Indicates whether this notification reports about the start of a @@ -2286,11 +2286,11 @@ definitions: vnfInstanceId: description: > The identifier of the VNF instance affected. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" operation: description: > The lifecycle management operation. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/LcmOperationType" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/LcmOperationType" isAutomaticInvocation: description: > Set to true if this VNF LCM operation occurrence has been triggered @@ -2310,7 +2310,7 @@ definitions: The identifier of the VNF lifecycle management operation occurrence associated to the notification. Shall be set to the value of the "id" attribute of the "VnfLcmOpOcc" representing the associate "Individual VNF lifecycle management operation occurrence" resource. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" affectedVnfcs: description: > Information about VNFC instances that were affected during the lifecycle operation. See note 1. @@ -2395,7 +2395,7 @@ definitions: the LCM operation (see clause 6.3 of ETSI GS NFV-SOL 013). Shall be present if the "operationState" attribute is "FAILED_TEMP", "FAILED" or "ROLLED_BACK" and shall be absent otherwise. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/ProblemDetails" _links: description: > Links to resources related to this notification. @@ -2428,17 +2428,17 @@ definitions: description: > Identifier of the virtual link instance, identifying the applicable "vnfVirtualLinkResourceInfo" or "extManagedVirtualLinkInfo" entry in the "VnfInstance" data type. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnf" vnfVirtualLinkDescId: description: > Identifier of the related VLD in the VNFD. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnfd" vnfdId: description: > Identifier of the VNFD. Shall be present in case of a "change current VNF Package" to identify whether the affected VL instance is associated to a VLD which is referred from the source or destination VNFD. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" changeType: description: > Signals the type of change. @@ -2465,7 +2465,7 @@ definitions: Reference to the VirtualNetwork resource. Detailed information is (for new and modified resources) or has been (for removed resources) available from the VIM. See note 1. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ResourceHandle" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/ResourceHandle" vnfLinkPortIds: description: > Identifiers of the link ports of the affected VL related to the change. Each identifier references a "VnfLinkPortInfo" @@ -2477,25 +2477,25 @@ definitions: attribute in the "VnfInstance" structure. See note 1. type: array items: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnfd" resourceDefinitionId: description: > The identifier of the "ResourceDefinition" in the granting exchange related to the LCM operation occurrence. It shall be present when an applicable GrantInfo for the granted resource exists. See note 1 and note 2. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierLocal" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierLocal" zoneId: description: > The identifier of the resource zone, as managed by the resource management layer (typically, the VIM), where the referenced VirtualNetwork resource is placed. Shall be provided if this information is available from the VIM. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" metadata: description: > Metadata about this resource. The content of this attribute shall be a copy of the content of the "metadata" attribute of the applicable "vnfVirtualLinkResourceInfo” structure if such structure is referenced by the "id" attribute and it has metadata. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/KeyValuePairs" AffectedVirtualStorage: description: > @@ -2517,17 +2517,17 @@ definitions: description: > Identifier of the storage instance, identifying the applicable "virtualStorageResourceInfo" entry in the "VnfInstance" data type. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnf" virtualStorageDescId: description: > Identifier of the related VirtualStorage descriptor in the VNFD. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnfd" vnfdId: description: > Identifier of the VNFD. Shall be present in case of a "change current VNF Package" to identify whether the affected virtual storage instance is associated to a VirtualStorage descriptor which is referred from the source or destination VNFD. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" changeType: description: > Signals the type of change. Permitted values: @@ -2548,24 +2548,24 @@ definitions: Reference to the VirtualStorage resource. Detailed information is (for new and modified resources) or has been (for removed resources) available from the VIM. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ResourceHandle" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/ResourceHandle" resourceDefinitionId: description: > The identifier of the "ResourceDefinition" in the granting exchange related to the LCM operation occurrence. It shall be present when an applicable GrantInfo for the granted resource exists. See note. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierLocal" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierLocal" zoneId: description: > The identifier of the resource zone, as managed by the resource management layer (typically, the VIM), where the referenced VirtualNetwork resource is placed. Shall be provided if this information is available from the VIM. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" metadata: description: > Metadata about this resource. The content of this attribute shall be a copy of the content of the "metadata" attribute of the VirtualStorageResourceInfo structure. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/KeyValuePairs" IntVnfCpData: description: > @@ -2585,14 +2585,14 @@ definitions: cpdId: description: > Identifier of the CPD in the VNFD. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" netAttDefResourceId: description: > Identifiers of the “NetAttDefResourceData” structure that provides the specification of the interface to attach the VNF internal CP created from the CPD identified by cpdId to a secondary container cluster network. See note. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" CreateVnfRequest: type: object @@ -2603,7 +2603,7 @@ definitions: description: > Identifier that identifies the VNFD which defines the VNF instance to be created. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" vnfInstanceName: description: > Human-readable name of the VNF instance to be created. @@ -2617,7 +2617,7 @@ definitions: If present, this attribute provides additional initial values, overriding those obtained from the VNFD, for the "metadata" attribute in "VnfInstance", as defined in clause 5.5.2.2. Provisions for handling metadata during the operation are defined in clause 5.4.2.3.1. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/KeyValuePairs" ScaleVnfRequest: description: > @@ -2643,7 +2643,7 @@ definitions: aspectId: description: > Identifier of the scaling aspect. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnfd" numberOfSteps: description: > Number of scaling steps to be executed as part of this Scale VNF @@ -2656,7 +2656,7 @@ definitions: Additional parameters passed by the NFVO as input to the scaling process, specific to the VNF being scaled, as declared in the VNFD as part of "ScaleVnfOpConfig" defined in ETSI GS NFV-IFA 011 [7]. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/KeyValuePairs" ScaleVnfToLevelRequest: description: > @@ -2679,7 +2679,7 @@ definitions: Identifier of the target instantiation level of the current deployment flavour to which the VNF is requested to be scaled. See note. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnfd" scaleInfo: description: > For each scaling aspect of the current deployment flavour, indicates @@ -2687,13 +2687,13 @@ definitions: See note. type: array items: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ScaleInfo" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/ScaleInfo" additionalParams: description: > Additional parameters passed by the NFVO as input to the scaling process, specific to the VNF being scaled, as declared in the VNFD as part of "ScaleVnfToLevelOpConfig" defined in ETSI GS NFV-IFA 011 [7]. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/KeyValuePairs" CancelMode: description: > @@ -2726,7 +2726,7 @@ definitions: callbackUri: description: > The URI of the endpoint to send the notification to. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Uri" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Uri" authentication: description: > Authentication parameters to configure the use of Authorization when @@ -2734,7 +2734,7 @@ definitions: in clause 8.3.4 of ETSI GS NFV-SOL 013. This attribute shall only be present if the subscriber requires authorization of notifications. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/SubscriptionAuthentication" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/SubscriptionAuthentication" verbosity: description: > This attribute signals the requested verbosity of LCM operation occurrence notifications. If it is not present, @@ -2755,7 +2755,7 @@ definitions: id: description: > Identifier of this subscription resource. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" filter: description: > Filter settings for this subscription, to define the subset of all @@ -2766,7 +2766,7 @@ definitions: callbackUri: description: > The URI of the endpoint to send the notification to. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Uri" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Uri" verbosity: description: > This attribute signals the verbosity of LCM operation occurrence notifications. @@ -2781,7 +2781,7 @@ definitions: self: description: > URI of this resource. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Link" ExtVirtualLinkInfo: description: > @@ -2805,11 +2805,11 @@ definitions: information instance. The identifier is assigned by the NFV-MANO entity that manages this VL instance. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" resourceHandle: description: > Reference to the resource realizing this VL. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ResourceHandle" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/ResourceHandle" extLinkPorts: description: > Link ports of this VL. @@ -2822,7 +2822,7 @@ definitions: to the external virtual link. See note. type: array items: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/VnfExtCpData" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/VnfExtCpData" extNetAttDefResource: description: > Network attachment definition resources that provide the specification of the interface to attach connection points @@ -2853,12 +2853,12 @@ definitions: id: description: > Identifier of this link port as provided by the entity that has created the link port. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnf" resourceHandle: description: > Reference to the virtualised resource realizing this link port. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ResourceHandle" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/ResourceHandle" cpInstanceId: description: > When the link port is used for external connectivity by the VNF, this attribute represents the @@ -2873,7 +2873,7 @@ definitions: internal connection point (i.e. VNFC CP) instance. The value refers to an "extCpInfo" item in the VnfInstance or a "vnfcCpInfo" item of a "vnfcResourceInfo" item in the VnfInstance. See note 1. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnf" cpInstanceType: description: > Type of the CP instance that is identified by cpInstanceId. @@ -2891,13 +2891,13 @@ definitions: description: > VIP CP instance of the VNF connected to this link port. May be present. See notes 1, and 2. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnf" trunkResourceId: description: > Identifier of the trunk resource in the VIM. Shall be present if the present link port corresponds to the parent port that the trunk resource is associated with. See note 3. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVim" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVim" ExtLinkPortInfo: description: > @@ -2915,32 +2915,32 @@ definitions: description: > Identifier of this link port as provided by the entity that has created the link port. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" resourceHandle: description: > Reference to the virtualised resource realizing this link port. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ResourceHandle" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/ResourceHandle" cpInstanceId: description: > Identifier of the external CP of the VNF connected to this link port. There shall be at most one link port associated with any external connection point instance. The value refers to an "extCpInfo" item in the VnfInstance. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnf" secondaryCpInstanceId: description: > Additional external CP of the VNF connected to this link port. If present, this attribute shall refer to a "secondary" ExtCpInfo item in the VNF instance that exposes a virtual IP CP instance which shares this linkport with the external CP instance referenced by the "cpInstanceId" attribute. See note 1. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnf" trunkResourceId: description: > Identifier of the trunk resource in the VIM. Shall be present if the present link port corresponds to the parent port that the trunk resource is associated with. See note 2. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVim" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVim" CpProtocolInfo: description: > @@ -3008,7 +3008,7 @@ definitions: macAddress: description: > MAC address, if assigned. See note 1. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/MacAddress" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/MacAddress" segmentationId: description: > Identification of the network segment to which the Cp instance connects to. See notes 3 and 4. @@ -3036,7 +3036,7 @@ definitions: Fixed addresses assigned (from the subnet defined by "subnetId" if provided). See note 2. type: array items: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IpAddress" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IpAddress" isDynamic: description: > Indicates whether this set of addresses was assigned @@ -3055,18 +3055,18 @@ definitions: minAddress: description: > Lowest IP address belonging to the range. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IpAddress" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IpAddress" maxAddress: description: > Highest IP address belonging to the range - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IpAddress" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IpAddress" subnetId: description: > Subnet defined by the identifier of the subnet resource in the VIM. In case this attribute is present, IP addresses are bound to that subnet. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVim" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVim" MonitoringParameter: type: object @@ -3077,13 +3077,13 @@ definitions: id: description: > Identifier of the monitoring parameter defined in the VNFD. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnfd" vnfdId: description: > Identifier of the VNFD. Shall be present in case the value differs from the vnfdId attribute of the VnfInstance (e.g. during a "Change current VNF package" operation or due to its final failure). - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" name: description: > Human readable name of the monitoring parameter, as defined in the @@ -3111,7 +3111,7 @@ definitions: vnfInstanceSubscriptionFilter: description: > Filter criteria to select VNF instances about which to notify. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/VnfInstanceSubscriptionFilter" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/VnfInstanceSubscriptionFilter" notificationTypes: description: > Match particular notification types. @@ -3137,7 +3137,7 @@ definitions: otherwise. type: array items: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/LcmOperationType" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/LcmOperationType" operationStates: description: > Match particular LCM operation state values as reported in @@ -3162,17 +3162,17 @@ definitions: description: > Link to the resource representing the VNF instance to which the notified change applies. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/NotificationLink" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/NotificationLink" subscription: description: > Link to the related subscription. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/NotificationLink" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/NotificationLink" vnfLcmOpOcc: description: > Link to the VNF lifecycle management operation occurrence that this notification is related to. Shall be present if there is a related lifecycle operation occurrence. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/NotificationLink" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/NotificationLink" VnfExtCpInfo: description: > @@ -3204,22 +3204,22 @@ definitions: id: description: > Identifier of the external CP instance and the related information instance. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnf" cpdId: description: > Identifier of the external CPD, VnfExtCpd, in the VNFD. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnfd" cpConfigId: description: > Identifier that references the applied "VnfExtCpConfig" entry in the "cpConfig" map of the "currentVnfExtCpData" in the "ExtVirtualLinkInfo" structure. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnf" vnfdId: description: > Identifier of the VNFD. Shall be present in case the value differs from the vnfdId attribute of the VnfInstance (e.g. during a "Change current VNF package" operation or due to its final failure). - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" cpProtocolInfo: description: > Network protocol information for this CP. @@ -3230,35 +3230,35 @@ definitions: description: > Identifier of the "ExtLinkPortInfo" structure inside the "ExtVirtualLinkInfo" structure. Shall be present if the CP is associated to a link port. See note 2. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" metadata: description: > Metadata about this external CP. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/KeyValuePairs" associatedVnfcCpId: description: > Identifier of the "vnfcCpInfo" structure in "VnfcResourceInfo" structure that represents the VNFC CP which is exposed by this external CP instance, either directly or via a floating IP address. Shall be present in case this CP instance maps to a VNFC CP. See note 1. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnf" associatedVipCpId: description: > Identifier of the VIP CP instance that is exposed as this VnfExtCp instance, either directly or via a floating IP address, and the related "VipCpInfo" structure in "VnfInstance". Shall be present if the cpdId of this VnfExtCp has a vipCpd attribute. See note 1. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnf" associatedVirtualCpId: description: > Identifier of the "VirtualCpInfo" structure that represents the Virtual CP that is exposed by this external CP instance. Shall be present in case this CP instance maps to a Virtual CP. See note 1. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnfd" associatedVnfVirtualLinkId: description: > Identifier of the "VnfVirtualLinkResourceInfo" structure that represents the internal VL or of the "ExtManagedVirtualLinkInfo" structure that represents the externally-managed internal VL which is exposed by this external CP instance. Shall be present in case this CP instance maps to an internal VL (including externally-managed internal VL). See note 1. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnf" netAttDefResourceInfoId: description: > Identifier of the “NetAttDefResourceInfo” structure that provides the specification of the interface to attach the @@ -3267,7 +3267,7 @@ definitions: is connected to a secondary container cluster network. It shall not be present otherwise. type: array items: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" VnfOperationalStateType: description: > @@ -3347,7 +3347,7 @@ definitions: id: description: > Identifier of the VNF instance. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" notificationType: description: > Discriminator for the different notification types. Shall be set to @@ -3358,15 +3358,15 @@ definitions: subscriptionId: description: > Identifier of the subscription that this notification relates to. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" timeStamp: description: > Date-time of the generation of the notification. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/DateTime" vnfInstanceId: description: > The created VNF instance identifier. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" _links: description: > Links to resources related to this notification. @@ -3393,7 +3393,7 @@ definitions: Identifier of this notification. If a notification is sent multiple times due to multiple subscriptions, the "id" attribute of all these notifications shall have the same value. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" notificationType: description: > Discriminator for the different notification types. Shall be set to @@ -3404,15 +3404,15 @@ definitions: subscriptionId: description: > Identifier of the subscription that this notification relates to. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" timeStamp: description: > Date-time of the generation of the notification. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/DateTime" vnfInstanceId: description: > The deleted VNF instance identifier. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" _links: description: > Links to resources related to this notification. @@ -3433,14 +3433,14 @@ definitions: description: > Identifier of the VNFC instance of which the information is to be modified. The identifier references the "id" attribute in a "VnfcInfo" structure. See note. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnf" vnfcConfigurableProperties: description: > Changes of the configurable properties of the VNFC instance. When this structure is part of a request, the modifications signalled in this attribute shall be applied according to the rules of JSON Merge Patch (see IETF RFC 7396). In addition, the provisions in clause 5.7 shall apply. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/KeyValuePairs" VnfcInfo: description: > @@ -3455,17 +3455,17 @@ definitions: id: description: > Identifier of the VNFC instance. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnf" vduId: description: > Reference to the applicable VDU information element in the VNFD. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnf" vnfcResourceInfoId: description: > Identifier of the VnfcResourceInfo instance representing the virtualised resources used by this VNFC instance. See note. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnf" vnfcState: description: > Identifier of the VnfcResourceInfo instance representing @@ -3479,7 +3479,7 @@ definitions: enum: - STARTED - STOPPED - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnf" vnfcConfigurableProperties: description: > Current values of the configurable properties of the @@ -3488,7 +3488,7 @@ definitions: declared in the VNFD. This attribute can be modified with the PATCH method. In addition, the provisions in clause 5.7 shall apply. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/KeyValuePairs" ModificationsTriggeredByVnfPkgChange: description: > @@ -3511,22 +3511,22 @@ definitions: This attribute signals the modifications of the "vnfConfigurableProperties" attribute in "VnfInstance" performed by the operation and shall be present if that attribute was modified during the operation. See note 1. In addition, the provisions in clause 5.7 shall apply. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/KeyValuePairs" metadata: description: > This attribute signals the modifications of the "metadata" attribute in "VnfInstance" performed by the operation and shall be present if that attribute was modified during the operation. See note 1. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/KeyValuePairs" extensions: description: > This attribute signals the modifications of the "extensions" attribute in "VnfInstance" performed by the operation and shall be present if that attribute was modified during the operation. See note 1. In addition, the provisions in clause 5.7 shall apply. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/KeyValuePairs" vnfdId: description: > If present, this attribute signals the new value of the "vnfdId" attribute in "VnfInstance". - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" vnfProvider: description: > If present, this attribute signals the new value of the "vnfProvider" attribute in "VnfInstance". See note 2. @@ -3538,11 +3538,11 @@ definitions: vnfSoftwareVersion: description: > If present, this attribute signals the new value of the "vnfSoftwareVersion" attribute in "VnfInstance". See note 2. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Version" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Version" vnfdVersion: description: > If present, this attribute signals the new value of the "vnfdVersion" attribute in "VnfInstance". See note 2. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Version" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Version" vimConnectionInfo: description: > If present, this attribute signals the changes to VIM connection info that were passed in the related @@ -3550,7 +3550,7 @@ definitions: 4.4.1.6 apply. type: object additionalProperties: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/VimConnectionInfo" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/VimConnectionInfo" LcmOpOccNotificationVerbosityType: description: > @@ -3585,12 +3585,12 @@ definitions: cpInstanceId: description: > Identifier of the virtual IP CP instance and the related "VipCpInfo" structure in "VnfInstance". - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnf" cpdId: description: > Identifier of the VipCpd in the VNFD. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnfd" vnfdId: description: > @@ -3598,7 +3598,7 @@ definitions: Shall be present in case of a "change current VNF Package" to identify whether the affected virtual CP instance is associated to a VipCpd which is referred from the source or destination VNFD. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" changeType: description: > @@ -3632,21 +3632,21 @@ definitions: cpInstanceId: description: > Identifier of this VIP CP instance and of this VipCpInfo information element. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnf" cpdId: description: > Identifier of the VIP Connection Point Descriptor, VipCpd, in the VNFD. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnfd" vnfdId: description: > Identifier of the VNFD. Shall be present in case the value differs from the vnfdId attribute of the VnfInstance (e.g. during a "Change current VNF package" operation or due to its final failure). See note 2. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" vnfExtCpId: description: > When the VIP CP is exposed as external CP of the VNF, the identifier of this external VNF CP instance. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnf" cpProtocolInfo: description: > Protocol information for this CP. There shall be one cpProtocolInfo for layer 3. @@ -3659,19 +3659,19 @@ definitions: Identifiers of the VnfcCps that share the virtual IP addresse allocated to the VIP CP instance. See note. type: array items: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnf" vnfLinkPortId: description: > Identifier of the "VnfLinkPortInfo" structure in the "VnfVirtualLinkResourceInfo" or "ExtManagedVirtualLinkInfo" structure. Shall be present if the CP is associated to a link port on an internal VL (including externally-managed internal VL). - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnf" metadata: description: > Metadata about this VIP CP. type: array items: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/KeyValuePairs" AffectedVirtualCp: description: > @@ -3686,18 +3686,18 @@ definitions: description: > dentifier of the virtual CP instance and the related "VirtualCpInfo" structure in "VnfInstance". - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnf" cpdId: description: > Identifier of the VirtualCpd in the VNFD. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnfd" vnfdId: description: > Reference to the VNFD. Shall be present in case of a "change current VNF Package" to identify whether the affected virtual CP instance is associated to a VirtualCpd which is referred from the source or destination VNFD. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" changeType: description: > Signals the type of change. @@ -3757,7 +3757,7 @@ definitions: mcioId: description: > Identifier of this MCIO, created by the CISM. See note 3. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" mcioName: description: > Human readable name of this MCIO. See note 4. @@ -3769,11 +3769,11 @@ definitions: vduId: description: > Reference to the related VDU in the VNFD applicable to this resource. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnfd" cismId: description: > Identifier of the CISM managing this MCIO. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" mcioType: description: > The type of MCIO. Specific values, their semantics and associated MCIO types are defined in clause @@ -3796,7 +3796,7 @@ definitions: Additional information which is specific to the MCIO, its type, and which is available from the CISM. See note 2. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/KeyValuePairs" VirtualCpInfo: description: > @@ -3816,19 +3816,19 @@ definitions: cpInstanceId: description: > Identifier of this virtual CP instance. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnf" cpdId: description: > Identifier of the VirtualCpd in the VNFD. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnfd" resourceHandle: description: > Reference to the virtualised resource realizing this virtual CP. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ResourceHandle" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/ResourceHandle" vnfExtCpId: description: > When the virtual CP is exposed as external CP of the VNF, the identifier of this external VNF CP instance. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnf" cpProtocolInfo: description: > Protocol information for this CP. There shall be one cpProtocolInfo for each layer protocol supported. @@ -3841,7 +3841,7 @@ definitions: type: array minItems: 1 items: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnfd" additionalServiceInfo: description: > Additional service identification information of the virtual CP instance. @@ -3851,7 +3851,7 @@ definitions: metadata: description: > Metadata about this virtual CP instance. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/KeyValuePairs" AdditionalServiceInfo: description: > @@ -3877,7 +3877,7 @@ definitions: description: > Service matching information exposed by the virtual CP instance. See note. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/KeyValuePairs" ServicePortInfo: description: > @@ -3913,7 +3913,7 @@ definitions: portConfigurable: description: Specifies whether the port attribute value is allowed to be configurable. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Boolean" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Boolean" NetAttDefResourceInfo: description: > @@ -3929,25 +3929,25 @@ definitions: description: > Identifier of this network attachment definition resource as provided by the entity that has created it. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" netAttDefResource: description: > Resource handle of the resource in the scope of the CISM. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ResourceHandle" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/ResourceHandle" associatedExtCpId: description: > Identifier of the external CP associated to this network attachment definition resource. Shall be present when the network attachment definition resource is used for external connectivity by the VNF. type: array items: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnf" associatedVnfcCpId: description: > Identifier of the VNFC CP associated to this network attachment definition resource. May be present when the network attachment definition resource is used for internal connectivity by the VNF. type: array items: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnf" VirtualCpAddressInfo: description: > @@ -3968,4 +3968,4 @@ definitions: loadBalancerIp: description: > Fixed addresses assigned to an external load balancer. - $ref: '../../../definitions/SOL002SOL003_def.yaml#/definitions/IpAddress' \ No newline at end of file + $ref: '../../General_Definitions/SOL003_def.yaml#/definitions/IpAddress' \ No newline at end of file diff --git a/src/SOL003/VNFLifecycleOperationGranting/VNFLifecycleOperationGranting.yaml b/src/SOL003/VNFLifecycleOperationGranting/VNFLifecycleOperationGranting.yaml index 2cc57e01..fac9bb69 100644 --- a/src/SOL003/VNFLifecycleOperationGranting/VNFLifecycleOperationGranting.yaml +++ b/src/SOL003/VNFLifecycleOperationGranting/VNFLifecycleOperationGranting.yaml @@ -251,7 +251,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" IndividualGrant.Get.200: description: | @@ -335,4 +335,4 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" \ No newline at end of file + $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" \ No newline at end of file diff --git a/src/SOL003/VNFLifecycleOperationGranting/definitions/SOL003VNFLifecycleOperationGranting_def.yaml b/src/SOL003/VNFLifecycleOperationGranting/definitions/SOL003VNFLifecycleOperationGranting_def.yaml index 0fa828b1..a4032ea1 100644 --- a/src/SOL003/VNFLifecycleOperationGranting/definitions/SOL003VNFLifecycleOperationGranting_def.yaml +++ b/src/SOL003/VNFLifecycleOperationGranting/definitions/SOL003VNFLifecycleOperationGranting_def.yaml @@ -51,12 +51,12 @@ definitions: to. Shall also be provided for VNFs that not yet exist but are planned to exist in the future, i.e. if the grant is requested for InstantiateVNF. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" vnfLcmOpOccId: description: > The identifier of the VNF lifecycle management operation occurrence associated to the GrantRequest. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" vnfdId: description: > Identifier of the VNFD that defines the VNF for which the LCM @@ -64,25 +64,25 @@ definitions: In case of the "Change current VNF package operation, this identifier refers to the VNFD which defines the VNF before the LCM operation to be granted. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" dstVnfdId: description: > Identifier of the "destination" VNFD which will define the VNF after executing the "Change current VNF package" LCM operation to be granted. Shall be included if the operation changes the current VNF Package and shall be absent otherwise. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" flavourId: description: > Identifier of the VNF deployment flavour of the VNFD that defines the VNF for which the LCM operation is to be granted. Shall be provided when instantiating the VNF or changing the deployment flavour of the VNF instance. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" operation: description: > The lifecycle management operation for which granting is requested. See note 1. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/GrantedLcmOperationType" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/GrantedLcmOperationType" isAutomaticInvocation: description: > Set to true if this VNF LCM operation occurrence has been triggered @@ -96,7 +96,7 @@ definitions: If operation=INSTANTIATE, the identifier of the instantiation level may be provided as an alternative way to define the resources to be added. This attribute shall only be used if operation=INSTANTIATE. See notes 2 and 7. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" targetScaleLevelInfo: description: > This attribute shall only be used for @@ -111,7 +111,7 @@ definitions: the scale level of VNF constituents (e.g., VDU level) to be instantiated. See notes 2, 7 and 8. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ScaleInfo" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/ScaleInfo" addResources: description: > List of resource definitions in the VNFD for resources to be added by the LCM operation @@ -169,7 +169,7 @@ definitions: description: > Additional parameters passed by the VNFM, specific to the VNF and the LCM operation. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/KeyValuePairs" _links: description: > Links to resources related to this request. @@ -181,11 +181,11 @@ definitions: vnfLcmOpOcc: description: > Related lifecycle management operation occurrence. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Link" vnfInstance: description: > Related VNF instance. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Link" Grant: description: > @@ -252,16 +252,16 @@ definitions: id: description: > Identifier of the grant. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" vnfInstanceId: description: > Identifier of the related VNF instance. See note 6. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" vnfLcmOpOccId: description: > Identifier of the related VNF lifecycle management operation occurrence. See note 6. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" vimConnectionInfo: description: > Provides information regarding VIM and/or CISM connections that are @@ -291,7 +291,7 @@ definitions: See note 1. type: object additionalProperties: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/VimConnectionInfo" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/VimConnectionInfo" cirConnectionInfo: description: > Provides information regarding a CIR connection that is approved to be @@ -301,7 +301,7 @@ definitions: resources are not managed by a CISM, present otherwise. type: object additionalProperties: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/VimConnectionInfo" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/VimConnectionInfo" mciopRepositoryInfo: description: > Provides information regarding a MCIOP repository. It shall be absent @@ -310,7 +310,7 @@ definitions: by a CISM, present otherwise. type: object additionalProperties: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/VimConnectionInfo" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/VimConnectionInfo" zones: description: > Identifies resource zones where the resources are approved to be @@ -409,7 +409,7 @@ definitions: compared to the entries that were passed in the LCM operation which is related to this granting exchange. type: array items: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ExtVirtualLinkData" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/ExtVirtualLinkData" extManagedVirtualLinks: description: > Information about internal VLs that are managed by other entities than the VNFM. See notes 4, 5, 7 and 8. @@ -420,7 +420,7 @@ definitions: description: > Additional parameters passed by the NFVO, specific to the VNF and the LCM operation. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/KeyValuePairs" _links: description: > Links to resources related to this resource. @@ -433,15 +433,15 @@ definitions: self: description: > URI of this resource. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Link" vnfLcmOpOcc: description: > Related VNF lifecycle management operation occurrence. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Link" vnfInstance: description: > Related VNF instance. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Link" ResourceDefinition: description: > @@ -465,7 +465,7 @@ definitions: description: > Identifier of this "ResourceDefinition" structure, unique at least within the scope of the "GrantRequest" structure. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierLocal" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierLocal" type: description: > Type of the resource definition referenced. @@ -488,12 +488,12 @@ definitions: resource. Shall only be present if a VDU is applicable to this resource, i.e. if "type" has the value "COMPUTE". - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnfd" vnfdId: description: > Identifier of the VNFD to which resourceTemplateId and vduId refer. Shall be present if the operation to be granted changes the current VNF Package. May be absent otherwise. See note 2. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" resourceTemplateId: description: > Reference to the applicable resource template in the VNFD as follows: @@ -507,7 +507,7 @@ definitions: type: array minItems: 1 items: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnfd" secondaryResourceTemplateId: description: > Reference to a secondary resource template (VnfExtCpd) in the VNFD. @@ -515,13 +515,13 @@ definitions: one exposing a VNFC CP instance (based on a VnfExtCpd referenced by "resourceTemplateId") and another one exposing a VIP CP instance (based on a VnfExtCpd referenced by this attribute). Shall be absent otherwise. See note 1. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnfd" resource: description: > Resource information for an existing resource. Shall be present for resources that are planned to be deleted or modified. Shall be absent otherwise. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ResourceHandle" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/ResourceHandle" snapshotResDef: description: > Information to identify a snapshot resource. Shall only be present if the @@ -541,13 +541,13 @@ definitions: description: > Identifier of the related "ResourceDefinition" structure from the related "GrantRequest" structure. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierLocal" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierLocal" reservationId: description: > The reservation identifier applicable to the VNFC/VirtualLink/VirtualStorage/compute host. It shall be present for new resources when policy is GRANT_RESERVE and an applicable reservation exists; shall not be present otherwise. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVim" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVim" vimConnectionId: description: > Identifier of the VIM or CISM connection to be used to manage this resource. @@ -560,7 +560,7 @@ definitions: - all or part of the granted resources are managed by a VIM and VNF-related Resource Management in direct mode is applicable. - all or part of the granted resources are managed by a CISM. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" resourceProviderId: description: > Identifies the entity responsible for the management of the @@ -569,7 +569,7 @@ definitions: This attribute shall only be supported when VNF-related Resource Management in indirect mode is applicable. The identification scheme is outside the scope of the present document. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" zoneId: description: > Reference to the identifier of the "ZoneInfo" structure in the @@ -577,7 +577,7 @@ definitions: resource is to be placed. Shall be present for new resources if the zones concept is applicable to them (typically, Compute resources), and shall be absent for resources that have already been allocated. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierLocal" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierLocal" resourceGroupId: description: > Identifier of the "infrastructure resource group", logical grouping @@ -591,13 +591,13 @@ definitions: for new resources. This attribute shall be absent for resources that have already been allocated. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVim" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVim" containerNamespace: description: > The value of the namespace in which the MCIOs of a VNF with containerized components shall be deployed. This attribute shall be present if the granted resources are managed by a CISM. The attribute shall be absent if the granted resources are not managed by a CISM. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/String" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/String" mcioConstraints: description: > The constraint values to be assigned to MCIOs of a VNF with containerized components. @@ -609,7 +609,7 @@ definitions: to the MCIO constraint. This attribute shall be present if the granted resources are managed by a CISM. The attribute shall be absent if the granted resources are not managed by a CISM. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/KeyValuePairs" ZoneInfo: description: > This type provides information regarding a resource zone. @@ -622,12 +622,12 @@ definitions: description: > The identifier of this ZoneInfo instance, for the purpose of referencing it from other structures in the "Grant" structure. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierLocal" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierLocal" zoneId: description: > The identifier of the resource zone, as managed by the resource management layer (typically, the VIM). - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" vimConnectionId: description: > Identifier of the connection to the VIM that manages the resource @@ -637,7 +637,7 @@ definitions: attribute of the "VnfInstance" structure. This attribute shall only be supported and present when VNF-related Resource Management in direct mode is applicable. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" resourceProviderId: description: > Identifies the entity responsible for the management the resource @@ -645,7 +645,7 @@ definitions: This attribute shall only be supported and present when VNF-related Resource Management in indirect mode is applicable. The identification scheme is outside the scope of the present document. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" ZoneGroupInfo: description: > @@ -668,7 +668,7 @@ definitions: group. type: array items: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierLocal" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierLocal" PlacementConstraint: description: > @@ -742,7 +742,7 @@ definitions: due to capacity constraints and/or due to the actual placement of existing resources, i.e. if resource placement cannot honour the placement constraint, the request is processed in a best effort manner. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Boolean" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Boolean" VimConstraint: description: > @@ -801,7 +801,7 @@ definitions: An actual resource-management-level identifier (idType=RES_MGMT), or an identifier that references a "ResourceDefinition" structure in the related "GrantRequest" structure (idType=GRANT). - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVim" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVim" vimConnectionId: description: > Identifier of the VIM connection for managing the resource. It shall @@ -811,7 +811,7 @@ definitions: attribute of the "VnfInstance" structure. This attribute shall only be supported when VNF-related resource management in direct mode is applicable. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" resourceProviderId: description: > Identifier of the resource provider. It shall only be present when @@ -819,7 +819,7 @@ definitions: This attribute shall only be supported when VNF-related resource management in indirect mode is applicable. The identification scheme is outside the scope of the present document. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" VimComputeResourceFlavour: description: > @@ -844,7 +844,7 @@ definitions: attribute of the "VnfInstance" structure. This attribute shall only be supported and present if VNF-related resource management in direct mode is applicable. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" resourceProviderId: description: > Identifies the entity responsible for the management of the @@ -852,17 +852,17 @@ definitions: This attribute shall only be supported and present if VNF-related resource management in indirect mode is applicable. The identification scheme is outside the scope of the present document. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" vnfdVirtualComputeDescId: description: > Identifier which references the virtual compute descriptor in the VNFD that maps to this flavour. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnfd" vimFlavourId: description: > Identifier of the compute resource flavour in the resource management layer (i.e. VIM). - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVim" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVim" VimSoftwareImage: description: > @@ -888,7 +888,7 @@ definitions: - the software image is to be loaded in a virtual machine and VNF-related resource management in direct mode is applicable. - the software image is to be loaded in an OS container managed by a CISM. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" resourceProviderId: description: > Identifies the entity responsible for the management of the @@ -896,17 +896,17 @@ definitions: This attribute shall only be supported and present if VNF-related resource management in indirect mode is applicable. The identification scheme is outside the scope of the present document. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" vnfdSoftwareImageId: description: > Identifier which references the software image descriptor in the VNFD. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnfd" vimSoftwareImageId: description: > Identifier of the software image in the resource management layer (i.e. VIM). See note. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVim" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVim" SnapshotResourceDefinition: description: > @@ -933,7 +933,7 @@ definitions: Identifier of the VNF snapshot related to the resource change for the VNF instance. Shall only be present if the operation to be granted concerns to creating a VNF snapshot from the VNF or to reverting the VNF to a VNF snapshot. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" vnfcSnapshotId: description: > Reference to the information about a specific VNFC snapshot (refer to "VnfcSnapshotInfo") of @@ -941,21 +941,21 @@ definitions: the "vnfSnapshotId" attribute. Shall only be present if the operation to be granted concerns to reverting the VNF to a VNF snapshot, and the resource is planned to be added based on the VNFC snapshot, and the type of resource is "COMPUTE" or "STORAGE". See notes 1 and 2. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierLocal" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierLocal" storageSnapshotId: description: > Reference to a snapshotted storage resource associated to the VNFC snapshot. Shall only be present if the operation to be granted concerns to reverting the VNF to a VNF snapshot, and the storage resource is planned to be added based on the VNFC snapshot, and the type of resource is "STORAGE". See note 2. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnf" snapshotResource: description: > Resource information for an existing snapshot resource. Shall only be present if the operation to be granted concerns to reverting the VNF to a VNF snapshot and the resource is planned to be added based on an existing VNF snapshot that has been created by the VNFM. Shall be absent otherwise. See note 2. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ResourceHandle" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/ResourceHandle" VimSnapshotResource: description: > @@ -975,34 +975,34 @@ definitions: obtained from the "vimConnectionInfo" attribute of the "VnfInstance" structure. This attribute shall only be supported and present if VNF-related resource management in direct mode is applicable. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" resourceProviderId: description: > Identifies the entity responsible for the management of the virtualised resource. This attribute shall only be supported and present if VNF-related resource management in indirect mode is applicable. The identification scheme is outside the scope of the present document. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" vnfSnapshotId: description: > Identifier of the VNF snapshot (referring to the "id" attribute in the "VnfSnapshot" data structure) related to this VIM snapshot resource. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" vnfcSnapshotId: description: > Identifier of the information about a specific VNFC snapshot (refer to "VnfcSnapshotInfo") of the VNF snapshot. The identifier is unique within the scope of a VNF snapshot, identified by the "vnfSnapshotId" attribute. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierLocal" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierLocal" storageSnapshotId: description: > Identifier of the virtual storage resource that has been snapshotted as referred in the VNFC snapshot information. Shall only be present if the snapshot resource in the VIM is a storage resource (as indicated by "type=STORAGE" in the parent resource definition). - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnf" vimSnapshotResourceId: description: > Identifier of the snapshot resource in the resource management layer (i.e. VIM). - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVim" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVim" StorageAsset: description: > @@ -1024,7 +1024,7 @@ definitions: - all or part of the granted resources are managed by a VIM and VNF related resource management in direct mode is applicable. - all or part of the granted resources are managed by a CISM. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" resourceProviderId: description: > Identifier used by NFVO to determine the entity responsible for the @@ -1032,13 +1032,13 @@ definitions: This attribute shall only be supported and present if VNF-related resource management in indirect mode is applicable. The identification scheme is outside the scope of the present document. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" virtualStorageDescId: description: > Identifier of the virtual storage descriptor in the VNFD. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnfd" storageClassName: description: > Name of storage class, which represents features and policies concerning a virtual storage. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/String" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/String" diff --git a/src/SOL003/VNFPackageManagement/VNFPackageManagement.yaml b/src/SOL003/VNFPackageManagement/VNFPackageManagement.yaml index a1dff429..c555f605 100644 --- a/src/SOL003/VNFPackageManagement/VNFPackageManagement.yaml +++ b/src/SOL003/VNFPackageManagement/VNFPackageManagement.yaml @@ -1139,7 +1139,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" VnfdInIndividualOnboardedVnfPackage.Get.200: description: | @@ -1216,7 +1216,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" ManifestInIndividualVnfPackage.Get.200: description: | @@ -1334,7 +1334,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" ManifestInIndividualOnboardedVnfPackage.Get.200: description: | @@ -1452,7 +1452,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" IndividualVnfPackageContent.Get.200: description: | @@ -1560,7 +1560,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" IndividualVnfPackageContent.Get.416: description: | @@ -1656,7 +1656,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" IndividualOnboardedVnfPackageContent.Get.416: description: | @@ -1777,7 +1777,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" IndividualVnfPackageArtifact.Get.416: description: | @@ -1843,7 +1843,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" IndividualOnboardedVnfPackageArtifact.Get.416: description: | @@ -1909,7 +1909,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" IndividualVnfPackageArtifacts.Get.416: description: | @@ -1978,7 +1978,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" IndividualOnboardedVnfPackageArtifacts.Get.416: description: | @@ -2469,7 +2469,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" Subscriptions.Get.200: description: | diff --git a/src/SOL003/VNFPackageManagement/definitions/SOL003VNFPackageManagement_def.yaml b/src/SOL003/VNFPackageManagement/definitions/SOL003VNFPackageManagement_def.yaml index ac50a9cf..ab2c67f6 100644 --- a/src/SOL003/VNFPackageManagement/definitions/SOL003VNFPackageManagement_def.yaml +++ b/src/SOL003/VNFPackageManagement/definitions/SOL003VNFPackageManagement_def.yaml @@ -23,7 +23,7 @@ definitions: description: > Identifier of the on-boarded VNF package. This identifier is allocated by the NFVO. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" vnfdId: description: > This identifier, which is managed by the VNF provider, identifies @@ -31,7 +31,7 @@ definitions: It's copied from the VNFD of the on-boarded VNF package. It shall be present after the VNF package content has been on-boarded and absent otherwise. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" vnfdExtInvariantId: description: > Identifies a VNFD in a version independent manner. This attribute is invariant across @@ -40,19 +40,19 @@ definitions: It shall be present after the VNF package content has been on-boarded if it is included in the VNFD and shall be absent otherwise. If present it is copied from the VNFD of the on-boarded VNF package. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" vnfProvider: description: > Provider of the VNF package and the VNFD. This information is copied from the VNFD. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/String" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/String" vnfProductName: description: > Name to identify the VNF product. Invariant for the VNF product lifetime. This information is copied from the VNFD. It shall be present after the VNF package content has been on-boarded and absent otherwise. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/String" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/String" vnfSoftwareVersion: description: > Software version of the VNF. This is changed when there is any @@ -60,13 +60,13 @@ definitions: This information is copied from the VNFD. It shall be present after the VNF package content has been on-boarded and absent otherwise. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Version" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Version" vnfdVersion: description: > The version of the VNFD. This information is copied from the VNFD. It shall be present after the VNF package content has been on-boarded and absent otherwise. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Version" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Version" compatibleSpecificationVersions: description: > Indicates which versions of the ETSI GS NFV-SOL 004 specification the @@ -74,14 +74,14 @@ definitions: Each entry shall be formatted as defined in clause 4.3.2 of ETSI GS NFV-SOL 004. type: array items: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Version" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Version" checksum: description: > Checksum of the on-boarded VNF package. It shall be present after the VNF package content has been on-boarded and absent otherwise. Permitted hash algorithms are defined in ETSI GS NFV-SOL 004. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Checksum" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Checksum" packageSecurityOption: description: > Signals the security option used by the package as defined in clause 5.1 of ETSI GS NFV-SOL 004. @@ -94,7 +94,7 @@ definitions: signingCertificate: description: > The singleton signing certificate if it is included as a file in the VNF package. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/String" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/String" softwareImages: description: > Information about VNF package artifacts that are software images. @@ -135,11 +135,11 @@ definitions: vnfmInfo: description: > Specifies VNFMs compatible with the VNF. This information is copied from the VNFD. See note 3. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/String" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/String" userDefinedData: description: > User defined data for the VNF package. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/KeyValuePairs" onboardingFailureDetails: description: > Failure details of current onboarding procedure. See clause 6.3 of ETSI GS NFV-SOL 013 @@ -147,7 +147,7 @@ definitions: If "onboardingState" is "ERROR", this attribute shall be present and contain error information (such as failed onboarding or processing operation, affected artifact etc.), unless it has been requested to be excluded via an attribute selector. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/ProblemDetails" _links: description: > Links to resources related to this resource. @@ -159,15 +159,15 @@ definitions: self: description: > URI of this resource. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Link" vnfd: description: > Link to the "VNFD in an individual VNf package" resource. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Link" packageContent: description: > Link to the "VNF package content" resource. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Link" PkgmSubscriptionRequest: description: > @@ -187,7 +187,7 @@ definitions: callbackUri: description: > The URI of the endpoint to send the notification to. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Uri" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Uri" authentication: description: > Authentication parameters to configure the use of Authorization when @@ -195,7 +195,7 @@ definitions: in clause 8.3.4 of ETSI GS NFV-SOL 013. This attribute shall only be present if the subscriber requires authorization of notifications. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/SubscriptionAuthentication" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/SubscriptionAuthentication" PkgmSubscription: description: > @@ -210,7 +210,7 @@ definitions: id: description: > Identifier of this "Individual subscription" resource. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" filter: description: > Filter settings for this subscription, to define the subset of all @@ -221,7 +221,7 @@ definitions: callbackUri: description: > The URI of the endpoint to send the notification to. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Uri" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Uri" _links: description: > Links to resources related to this resource. @@ -232,7 +232,7 @@ definitions: self: description: > URI of this resource. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Link" VnfPackageSoftwareImageInfo: description: > @@ -262,28 +262,28 @@ definitions: id: description: > Identifier of the software image. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnfd" name: description: > Name of the software image. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/String" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/String" provider: description: > Provider of the software image. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/String" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/String" version: description: > Version of the software image. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Version" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Version" checksum: description: > Checksum of the software image file. Permitted hash algorithms are defined in ETSI GS NFV-SOL 004. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Checksum" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Checksum" isEncrypted: description: > Reflects whether the image is encrypted (true) or not (false). - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Boolean" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Boolean" containerFormat: description: > Container format indicates whether the software image is in a file @@ -338,7 +338,7 @@ definitions: createdAt: description: > Time when this software image was created. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/DateTime" minDisk: description: > The minimal disk for this software image in bytes. See note 4. @@ -354,7 +354,7 @@ definitions: userMetadata: description: > User-defined data. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/KeyValuePairs" imagePath: description: > Path which identifies the image artifact and also @@ -383,7 +383,7 @@ definitions: manifest. Shall be present if the image artifact is external to the VNF package and shall be absent otherwise. EXAMPLE: https://example.com/m%40ster.vhd - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Uri" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Uri" VnfPackageArtifactInfo: description: > @@ -418,7 +418,7 @@ definitions: NFVO to synthesize this path in a manner that avoids any collision of the synthesized artifact path with the paths and names of artifacts included in the package. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/String" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/String" artifactURI: description: > URI of the artifact as defined in the VNF package manifest. @@ -428,22 +428,22 @@ definitions: EXAMPLE: https://example.com/m%40ster.sh type: array items: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Uri" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Uri" checksum: description: > Checksum of the artifact file. Permitted hash algorithms are defined in ETSI GS NFV-SOL 004. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Checksum" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Checksum" isEncrypted: description: > Reflects whether the artifact is encrypted (true) or not (false). - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Boolean" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Boolean" nonManoArtifactSetId: description: > Non-MANO artifact set identifier of the non-MANO artifact set to which the artifact belongs, as defined in clause 4.3.7 of ETSI GS NFV-SOL 004. Shall be provided if the artifact is a non-MANO artifact, and shall be omitted otherwise. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/String" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/String" artifactClassification: description: > Marks specific types of artifacts as defined in the VNF package. @@ -462,7 +462,7 @@ definitions: description: > The metadata of the artifact that are available in the VNF package, such as Content type, size, creation date, etc. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/KeyValuePairs" PkgmNotificationsFilter: description: > @@ -515,7 +515,7 @@ definitions: vnfProvider: description: > Name of the VNF provider to match. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/String" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/String" vnfProducts: description: > If present, match VNF packages that contain VNF products with @@ -529,7 +529,7 @@ definitions: vnfProductName: description: > Name of the VNF product to match. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/String" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/String" versions: description: > If present, match VNF packages that contain VNF products @@ -544,7 +544,7 @@ definitions: vnfSoftwareVersion: description: > VNF software version to match. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Version" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Version" vnfdVersions: description: > If present, match VNF packages that contain VNF @@ -553,14 +553,14 @@ definitions: one particular provider. type: array items: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Version" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Version" vnfdId: description: > Match VNF packages with a VNFD identifier listed in the attribute. See note 2. type: array items: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" vnfPkgId: description: > Match VNF packages with a package identifier listed in the @@ -571,7 +571,7 @@ definitions: See note 2. type: array items: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" operationalState: description: > Match particular operational states of the VNF package. @@ -591,7 +591,7 @@ definitions: Match strings that specify VNFMs compatible with the VNF. See table 10.5.2.2-1. type: array items: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/String" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/String" PackageOperationalStateType: description: > diff --git a/src/SOL003/VNFPackageManagementNotification/definitions/SOL003VNFPackageManagementNotification_def.yaml b/src/SOL003/VNFPackageManagementNotification/definitions/SOL003VNFPackageManagementNotification_def.yaml index c78f7e22..a207343f 100644 --- a/src/SOL003/VNFPackageManagementNotification/definitions/SOL003VNFPackageManagementNotification_def.yaml +++ b/src/SOL003/VNFPackageManagementNotification/definitions/SOL003VNFPackageManagementNotification_def.yaml @@ -26,7 +26,7 @@ definitions: Identifier of this notification. If a notification is sent multiple times due to multiple subscriptions, the "id" attribute of all these notifications shall have the same value. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" notificationType: description: > Discriminator for the different notification types. @@ -38,30 +38,30 @@ definitions: subscriptionId: description: > Identifier of the subscription that this notification relates to. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" timeStamp: description: > Date-time of the generation of the notification. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/DateTime" vnfPkgId: description: > Identifier of the VNF package. This identifier is allocated by the NFVO. Its value is the same as the value of the "id" attribute of the related "Individual VNF package" resource. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" vnfdId: description: > This identifier, which is managed by the VNF provider, identifies the VNF package and the VNFD in a globally unique way. It's copied from the VNFD of the on-boarded VNF package. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" vnfmInfo: description: > Specifies VNFMs compatible with the VNF. This information is copied from the VNFD. See table 10.5.2.2-1. type: array items: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/String" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/String" _links: description: > Links to resources related to this notification. @@ -98,7 +98,7 @@ definitions: Identifier of this notification. If a notification is sent multiple times due to multiple subscriptions, the "id" attribute of all these notifications shall have the same value. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" notificationType: description: > Discriminator for the different notification types. @@ -109,23 +109,23 @@ definitions: subscriptionId: description: > Identifier of the subscription that this notification relates to. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" timeStamp: description: > Date-time of the generation of the notification. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/DateTime" vnfPkgId: description: > Identifier of the VNF package. This identifier is allocated by the NFVO. Its value is the same as the value of the "id" attribute of the related "Individual VNF package" resource. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" vnfdId: description: > Identifier of the VNFD contained in the VNF package, which also identifies the VNF package. This identifier is allocated by the VNF provider and copied from the VNFD. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" changeType: description: > The type of change of the VNF package. @@ -166,15 +166,15 @@ definitions: identifier which is managed by the NFVO. This attribute shall be provided by the NFVO but is deprecated and can be removed in future versions of the present document. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/NotificationLink" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/NotificationLink" vnfPackageByVnfdId: description: > Link to the resource representing the VNF package to which the notified change applies, i.e. the "Individual VNF package resource" that represents the VNF package, identified by the "vnfdId" identifier which is assigned by the VNF vendor. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/NotificationLink" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/NotificationLink" subscription: description: > Link to the related subscription. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/NotificationLink" \ No newline at end of file + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/NotificationLink" \ No newline at end of file diff --git a/src/SOL003/VNFPerformanceManagement/VNFPerformanceManagement.yaml b/src/SOL003/VNFPerformanceManagement/VNFPerformanceManagement.yaml index 9d1f306a..ce927b81 100644 --- a/src/SOL003/VNFPerformanceManagement/VNFPerformanceManagement.yaml +++ b/src/SOL003/VNFPerformanceManagement/VNFPerformanceManagement.yaml @@ -593,7 +593,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" PmJobs.Get.200: description: | @@ -806,7 +806,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" IndividualPmJob.Delete.200: description: | @@ -959,7 +959,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" Thresholds.Get.200: description: | @@ -1195,7 +1195,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" IndividualThreshold.Delete.200: description: | diff --git a/src/SOL003/VNFPerformanceManagement/definitions/SOL003VNFPerformanceManagement_def.yaml b/src/SOL003/VNFPerformanceManagement/definitions/SOL003VNFPerformanceManagement_def.yaml index 32ce5a5e..992b98cb 100644 --- a/src/SOL003/VNFPerformanceManagement/definitions/SOL003VNFPerformanceManagement_def.yaml +++ b/src/SOL003/VNFPerformanceManagement/definitions/SOL003VNFPerformanceManagement_def.yaml @@ -18,7 +18,7 @@ definitions: objectInstanceId: description: > Identifier of the VNF instance associated with this threshold. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" subObjectInstanceIds: description: > Identifiers of the sub-object instances of the measured @@ -31,7 +31,7 @@ definitions: the measured object instance. type: array items: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnf" criteria: description: > Criteria that define this threshold. @@ -39,7 +39,7 @@ definitions: callbackUri: description: > The URI of the endpoint to send the notification to. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Uri" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Uri" authentication: description: > Authentication parameters to configure the use of Authorization @@ -47,7 +47,7 @@ definitions: as defined in clause 8.3.4 of ETSI GS NFV-SOL 013. This attribute shall only be present if the API consumer requires authorization of notifications. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/SubscriptionAuthentication" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/SubscriptionAuthentication" CreatePmJobRequest: description: > @@ -70,7 +70,7 @@ definitions: which performance information is requested to be collected. type: array items: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" subObjectInstanceIds: description: > Identifiers of the sub-object instances of the measured @@ -84,7 +84,7 @@ definitions: will be taken for all sub-object instances of the measured object instance. type: array items: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnf" criteria: description: > Criteria of the collection of performance information. @@ -92,7 +92,7 @@ definitions: callbackUri: description: > The URI of the endpoint to send the notification to. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Uri" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Uri" authentication: description: > Authentication parameters to configure the use of Authorization @@ -100,7 +100,7 @@ definitions: in clause 8.3.4 of ETSI GS NFV-SOL 013. This attribute shall only be present if the API consumer requires authorization of notifications. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/SubscriptionAuthentication" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/SubscriptionAuthentication" CrossingDirectionType: type: string @@ -131,7 +131,7 @@ definitions: Identifier of this notification. If a notification is sent multiple times due to multiple subscriptions, the "id" attribute of all these notifications shall have the same value. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" notificationType: description: > Discriminator for the different notification types. Shall be set to @@ -143,11 +143,11 @@ definitions: timeStamp: description: > Date and time of the generation of the notification. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/DateTime" pmJobId: description: > Identifier of the PM job for which performance information is available. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" objectType: description: > Type of the measured object. @@ -157,7 +157,7 @@ definitions: objectInstanceId: description: > Identifier of the measured object instance. as per clause 6.2 of ETSI GS NFV-IFA 027. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" subObjectInstanceIds: description: > Identifiers of the sub-object instances of the measured @@ -169,7 +169,7 @@ definitions: Shall be absent otherwise. type: array items: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnf" _links: description: > Links to resources related to this notification. @@ -183,18 +183,18 @@ definitions: Link to the resource representing the measured object instance to which the notification applies. Shall be present if the measured object instance information is accessible as a resource. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/NotificationLink" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/NotificationLink" pmJob: description: > Link to the resource that represents the PM job for which performance information is available. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/NotificationLink" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/NotificationLink" performanceReport: description: > Link from which the available performance information of data type "PerformanceReport" can be obtained. This link should point to an "Individual performance report" resource. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/NotificationLink" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/NotificationLink" PerformanceReport: description: > @@ -236,13 +236,13 @@ definitions: objectInstanceId: description: > Identifier of the measured object instance for which the performance metric is reported - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" subObjectInstanceId: description: > Identifier of the sub-object instance of the measured object instance for which the performance metric is reported. Shall be present if this is required in clause 6.2 of ETSI GS NFV-IFA 027 for the related measured object type. See note. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnf" performanceMetric: description: > Name of the metric collected. This attribute shall contain the related "Measurement Name" @@ -261,7 +261,7 @@ definitions: timeStamp: description: > Time stamp indicating when the data has been collected. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/DateTime" value: description: > Value of the metric collected. @@ -273,7 +273,7 @@ definitions: Measurement context information related to the measured value. The set of applicable keys is defined per measurement in the related "Measurement Context" in clause 7.2 of ETSI GS NFV-IFA 027. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/KeyValuePairs" PmJob: description: > @@ -290,7 +290,7 @@ definitions: id: description: > Identifier of this PM job. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" objectType: description: > Type of the measured object. @@ -303,7 +303,7 @@ definitions: is collected. type: array items: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" subObjectInstanceIds: description: > Identifiers of the sub-object instances of the measured object @@ -317,7 +317,7 @@ definitions: be taken for all sub-object instances of the measured object instance. type: array items: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnf" criteria: description: > Criteria of the collection of performance information. @@ -325,7 +325,7 @@ definitions: callbackUri: description: > The URI of the endpoint to send the notification to. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Uri" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Uri" reports: description: > Information about available reports collected by this PM job. @@ -342,11 +342,11 @@ definitions: readyTime: description: > The time when the report was made available. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/DateTime" expiryTime: description: > The time when the report will expire. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/DateTime" fileSize: description: > The size of the report file in bytes, if known. @@ -365,7 +365,7 @@ definitions: self: description: > URI of this resource. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Link" objects: description: > Links to resources representing the measure @@ -375,7 +375,7 @@ definitions: accessible as a resource. type: array items: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Link" PmJobModifications: description: > @@ -392,7 +392,7 @@ definitions: callbackUri: description: > New value of the "callbackUri" attribute. The value "null" is not permitted. See note. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Uri" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Uri" authentication: description: > New value of the "authentication" attribute, or "null" to remove the attribute. If present @@ -400,7 +400,7 @@ definitions: Patch (see IETF RFC 7396). This attribute shall not be present in response bodies. See note. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/SubscriptionAuthentication" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/SubscriptionAuthentication" PmJobCriteria: description: > @@ -459,7 +459,7 @@ definitions: Identifies a time boundary after which the reporting will stop. The boundary shall allow a single reporting as well as periodic reporting up to the boundary. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/DateTime" Threshold: description: > @@ -476,7 +476,7 @@ definitions: id: description: > Identifier of this threshold resource. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" objectType: description: > Type of the measured object. @@ -486,7 +486,7 @@ definitions: objectInstanceId: description: > Identifier of the VNF instance associated with the threshold. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" subObjectInstanceIds: description: > Identifiers of the sub-object instances of the measured object @@ -499,7 +499,7 @@ definitions: measured object instance. type: array items: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnf" criteria: description: > Criteria that define this threshold. @@ -507,7 +507,7 @@ definitions: callbackUri: description: > The URI of the endpoint to send the notification to. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Uri" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Uri" _links: description: > Links for this resource. @@ -518,13 +518,13 @@ definitions: self: description: > URI of this resource. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Link" object: description: > Link to a resource representing the measured object instance for which performance information is collected. Shall be present if the measured object instance information is accessible as a resource. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Link" ThresholdModifications: description: > @@ -541,14 +541,14 @@ definitions: callbackUri: description: > New value of the "callbackUri" attribute. The value "null" is not permitted. See note. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Uri" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Uri" authentication: description: > New value of the "authentication" attribute, or "null" to remove the attribute. If present in a request body, these modifications shall be applied according to the rules of JSON Merge Patch (see IETF RFC 7396). This attribute shall not be present in response bodies. See note. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/SubscriptionAuthentication" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/SubscriptionAuthentication" ThresholdCriteria: description: > @@ -641,7 +641,7 @@ definitions: Identifier of this notification. If a notification is sent multiple times due to multiple subscriptions, the "id" attribute of all these notifications shall have the same value. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" notificationType: description: > Discriminator for the different notification types. Shall be set to @@ -652,11 +652,11 @@ definitions: timeStamp: description: > Date and time of the generation of the notification. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/DateTime" thresholdId: description: > Identifier of the threshold which has been crossed. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" crossingDirection: description: > An indication of whether the threshold was crossed in upward or @@ -670,14 +670,14 @@ definitions: objectInstanceId: description: > Identifier that identifies a VNF instance. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" subObjectInstanceId: description: > Identifier of the sub-object of the measured object to which the measurement applies. Shall be present if this is required in clause 6.2 of ETSI GS NFV-IFA 027 for the related measured object type. See note. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnf" performanceMetric: description: > Performance metric associated with the threshold. @@ -695,7 +695,7 @@ definitions: Measurement context information related to the measured value. The set of applicable keys is defined per measurement in the related "Measurement Context" in clause 7.2 of ETSI GS NFV-IFA 027. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/KeyValuePairs" _links: description: > Links to resources related to this notification. @@ -708,9 +708,9 @@ definitions: Link to the resource representing the measured object instance to which the notified change applies. Shall be present if the measured object instance information is accessible as a resource. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/NotificationLink" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/NotificationLink" threshold: description: > Link to the resource that represents the threshold that was crossed. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/NotificationLink" \ No newline at end of file + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/NotificationLink" \ No newline at end of file diff --git a/src/SOL003/VNFSnapshotPackageManagement/VNFSnapshotPackageManagement.yaml b/src/SOL003/VNFSnapshotPackageManagement/VNFSnapshotPackageManagement.yaml index 7b5cdeaf..0921f762 100644 --- a/src/SOL003/VNFSnapshotPackageManagement/VNFSnapshotPackageManagement.yaml +++ b/src/SOL003/VNFSnapshotPackageManagement/VNFSnapshotPackageManagement.yaml @@ -482,7 +482,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" PackageContent.Get.416: description: | @@ -634,7 +634,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" IndividualArtifact.Get.416: description: | diff --git a/src/SOL003/VNFSnapshotPackageManagement/definitions/SOL003VNFSnapshotPackageManagement_def.yaml b/src/SOL003/VNFSnapshotPackageManagement/definitions/SOL003VNFSnapshotPackageManagement_def.yaml index 24963fe4..3b205586 100644 --- a/src/SOL003/VNFSnapshotPackageManagement/definitions/SOL003VNFSnapshotPackageManagement_def.yaml +++ b/src/SOL003/VNFSnapshotPackageManagement/definitions/SOL003VNFSnapshotPackageManagement_def.yaml @@ -21,7 +21,7 @@ definitions: description: > Identifier of the VNF snapshot packageinformation held by the NFVO. This identifier is allocated by the NFVO. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" vnfSnapshotPkgUniqueId: description: > Identifier of the VNF snapshot package, which identifies the VNF snapshot package in @@ -29,29 +29,29 @@ definitions: Multiples instances of the same VNF snapshot package share the same vnfSnapshotPkgUniqueId. See note. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" name: description: > Human-readable name of the VNF snapshot package. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/String" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/String" checksum: description: > Checksum of the stored VNF snapshot package. Hash algorithms applicable to VNF snapshot packages are defined in ETSI GS NFV-SOL 010. See note. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Checksum" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Checksum" createdAt: description: > Timestamp indicating when the VNF snapshot package creation has been completed. See note. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/DateTime" vnfSnapshotId: description: > Identifier of specific VNF snapshot in the VNF snapshot package. This identifier is allocated by the VNFM during the VNF snapshot creation. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" vnfcSnapshotInfoIds: description: > Identifiers of information held by the VNFM about specific VNFC snapshots part @@ -61,12 +61,12 @@ definitions: See note. type: object items: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierLocal" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierLocal" isFullSnapshot: description: > Value is TRUE in case of a "full" VNF snapshot package, i.e., containing all snapshotted VNFC instances; otherwise the value is FALSE. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Boolean" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Boolean" vnfdInfo: description: > VNFD of the snapshotted VNF instance that is contained in the stored VNF snapshot package. @@ -121,7 +121,7 @@ definitions: cancelled. If the value of the "state" attribute is "BUILDING", "UPLOADING", "PROCESSING" or "EXTRACTING" and the operation is being cancelled, this attribute shall be set to true. Otherwise, it shall be set to false. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Boolean" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Boolean" failureDetails: description: > Failure details associated to current error state of the VNF snapshot package state. @@ -154,11 +154,11 @@ definitions: Failure details containing error information (such as failed uploading or processing operation, affected artifact, reason for cancellation, etc.). See clause 6.3 of ETSI GS NFV-SOL 013 for the details of "ProblemDetails" structure. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/ProblemDetails" userDefinedData: description: > User defined data for the VNF snapshot package to be built/uploaded. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/KeyValuePairs" _links: description: > Links to resources related to this resource. @@ -170,11 +170,11 @@ definitions: self: description: > URI of this resource. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Link" packageContent: description: > Link to the "VNF snapshot package content" resource. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Link" VnfcSnapshotImageInfo: description: > @@ -209,24 +209,24 @@ definitions: "storageResourceId" attribute in the "VnfcSnapshotInfo" of the corresponding storage snapshot resource. When onboarding an existing VNF snapshot package, the NFVO shall set the value of this attribute as provided in the manifest file in the VNF snapshot package (refer to ETSI GS NFV-SOL 010). - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierLocal" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierLocal" name: description: > Name of the VNFC snapshot image. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/String" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/String" checksum: description: > Checksum of the snapshot image file. Hash algorithms applicable to VNF snapshot package artifacts are defined in ETSI GS NFV-SOL 010. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Checksum" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Checksum" isEncrypted: description: > Reflects whether the artifact is encrypted (true) or not (false). - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Boolean" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Boolean" vnfcInstanceId: description: > Identifier of the snapshotted VNFC instance that this snapshot image belongs to. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnf" containerFormat: description: > Container format indicates whether the snapshot image is in a file format that @@ -283,23 +283,23 @@ definitions: createdAt: description: > Timestamp indicating when the VNFC snapshot image was created. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/DateTime" minDisk: description: > The minimal disk for this VNFC snapshot image (in bytes). - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/UnsignedInt" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/UnsignedInt" minRam: description: > The minimal RAM for this VNFC snapshot image (in bytes). - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/UnsignedInt" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/UnsignedInt" size: description: > Size of this VNFC snapshot image (in bytes). - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/UnsignedInt" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/UnsignedInt" userMetadata: description: > User-defined metadata. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/KeyValuePairs" imagePath: description: > Path which identifies the image artifact and also allows to access a copy of the image artifact. @@ -318,14 +318,14 @@ definitions: responsibility of the NFVO to synthesize this path in a manner that avoids any collision of the synthesized artifact path with the paths and names of artifacts included in the snapshot package. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/String" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/String" imageUri: description: > URI of the image artifact as defined in the VNF snapshot package manifest. Shall be present if the image artifact is external to the snapshot package and shall be absent otherwise. EXAMPLE: https://example.com/m%40ster.vhd - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Uri" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Uri" SnapshotPkgArtifactInfo: description: > @@ -354,28 +354,28 @@ definitions: clause 12.4.5. It is the responsibility of the NFVO to synthesize this path in a manner that avoids any collision of the synthesized artifact path with the paths and names of artifacts included in the snapshot package. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/String" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/String" artifactUri: description: > URI of the artifact as defined in the VNF snapshot package manifest. Shall be present if the artifact is external to the snapshot package and shall be absent otherwise. EXAMPLE: https://example.com/m%40ster.sh - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Uri" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Uri" checksum: description: > Checksum of the artifact file. Hash algorithms applicable to VNF snapshot package artifacts are defined in ETSI GS NFV-SOL 010. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Checksum" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Checksum" isEncrypted: description: > Reflects whether the artifact is encrypted (true) or not (false). - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Boolean" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Boolean" metadata: description: > The metadata of the artifact that are available in the VNF package, such as Content type, size, creation date, etc. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/KeyValuePairs" VnfdInfo: description: > @@ -390,7 +390,7 @@ definitions: avnfdId: description: > VNFD identifier of the snapshotted VNF instance. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" vnfdPath: description: > Path which allows to access a copy of the VNFD. The VNFD is implemented as @@ -401,16 +401,16 @@ definitions: of the path in the package, i.e. it shall not be prefixed by path separator characters such as "." and "/". EXAMPLE: foo/bar/m@ster - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/String" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/String" checksum: description: > Checksum of the VNFD archive file. Hash algorithms applicable to VNF snapshot package artifacts are defined in ETSI GS NFV-SOL 010. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Checksum" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Checksum" isEncrypted: description: > Reflects whether the VNFD archive file is encrypted (true) or not (false). - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Boolean" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Boolean" VnfSnapshotRecord: description: > @@ -429,13 +429,13 @@ definitions: path in the package, i.e. it shall not be prefixed by path separator characters such as "." and "/". EXAMPLE: foo/bar/m@ster - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/String" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/String" checksum: description: > Checksum of the VNF snapshot record file. Hash algorithms applicable to VNF snapshot package artifacts are defined in ETSI GS NFV-SOL 010. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Checksum" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Checksum" isEncrypted: description: > Reflects whether the VNF snapshot record file is encrypted (true) or not (false). - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Boolean" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Boolean" diff --git a/src/SOL003/VirtualisedResourcesQuotaAvailableNotification/VirtualisedResourcesQuotaAvailableNotification.yaml b/src/SOL003/VirtualisedResourcesQuotaAvailableNotification/VirtualisedResourcesQuotaAvailableNotification.yaml index 8a1ef39e..2f08af2e 100644 --- a/src/SOL003/VirtualisedResourcesQuotaAvailableNotification/VirtualisedResourcesQuotaAvailableNotification.yaml +++ b/src/SOL003/VirtualisedResourcesQuotaAvailableNotification/VirtualisedResourcesQuotaAvailableNotification.yaml @@ -348,7 +348,7 @@ components: content: application/json: schema: - $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" Subscriptions.Get.200: description: | diff --git a/src/SOL003/VirtualisedResourcesQuotaAvailableNotification/definitions/SOL003VirtualisedResourcesQuotaAvailableNotification_def.yaml b/src/SOL003/VirtualisedResourcesQuotaAvailableNotification/definitions/SOL003VirtualisedResourcesQuotaAvailableNotification_def.yaml index 19e58cf7..77fdeee2 100644 --- a/src/SOL003/VirtualisedResourcesQuotaAvailableNotification/definitions/SOL003VirtualisedResourcesQuotaAvailableNotification_def.yaml +++ b/src/SOL003/VirtualisedResourcesQuotaAvailableNotification/definitions/SOL003VirtualisedResourcesQuotaAvailableNotification_def.yaml @@ -21,7 +21,7 @@ definitions: Management in direct mode is applicable. type: array items: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" resourceProviderIds: description: > Match the entities responsible for the management of the virtualised @@ -31,7 +31,7 @@ definitions: is outside the scope of the present document. type: array items: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" resourceTypes: description: > Match particular resource types. @@ -49,7 +49,7 @@ definitions: an infrastructure Domain. type: array items: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVim" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVim" VrQuotaAvailSubscription: description: > @@ -64,7 +64,7 @@ definitions: id: description: > Identifier of this "Individual subscription" resource - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" filter: description: > Input filter for selecting notifications to subscribe to. @@ -74,7 +74,7 @@ definitions: callbackUri: description: > The URI of the endpoint to send the notification to. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Uri" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Uri" _links: description: > Links for this resource @@ -85,7 +85,7 @@ definitions: self: description: > URI of this resource - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Link" VrQuotaAvailSubscriptionRequest: description: > @@ -104,12 +104,12 @@ definitions: callbackUri: description: > The URI of the endpoint to send the notification to. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Uri" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Uri" authentication: description: > Authentication parameters to configure the use of Authorization when sending notifications corresponding to this subscription, as defined in clause 8.3.4 of ETSI GS NFV-SOL 013. This attribute shall only be present if the subscriber requires authorization of notifications. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/SubscriptionAuthentication" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/SubscriptionAuthentication" diff --git a/src/endpoints/SOL002SOL003_endpoints.yaml b/src/endpoints/SOL002SOL003_endpoints.yaml index cfdfd0ce..4e4e1a11 100644 --- a/src/endpoints/SOL002SOL003_endpoints.yaml +++ b/src/endpoints/SOL002SOL003_endpoints.yaml @@ -89,4 +89,4 @@ components: content: application/json: schema: - $ref: '../definitions/SOL002SOL003_def.yaml#/definitions/ApiVersionInformation' \ No newline at end of file + $ref: '../SOL002/General_Definitions/SOL002_def.yaml#/definitions/ApiVersionInformation' \ No newline at end of file diff --git a/src/responses/SOL002SOL003_resp.yaml b/src/responses/SOL002SOL003_resp.yaml index d1e0e089..78d92fe9 100644 --- a/src/responses/SOL002SOL003_resp.yaml +++ b/src/responses/SOL002SOL003_resp.yaml @@ -40,7 +40,7 @@ components: content: application/json: schema: - $ref: "../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../SOL002/General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" 303: description: > @@ -123,7 +123,7 @@ components: content: application/json: schema: - $ref: "../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../SOL002/General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" 401: description: > @@ -159,7 +159,7 @@ components: content: application/json: schema: - $ref: "../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../SOL002/General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" 403: description: > @@ -195,7 +195,7 @@ components: content: application/json: schema: - $ref: "../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../SOL002/General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" 404: description: > @@ -236,7 +236,7 @@ components: content: application/json: schema: - $ref: "../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../SOL002/General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" 405: description: > @@ -270,7 +270,7 @@ components: content: application/json: schema: - $ref: "../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../SOL002/General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" 406: description: > @@ -305,7 +305,7 @@ components: content: application/json: schema: - $ref: "../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../SOL002/General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" 409: description: > @@ -336,7 +336,7 @@ components: content: application/json: schema: - $ref: "../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../SOL002/General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" 412: description: > @@ -372,7 +372,7 @@ components: content: application/json: schema: - $ref: "../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../SOL002/General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" 413: description: > @@ -407,7 +407,7 @@ components: content: application/json: schema: - $ref: "../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../SOL002/General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" 414: description: > @@ -442,7 +442,7 @@ components: content: application/json: schema: - $ref: "../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../SOL002/General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" 416: description: > @@ -473,7 +473,7 @@ components: content: application/json: schema: - $ref: "../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../SOL002/General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" 422: description: > @@ -511,7 +511,7 @@ components: content: application/json: schema: - $ref: "../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../SOL002/General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" 429: description: > @@ -551,7 +551,7 @@ components: content: application/json: schema: - $ref: "../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../SOL002/General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" 500: description: > @@ -587,7 +587,7 @@ components: content: application/json: schema: - $ref: "../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../SOL002/General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" 503: description: > @@ -623,7 +623,7 @@ components: content: application/json: schema: - $ref: "../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" + $ref: "../SOL002/General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" 504: description: > @@ -658,4 +658,4 @@ components: content: application/json: schema: - $ref: "../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" \ No newline at end of file + $ref: "../SOL002/General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" \ No newline at end of file -- GitLab From 61902a9c67f0a9e4af2aa1b25aee89e4ab7eeb4d Mon Sep 17 00:00:00 2001 From: muhammadh Date: Thu, 30 Jun 2022 13:21:38 +0500 Subject: [PATCH 33/41] fix referencing in SOL003 APIs --- .../VNFFaultManagement.yaml | 4 +- src/SOL003/VNFIndicator/VNFIndicator.yaml | 2 +- .../VNFLifecycleManagement.yaml | 68 +++++++++---------- .../VNFLifecycleOperationGranting.yaml | 4 +- .../VNFPackageManagement.yaml | 22 +++--- .../VNFPerformanceManagement.yaml | 8 +-- .../VNFSnapshotPackageManagement.yaml | 4 +- ...edResourcesQuotaAvailableNotification.yaml | 2 +- 8 files changed, 57 insertions(+), 57 deletions(-) diff --git a/src/SOL003/VNFFaultManagement/VNFFaultManagement.yaml b/src/SOL003/VNFFaultManagement/VNFFaultManagement.yaml index 22d7bd15..5204d752 100644 --- a/src/SOL003/VNFFaultManagement/VNFFaultManagement.yaml +++ b/src/SOL003/VNFFaultManagement/VNFFaultManagement.yaml @@ -536,7 +536,7 @@ components: content: application/json: schema: - $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL003_def.yaml#/definitions/ProblemDetails" IndividualAlarm.Patch.412: description: | @@ -747,7 +747,7 @@ components: content: application/json: schema: - $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL003_def.yaml#/definitions/ProblemDetails" IndividualSubscription.Get.200: description: | diff --git a/src/SOL003/VNFIndicator/VNFIndicator.yaml b/src/SOL003/VNFIndicator/VNFIndicator.yaml index 72b8d958..6f55e1c9 100644 --- a/src/SOL003/VNFIndicator/VNFIndicator.yaml +++ b/src/SOL003/VNFIndicator/VNFIndicator.yaml @@ -608,7 +608,7 @@ components: content: application/json: schema: - $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL003_def.yaml#/definitions/ProblemDetails" Subscriptions.Get.200: description: | 200 OK diff --git a/src/SOL003/VNFLifecycleManagement/VNFLifecycleManagement.yaml b/src/SOL003/VNFLifecycleManagement/VNFLifecycleManagement.yaml index 59696f76..3955a2c5 100644 --- a/src/SOL003/VNFLifecycleManagement/VNFLifecycleManagement.yaml +++ b/src/SOL003/VNFLifecycleManagement/VNFLifecycleManagement.yaml @@ -1659,7 +1659,7 @@ components: content: application/json: schema: - $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL003_def.yaml#/definitions/ProblemDetails" VNFInstances.Get.200: description: | @@ -1838,7 +1838,7 @@ components: content: application/json: schema: - $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL003_def.yaml#/definitions/ProblemDetails" IndividualVnfInstance.Patch.412: description: | @@ -1937,7 +1937,7 @@ components: content: application/json: schema: - $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL003_def.yaml#/definitions/ProblemDetails" InstantiateVnfInstance.Post.202: description: | @@ -2011,7 +2011,7 @@ components: content: application/json: schema: - $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL003_def.yaml#/definitions/ProblemDetails" ScaleVnfInstance.Post.202: description: | @@ -2091,7 +2091,7 @@ components: content: application/json: schema: - $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL003_def.yaml#/definitions/ProblemDetails" ScaleVnfInstance.Post.409: description: | @@ -2133,7 +2133,7 @@ components: content: application/json: schema: - $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL003_def.yaml#/definitions/ProblemDetails" ScaleToLevelVnfInstance.Post.202: description: | @@ -2214,7 +2214,7 @@ components: content: application/json: schema: - $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL003_def.yaml#/definitions/ProblemDetails" ScaleToLevelVnfInstance.Post.409: description: | 409 CONFLICT @@ -2255,7 +2255,7 @@ components: content: application/json: schema: - $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL003_def.yaml#/definitions/ProblemDetails" ChangeFlavourVnfInstance.Post.202: description: | @@ -2336,7 +2336,7 @@ components: content: application/json: schema: - $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL003_def.yaml#/definitions/ProblemDetails" ChangeFlavourVnfInstance.Post.409: description: | @@ -2379,7 +2379,7 @@ components: content: application/json: schema: - $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL003_def.yaml#/definitions/ProblemDetails" TerminateVnfInstance.Post.202: description: | @@ -2454,7 +2454,7 @@ components: content: application/json: schema: - $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL003_def.yaml#/definitions/ProblemDetails" HealVnfInstance.Post.202: description: | @@ -2534,7 +2534,7 @@ components: content: application/json: schema: - $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL003_def.yaml#/definitions/ProblemDetails" HealVnfInstance.Post.409: description: | @@ -2576,7 +2576,7 @@ components: content: application/json: schema: - $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL003_def.yaml#/definitions/ProblemDetails" OperateVnfInstance.Post.202: description: | @@ -2657,7 +2657,7 @@ components: content: application/json: schema: - $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL003_def.yaml#/definitions/ProblemDetails" OperateVnfInstance.Post.409: description: | @@ -2700,7 +2700,7 @@ components: content: application/json: schema: - $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL003_def.yaml#/definitions/ProblemDetails" ChangeExtConnVnfInstance.Post.202: description: | @@ -2777,7 +2777,7 @@ components: content: application/json: schema: - $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL003_def.yaml#/definitions/ProblemDetails" ChangeVnfpkgVnfInstance.Post.202: description: | @@ -2851,7 +2851,7 @@ components: content: application/json: schema: - $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL003_def.yaml#/definitions/ProblemDetails" VnfLcmOpOccs.Get.200: description: | @@ -3003,7 +3003,7 @@ components: content: application/json: schema: - $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL003_def.yaml#/definitions/ProblemDetails" RollbackVnfLcmOpOcc.Post.409: description: | @@ -3045,7 +3045,7 @@ components: content: application/json: schema: - $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL003_def.yaml#/definitions/ProblemDetails" RetryVnfLcmOpOcc.Post.202: description: | @@ -3114,7 +3114,7 @@ components: content: application/json: schema: - $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL003_def.yaml#/definitions/ProblemDetails" RetryVnfLcmOpOcc.Post.409: description: | @@ -3156,7 +3156,7 @@ components: content: application/json: schema: - $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL003_def.yaml#/definitions/ProblemDetails" FailVnfLcmOpOcc.Post.200: description: | @@ -3240,7 +3240,7 @@ components: content: application/json: schema: - $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL003_def.yaml#/definitions/ProblemDetails" FailVnfLcmOpOcc.Post.409: description: | @@ -3282,7 +3282,7 @@ components: content: application/json: schema: - $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL003_def.yaml#/definitions/ProblemDetails" CancelVnfLcmOpOcc.Post.202: description: | @@ -3353,7 +3353,7 @@ components: content: application/json: schema: - $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL003_def.yaml#/definitions/ProblemDetails" CancelVnfLcmOpOcc.Post.409: description: | @@ -3394,7 +3394,7 @@ components: content: application/json: schema: - $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL003_def.yaml#/definitions/ProblemDetails" Subscriptions.Post.201: description: | @@ -3527,7 +3527,7 @@ components: content: application/json: schema: - $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL003_def.yaml#/definitions/ProblemDetails" Subscriptions.Get.200: description: | @@ -3704,7 +3704,7 @@ components: content: application/json: schema: - $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL003_def.yaml#/definitions/ProblemDetails" CreateVnfSnapshotTask.Post.409: description: | @@ -3745,7 +3745,7 @@ components: content: application/json: schema: - $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL003_def.yaml#/definitions/ProblemDetails" CreateVnfSnapshotTask.Post.422: description: | @@ -3791,7 +3791,7 @@ components: content: application/json: schema: - $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL003_def.yaml#/definitions/ProblemDetails" RevertToVnfSnapshotTask.Post.202: description: | @@ -3872,7 +3872,7 @@ components: content: application/json: schema: - $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL003_def.yaml#/definitions/ProblemDetails" RevertToVnfSnapshotTask.Post.409: description: | @@ -3913,7 +3913,7 @@ components: content: application/json: schema: - $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL003_def.yaml#/definitions/ProblemDetails" VnfSnapshots.Post.201: description: | @@ -4149,7 +4149,7 @@ components: content: application/json: schema: - $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL003_def.yaml#/definitions/ProblemDetails" IndividualVnfSnapshot.Patch.412: description: | @@ -4246,7 +4246,7 @@ components: content: application/json: schema: - $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL003_def.yaml#/definitions/ProblemDetails" IndividualVnfSnapshotState.Get.200: description: | @@ -4363,7 +4363,7 @@ components: content: application/json: schema: - $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL003_def.yaml#/definitions/ProblemDetails" IndividualVnfSnapshotState.Get.416: description: | diff --git a/src/SOL003/VNFLifecycleOperationGranting/VNFLifecycleOperationGranting.yaml b/src/SOL003/VNFLifecycleOperationGranting/VNFLifecycleOperationGranting.yaml index fac9bb69..ffd277c9 100644 --- a/src/SOL003/VNFLifecycleOperationGranting/VNFLifecycleOperationGranting.yaml +++ b/src/SOL003/VNFLifecycleOperationGranting/VNFLifecycleOperationGranting.yaml @@ -251,7 +251,7 @@ components: content: application/json: schema: - $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL003_def.yaml#/definitions/ProblemDetails" IndividualGrant.Get.200: description: | @@ -335,4 +335,4 @@ components: content: application/json: schema: - $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" \ No newline at end of file + $ref: "../General_Definitions/SOL003_def.yaml#/definitions/ProblemDetails" \ No newline at end of file diff --git a/src/SOL003/VNFPackageManagement/VNFPackageManagement.yaml b/src/SOL003/VNFPackageManagement/VNFPackageManagement.yaml index c555f605..04a91832 100644 --- a/src/SOL003/VNFPackageManagement/VNFPackageManagement.yaml +++ b/src/SOL003/VNFPackageManagement/VNFPackageManagement.yaml @@ -1139,7 +1139,7 @@ components: content: application/json: schema: - $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL003_def.yaml#/definitions/ProblemDetails" VnfdInIndividualOnboardedVnfPackage.Get.200: description: | @@ -1216,7 +1216,7 @@ components: content: application/json: schema: - $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL003_def.yaml#/definitions/ProblemDetails" ManifestInIndividualVnfPackage.Get.200: description: | @@ -1334,7 +1334,7 @@ components: content: application/json: schema: - $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL003_def.yaml#/definitions/ProblemDetails" ManifestInIndividualOnboardedVnfPackage.Get.200: description: | @@ -1452,7 +1452,7 @@ components: content: application/json: schema: - $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL003_def.yaml#/definitions/ProblemDetails" IndividualVnfPackageContent.Get.200: description: | @@ -1560,7 +1560,7 @@ components: content: application/json: schema: - $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL003_def.yaml#/definitions/ProblemDetails" IndividualVnfPackageContent.Get.416: description: | @@ -1656,7 +1656,7 @@ components: content: application/json: schema: - $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL003_def.yaml#/definitions/ProblemDetails" IndividualOnboardedVnfPackageContent.Get.416: description: | @@ -1777,7 +1777,7 @@ components: content: application/json: schema: - $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL003_def.yaml#/definitions/ProblemDetails" IndividualVnfPackageArtifact.Get.416: description: | @@ -1843,7 +1843,7 @@ components: content: application/json: schema: - $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL003_def.yaml#/definitions/ProblemDetails" IndividualOnboardedVnfPackageArtifact.Get.416: description: | @@ -1909,7 +1909,7 @@ components: content: application/json: schema: - $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL003_def.yaml#/definitions/ProblemDetails" IndividualVnfPackageArtifacts.Get.416: description: | @@ -1978,7 +1978,7 @@ components: content: application/json: schema: - $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL003_def.yaml#/definitions/ProblemDetails" IndividualOnboardedVnfPackageArtifacts.Get.416: description: | @@ -2469,7 +2469,7 @@ components: content: application/json: schema: - $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL003_def.yaml#/definitions/ProblemDetails" Subscriptions.Get.200: description: | diff --git a/src/SOL003/VNFPerformanceManagement/VNFPerformanceManagement.yaml b/src/SOL003/VNFPerformanceManagement/VNFPerformanceManagement.yaml index ce927b81..3a9f0d2d 100644 --- a/src/SOL003/VNFPerformanceManagement/VNFPerformanceManagement.yaml +++ b/src/SOL003/VNFPerformanceManagement/VNFPerformanceManagement.yaml @@ -593,7 +593,7 @@ components: content: application/json: schema: - $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL003_def.yaml#/definitions/ProblemDetails" PmJobs.Get.200: description: | @@ -806,7 +806,7 @@ components: content: application/json: schema: - $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL003_def.yaml#/definitions/ProblemDetails" IndividualPmJob.Delete.200: description: | @@ -959,7 +959,7 @@ components: content: application/json: schema: - $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL003_def.yaml#/definitions/ProblemDetails" Thresholds.Get.200: description: | @@ -1195,7 +1195,7 @@ components: content: application/json: schema: - $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL003_def.yaml#/definitions/ProblemDetails" IndividualThreshold.Delete.200: description: | diff --git a/src/SOL003/VNFSnapshotPackageManagement/VNFSnapshotPackageManagement.yaml b/src/SOL003/VNFSnapshotPackageManagement/VNFSnapshotPackageManagement.yaml index 0921f762..787d5ebf 100644 --- a/src/SOL003/VNFSnapshotPackageManagement/VNFSnapshotPackageManagement.yaml +++ b/src/SOL003/VNFSnapshotPackageManagement/VNFSnapshotPackageManagement.yaml @@ -482,7 +482,7 @@ components: content: application/json: schema: - $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL003_def.yaml#/definitions/ProblemDetails" PackageContent.Get.416: description: | @@ -634,7 +634,7 @@ components: content: application/json: schema: - $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL003_def.yaml#/definitions/ProblemDetails" IndividualArtifact.Get.416: description: | diff --git a/src/SOL003/VirtualisedResourcesQuotaAvailableNotification/VirtualisedResourcesQuotaAvailableNotification.yaml b/src/SOL003/VirtualisedResourcesQuotaAvailableNotification/VirtualisedResourcesQuotaAvailableNotification.yaml index 2f08af2e..a47d1b30 100644 --- a/src/SOL003/VirtualisedResourcesQuotaAvailableNotification/VirtualisedResourcesQuotaAvailableNotification.yaml +++ b/src/SOL003/VirtualisedResourcesQuotaAvailableNotification/VirtualisedResourcesQuotaAvailableNotification.yaml @@ -348,7 +348,7 @@ components: content: application/json: schema: - $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails" + $ref: "../General_Definitions/SOL003_def.yaml#/definitions/ProblemDetails" Subscriptions.Get.200: description: | -- GitLab From 3929108dda14f8b230372f583e5642d164df1371 Mon Sep 17 00:00:00 2001 From: muhammadh Date: Thu, 30 Jun 2022 13:43:08 +0500 Subject: [PATCH 34/41] redefine few data models as per SOL specs --- .../General_Definitions/SOL002_def.yaml | 63 +++++++---------- .../General_Definitions/SOL003_def.yaml | 69 +++++++------------ 2 files changed, 50 insertions(+), 82 deletions(-) diff --git a/src/SOL002/General_Definitions/SOL002_def.yaml b/src/SOL002/General_Definitions/SOL002_def.yaml index 859a0a6b..1a71a3c0 100644 --- a/src/SOL002/General_Definitions/SOL002_def.yaml +++ b/src/SOL002/General_Definitions/SOL002_def.yaml @@ -275,46 +275,36 @@ definitions: - resourceId type: object description: > - This type represents the information that allows addressing a virtualised - resource that is used by a VNF instance. Information about the resource - is available from the VIM. + This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. + Information about the resource is available from the VIM. - * NOTE 1: The information about the VIM or CISM connection referenced by the VIM connection id is - known to the VNFM. Moreover, the identifier of the VIM connection provides scope to the - resourceId. (This applies in case of SOL002) + * NOTE 1: The information about the VIM or CISM 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: The value set of the "vimLevelResourceType" attribute is within the scope of the VIM - or CISM or the resource provider and can be used as information that complements the - ResourceHandle. This value set is different from the value set of the "type" attribute - in the ResourceDefinition (refer to clause 9.5.3.2). When the container infrastructure - service management is a Kubernetes® instance the vimLevelResourceType is the type of - resource, as would correspond to the 'kind' field if the resource is declared in its own - Kubernetes® manifest, e.g.: Pod, PersistentVolumeClaim, NetworkAttachmentDefinition. + * NOTE 2: The value set of the "vimLevelResourceType" attribute is within the scope of the VIM or CISM or the resource + provider and can be used as information that complements the ResourceHandle. When the container + infrastructure service is a Kubernetes® instance the vimLevelResourceType is the type of resource, as would + correspond to the 'kind' field if the resource is declared in its own Kubernetes® manifest, e.g.: Pod, + PersistentVolumeClaim, NetworkAttachmentDefinition. - * NOTE 3: When the container infrastructure service management is a Kubernetes® instance the resourceId shall be - populated in the following way: - - For a compute MCIO, it is the instance identifier that Kubernetes® assigns, which is unique cluster wide + * NOTE 3: When the container infrastructure service is a Kubernetes® instance the resourceId shall be populated in the + following way: + - For a compute MCIO, it is the instance identifier that Kubernetes® assigns, which is unique cluster wide per resource type. - - For a storage MCIO modelled as a persistent volume claim, it is the name of the persistent volume claim, - i.e. the value of the 'claimName' field in the Kubernetes® manifest, or a compound name built by - Kubernetes® if the persistent volume claim is defined inline in another template instead of in its own + - For a storage MCIO modelled as a persistent volume claim, it is the name of the persistent volume claim, + i.e. the value of the 'claimName' field in the Kubernetes® manifest, or a compound name built by + Kubernetes® if the persistent volume claim is defined inline in another template instead of in its own manifest. - - For a network MCIO representing a NetworkAttachme. + - For a network MCIO representing a NetworkAttachmentDefinition, a Service or an Ingress, it is the value of + the 'metadata.name' field in Kubernetes® manifest. properties: vimConnectionId: description: > - Identifier of the VIM or CISM connection to manage the - resource. - This attribute shall be supported when the resource is - managed by a CISM. - When the resource is managed by a VIM, this attribute - shall only be supported and present if VNF--related + Identifier of the VIM or CISM connection to manage the resource. + This attribute shall be supported when the resource is managed by a CISM. + When the resource is managed by a VIM, this attribute shall only be supported and present if VNF-related resource management in direct mode is applicable. - The applicable "VimConnectionInfo" structure, which is - referenced by vimConnectionId, can be obtained from - the "vimConnectionInfo" attribute of the "VnfInstance" - structure. (This applies in case of SOL003) - See note 1. (This applies in case of SOL002) + See note 1. $ref: "#/definitions/Identifier" resourceProviderId: description: > @@ -528,7 +518,7 @@ definitions: of the packets or it may be an identifier used between the application and the NFVI networking infrastructure to identify the network sub-interface of the trunk port in question. In the latter case the NFVI infrastructure will map this local segmentationId to whatever segmentationId is - actually used by the NFVI’s transport technology. + actually used by the NFVI's transport technology. type: object anyOf: - required: @@ -627,11 +617,8 @@ definitions: VirtualCpAddressData: description: > - This type represents network address data for a virtual CP. It shall comply with the provisions defined in - table 4.4.1.10d-1. - - This type represents information about a link port of an external VL, i.e. a port providing connectivity - for the VNF to an NS VL. It shall comply with the provisions defined in table 5.5.3.6d-1. (This applies in case of SOL002) + This type represents information about a link port of an external VL, i.e. a port providing connectivity for the VNF to an + NS VL. It shall comply with the provisions defined in table 5.5.3.6d-1. * NOTE 1: If the container cluster is set up to be able to configure an external load balancer this address will be used, otherwise it will be ignored by the CISM. @@ -660,7 +647,7 @@ definitions: 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. (This applies in case of SOL002) + 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: 1 For a VIP CP directly exposed as an external CP: diff --git a/src/SOL003/General_Definitions/SOL003_def.yaml b/src/SOL003/General_Definitions/SOL003_def.yaml index 859a0a6b..151bde61 100644 --- a/src/SOL003/General_Definitions/SOL003_def.yaml +++ b/src/SOL003/General_Definitions/SOL003_def.yaml @@ -275,46 +275,36 @@ definitions: - resourceId type: object description: > - This type represents the information that allows addressing a virtualised - resource that is used by a VNF instance. Information about the resource - is available from the VIM. + This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. + Information about the resource is available from the VIM. The ResourceHandle type shall comply with the provisions + defined in table 4.4.1.7-1. - * NOTE 1: The information about the VIM or CISM connection referenced by the VIM connection id is - known to the VNFM. Moreover, the identifier of the VIM connection provides scope to the - resourceId. (This applies in case of SOL002) + * NOTE 1: The value set of the "vimLevelResourceType" attribute is within the scope of the VIM or CISM or the resource + provider and can be used as information that complements the ResourceHandle. This value set is different from + the value set of the "type" attribute in the ResourceDefinition (refer to clause 9.5.3.2). When the container + infrastructure service management is a Kubernetes® instance the vimLevelResourceType is the type of + resource, as would correspond to the 'kind' field if the resource is declared in its own Kubernetes® manifest, + e.g.: Pod, PersistentVolumeClaim, NetworkAttachmentDefinition. - * NOTE 2: The value set of the "vimLevelResourceType" attribute is within the scope of the VIM - or CISM or the resource provider and can be used as information that complements the - ResourceHandle. This value set is different from the value set of the "type" attribute - in the ResourceDefinition (refer to clause 9.5.3.2). When the container infrastructure - service management is a Kubernetes® instance the vimLevelResourceType is the type of - resource, as would correspond to the 'kind' field if the resource is declared in its own - Kubernetes® manifest, e.g.: Pod, PersistentVolumeClaim, NetworkAttachmentDefinition. - - * NOTE 3: When the container infrastructure service management is a Kubernetes® instance the resourceId shall be + * NOTE 2: When the container infrastructure service management is a Kubernetes® instance the resourceId shall be populated in the following way: - - For a compute MCIO, it is the instance identifier that Kubernetes® assigns, which is unique cluster wide + - For a compute MCIO, it is the instance identifier that Kubernetes® assigns, which is unique cluster wide per resource type. - - For a storage MCIO modelled as a persistent volume claim, it is the name of the persistent volume claim, - i.e. the value of the 'claimName' field in the Kubernetes® manifest, or a compound name built by - Kubernetes® if the persistent volume claim is defined inline in another template instead of in its own + - For a storage MCIO modelled as a persistent volume claim, it is the name of the persistent volume claim, + i.e. the value of the 'claimName' field in the Kubernetes® manifest, or a compound name built by + Kubernetes® if the persistent volume claim is defined inline in another template instead of in its own manifest. - - For a network MCIO representing a NetworkAttachme. + - For a network MCIO representing a NetworkAttachmentDefinition, a Service or an Ingress, it is the value of + the 'metadata.name' field in Kubernetes® manifest. properties: vimConnectionId: description: > - Identifier of the VIM or CISM connection to manage the - resource. - This attribute shall be supported when the resource is - managed by a CISM. - When the resource is managed by a VIM, this attribute - shall only be supported and present if VNF--related + Identifier of the VIM or CISM connection to manage the resource. + This attribute shall be supported when the resource is managed by a CISM. + When the resource is managed by a VIM, this attribute shall only be supported and present if VNF--related resource management in direct mode is applicable. - The applicable "VimConnectionInfo" structure, which is - referenced by vimConnectionId, can be obtained from - the "vimConnectionInfo" attribute of the "VnfInstance" - structure. (This applies in case of SOL003) - See note 1. (This applies in case of SOL002) + The applicable "VimConnectionInfo" structure, which is referenced by vimConnectionId, can be obtained from + the "vimConnectionInfo" attribute of the "VnfInstance" structure. $ref: "#/definitions/Identifier" resourceProviderId: description: > @@ -627,11 +617,7 @@ definitions: VirtualCpAddressData: description: > - This type represents network address data for a virtual CP. It shall comply with the provisions defined in - table 4.4.1.10d-1. - - This type represents information about a link port of an external VL, i.e. a port providing connectivity - for the VNF to an NS VL. It shall comply with the provisions defined in table 5.5.3.6d-1. (This applies in case of SOL002) + This type represents network address data for a virtual CP. It shall comply with the provisions defined in table 4.4.1.10d-1. * NOTE 1: If the container cluster is set up to be able to configure an external load balancer this address will be used, otherwise it will be ignored by the CISM. @@ -658,11 +644,9 @@ 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. (This applies in case of SOL002) + This type represents an external VL. It shall comply with the provisions defined in table 4.4.1.11-1. - * NOTE 2: A link port is not needed for an external CP instance that exposes a VIP CP in the following cases: + * NOTE 1: 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 an external CP: 1.1 No dedicated IP address is allocated as VIP address, as indicated in the VNFD. 1.2 A dedicated IP address is allocated as VIP address, but the NFVO indicates that no port is needed @@ -674,7 +658,7 @@ definitions: 4 For a VNFC CP exposed as an external CP in a secondary container cluster external network or a secondary container cluster internal network. - * NOTE 3: An example of the network attachment definition resource when the container infrastructure service + * 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). type: object required: @@ -898,9 +882,6 @@ definitions: Cheksum description type: string -######################################################################################################################## -# TO CHECK IF INCLUDE THESE DATA TYPES IN ANOTHER DEF FILES - VnfLinkPortData: description: > This type represents an externally provided link port to be used to connect a VNFC connection point -- GitLab From b73b2a7bc40a177181625a07f508e80583a25872 Mon Sep 17 00:00:00 2001 From: Giacomo Bernini Date: Thu, 7 Jul 2022 14:42:02 +0200 Subject: [PATCH 35/41] removed mandatory Version HTTP header in ApiVersion operations to align with SOL013ed431 --- src/endpoints/SOL002SOL003_endpoints.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/endpoints/SOL002SOL003_endpoints.yaml b/src/endpoints/SOL002SOL003_endpoints.yaml index 4e4e1a11..fe89b234 100644 --- a/src/endpoints/SOL002SOL003_endpoints.yaml +++ b/src/endpoints/SOL002SOL003_endpoints.yaml @@ -2,8 +2,6 @@ # https://forge.etsi.org/etsi-forge-copyright-notice.txt endpoints: api-versions: - parameters: - - $ref: ../components/SOL002_params.yaml#/components/parameters/Version get: description: > The GET method reads API version information. This method shall follow the provisions specified in SOL013 table 9.3.3.3.2-1 -- GitLab From cd69d355b89dc2d6ffb7d2c8255ce07a19208107 Mon Sep 17 00:00:00 2001 From: muhammadh Date: Thu, 14 Jul 2022 15:15:44 +0500 Subject: [PATCH 36/41] resolve issues raised by Vlademir in SOL002 v4.3.1 --- .../General_Definitions/SOL002_def.yaml | 59 +++++++------- .../SOL002VNFFaultManagement_def.yaml | 7 +- .../definitions/SOL002VNFIndicator_def.yaml | 10 +-- .../SOL002VNFLifecycleManagement_def.yaml | 81 +++++++++---------- ...NFLifecycleManagementNotification_def.yaml | 5 ++ .../SOL002VNFPerformanceManagement_def.yaml | 13 ++- 6 files changed, 89 insertions(+), 86 deletions(-) diff --git a/src/SOL002/General_Definitions/SOL002_def.yaml b/src/SOL002/General_Definitions/SOL002_def.yaml index 1a71a3c0..b0f98496 100644 --- a/src/SOL002/General_Definitions/SOL002_def.yaml +++ b/src/SOL002/General_Definitions/SOL002_def.yaml @@ -188,7 +188,7 @@ definitions: VimConnectionInfo: description: > This type represents parameters to connect to a VIM, a CISM, a CIR or a MCIOP repository for managing - the resources of a VNF instance. It shall comply with the provisions defined in table 4.4.1.6-1. + the resources of a VNF instance. This structure is used to convey VIM-related, CISM-related, CIR-related, or MCIOP-repository-relate dparameters over the Or-Vnfm interface. Additional parameters for a VIM, a CISM, a CIR or a MCIOP @@ -354,13 +354,13 @@ definitions: virtual link, and deletion of that instance in case it represents a subport. Deleting the last key from the map removes the affected instance of the "VnfExtCpData" structure from its parent data structure. - * NOTE 4: If, as defined by the input parameters of a "ChangeVnfFlavour", "ChangeExtVnfConnectivity" or - "ChangeCurrentVnfPkg" operation or as part of the Grant response for any of these operations, a - cpConfig map entry identified by a particular map key value is moved into another "ExtVirtualLinkData" - or "VnfExtCpData" structure, this particular cpConfig map entry may be used by an external CP instance - different than the one that has used it before the operation, or by no external CP instance at all. - Renaming a CPD identifier during the "changeCurrentVnfPkg" operation does not count as moving the - related "cpConfig" map entries to a new "extCpData" structure. + * NOTE 4: If, as defined by the input parameters of a "ChangeVnfFlavour", "ChangeExtVnfConnectivity" or + "ChangeCurrentVnfPkg" operation, a cpConfig map entry identified by a particular map key value + is moved into another "ExtVirtualLinkData" or "VnfExtCpData" structure, this particular cpConfig + map entry may be used by an external CP instance different than the one that has used it before the + operation, or by no external CP instance at all. Renaming a CPD identifier during the "changeCurrentVnfPkg" + operation does not count as moving the related "cpConfig" map entries to a new "extCpData" structure. + type: object required: - cpdId @@ -433,6 +433,7 @@ definitions: in "VnfExtCpConfig" structures that provide configuration information for a CP which represents a sub-port in a trunk, and if parent ports are supported. $ref: "#/definitions/IdentifierInVnf" + linkPortId: description: > Identifier of a pre-configured link port to which the external CP @@ -448,6 +449,14 @@ definitions: instance for which a dedicated IP address is allocated. It shall be present in that case and shall be absent otherwise. type: boolean + cpProtocolData: + description: > + Parameters for configuring the network protocols on the + link port that connects the CP to a VL. See notes 1 and 2. + type: array + items: + $ref: "#/definitions/CpProtocolData" + netAttDefResourceId: description: > Identifier of the “NetAttDefResourceData” structure that @@ -462,13 +471,6 @@ definitions: type: array items: $ref: "#/definitions/Identifier" - cpProtocolData: - description: > - Parameters for configuring the network protocols on the - link port that connects the CP to a VL. See notes 1 and 2. - type: array - items: - $ref: "#/definitions/CpProtocolData" CpProtocolData: description: > @@ -490,6 +492,7 @@ definitions: type: string enum: - IP_OVER_ETHERNET + - IP_FOR_VIRTUAL_CP ipOverEthernet: description: > Network address data for IP over Ethernet to assign to the external CP @@ -618,7 +621,7 @@ definitions: VirtualCpAddressData: description: > This type represents information about a link port of an external VL, i.e. a port providing connectivity for the VNF to an - NS VL. It shall comply with the provisions defined in table 5.5.3.6d-1. + NS VL. * NOTE 1: If the container cluster is set up to be able to configure an external load balancer this address will be used, otherwise it will be ignored by the CISM. @@ -650,16 +653,15 @@ definitions: 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: - 1 For a VIP CP directly exposed as an external CP: - 1.1 No dedicated IP address is allocated as VIP address, as indicated in the VNFD. - 1.2 A dedicated IP address is allocated as VIP address, but the NFVO indicates that no port is needed - (createExtLinkPort in VnfExtCpConfig set to false). - 2 For a VIP CP exposed as an external CP via a floating IP address: - 2.1 No dedicated IP address is allocated as VIP address, as indicated in the VNFD, and the VNFC CP - associated to the VIP CP is also exposed via a floating IP address. - 3 For a VIRTUAL CP exposed as an external CP. - 4 For a VNFC CP exposed as an external CP in a secondary container cluster external network or a - secondary container cluster internal network. + 1) For a VIP CP directly exposed as an external CP: + 1.1) No dedicated IP address is allocated as VIP address, as indicated in the VNFD. + 1.2) A dedicated IP address is allocated as VIP address, but the NFVO indicates that no port is needed + (createExtLinkPort in VnfExtCpConfig set to false). + 2) For a VIP CP exposed as an external CP via a floating IP address: + 2.1) No dedicated IP address is allocated as VIP address, as indicated in the VNFD, and the VNFC CP + associated to the VIP CP is also exposed via a floating IP address. + 3) For a VIRTUAL CP exposed as an external CP. + 4) For a VNFC CP exposed as an external CP in a secondary container cluster external network. * 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). @@ -754,6 +756,8 @@ definitions: description: > This type represents additional resource information which resource and resource type specific, and which is available from the VIM or the CISM or the resource provider. + + * NOTE: At least one attribute shall be present. type: object properties: hostName: @@ -969,8 +973,7 @@ definitions: The enumeration LcmOpType defines the permitted values to represent VNF lifecycle operation types in VNF lifecycle management operation occurrence resources and VNF lifecycle management operation occurrence - notifications. - It shall comply with the provisions defined in table 5.5.4.5-1. + notifications. Value | Description ------|------------ diff --git a/src/SOL002/VNFFaultManagement/definitions/SOL002VNFFaultManagement_def.yaml b/src/SOL002/VNFFaultManagement/definitions/SOL002VNFFaultManagement_def.yaml index 087c5e16..65623733 100644 --- a/src/SOL002/VNFFaultManagement/definitions/SOL002VNFFaultManagement_def.yaml +++ b/src/SOL002/VNFFaultManagement/definitions/SOL002VNFFaultManagement_def.yaml @@ -4,8 +4,7 @@ definitions: Alarm: description: > - The alarm data type encapsulates information about an alarm. It shall comply with the provisions defined in - table 7.5.2.4-1. + The alarm data type encapsulates information about an alarm. If the attribute "faultType" has the value "NFVI_OAM_VIRTUALISED_RESOURCE_STATE_CHANGE", the following provisions apply for the values of the attribute "faultDetails" related to @@ -479,8 +478,8 @@ definitions: FmNotificationsFilter: description: > - This type represents a subscription filter related to notifications about VNF faults. - It shall comply with the provisions defined in table 7.5.3.2-1. + This type represents a subscription filter related to notifications about VNF faults. + At a particular nesting level in the filter structure, the following applies: All attributes shall match in order for the filter to match (logical "and" between different filter attributes). If an attribute is an array, the attribute shall match if at least one of the values in the array diff --git a/src/SOL002/VNFIndicator/definitions/SOL002VNFIndicator_def.yaml b/src/SOL002/VNFIndicator/definitions/SOL002VNFIndicator_def.yaml index c59c4ce0..ae52d2ad 100644 --- a/src/SOL002/VNFIndicator/definitions/SOL002VNFIndicator_def.yaml +++ b/src/SOL002/VNFIndicator/definitions/SOL002VNFIndicator_def.yaml @@ -4,7 +4,7 @@ definitions: VnfIndicator: description: > - This type represents a VNF indicator value. It shall comply with the provisions defined in table 8.5.2.2-1. + This type represents a VNF indicator value. NOTE: ETSI GS NFV-SOL 001 specifies the structure and format of the VNFD based on TOSCA specifications. type: object @@ -50,8 +50,8 @@ definitions: VnfIndicatorNotificationsFilter: description: > - This type represents a subscription filter for notifications related to VNF indicators. - It shall comply with the provisions defined in table 8.5.3.2-1. + This type represents a subscription filter for notifications related to VNF indicators. + At a particular nesting level in the filter structure, the following applies: All attributes shall match in order for the filter to match (logical "and" between different filter attributes). If an attribute is an array, the attribute shall match if at least one of @@ -152,7 +152,7 @@ definitions: VnfIndicatorValueChangeNotification: description: > - This type represents a VNF indicator value change notification. It shall comply with the provisions defined in table 8.5.2.5-1. + This type represents a VNF indicator value change notification. The notification shall be triggered by the VNFM when the value of an indicator has changed. NOTE: ETSI GS NFV-SOL 001 specifies the structure and format of the VNFD based on TOSCA specifications. @@ -226,7 +226,7 @@ definitions: SupportedIndicatorsChangeNotification: description: > This type represents a notification to inform the receiver that the set of indicators supported - by a VNF instance has changed. It shall comply with the provisions defined in table 8.5.2.6-1. + by a VNF instance has changed. The notification shall be triggered by the VNFM when the set of supported VNF indicators has changed as a side effect of the "Change current VNF package" operation. It may be triggered by the VNFM when diff --git a/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml b/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml index c5a73714..052610a6 100644 --- a/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml +++ b/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml @@ -1068,8 +1068,7 @@ definitions: ExtManagedVirtualLinkInfo: description: > - This type provides information about an externally-managed virtual link. It shall - comply with the provisions defined in table 5.5.3.5-1. + This type provides information about an externally-managed virtual link. type: object required: - id @@ -1899,6 +1898,7 @@ definitions: type: string enum: - ADDED + - MODIFIED - REMOVED extCpInstanceId: description: > @@ -1987,6 +1987,8 @@ definitions: $ref: "#/definitions/VnfcInfoModifications" CreateVnfRequest: + description: > + This type represents request parameters for the "Create VNF identifier" operation. type: object required: - vnfdId @@ -2013,8 +2015,7 @@ definitions: ScaleVnfRequest: description: > - This type represents request parameters for the "Scale VNF" operation. It shall comply with the provisions defined in - table 5.5.2.5-1. See clause B.2 in annex B for an explanation of VNF scaling. + This type represents request parameters for the "Scale VNF" operation. type: object required: - type @@ -2052,9 +2053,7 @@ definitions: ScaleVnfToLevelRequest: description: > - This type represents request parameters for the "Scale VNF to Level" operation. - It shall comply with the provisions defined in table 5.5.2.6-1. See clause B.2 - for an explanation of VNF scaling. + This type represents request parameters for the "Scale VNF to Level" operation. NOTE: Either the instantiationLevelId attribute or the scaleInfo attribute shall be included. @@ -2177,7 +2176,7 @@ definitions: ExtVirtualLinkInfo: description: > - This type represents information about an external VL. It shall comply with the provisions defined in table 5.5.3.2-1. + This type represents information about an external VL. NOTE: This attribute reflects the current configuration information that has resulted from merging into this attribute the "VnfExtCpData" information which was passed as part of the "ExtVirtualLinkData" structure in the input of the @@ -2225,8 +2224,7 @@ definitions: VnfLinkPortInfo: description: > - This type represents a link port of an internal VL of a VNF. It shall comply with the provisions - defined in table 5.5.3.8 1. + This type represents a link port of an internal VL of a VNF. NOTE 1: Either cpInstanceId with cpInstanceType set to "EXT_CP" or any combination of cpInstanceId with cpInstanceType set to "VNFC_CP" and vipCpInstanceId (i.e. one or both of them) shall be @@ -2294,7 +2292,7 @@ definitions: ExtLinkPortInfo: description: > This type represents information about a link port of an external VL, i.e. a port providing connectivity for the VNF to - an NS VL. It shall comply with the provisions defined in table 5.5.3.9-1. + an NS VL. NOTE 1: The use cases UC#4 and UC#5 in clause A.4 of ETSI GS NFV-IFA 007 provide examples for such a configuration. NOTE 2: The value of "trunkResourceId" is scoped by the value of "vimConnectionId" in the "resourceHandle" attribute. @@ -2336,8 +2334,7 @@ definitions: CpProtocolInfo: description: > - This type describes the protocol layer(s) that a CP uses together with protocol-related information, like addresses. - It shall comply with the provisions defined in table 5.5.3.9b-1. + This type describes the protocol layer(s) that a CP uses together with protocol-related information, like addresses. NOTE: This attribute allows to signal the addition of further types of layer and protocol in future versions of the present document in a backwards-compatible way. In the current version of the present document, only IP over @@ -2351,12 +2348,13 @@ definitions: The identifier of layer(s) and protocol(s) associated to the network address information. Permitted values: - 1. IP_OVER_ETHERNET - 2. IP_FOR_VIRTUAL_CP + - IP_OVER_ETHERNET + - IP_FOR_VIRTUAL_CP See note. type: string enum: - IP_OVER_ETHERNET + - IP_FOR_VIRTUAL_CP ipOverEthernet: description: > IP addresses over Ethernet to assign to the extCP instance. Shall be @@ -2372,8 +2370,7 @@ definitions: IpOverEthernetAddressInfo: description: > - This type represents information about a network address that has been assigned. - It shall comply with the provisions defined in table 5.5.3.10-1. + This type represents information about a network address that has been assigned. NOTE 1: At least one of "macAddress" or "ipAddresses" shall be present. NOTE 2: Exactly one of "addresses" or "addressRange" shall be present. @@ -2489,8 +2486,8 @@ definitions: LifecycleChangeNotificationsFilter: description: > - This type represents a subscription filter related to notifications about VNF lifecycle changes. - It shall comply with the provisions defined in table 5.5.3.12-1. + This type represents a subscription filter related to notifications about VNF lifecycle changes. + At a particular nesting level in the filter structure, the following applies: All attributes shall match in order for the filter to match (logical "and" between different filter attributes). If an attribute is an array, the attribute shall match if at least one of the values in the array @@ -2568,8 +2565,7 @@ definitions: VnfExtCpInfo: description: > - This type represents information about an external CP of a VNF. - It shall comply with the provisions defined in table 5.5.3.17 1. + This type represents information about an external CP of a VNF. NOTE 1: The attributes "associatedVnfcCpId", "associatedVipCpId", "associatedVirtualCpId" and "associatedVnfVirtualLinkId" are mutually exclusive. Exactly one shall be present. @@ -2888,7 +2884,6 @@ definitions: when changing the current VNF package. The attributes that can be included consist of those requested to be modified explicitly in the "ChangeCurrentVnfPkgRequest" data structure, and additional attributes of the "VnfInstance" data structure that were modified implicitly during the operation. - The "ModificationsTriggeredByVnfPkgChange" data type shall comply with the provisions defined in table 5.5.3.21-1. NOTE 1: This attribute represents the delta (semantics as per IETF RFC 7396, JSON Merge Patch) between the value of the attribute at the start of the "Change current VNF package" operation and the value of the attribute @@ -2900,19 +2895,20 @@ definitions: properties: vnfConfigurableProperties: description: > - This attribute signals the modifications of the "vnfConfigurableProperties" attribute in "VnfInstance" performed - by the operation and shall be present if that attribute was modified during the operation. See note 1. + This attribute signals the modifications of the "vnfConfigurableProperties" attribute in "VnfInstance" + performed by the operation and shall be present if that attribute was modified during the operation. + See note 1. In addition, the provisions in clause 5.7 shall apply. $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/KeyValuePairs" metadata: description: > - This attribute signals the modifications of the "metadata" attribute in "VnfInstance" performed by the operation and - shall be present if that attribute was modified during the operation. See note 1. + This attribute signals the modifications of the "metadata" attribute in "VnfInstance" performed by + the operation and shall be present if that attribute was modified during the operation. See note 1. $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/KeyValuePairs" extensions: description: > - This attribute signals the modifications of the "extensions" attribute in "VnfInstance" performed by the operation and - shall be present if that attribute was modified during the operation. See note 1. + This attribute signals the modifications of the "extensions" attribute in "VnfInstance" performed by + the operation and shall be present if that attribute was modified during the operation. See note 1. In addition, the provisions in clause 5.7 shall apply. $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/KeyValuePairs" vnfdId: @@ -2921,19 +2917,23 @@ definitions: $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" vnfProvider: description: > - If present, this attribute signals the new value of the "vnfProvider" attribute in "VnfInstance". See note 2. + If present, this attribute signals the new value of the "vnfProvider" attribute in "VnfInstance". + See note 2. type: string vnfProductName: description: > - If present, this attribute signals the new value of the "vnfProductName" attribute in "VnfInstance". See note 2. + If present, this attribute signals the new value of the "vnfProductName" attribute in "VnfInstance". + See note 2. type: string vnfSoftwareVersion: description: > - If present, this attribute signals the new value of the "vnfSoftwareVersion" attribute in "VnfInstance". See note 2. + If present, this attribute signals the new value of the "vnfSoftwareVersion" attribute in "VnfInstance". + See note 2. $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Version" vnfdVersion: description: > - If present, this attribute signals the new value of the "vnfdVersion" attribute in "VnfInstance". See note 2. + If present, this attribute signals the new value of the "vnfdVersion" attribute in "VnfInstance". + See note 2. $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Version" vimConnectionInfo: description: > @@ -2958,8 +2958,8 @@ definitions: McioTypeName: description: > - The present type definition provides valid string values for the "mcioType" attribute of the "McioInfo" data type , and - the valid values are defined in table 5.5.4.9-1. + The present type definition provides valid string values for the "mcioType" attribute of the "McioInfo" + data type , and the valid values are defined in table 5.5.4.9-1. type: string enum: - Deployment @@ -3007,8 +3007,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.28-1. + This type provides information related to virtual IP (VIP) CP. NOTE 1: It is possible that there is no associated VnfcCp because the VIP CP is available but not associated yet. @@ -3192,8 +3191,7 @@ definitions: VirtualCpInfo: description: > - This type provides information related to a virtual CP instance of a VNF. It shall comply with the provisions - in table 5.5.3.31-1. + This type provides information related to a virtual CP instance of a VNF. NOTE: A consumer of the VNF LCM interface can learn the actual VNFC instances implementing the service accessible via the virtual CP instance by querying the "vnfcResourceInfo" from the "InstantiatedVnfInfo" @@ -3248,7 +3246,7 @@ definitions: AdditionalServiceInfo: description: > This type provides additional service information of the virtual CP instance used to expose properties of the - virtual CP to NFV-MANO. It shall comply with the provisions in table 5.5.3.32-1. + virtual CP to NFV-MANO. NOTE: This attribute shall only be present if additional information is needed to identify the service termination within the VNF, such as for example a URL path information in an HTTP request required @@ -3273,8 +3271,7 @@ definitions: ServicePortInfo: description: > - This type describes the service identifying port properties exposed by the virtual CP instance. It shall - comply with the provisions in table 5.5.3.33-1. + This type describes the service identifying port properties exposed by the virtual CP instance. type: object required: - name @@ -3311,7 +3308,7 @@ definitions: description: > This type contains information related to a network attachment definition resource that provides the specification of the interface used to connect one or multiple connection points to a secondary container - cluster network. It shall comply with the provisions defined in table 5.5.3.36-1. + cluster network. type: object required: - netAttDefResourceInfoId diff --git a/src/SOL002/VNFLifecycleManagementNotification/definitions/SOL002VNFLifecycleManagementNotification_def.yaml b/src/SOL002/VNFLifecycleManagementNotification/definitions/SOL002VNFLifecycleManagementNotification_def.yaml index 6062b486..34940475 100644 --- a/src/SOL002/VNFLifecycleManagementNotification/definitions/SOL002VNFLifecycleManagementNotification_def.yaml +++ b/src/SOL002/VNFLifecycleManagementNotification/definitions/SOL002VNFLifecycleManagementNotification_def.yaml @@ -180,6 +180,11 @@ definitions: Information about virtual CP instances that were affected during the execution of the lifecycle management operation, if this notification represents the result of a lifecycle management operation occurrence. + + Shall be present if the "notificationStatus" is set to "RESULT", the "verbosity" attribute is + set to "FULL" and the operation has made any changes to the virtual CP instances of the VNF instance. + Shall be absent otherwise. Only information about virtual CP instances that have been added, deleted + or modified shall be provided. type: array items: $ref: "../../VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml#/definitions/AffectedVirtualCp" diff --git a/src/SOL002/VNFPerformanceManagement/definitions/SOL002VNFPerformanceManagement_def.yaml b/src/SOL002/VNFPerformanceManagement/definitions/SOL002VNFPerformanceManagement_def.yaml index 28ca82d8..c5c8b3a7 100644 --- a/src/SOL002/VNFPerformanceManagement/definitions/SOL002VNFPerformanceManagement_def.yaml +++ b/src/SOL002/VNFPerformanceManagement/definitions/SOL002VNFPerformanceManagement_def.yaml @@ -199,7 +199,7 @@ definitions: PerformanceReport: description: > This type defines the format of a performance report provided by the VNFM to the NFVO as a result of collecting - performance information as part of a PM job. The type shall comply with the provisions defined in table 6.5.2.10-1. + performance information as part of a PM job. NOTE: The sub-object allows to structure the measured object but is not to be confused with sub-counters which allow to structure the measurement value. @@ -379,7 +379,7 @@ definitions: PmJobModifications: description: > - This type represents modifications to a PM job. It shall comply with the provisions defined in table 6.5.2.12-1. + This type represents modifications to a PM job. NOTE: At least one of the attributes defined in this type shall be present in request bodies. type: object @@ -404,7 +404,7 @@ definitions: PmJobCriteria: description: > - This type represents collection criteria for PM jobs. It shall comply with the provisions defined in table 6.5.3.3-1. + This type represents collection criteria for PM jobs. NOTE 1: At the end of each reportingPeriod, the API producer will inform the API consumer about availability of the performance data collected for each completed collection period during this reportingPeriod. @@ -528,7 +528,7 @@ definitions: ThresholdModifications: description: > - This type represents modifications to a threshold. It shall comply with the provisions defined in table 6.5.2.11-1. + This type represents modifications to a threshold. NOTE: At least one of the attributes defined in this type shall be present in request bodies. type: object @@ -552,7 +552,7 @@ definitions: ThresholdCriteria: description: > - This type represents criteria that define a threshold. It shall comply with the provisions defined in table 6.5.3.4-1. + This type represents criteria that define a threshold. NOTE 1: In the present document, simple thresholds are defined. The definition of additional threshold types is left for future specification. @@ -613,8 +613,7 @@ definitions: ThresholdCrossedNotification: description: > - This type represents a notification that is sent when a threshold has been crossed. - It shall comply with the provisions defined in table 6.5.2.4-1. + This type represents a notification that is sent when a threshold has been crossed. NOTE: The timing of sending this notification is determined by the capability of the producing entity to evaluate the threshold crossing condition. -- GitLab From 9f59382c758ed710fb08e611b5446ab2cf32e69f Mon Sep 17 00:00:00 2001 From: "M. Hamza" Date: Thu, 14 Jul 2022 16:33:33 +0500 Subject: [PATCH 37/41] resolve minor issues in SOL003 v4.3.1 --- .../General_Definitions/SOL003_def.yaml | 73 +++++++------- .../SOL003VNFFaultManagement_def.yaml | 4 +- .../definitions/SOL003VNFIndicator_def.yaml | 11 ++- .../SOL003VNFLifecycleManagement_def.yaml | 99 +++++++------------ ...L003VNFLifecycleOperationGranting_def.yaml | 10 +- .../SOL003VNFPackageManagement_def.yaml | 9 +- .../SOL003VNFPerformanceManagement_def.yaml | 13 ++- ...OL003VNFSnapshotPackageManagement_def.yaml | 9 +- 8 files changed, 101 insertions(+), 127 deletions(-) diff --git a/src/SOL003/General_Definitions/SOL003_def.yaml b/src/SOL003/General_Definitions/SOL003_def.yaml index 151bde61..260095d4 100644 --- a/src/SOL003/General_Definitions/SOL003_def.yaml +++ b/src/SOL003/General_Definitions/SOL003_def.yaml @@ -188,7 +188,7 @@ definitions: VimConnectionInfo: description: > This type represents parameters to connect to a VIM, a CISM, a CIR or a MCIOP repository for managing - the resources of a VNF instance. It shall comply with the provisions defined in table 4.4.1.6-1. + the resources of a VNF instance. This structure is used to convey VIM-related, CISM-related, CIR-related, or MCIOP-repository-relate dparameters over the Or-Vnfm interface. Additional parameters for a VIM, a CISM, a CIR or a MCIOP @@ -276,8 +276,7 @@ definitions: type: object description: > This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. - Information about the resource is available from the VIM. The ResourceHandle type shall comply with the provisions - defined in table 4.4.1.7-1. + Information about the resource is available from the VIM. * NOTE 1: The value set of the "vimLevelResourceType" attribute is within the scope of the VIM or CISM or the resource provider and can be used as information that complements the ResourceHandle. This value set is different from @@ -341,26 +340,26 @@ definitions: description: > This type represents configuration information for external CPs created. * NOTE 1: In case this identifier refers to a CPD with trunking enabled, the external CP instances created - from this CPD will represent ports in a trunk. + from this CPD will represent ports in a trunk. * NOTE 2: Within one VNF instance, all VNFC instances created from a particular VDU have the same external - connectivity. Thus, given a particular value of the "cpdId" attribute, there shall be one - "cpConfig" entry for each VNFC instance that has been or can be created from a VDU which includes - a CPD identified by the "cpdId" attribute. If the cpConfig represents a subport in a trunk, - all "cpConfig" entries in this list shall have the same segmentationId, which means they are - connected to the same set of external VLs via the trunk. + connectivity. Thus, given a particular value of the "cpdId" attribute, there shall be one + "cpConfig" entry for each VNFC instance that has been or can be created from a VDU which includes + a CPD identified by the "cpdId" attribute. If the cpConfig represents a subport in a trunk, + all "cpConfig" entries in this list shall have the same segmentationId, which means they are + connected to the same set of external VLs via the trunk. * NOTE 3: The map entry value shall be set to "null" in order to delete a "VnfExtCpConfig" entry identified - by a particular key value from the map, i.e. for the disconnection of an existing external - CP instance addressed by cpInstanceId in the deleted map entry from a particular external - virtual link, and deletion of that instance in case it represents a subport. Deleting the - last key from the map removes the affected instance of the "VnfExtCpData" structure from - its parent data structure. - * NOTE 4: If, as defined by the input parameters of a "ChangeVnfFlavour", "ChangeExtVnfConnectivity" or - "ChangeCurrentVnfPkg" operation or as part of the Grant response for any of these operations, a - cpConfig map entry identified by a particular map key value is moved into another "ExtVirtualLinkData" - or "VnfExtCpData" structure, this particular cpConfig map entry may be used by an external CP instance - different than the one that has used it before the operation, or by no external CP instance at all. - Renaming a CPD identifier during the "changeCurrentVnfPkg" operation does not count as moving the - related "cpConfig" map entries to a new "extCpData" structure. + by a particular key value from the map, i.e. for the disconnection of an existing external + CP instance addressed by cpInstanceId in the deleted map entry from a particular external + virtual link, and deletion of that instance in case it represents a subport. Deleting the + last key from the map removes the affected instance of the "VnfExtCpData" structure from + its parent data structure. + * NOTE 4: If, as defined by the input parameters of a "ChangeVnfFlavour", "ChangeExtVnfConnectivity" or + "ChangeCurrentVnfPkg" operation or as part of the Grant response for any of these operations, a cpConfig + map entry identified by a particular map key value is moved into another "ExtVirtualLinkData" or + "VnfExtCpData" structure, this particular cpConfig map entry may be used by an external CP instance + different than the one that has used it before the operation, or by no external CP instance at all. + Renaming a CPD identifier during the "changeCurrentVnfPkg" operation does not count as moving the related + "cpConfig" map entries to a new "extCpData" structure. type: object required: - cpdId @@ -433,6 +432,7 @@ definitions: in "VnfExtCpConfig" structures that provide configuration information for a CP which represents a sub-port in a trunk, and if parent ports are supported. $ref: "#/definitions/IdentifierInVnf" + linkPortId: description: > Identifier of a pre-configured link port to which the external CP @@ -462,6 +462,7 @@ definitions: type: array items: $ref: "#/definitions/Identifier" + cpProtocolData: description: > Parameters for configuring the network protocols on the @@ -490,6 +491,7 @@ definitions: type: string enum: - IP_OVER_ETHERNET + - IP_FOR_VIRTUAL_CP ipOverEthernet: description: > Network address data for IP over Ethernet to assign to the external CP @@ -617,7 +619,7 @@ definitions: VirtualCpAddressData: description: > - This type represents network address data for a virtual CP. It shall comply with the provisions defined in table 4.4.1.10d-1. + This type represents network address data for a virtual CP. * NOTE 1: If the container cluster is set up to be able to configure an external load balancer this address will be used, otherwise it will be ignored by the CISM. @@ -644,19 +646,19 @@ definitions: ExtVirtualLinkData: description: > - This type represents an external VL. It shall comply with the provisions defined in table 4.4.1.11-1. + This type represents an external VL. * NOTE 1: 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 an external CP: - 1.1 No dedicated IP address is allocated as VIP address, as indicated in the VNFD. - 1.2 A dedicated IP address is allocated as VIP address, but the NFVO indicates that no port is needed - (createExtLinkPort in VnfExtCpConfig set to false). - 2 For a VIP CP exposed as an external CP via a floating IP address: - 2.1 No dedicated IP address is allocated as VIP address, as indicated in the VNFD, and the VNFC CP - associated to the VIP CP is also exposed via a floating IP address. - 3 For a VIRTUAL CP exposed as an external CP. - 4 For a VNFC CP exposed as an external CP in a secondary container cluster external network or a - secondary container cluster internal network. + 1) For a VIP CP directly exposed as an external CP: + 1.1) No dedicated IP address is allocated as VIP address, as indicated in the VNFD. + 1.2) A dedicated IP address is allocated as VIP address, but the NFVO indicates that no port is needed + (createExtLinkPort in VnfExtCpConfig set to false). + 2) For a VIP CP exposed as an external CP via a floating IP address: + 2.1) No dedicated IP address is allocated as VIP address, as indicated in the VNFD, and the VNFC CP + associated to the VIP CP is also exposed via a floating IP address. + 3) For a VIRTUAL CP exposed as an external CP. + 4) For a VNFC CP exposed as an external CP in a secondary container cluster external network or a + secondary container cluster internal network. * 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). @@ -751,6 +753,8 @@ definitions: description: > This type represents additional resource information which resource and resource type specific, and which is available from the VIM or the CISM or the resource provider. + + NOTE: At least one attribute shall be present. type: object properties: hostName: @@ -963,8 +967,7 @@ definitions: The enumeration LcmOpType defines the permitted values to represent VNF lifecycle operation types in VNF lifecycle management operation occurrence resources and VNF lifecycle management operation occurrence - notifications. - It shall comply with the provisions defined in table 5.5.4.5-1. + notifications. Value | Description ------|------------ diff --git a/src/SOL003/VNFFaultManagement/definitions/SOL003VNFFaultManagement_def.yaml b/src/SOL003/VNFFaultManagement/definitions/SOL003VNFFaultManagement_def.yaml index 69e61cff..6210c4ad 100644 --- a/src/SOL003/VNFFaultManagement/definitions/SOL003VNFFaultManagement_def.yaml +++ b/src/SOL003/VNFFaultManagement/definitions/SOL003VNFFaultManagement_def.yaml @@ -453,8 +453,8 @@ definitions: FmNotificationsFilter: description: > - This type represents a subscription filter related to notifications about VNF faults. - It shall comply with the provisions defined in table 7.5.3.2-1. + This type represents a subscription filter related to notifications about VNF faults. + At a particular nesting level in the filter structure, the following applies: All attributes shall match in order for the filter to match (logical "and" between different filter attributes). If an attribute is an array, the attribute shall match if at least one of the values in the array diff --git a/src/SOL003/VNFIndicator/definitions/SOL003VNFIndicator_def.yaml b/src/SOL003/VNFIndicator/definitions/SOL003VNFIndicator_def.yaml index c8a7b713..49d052f9 100644 --- a/src/SOL003/VNFIndicator/definitions/SOL003VNFIndicator_def.yaml +++ b/src/SOL003/VNFIndicator/definitions/SOL003VNFIndicator_def.yaml @@ -4,7 +4,7 @@ definitions: VnfIndicator: description: > - This type represents a VNF indicator value. It shall comply with the provisions defined in table 8.5.2.2-1. + This type represents a VNF indicator value. NOTE: ETSI GS NFV-SOL 001 specifies the structure and format of the VNFD based on TOSCA specifications. type: object @@ -50,8 +50,8 @@ definitions: VnfIndicatorNotificationsFilter: description: > - This type represents a subscription filter for notifications related to VNF indicators. - It shall comply with the provisions defined in table 8.5.3.2-1. + This type represents a subscription filter for notifications related to VNF indicators. + At a particular nesting level in the filter structure, the following applies: All attributes shall match in order for the filter to match (logical "and" between different filter attributes). If an attribute is an array, the attribute shall match if at least one of @@ -152,7 +152,8 @@ definitions: VnfIndicatorValueChangeNotification: description: > - This type represents a VNF indicator value change notification. It shall comply with the provisions defined in table 8.5.2.5-1. + This type represents a VNF indicator value change notification. + The notification shall be triggered by the VNFM when the value of an indicator has changed. NOTE: ETSI GS NFV-SOL 001 specifies the structure and format of the VNFD based on TOSCA specifications. @@ -226,7 +227,7 @@ definitions: SupportedIndicatorsChangeNotification: description: > This type represents a notification to inform the receiver that the set of indicators supported - by a VNF instance has changed. It shall comply with the provisions defined in table 8.5.2.6-1. + by a VNF instance has changed. The notification shall be triggered by the VNFM when the set of supported VNF indicators has changed as a side effect of the "Change current VNF package" operation. It may be triggered by the VNFM when diff --git a/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml b/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml index 9cf02644..bbbe4838 100644 --- a/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml +++ b/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml @@ -4,8 +4,7 @@ definitions: InstantiateVnfRequest: description: > - This type represents request parameters for the "Instantiate VNF" operation. - It shall comply with the provisions defined in table 5.5.2.4-1. + This type represents request parameters for the "Instantiate VNF" operation. * NOTE 1: The indication of externally-managed internal VLs is needed in case networks have been pre-configured for use with certain VNFs, for instance @@ -199,8 +198,7 @@ definitions: ChangeVnfFlavourRequest: description: > - This type represents request parameters for the "Change VNF flavour" operation. - It shall comply with the provisions defined in table 5.5.2.7-1. + This type represents request parameters for the "Change VNF flavour" operation. * NOTE 1: The indication of externally-managed internal VLs is needed in case networks have been pre-configured for use with certain VNFs, for instance to ensure @@ -307,8 +305,7 @@ definitions: TerminateVnfRequest: description: > - This type represents request parameters for the "Terminate VNF" operation. - It shall comply with the provisions defined in table 5.5.2.8-1. + This type represents request parameters for the "Terminate VNF" operation. NOTE: If the VNF is still in service, requesting forceful termination can adversely impact network service. @@ -369,8 +366,7 @@ definitions: OperateVnfRequest: description: > - This type represents request parameters for the "Operate VNF" operation. - It shall comply with the provisions defined in table 5.5.2.10-1. + This type represents request parameters for the "Operate VNF" operation. NOTE: The "stopType" and "gracefulStopTimeout" attributes shall be absent, when the "changeStateTo" attribute is equal to "STARTED". @@ -456,8 +452,7 @@ definitions: ChangeCurrentVnfPkgRequest: description: > This type represents request parameters for the "Change current VNF package" - operation to replace the VNF package on which a VNF instance is based. - It shall comply with the provisions defined in table 5.5.2.11a-1. + operation to replace the VNF package on which a VNF instance is based. NOTE 1: The indication of externally-managed internal VLs is needed in case networks have been pre-configured for use with certain VNFs, for instance to ensure @@ -583,8 +578,6 @@ definitions: to be modified explicitly in the "VnfInfoModificationRequest" data structure, and additional attributes of the "VnfInstance" data structure that were modified implicitly e.g. when modifying the referenced VNF package. - The "VnfInfoModifications" data type shall comply with the provisions defined in table - 5.5.2.12a-1. NOTE: If present, this attribute (which depends on the value of the "vnfdId" attribute) was modified implicitly following a request to modify the "vnfdId" attribute, by @@ -673,7 +666,6 @@ definitions: LCM operation which takes a snapshot of a VNF instance and populates a previously-created "Individual VNF snapshot" resource with the content of the snapshot. - It shall comply with the provisions defined in table 5.5.2.21-1. type: object required: - vnfSnapshotResId @@ -698,8 +690,7 @@ definitions: description: | This type represents request parameters for the creation of an "Individual VNF snapshot" resource which can be populated with content obtained by invoking the "Create VNF snapshot" - LCM operation or extracted from a VNF snapshot package. It shall comply with the provisions - defined in table 5.5.2.20-1. + LCM operation or extracted from a VNF snapshot package. NOTE: The present attribute shall be provided if the "Individual VNF snapshot" resource is requested to be created as part of a VNF snapshot package extraction. @@ -737,8 +728,7 @@ definitions: This type represents attribute modifications for an "Individual VNF snapshot" resource, i.e. modifications to a resource representation based on the "VnfSnapshotInfo" data type. The attributes of "VnfSnapshotInfo" that can be modified according to the provisions in clause 5.5.2.22 are included in the - "VnfSnapshotInfoModificationRequest" data type. The "VnfSnapshotInfoModificationRequest" data type shall - comply with the provisions defined in table 5.5.2.24-1. + "VnfSnapshotInfoModificationRequest" data type. type: object properties: vnfSnapshotPkgId: @@ -757,8 +747,7 @@ definitions: This type represents attribute modifications that were performed on an "Individual VNF snapshot" resource. The attributes that can be included consist of those requested to be modified explicitly in the "VnfSnapshotInfoModificationRequest" data structure, and additional attributes of the - "VnfSnapshotInfo" data structure that were modified implicitly. The "VnfSnapshotInfoModifications" - data type shall comply with the provisions defined in table 5.5.2.25-1. + "VnfSnapshotInfo" data structure that were modified implicitly. type: object properties: vnfSnapshotPkgId: @@ -774,7 +763,7 @@ definitions: VnfInstance: description: > - This type represents a VNF instance. It shall comply with the provisions defined in table 5.5.2.2-1. + This type represents a VNF instance. NOTE: Clause B.3.2 provides examples illustrating the relationship among the different run-time information elements (CP, VL and link ports) used to represent the connectivity of a VNF. @@ -1297,7 +1286,6 @@ definitions: In addition, the references to the storage resources depend on the form of the VNFC: a) For a VNFC based on VM, storage resource identifiers shall refer to VirtualStorage resources, and b) For a VNFC based on OS container(s), storage resource identifiers shall refer to Storage MCIOs. - It shall comply with the provisions defined in table 5.5.3.5-1. NOTE 1: ETSI GS NFV-SOL 001 specifies the structure and format of the VNFD based on TOSCA specifications. @@ -1427,7 +1415,6 @@ definitions: VnfSnapshotInfo: description: > This type represents an "Individual VNF snapshot" resource. - It shall comply with the provisions defined in table 5.5.2.22-1. type: object required: - id @@ -1491,7 +1478,6 @@ definitions: VnfSnapshot: description: > This type represents a VNF snapshot. - It shall comply with the provisions defined in table 5.5.2.23-1. type: object required: - id @@ -1564,7 +1550,7 @@ definitions: VnfcSnapshotInfo: description: > - This type represents a VNFC snapshot. It shall comply with the provisions defined in table 5.5.3.19-1. + This type represents a VNFC snapshot. NOTE 1: The identifier of the compute snapshot resource is assigned during creation of a VNFC snapshot being returned from the VIM as output data in the response message of the individual resource @@ -1697,8 +1683,7 @@ definitions: AffectedVnfc: description: > - This type provides information about added, deleted, modified and temporary VNFCs. - It shall comply with the provisions in table 5.5.3.13-1. + This type provides information about added, deleted, modified and temporary VNFCs. NOTE: The "resourceDefinitionId" attribute provides information to the API consumer (i.e. the NFVO) to assist in correlating the resource changes performed during @@ -1798,8 +1783,7 @@ definitions: VnfLcmOpOcc: description: > - This type represents a VNF lifecycle management operation occurrence. - It shall comply with the provisions defined in table 5.5.2.13-1. + This type represents a VNF lifecycle management operation occurrence. NOTE 1: This allows the NFVO to obtain the information contained in the latest "result" notification if it has not received it due to an error or a @@ -2130,8 +2114,7 @@ definitions: AffectedExtLinkPort: description: > - This type provides information about added and deleted external link ports (link ports attached to external virtual links). - It shall comply with the provisions in table 5.5.3.14a-1. + This type provides information about added and deleted external link ports (link ports attached to external virtual links). NOTE: The "resourceDefinitionId" attribute provides information to the API consumer (i.e. the NFVO) to assist in correlating the resource changes performed during the LCM operation with the granted resources in a specific Grant exchange, which @@ -2159,6 +2142,7 @@ definitions: type: string enum: - ADDED + - MODIFIED - REMOVED extCpInstanceId: description: > @@ -2178,8 +2162,8 @@ definitions: VnfLcmOperationOccurrenceNotification: description: > This type represents a VNF lifecycle management operation occurrence notification, which - informs the receiver of changes in the VNF lifecycle caused by a VNF LCM operation occurrence. - It shall comply with the provisions defined in table 5.5.2.17-1. + informs the receiver of changes in the VNF lifecycle caused by a VNF LCM operation occurrence. + The support of the notification is mandatory. This notification shall be triggered by the VNFM when there is a change in the state of a VNF LCM @@ -2499,8 +2483,7 @@ definitions: AffectedVirtualStorage: description: > - This type provides information about added, deleted, modified and temporary virtual storage resources. - It shall comply with the provisions in table 5.5.3.15-1. + This type provides information about added, deleted, modified and temporary virtual storage resources. NOTE: The "resourceDefinitionId" attribute provides information to the API consumer (i.e. the NFVO) to assist in correlating the resource changes performed during the LCM operation with the granted @@ -2595,6 +2578,8 @@ definitions: $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" CreateVnfRequest: + description: > + This type represents request parameters for the "Create VNF identifier" operation. type: object required: - vnfdId @@ -2621,8 +2606,7 @@ definitions: ScaleVnfRequest: description: > - This type represents request parameters for the "Scale VNF" operation. It shall comply with the provisions defined in - table 5.5.2.5-1. See clause B.2 in annex B for an explanation of VNF scaling. + This type represents request parameters for the "Scale VNF" operation. type: object required: - type @@ -2660,9 +2644,7 @@ definitions: ScaleVnfToLevelRequest: description: > - This type represents request parameters for the "Scale VNF to Level" operation. - It shall comply with the provisions defined in table 5.5.2.6-1. See clause B.2 - for an explanation of VNF scaling. + This type represents request parameters for the "Scale VNF to Level" operation. NOTE: Either the instantiationLevelId attribute or the scaleInfo attribute shall be included. @@ -2785,7 +2767,7 @@ definitions: ExtVirtualLinkInfo: description: > - This type represents information about an external VL. It shall comply with the provisions defined in table 5.5.3.2-1. + This type represents information about an external VL. NOTE: This attribute reflects the current configuration information that has resulted from merging into this attribute the "VnfExtCpData" information which was passed as part of the "ExtVirtualLinkData" structure in the input of the @@ -2833,8 +2815,7 @@ definitions: VnfLinkPortInfo: description: > - This type represents a link port of an internal VL of a VNF. It shall comply with the provisions - defined in table 5.5.3.8 1. + This type represents a link port of an internal VL of a VNF. NOTE 1: Either cpInstanceId with cpInstanceType set to "EXT_CP" or any combination of cpInstanceId with cpInstanceType set to "VNFC_CP" and vipCpInstanceId (i.e. one or both of them) shall be @@ -2902,7 +2883,7 @@ definitions: ExtLinkPortInfo: description: > This type represents information about a link port of an external VL, i.e. a port providing connectivity for the VNF to - an NS VL. It shall comply with the provisions defined in table 5.5.3.9-1. + an NS VL. NOTE 1: The use cases UC#4 and UC#5 in clause A.4 of ETSI GS NFV-IFA 007 provide examples for such a configuration. NOTE 2: The value of "trunkResourceId" is scoped by the value of "vimConnectionId" in the "resourceHandle" attribute. @@ -2944,8 +2925,7 @@ definitions: CpProtocolInfo: description: > - This type describes the protocol layer(s) that a CP uses together with protocol-related information, like addresses. - It shall comply with the provisions defined in table 5.5.3.9b-1. + This type describes the protocol layer(s) that a CP uses together with protocol-related information, like addresses. NOTE: This attribute allows to signal the addition of further types of layer and protocol in future versions of the present document in a backwards-compatible way. In the current version of the present document, only IP over @@ -2959,12 +2939,13 @@ definitions: The identifier of layer(s) and protocol(s) associated to the network address information. Permitted values: - 1. IP_OVER_ETHERNET - 2. IP_FOR_VIRTUAL_CP + - IP_OVER_ETHERNET + - IP_FOR_VIRTUAL_CP See note. type: string enum: - IP_OVER_ETHERNET + - IP_FOR_VIRTUAL_CP ipOverEthernet: description: > IP addresses over Ethernet to assign to the extCP instance. Shall be @@ -2980,8 +2961,7 @@ definitions: IpOverEthernetAddressInfo: description: > - This type represents information about a network address that has been assigned. - It shall comply with the provisions defined in table 5.5.3.10-1. + This type represents information about a network address that has been assigned. NOTE 1: At least one of "macAddress" or "ipAddresses" shall be present. NOTE 2: Exactly one of "addresses" or "addressRange" shall be present. @@ -3097,8 +3077,8 @@ definitions: LifecycleChangeNotificationsFilter: description: > - This type represents a subscription filter related to notifications about VNF lifecycle changes. - It shall comply with the provisions defined in table 5.5.3.12-1. + This type represents a subscription filter related to notifications about VNF lifecycle changes. + At a particular nesting level in the filter structure, the following applies: All attributes shall match in order for the filter to match (logical "and" between different filter attributes). If an attribute is an array, the attribute shall match if at least one of the values in the array @@ -3176,8 +3156,7 @@ definitions: VnfExtCpInfo: description: > - This type represents information about an external CP of a VNF. - It shall comply with the provisions defined in table 5.5.3.17 1. + This type represents information about an external CP of a VNF. NOTE 1: The attributes "associatedVnfcCpId", "associatedVipCpId", "associatedVirtualCpId" and "associatedVnfVirtualLinkId" are mutually exclusive. Exactly one shall be present. @@ -3496,7 +3475,6 @@ definitions: when changing the current VNF package. The attributes that can be included consist of those requested to be modified explicitly in the "ChangeCurrentVnfPkgRequest" data structure, and additional attributes of the "VnfInstance" data structure that were modified implicitly during the operation. - The "ModificationsTriggeredByVnfPkgChange" data type shall comply with the provisions defined in table 5.5.3.21-1. NOTE 1: This attribute represents the delta (semantics as per IETF RFC 7396, JSON Merge Patch) between the value of the attribute at the start of the "Change current VNF package" operation and the value of the attribute @@ -3615,8 +3593,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.28-1. + This type provides information related to virtual IP (VIP) CP. NOTE 1: It is possible that there is no associated VnfcCp because the VIP CP is available but not associated yet. @@ -3800,8 +3777,7 @@ definitions: VirtualCpInfo: description: > - This type provides information related to a virtual CP instance of a VNF. It shall comply with the provisions - in table 5.5.3.31-1. + This type provides information related to a virtual CP instance of a VNF. NOTE: A consumer of the VNF LCM interface can learn the actual VNFC instances implementing the service accessible via the virtual CP instance by querying the "vnfcResourceInfo" from the "InstantiatedVnfInfo" @@ -3856,7 +3832,7 @@ definitions: AdditionalServiceInfo: description: > This type provides additional service information of the virtual CP instance used to expose properties of the - virtual CP to NFV-MANO. It shall comply with the provisions in table 5.5.3.32-1. + virtual CP to NFV-MANO. NOTE: This attribute shall only be present if additional information is needed to identify the service termination within the VNF, such as for example a URL path information in an HTTP request required @@ -3881,8 +3857,7 @@ definitions: ServicePortInfo: description: > - This type describes the service identifying port properties exposed by the virtual CP instance. It shall - comply with the provisions in table 5.5.3.33-1. + This type describes the service identifying port properties exposed by the virtual CP instance. type: object required: - name @@ -3919,7 +3894,7 @@ definitions: description: > This type contains information related to a network attachment definition resource that provides the specification of the interface used to connect one or multiple connection points to a secondary container - cluster network. It shall comply with the provisions defined in table 5.5.3.36-1. + cluster network. type: object required: - netAttDefResourceInfoId diff --git a/src/SOL003/VNFLifecycleOperationGranting/definitions/SOL003VNFLifecycleOperationGranting_def.yaml b/src/SOL003/VNFLifecycleOperationGranting/definitions/SOL003VNFLifecycleOperationGranting_def.yaml index a4032ea1..7eeac235 100644 --- a/src/SOL003/VNFLifecycleOperationGranting/definitions/SOL003VNFLifecycleOperationGranting_def.yaml +++ b/src/SOL003/VNFLifecycleOperationGranting/definitions/SOL003VNFLifecycleOperationGranting_def.yaml @@ -4,7 +4,7 @@ definitions: GrantRequest: description: > - This type represents a grant request. It shall comply with the provisions defined in table 9.5.2.2-1. + This type represents a grant request. NOTE 1: The VNF LCM operations CreateVnfIdentifier, DeleteVnfIdentifier, QueryVnf and ModifyVnfInformation can be executed by the VNFM without requesting granting. @@ -445,8 +445,7 @@ definitions: ResourceDefinition: description: > - This type provides information of an existing or proposed resource used by the VNF. - It shall comply with the provisions defined in table 9.5.3.2-1. + This type provides information of an existing or proposed resource used by the VNF. NOTE 1: The use cases UC#4 and UC#5 in Annex A.4 of ETSI GS NFV-IFA 007 provide examples for such a configuration. @@ -910,8 +909,7 @@ definitions: SnapshotResourceDefinition: description: > - This type represents resource definition information related to a snapshot resource. - It shall comply with the provisions defined in table 9.5.3.11-1. + This type represents resource definition information related to a snapshot resource. NOTE 1: If present, the value of the "vduId" (for a related VDU) in the "VnfcResourceInfo" referred by the "vnfcInfoId" of the "VnfcSnapshotInfo" shall match the value of the @@ -1007,7 +1005,7 @@ definitions: StorageAsset: description: > This type provides a mapping between a VirtualStorageDesc in the VNFD and the corresponding virtual storage - managed by the NFVO in the NFVI. It shall comply with the provisions defined in table 9.5.3.13-1. + managed by the NFVO in the NFVI. type: object required: - virtualStorageDescId diff --git a/src/SOL003/VNFPackageManagement/definitions/SOL003VNFPackageManagement_def.yaml b/src/SOL003/VNFPackageManagement/definitions/SOL003VNFPackageManagement_def.yaml index ab2c67f6..67ce70e0 100644 --- a/src/SOL003/VNFPackageManagement/definitions/SOL003VNFPackageManagement_def.yaml +++ b/src/SOL003/VNFPackageManagement/definitions/SOL003VNFPackageManagement_def.yaml @@ -4,7 +4,7 @@ definitions: VnfPkgInfo: description: > - This type represents the information of a VNF package. It shall comply with the provisions defined in table 10.5.2.2-1. + This type represents the information of a VNF package. NOTE 1: If the value of the onboardingState attribute is not equal to "ONBOARDED", the value of the operationalState attribute shall be equal to "DISABLED". @@ -236,8 +236,7 @@ definitions: VnfPackageSoftwareImageInfo: description: > - This type represents an artifact contained in or external to a VNF package which represents a software image. - It shall comply with the provisions defined in table 10.5.3.2-1. + This type represents an artifact contained in or external to a VNF package which represents a software image.. * NOTE 1: The list of permitted values was taken from "Container formats" in OpenStack® documentation: "Disk and container formats for images" (Available at https://docs.openstack.org/glance/pike/user/formats.html). @@ -466,8 +465,8 @@ definitions: PkgmNotificationsFilter: description: > - This type represents a subscription filter related to notifications related to VNF package management. - It shall comply with the provisions defined in table 10.5.3.4-1. + This type represents a subscription filter related to notifications related to VNF package management. + At a particular nesting level in the filter structure, the following applies: All attributes shall match in order for the filter to match (logical "and" between different filter attributes). If an attribute is an array, the attribute shall match if at least one of the values in the array matches (logical "or" diff --git a/src/SOL003/VNFPerformanceManagement/definitions/SOL003VNFPerformanceManagement_def.yaml b/src/SOL003/VNFPerformanceManagement/definitions/SOL003VNFPerformanceManagement_def.yaml index 992b98cb..88d07970 100644 --- a/src/SOL003/VNFPerformanceManagement/definitions/SOL003VNFPerformanceManagement_def.yaml +++ b/src/SOL003/VNFPerformanceManagement/definitions/SOL003VNFPerformanceManagement_def.yaml @@ -199,7 +199,7 @@ definitions: PerformanceReport: description: > This type defines the format of a performance report provided by the VNFM to the NFVO as a result of collecting - performance information as part of a PM job. The type shall comply with the provisions defined in table 6.5.2.10-1. + performance information as part of a PM job. NOTE: The sub-object allows to structure the measured object but is not to be confused with sub-counters which allow to structure the measurement value. @@ -379,7 +379,7 @@ definitions: PmJobModifications: description: > - This type represents modifications to a PM job. It shall comply with the provisions defined in table 6.5.2.12-1. + This type represents modifications to a PM job. NOTE: At least one of the attributes defined in this type shall be present in request bodies. type: object @@ -404,7 +404,7 @@ definitions: PmJobCriteria: description: > - This type represents collection criteria for PM jobs. It shall comply with the provisions defined in table 6.5.3.3-1. + This type represents collection criteria for PM jobs. NOTE 1: At the end of each reportingPeriod, the API producer will inform the API consumer about availability of the performance data collected for each completed collection period during this reportingPeriod. @@ -528,7 +528,7 @@ definitions: ThresholdModifications: description: > - This type represents modifications to a threshold. It shall comply with the provisions defined in table 6.5.2.11-1. + This type represents modifications to a threshold. NOTE: At least one of the attributes defined in this type shall be present in request bodies. type: object @@ -552,7 +552,7 @@ definitions: ThresholdCriteria: description: > - This type represents criteria that define a threshold. It shall comply with the provisions defined in table 6.5.3.4-1. + This type represents criteria that define a threshold. NOTE 1: In the present document, simple thresholds are defined. The definition of additional threshold types is left for future specification. @@ -613,8 +613,7 @@ definitions: ThresholdCrossedNotification: description: > - This type represents a notification that is sent when a threshold has been crossed. - It shall comply with the provisions defined in table 6.5.2.4-1. + This type represents a notification that is sent when a threshold has been crossed. NOTE: The timing of sending this notification is determined by the capability of the producing entity to evaluate the threshold crossing condition. diff --git a/src/SOL003/VNFSnapshotPackageManagement/definitions/SOL003VNFSnapshotPackageManagement_def.yaml b/src/SOL003/VNFSnapshotPackageManagement/definitions/SOL003VNFSnapshotPackageManagement_def.yaml index 3b205586..1a026488 100644 --- a/src/SOL003/VNFSnapshotPackageManagement/definitions/SOL003VNFSnapshotPackageManagement_def.yaml +++ b/src/SOL003/VNFSnapshotPackageManagement/definitions/SOL003VNFSnapshotPackageManagement_def.yaml @@ -4,10 +4,10 @@ definitions: VnfSnapshotPkgInfo: description: > - This type represents the information of a VNF snapshot package. It shall comply with the provisions defined in table 12.5.2.2-1. + This type represents the information of a VNF snapshot package. - NOTE: The attribute shall not be present before the VNF snapshot package content has been uploaded or built. Otherwise, this - attribute shall be present unless it has been requested to be excluded per attribute selector. + NOTE: The attribute shall not be present before the VNF snapshot package content has been uploaded or built. + Otherwise, this attribute shall be present unless it has been requested to be excluded per attribute selector. type: object required: - id @@ -178,8 +178,7 @@ definitions: VnfcSnapshotImageInfo: description: > - This type represents an artifact contained in a VNF snapshot package which represents a snapshot image. - It shall comply with the provisions defined in table 12.5.3.2-1. + This type represents an artifact contained in a VNF snapshot package which represents a snapshot image. NOTE 1: The list of permitted values was taken from "Container formats" in OpenStack® documentation: "Disk and container formats for images" (Available at https://docs.openstack.org/glance/pike/user/formats.html). -- GitLab From e7fc1e28a08b3814c8b267e0b3d03678eb19b518 Mon Sep 17 00:00:00 2001 From: "M. Hamza" Date: Tue, 19 Jul 2022 12:33:17 +0500 Subject: [PATCH 38/41] resolve issues raised by Vlademir in SOL002 and SOL003 v4.3.1 --- .../General_Definitions/SOL002_def.yaml | 2 +- .../SOL002VNFLifecycleManagement_def.yaml | 10 +-- .../General_Definitions/SOL003_def.yaml | 20 +++--- .../SOL003VNFLifecycleManagement_def.yaml | 61 +++++++++++-------- ...L003VNFLifecycleOperationGranting_def.yaml | 18 +++++- .../SOL003VNFPackageManagement_def.yaml | 1 + 6 files changed, 67 insertions(+), 45 deletions(-) diff --git a/src/SOL002/General_Definitions/SOL002_def.yaml b/src/SOL002/General_Definitions/SOL002_def.yaml index b0f98496..2e686619 100644 --- a/src/SOL002/General_Definitions/SOL002_def.yaml +++ b/src/SOL002/General_Definitions/SOL002_def.yaml @@ -773,7 +773,7 @@ definitions: It may be present for storage resources in the scope of the CISM and shall be absent otherwise. See note. type: string - AdditionalResourceInfo: + additionalInfo: description: > Information related to other properties directly owned by the resource and available from the VIM or CISM or the diff --git a/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml b/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml index 052610a6..6a004e99 100644 --- a/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml +++ b/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml @@ -1217,10 +1217,6 @@ definitions: of a trunk that the present VNFC CP instance participates in. Shall be provided if the present CP instance participates in a trunk as subport. $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnf" - metadata: - description: > - Metadata about this CP. - $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/KeyValuePairs" netAttDefResourceId: description: > Identifier of the “NetAttDefResourceInfo” structure that provides the specification of the interface @@ -1230,6 +1226,10 @@ definitions: type: array items: $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" + metadata: + description: > + Metadata about this CP. + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/KeyValuePairs" metadata: description: > Metadata about this resource. @@ -2647,7 +2647,7 @@ definitions: exposed by this external CP instance. Shall be present in case this CP instance maps to an internal VL (including externally-managed internal VL). See note 1. $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnf" - netAttDefResourceInfoId: + netAttDefResourceId: description: > Identifier of the “NetAttDefResourceInfo” structure that provides the specification of the interface to attach the connection point to a secondary container cluster network. See notes 3 and 4. diff --git a/src/SOL003/General_Definitions/SOL003_def.yaml b/src/SOL003/General_Definitions/SOL003_def.yaml index 260095d4..6564492c 100644 --- a/src/SOL003/General_Definitions/SOL003_def.yaml +++ b/src/SOL003/General_Definitions/SOL003_def.yaml @@ -190,8 +190,8 @@ definitions: This type represents parameters to connect to a VIM, a CISM, a CIR or a MCIOP repository for managing the resources of a VNF instance. - This structure is used to convey VIM-related, CISM-related, CIR-related, or MCIOP-repository-relate - dparameters over the Or-Vnfm interface. Additional parameters for a VIM, a CISM, a CIR or a MCIOP + This structure is used to convey VIM-related, CISM-related, CIR-related, or MCIOP-repository-related + parameters over the Or-Vnfm interface. Additional parameters for a VIM, a CISM, a CIR or a MCIOP repository may be configured into the VNFM by means outside the scope of the present document and bound to the identifier of that VIM. @@ -205,7 +205,7 @@ definitions: required properties for authentication purpose), will be transmitted as plain text through a TLS tunnel without additional encoding/encryption before transmitting it, making the sensitive data visible to the endpoint. The base64 encoded certificates are only used by the VNFM to verify the authenticity of the - interface endpoint of the VIM., CISM, CIR or MCIOP repository. + interface endpoint of the VIM, CISM, CIR or MCIOP repository. type: object required: - vimType @@ -315,12 +315,12 @@ definitions: resourceId: description: > Identifier of the resource in the scope of the VIM or the - CISM or the resource provider. See note 3. + CISM or the resource provider. See note 2. $ref: "#/definitions/IdentifierInVim" vimLevelResourceType: description: > Type of the resource in the scope of the VIM or the CISM - or the resource provider. See note 2. + or the resource provider. See note 1. type: string vimLevelAdditionalResourceInfo: description: > @@ -706,7 +706,7 @@ definitions: external connection points to this external VL. If this attribute is not present, the VNFM shall create the link ports on the external VL except in the cases defined - below. See note 2. + below. See note 1. type: array items: $ref: "#/definitions/ExtLinkPortData" @@ -714,7 +714,7 @@ definitions: description: > Externally provided network attachment definition resource(s) that provide the specification of the interface - to attach external CPs to this external VL. See note 3. + to attach external CPs to this external VL. See note 2. It is only applicable if the external VL is realized by a secondary container cluster network. It shall not be present otherwise. @@ -741,7 +741,7 @@ definitions: attribute of the VnfInstance (e.g. during a "Change current VNF package" operation or due to its final failure). - $ref: "#/definitions/IdentifierInVnfd" + $ref: "#/definitions/Identifier" scaleToLevel: description: > Indicates the scale level. The minimum value shall be 0 @@ -754,7 +754,7 @@ definitions: This type represents additional resource information which resource and resource type specific, and which is available from the VIM or the CISM or the resource provider. - NOTE: At least one attribute shall be present. + * NOTE: At least one attribute shall be present. type: object properties: hostName: @@ -770,7 +770,7 @@ definitions: It may be present for storage resources in the scope of the CISM and shall be absent otherwise. See note. type: string - AdditionalResourceInfo: + additionalInfo: description: > Information related to other properties directly owned by the resource and available from the VIM or CISM or the diff --git a/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml b/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml index bbbe4838..32e84d34 100644 --- a/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml +++ b/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml @@ -24,6 +24,11 @@ definitions: scalable constituents of the VNF (e.g, VDUs/VLs). For scaling aspects not specified in targetScaleLevelInfo or for the VNF constituents (e.g.,VDUs/VLs) that are not scalable, the default instantiation level as declared in the VNFD shall be used for instantiation. + anyOf: + - required: + - instantiationLevelId + - required: + - targetScaleLevelInfo type: object required: - flavourId @@ -80,7 +85,7 @@ definitions: This attribute shall only be supported and may be present if - the resources for at least one of the VNFCs - shall be managed by a VIM and VNFrelated resource management in direct + shall be managed by a VIM and VNF-related resource management in direct mode is applicable. - the resources for at least one of the VNFCs shall be managed by a CISM. @@ -228,8 +233,7 @@ definitions: instantiationLevelId: description: > Identifier of the instantiation level of the deployment flavour to - be instantiated. See note 3. If not present, the default instantiation level as - declared in the VNFD is instantiated. + be instantiated. See note 3. $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnfd" targetScaleLevelInfo: description: > @@ -511,7 +515,7 @@ definitions: description: > Additional parameters passed by the NFVO as input to the process, specific to the VNF of which the underlying VNF package is changed, as declared in - the VNFD as part of "ChangeCurrentVnfPkgOpConfig" " defined in ETSI GS NFV-IFA 011 [10]. + the VNFD as part of "ChangeCurrentVnfPkgOpConfig" defined in ETSI GS NFV-IFA 011 [10]. $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/KeyValuePairs" extensions: description: > @@ -802,6 +806,7 @@ definitions: - vnfSoftwareVersion - vnfdVersion - instantiationState + - _links properties: id: description: > @@ -935,6 +940,7 @@ definitions: required: - flavourId - vnfState + - extCpInfo properties: flavourId: description: > @@ -1385,28 +1391,26 @@ definitions: Shall be present if the CP is associated to a link port on an internal VL (including externally-managed internal VL) of the VNF instance and shall be absent otherwise. $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnf" + parentCpId: + description: > + Identifier of another VNFC CP instance that corresponds to the parent port of a trunk that the present VNFC CP + instance participates in. Shall be provided if the present CP instance participates in a trunk as subport, and + the referred VNFC CP instances are also present in the vnfcCpInfo attribute. + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnf" + netAttDefResourceId: + description: > + Identifier of the “NetAttDefResourceInfo” structure that provides the specification of the interface to attach the + connection point to a secondary container cluster network. See notes 5 and 6. + It shall be present if the internal CP is associated to a VNFC realized by one or a set of OS containers and is + connected to a secondary container cluster network. It shall not be present otherwise. + type: array + items: + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" metadata: description: > Metadata about this CP. $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/KeyValuePairs" - parentCpId: - description: > - Identifier of another VNFC CP instance that corresponds to the parent port of a trunk that the present VNFC CP - instance participates in. Shall be provided if the present CP instance participates in a trunk as subport, and - the referred VNFC CP instances are also present in the vnfcCpInfo attribute. - $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnf" - - netAttDefResourceInfoId: - description: > - Identifier of the “NetAttDefResourceInfo” structure that provides the specification of the interface to attach the - connection point to a secondary container cluster network. See notes 5 and 6. - It shall be present if the internal CP is associated to a VNFC realized by one or a set of OS containers and is - connected to a secondary container cluster network. It shall not be present otherwise. - type: array - items: - $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" - metadata: description: > Metadata about this resource. @@ -2575,7 +2579,9 @@ definitions: provides the specification of the interface to attach the VNF internal CP created from the CPD identified by cpdId to a secondary container cluster network. See note. - $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" + type: array + items: + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" CreateVnfRequest: description: > @@ -2639,7 +2645,7 @@ definitions: description: > Additional parameters passed by the NFVO as input to the scaling process, specific to the VNF being scaled, as declared in the VNFD - as part of "ScaleVnfOpConfig" defined in ETSI GS NFV-IFA 011 [7]. + as part of "ScaleVnfOpConfig" defined in ETSI GS NFV-IFA 011 [10]. $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/KeyValuePairs" ScaleVnfToLevelRequest: @@ -2674,7 +2680,7 @@ definitions: description: > Additional parameters passed by the NFVO as input to the scaling process, specific to the VNF being scaled, as declared in the - VNFD as part of "ScaleVnfToLevelOpConfig" defined in ETSI GS NFV-IFA 011 [7]. + VNFD as part of "ScaleVnfToLevelOpConfig" defined in ETSI GS NFV-IFA 011 [10]. $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/KeyValuePairs" CancelMode: @@ -3230,7 +3236,7 @@ definitions: description: > Identifier of the "VirtualCpInfo" structure that represents the Virtual CP that is exposed by this external CP instance. Shall be present in case this CP instance maps to a Virtual CP. See note 1. - $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnfd" + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnf" associatedVnfVirtualLinkId: description: > Identifier of the "VnfVirtualLinkResourceInfo" structure that represents the internal VL or of the @@ -3238,10 +3244,11 @@ definitions: exposed by this external CP instance. Shall be present in case this CP instance maps to an internal VL (including externally-managed internal VL). See note 1. $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnf" - netAttDefResourceInfoId: + netAttDefResourceId: description: > Identifier of the “NetAttDefResourceInfo” structure that provides the specification of the interface to attach the connection point to a secondary container cluster network. See notes 3 and 4. + It shall be present if the external CP is associated to a VNFC realized by one or a set of OS containers and is connected to a secondary container cluster network. It shall not be present otherwise. type: array @@ -3661,7 +3668,7 @@ definitions: properties: cpInstanceId: description: > - dentifier of the virtual CP instance and the related "VirtualCpInfo" + Identifier of the virtual CP instance and the related "VirtualCpInfo" structure in "VnfInstance". $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnf" cpdId: diff --git a/src/SOL003/VNFLifecycleOperationGranting/definitions/SOL003VNFLifecycleOperationGranting_def.yaml b/src/SOL003/VNFLifecycleOperationGranting/definitions/SOL003VNFLifecycleOperationGranting_def.yaml index 7eeac235..3ee3c1b1 100644 --- a/src/SOL003/VNFLifecycleOperationGranting/definitions/SOL003VNFLifecycleOperationGranting_def.yaml +++ b/src/SOL003/VNFLifecycleOperationGranting/definitions/SOL003VNFLifecycleOperationGranting_def.yaml @@ -36,6 +36,13 @@ definitions: scalable constituents of the VNF (e.g, VDUs/VLs) in the granting process. For scaling aspects not specified in targetScaleLevelInfo or for the VNF constituents (e.g.,VDUs/VLs) that are not scalable, the default instantiation level as declared in the VNFD shall be used in the granting process. + anyOf: + - required: + - instantiationLevelId + - required: + - targetScaleLevelInfo + - required: + - addResources type: object required: - vnfInstanceId @@ -111,7 +118,9 @@ definitions: the scale level of VNF constituents (e.g., VDU level) to be instantiated. See notes 2, 7 and 8. - $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/ScaleInfo" + type: array + items: + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/ScaleInfo" addResources: description: > List of resource definitions in the VNFD for resources to be added by the LCM operation @@ -459,6 +468,7 @@ definitions: required: - id - type + - resourceTemplateId properties: id: description: > @@ -473,6 +483,8 @@ definitions: * VL * STORAGE * LINKPORT + * OSCONTAINER + * VIRTUALCP type: string enum: - COMPUTE @@ -608,7 +620,9 @@ definitions: to the MCIO constraint. This attribute shall be present if the granted resources are managed by a CISM. The attribute shall be absent if the granted resources are not managed by a CISM. - $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/KeyValuePairs" + type: array + items: + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/KeyValuePairs" ZoneInfo: description: > This type provides information regarding a resource zone. diff --git a/src/SOL003/VNFPackageManagement/definitions/SOL003VNFPackageManagement_def.yaml b/src/SOL003/VNFPackageManagement/definitions/SOL003VNFPackageManagement_def.yaml index 67ce70e0..2c264066 100644 --- a/src/SOL003/VNFPackageManagement/definitions/SOL003VNFPackageManagement_def.yaml +++ b/src/SOL003/VNFPackageManagement/definitions/SOL003VNFPackageManagement_def.yaml @@ -14,6 +14,7 @@ definitions: type: object required: - id + - onboardingState - operationalState - usageState - vnfmInfo -- GitLab From ff799d6de43022a8e042b22388d69c88cc1c66b2 Mon Sep 17 00:00:00 2001 From: "M. Hamza" Date: Tue, 19 Jul 2022 13:10:14 +0500 Subject: [PATCH 39/41] add anyOf tag in InstantiateVnfRequest datatype in SOL002 --- .../definitions/SOL002VNFLifecycleManagement_def.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml b/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml index 6a004e99..8f1e0b54 100644 --- a/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml +++ b/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml @@ -389,6 +389,11 @@ definitions: instantiating scalable constituents of the VNF (e.g, VDUs/VLs). For scaling aspects not specified in targetScaleLevelInfo or for the VNF constituents (e.g., VDUs/VLs) that are not scalable, the default instantiation level as declared in the VNFD shall be used for instantiation. + anyOf: + - required: + - instantiationLevelId + - required: + - targetScaleLevelInfo type: object required: - flavourId -- GitLab From 6ff558244cb6ee55bcddc1a83f89185a14c13639 Mon Sep 17 00:00:00 2001 From: "M. Hamza" Date: Wed, 20 Jul 2022 11:14:58 +0500 Subject: [PATCH 40/41] resolve VnfExtCpConfig datatype issue in both SOL002 and SOL003 --- src/SOL002/General_Definitions/SOL002_def.yaml | 2 ++ src/SOL003/General_Definitions/SOL003_def.yaml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/SOL002/General_Definitions/SOL002_def.yaml b/src/SOL002/General_Definitions/SOL002_def.yaml index 2e686619..cb2bfa65 100644 --- a/src/SOL002/General_Definitions/SOL002_def.yaml +++ b/src/SOL002/General_Definitions/SOL002_def.yaml @@ -424,6 +424,8 @@ definitions: - linkPortId - required: - cpProtocolData + - required: + - netAttDefResourceId type: object properties: parentCpConfigId: diff --git a/src/SOL003/General_Definitions/SOL003_def.yaml b/src/SOL003/General_Definitions/SOL003_def.yaml index 6564492c..cfa6c227 100644 --- a/src/SOL003/General_Definitions/SOL003_def.yaml +++ b/src/SOL003/General_Definitions/SOL003_def.yaml @@ -423,6 +423,8 @@ definitions: - linkPortId - required: - cpProtocolData + - required: + - netAttDefResourceId type: object properties: parentCpConfigId: -- GitLab From 69604a013ac5ea1e82e9453db2292918c1026eec Mon Sep 17 00:00:00 2001 From: Giacomo Bernini Date: Thu, 18 Aug 2022 09:42:48 +0000 Subject: [PATCH 41/41] Update Readme.md --- Readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Readme.md b/Readme.md index 4852a88d..a8414add 100644 --- a/Readme.md +++ b/Readme.md @@ -35,7 +35,7 @@ and the results will be stored in a `build/` directory in the project folder. ## How to raise issues -Change requests can be filed at [ETSI Forge Bugzilla](forge.etsi.org/bugzilla/buglist.cgi?component=Nfv-Openapis&list_id=62&product=NFV). Please report errors, bugs or other issues [here](https://forge.etsi.org/bugzilla/enter_bug.cgi?product=NFV). +Please report errors, bugs or other issues [here](https://forge.etsi.org/rep/nfv/SOL002-SOL003/-/issues). ## How to contribute -- GitLab