From 4bb86476ad04dd6e22ebbeebb8fc17c84ca5dabc Mon Sep 17 00:00:00 2001 From: Pietro Piscione Date: Thu, 11 Jul 2024 12:21:22 +0200 Subject: [PATCH 1/7] SOL005_1, SOL005_2, SOL005_6, and SOL007 --- src/SOL005/APIVersion/APIVersion.yaml | 4 +- .../NFVICapacityInformation.yaml | 6 +- .../NFVICapacityInformationNotification.yaml | 4 +- src/SOL005/NSDManagement/NSDManagement.yaml | 4 +- .../NSDManagementNotification.yaml | 4 +- .../NSFaultManagement/NSFaultManagement.yaml | 6 +- .../NSFaultManagementNotification.yaml | 4 +- .../NSLCMCoordination/NSLCMCoordination.yaml | 4 +- .../NSLifecycleManagement.yaml | 6 +- .../NSLifecycleManagementNotification.yaml | 4 +- .../NSPerformanceManagement.yaml | 6 +- .../SOL005NSPerformanceManagement_def.yaml | 58 +++++++++++++++++++ .../NSPerformanceManagementNotification.yaml | 4 +- .../VNFPackageManagement.yaml | 4 +- .../VNFPackageManagementNotification.yaml | 4 +- .../VNFSnapshotPackageManagement.yaml | 4 +- 16 files changed, 92 insertions(+), 34 deletions(-) diff --git a/src/SOL005/APIVersion/APIVersion.yaml b/src/SOL005/APIVersion/APIVersion.yaml index 38d98d2..1656095 100644 --- a/src/SOL005/APIVersion/APIVersion.yaml +++ b/src/SOL005/APIVersion/APIVersion.yaml @@ -19,8 +19,8 @@ info: version: 1.10.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 005 V4.5.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/04.05.01_60/gs_NFV-SOL005v040501p.pdf + description: ETSI GS NFV-SOL 005 V5.1.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/05.01.01_60/gs_nfv-sol005v050101p.pdf servers: - url: http://127.0.0.1/ diff --git a/src/SOL005/NFVICapacityInformation/NFVICapacityInformation.yaml b/src/SOL005/NFVICapacityInformation/NFVICapacityInformation.yaml index 0e1d2de..e502485 100644 --- a/src/SOL005/NFVICapacityInformation/NFVICapacityInformation.yaml +++ b/src/SOL005/NFVICapacityInformation/NFVICapacityInformation.yaml @@ -16,11 +16,11 @@ info: license: name: ETSI Forge copyright notice url: https://forge.etsi.org/etsi-forge-copyright-notice.txt - version: 1.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 + version: 1.13.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 005 V4.5.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/04.05.01_60/gs_NFV-SOL005v040501p.pdf + description: ETSI GS NFV-SOL 005 V5.1.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/05.01.01_60/gs_nfv-sol005v050101p.pdf servers: - url: http://127.0.0.1/nfvici/v1 diff --git a/src/SOL005/NFVICapacityInformationNotification/NFVICapacityInformationNotification.yaml b/src/SOL005/NFVICapacityInformationNotification/NFVICapacityInformationNotification.yaml index 8bc2c9d..2ce5a75 100644 --- a/src/SOL005/NFVICapacityInformationNotification/NFVICapacityInformationNotification.yaml +++ b/src/SOL005/NFVICapacityInformationNotification/NFVICapacityInformationNotification.yaml @@ -19,8 +19,8 @@ info: version: 1.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 005 V4.5.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/04.05.01_60/gs_NFV-SOL005v040501p.pdf + description: ETSI GS NFV-SOL 005 V5.1.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/05.01.01_60/gs_nfv-sol005v050101p.pdf servers: - url: http://127.0.0.1/callback/v1 diff --git a/src/SOL005/NSDManagement/NSDManagement.yaml b/src/SOL005/NSDManagement/NSDManagement.yaml index 03a5bae..97e5b08 100644 --- a/src/SOL005/NSDManagement/NSDManagement.yaml +++ b/src/SOL005/NSDManagement/NSDManagement.yaml @@ -19,8 +19,8 @@ info: version: 2.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 005 V4.5.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/04.05.01_60/gs_NFV-SOL005v040501p.pdf + description: ETSI GS NFV-SOL 005 V5.1.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/05.01.01_60/gs_nfv-sol005v050101p.pdf servers: - url: http://127.0.0.1/nsd/v2 diff --git a/src/SOL005/NSDManagementNotification/NSDManagementNotification.yaml b/src/SOL005/NSDManagementNotification/NSDManagementNotification.yaml index 4cc00b9..93daa7c 100644 --- a/src/SOL005/NSDManagementNotification/NSDManagementNotification.yaml +++ b/src/SOL005/NSDManagementNotification/NSDManagementNotification.yaml @@ -19,8 +19,8 @@ info: version: 2.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 005 V4.5.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/04.05.01_60/gs_NFV-SOL005v040501p.pdf + description: ETSI GS NFV-SOL 005 V5.1.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/05.01.01_60/gs_nfv-sol005v050101p.pdf servers: - url: http://127.0.0.1/callback/v2 diff --git a/src/SOL005/NSFaultManagement/NSFaultManagement.yaml b/src/SOL005/NSFaultManagement/NSFaultManagement.yaml index 5052510..acdcfd5 100644 --- a/src/SOL005/NSFaultManagement/NSFaultManagement.yaml +++ b/src/SOL005/NSFaultManagement/NSFaultManagement.yaml @@ -16,11 +16,11 @@ info: license: name: ETSI Forge copyright notice url: https://forge.etsi.org/etsi-forge-copyright-notice.txt - version: 1.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 + version: 1.14.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 005 V4.5.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/04.05.01_60/gs_NFV-SOL005v040501p.pdf + description: ETSI GS NFV-SOL 005 V5.1.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/05.01.01_60/gs_nfv-sol005v050101p.pdf servers: - url: http://127.0.0.1/nsfm/v1 diff --git a/src/SOL005/NSFaultManagementNotification/NSFaultManagementNotification.yaml b/src/SOL005/NSFaultManagementNotification/NSFaultManagementNotification.yaml index acda133..8f1728c 100644 --- a/src/SOL005/NSFaultManagementNotification/NSFaultManagementNotification.yaml +++ b/src/SOL005/NSFaultManagementNotification/NSFaultManagementNotification.yaml @@ -19,8 +19,8 @@ info: version: 1.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 005 V4.5.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/04.05.01_60/gs_NFV-SOL005v040501p.pdf + description: ETSI GS NFV-SOL 005 V5.1.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/05.01.01_60/gs_nfv-sol005v050101p.pdf servers: - url: http://127.0.0.1/callback/v1 diff --git a/src/SOL005/NSLCMCoordination/NSLCMCoordination.yaml b/src/SOL005/NSLCMCoordination/NSLCMCoordination.yaml index 14c509f..b345b11 100644 --- a/src/SOL005/NSLCMCoordination/NSLCMCoordination.yaml +++ b/src/SOL005/NSLCMCoordination/NSLCMCoordination.yaml @@ -19,8 +19,8 @@ info: version: 1.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 005 V4.5.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/04.05.01_60/gs_NFV-SOL005v040501p.pdf + description: ETSI GS NFV-SOL 005 V5.1.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/05.01.01_60/gs_nfv-sol005v050101p.pdf servers: - url: http://127.0.0.1/lcmcoord/v1 diff --git a/src/SOL005/NSLifecycleManagement/NSLifecycleManagement.yaml b/src/SOL005/NSLifecycleManagement/NSLifecycleManagement.yaml index 81945e2..e52d8d7 100644 --- a/src/SOL005/NSLifecycleManagement/NSLifecycleManagement.yaml +++ b/src/SOL005/NSLifecycleManagement/NSLifecycleManagement.yaml @@ -16,11 +16,11 @@ info: license: name: ETSI Forge copyright notice url: https://forge.etsi.org/etsi-forge-copyright-notice.txt - version: 2.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 + version: 2.14.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 005 V4.5.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/04.05.01_60/gs_NFV-SOL005v040501p.pdf + description: ETSI GS NFV-SOL 005 V5.1.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/05.01.01_60/gs_nfv-sol005v050101p.pdf servers: - url: http://127.0.0.1/nslcm/v2 diff --git a/src/SOL005/NSLifecycleManagementNotification/NSLifecycleManagementNotification.yaml b/src/SOL005/NSLifecycleManagementNotification/NSLifecycleManagementNotification.yaml index 6f7db86..ddb9754 100644 --- a/src/SOL005/NSLifecycleManagementNotification/NSLifecycleManagementNotification.yaml +++ b/src/SOL005/NSLifecycleManagementNotification/NSLifecycleManagementNotification.yaml @@ -17,8 +17,8 @@ info: version: 2.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 005 V4.5.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/04.05.01_60/gs_NFV-SOL005v040501p.pdf + description: ETSI GS NFV-SOL 005 V5.1.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/05.01.01_60/gs_nfv-sol005v050101p.pdf servers: - url: http://127.0.0.1/callback/v2 diff --git a/src/SOL005/NSPerformanceManagement/NSPerformanceManagement.yaml b/src/SOL005/NSPerformanceManagement/NSPerformanceManagement.yaml index ef7dc33..cae2bd4 100644 --- a/src/SOL005/NSPerformanceManagement/NSPerformanceManagement.yaml +++ b/src/SOL005/NSPerformanceManagement/NSPerformanceManagement.yaml @@ -16,11 +16,11 @@ info: license: name: ETSI Forge copyright notice url: https://forge.etsi.org/etsi-forge-copyright-notice.txt - version: 2.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 + version: 2.13.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 005 V4.5.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/04.05.01_60/gs_NFV-SOL005v040501p.pdf + description: ETSI GS NFV-SOL 005 V5.1.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/05.01.01_60/gs_nfv-sol005v050101p.pdf servers: - url: http://127.0.0.1/nspm/v2 diff --git a/src/SOL005/NSPerformanceManagement/definitions/SOL005NSPerformanceManagement_def.yaml b/src/SOL005/NSPerformanceManagement/definitions/SOL005NSPerformanceManagement_def.yaml index 941446a..fae7f5e 100644 --- a/src/SOL005/NSPerformanceManagement/definitions/SOL005NSPerformanceManagement_def.yaml +++ b/src/SOL005/NSPerformanceManagement/definitions/SOL005NSPerformanceManagement_def.yaml @@ -120,6 +120,64 @@ definitions: authorization of notifications. $ref: "../../definitions/SOL005_def.yaml#/definitions/SubscriptionAuthentication" + MonitoringConnection: + description: > + This type represents a MonitoringConnection. + + NOTE: The VNFM can be made aware of monitoring connection information, including their identifiers to be used by + configuration means outside the scope of the present document (e.g. using relevant NFV-MANO management + APIs as defined in ETSI GS NFV-SOL 009). + type: object + required: + - id + - monitoringType + properties: + id: + description: > + Identifier of the monitoring connection. See note + $ref: "../../definitions/SOL005_def.yaml#/definitions/Identifier" + monitoringType: + description: > + Type of monitoring way. + VALUES: + • VIM_CISM + • EXTERNAL + • PAAS + type: string + enum: + - VIM_CISM + - EXTERNAL + - PAAS + vimId: + description: > + Information about VIM or CISM connection(s) for + monitoring resources for the VNF instance. + Can be set when MonitoringType is equal to + "VIM_CISM". + $ref: "../../definitions/SOL005_def.yaml#/definitions/Identifier" + paasServiceId: + description: > + Information about PaasAsset to be used. + Can be set when MonitoringType is equal to + "PAAS". + $ref: "../../definitions/SOL005_def.yaml#/definitions/Identifier" + interfaceInfo: + description: > + Information about the interface(s) to the external monitoring tool, + if available, including interface endpoint e.g. URL API version, and protocol type. + Can be set when MonitoringType is equal to “EXTERNAL”. + $ref: "../../definitions/SOL005_def.yaml#/definitions/KeyValuePairs" + accessInfo: + description: > + Authentication credentials for accessing the external monitoring tool. + Examples can include those to support different authentication schemes, + e.g. OAuth, Token, Username/password, etc. Can be set when MonitoringType is equal to “EXTERNAL”. + $ref: "../../definitions/SOL005_def.yaml#/definitions/KeyValuePairs" + extra: + description: > + Type specific additional information, if applicable. + type: string + PmJob: description: > This type represents a PM job. diff --git a/src/SOL005/NSPerformanceManagementNotification/NSPerformanceManagementNotification.yaml b/src/SOL005/NSPerformanceManagementNotification/NSPerformanceManagementNotification.yaml index 538b2d1..5f25864 100644 --- a/src/SOL005/NSPerformanceManagementNotification/NSPerformanceManagementNotification.yaml +++ b/src/SOL005/NSPerformanceManagementNotification/NSPerformanceManagementNotification.yaml @@ -19,8 +19,8 @@ info: version: 2.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 005 V4.5.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/04.05.01_60/gs_NFV-SOL005v040501p.pdf + description: ETSI GS NFV-SOL 005 V5.1.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/05.01.01_60/gs_nfv-sol005v050101p.pdf servers: - url: http://127.0.0.1/callback/v2 diff --git a/src/SOL005/VNFPackageManagement/VNFPackageManagement.yaml b/src/SOL005/VNFPackageManagement/VNFPackageManagement.yaml index dab3821..2ed63d3 100644 --- a/src/SOL005/VNFPackageManagement/VNFPackageManagement.yaml +++ b/src/SOL005/VNFPackageManagement/VNFPackageManagement.yaml @@ -19,8 +19,8 @@ info: version: 2.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 005 V4.5.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/04.05.01_60/gs_NFV-SOL005v040501p.pdf + description: ETSI GS NFV-SOL 005 V5.1.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/05.01.01_60/gs_nfv-sol005v050101p.pdf servers: - url: http://127.0.0.1/vnfpkgm/v2 diff --git a/src/SOL005/VNFPackageManagementNotification/VNFPackageManagementNotification.yaml b/src/SOL005/VNFPackageManagementNotification/VNFPackageManagementNotification.yaml index 11cc958..ba1f9bc 100644 --- a/src/SOL005/VNFPackageManagementNotification/VNFPackageManagementNotification.yaml +++ b/src/SOL005/VNFPackageManagementNotification/VNFPackageManagementNotification.yaml @@ -19,8 +19,8 @@ info: version: 2.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 005 V4.5.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/04.05.01_60/gs_NFV-SOL005v040501p.pdf + description: ETSI GS NFV-SOL 005 V5.1.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/05.01.01_60/gs_nfv-sol005v050101p.pdf servers: - url: http://127.0.0.1/callback/v2 diff --git a/src/SOL005/VNFSnapshotPackageManagement/VNFSnapshotPackageManagement.yaml b/src/SOL005/VNFSnapshotPackageManagement/VNFSnapshotPackageManagement.yaml index 75b97ee..aaed77e 100644 --- a/src/SOL005/VNFSnapshotPackageManagement/VNFSnapshotPackageManagement.yaml +++ b/src/SOL005/VNFSnapshotPackageManagement/VNFSnapshotPackageManagement.yaml @@ -19,8 +19,8 @@ info: version: 1.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 005 V4.5.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/04.05.01_60/gs_NFV-SOL005v040501p.pdf + description: ETSI GS NFV-SOL 005 V5.1.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/05.01.01_60/gs_nfv-sol005v050101p.pdf servers: - url: http://127.0.0.1/vnfsnapshotpkgm/v1 -- GitLab From 575f7b4f693163e2a2a931759c23c74c7e387de3 Mon Sep 17 00:00:00 2001 From: Pietro Piscione Date: Thu, 11 Jul 2024 15:13:13 +0200 Subject: [PATCH 2/7] SOL005_10 to SOL005_13 and SOL005_15 --- .../SOL005NSLifecycleManagement_def.yaml | 69 +++++++++++++++++-- 1 file changed, 64 insertions(+), 5 deletions(-) diff --git a/src/SOL005/NSLifecycleManagement/definitions/SOL005NSLifecycleManagement_def.yaml b/src/SOL005/NSLifecycleManagement/definitions/SOL005NSLifecycleManagement_def.yaml index 32b3a81..ede1552 100644 --- a/src/SOL005/NSLifecycleManagement/definitions/SOL005NSLifecycleManagement_def.yaml +++ b/src/SOL005/NSLifecycleManagement/definitions/SOL005NSLifecycleManagement_def.yaml @@ -119,6 +119,29 @@ definitions: the healing process, specific to the VNF being healed. EXAMPLE: Input parameters to VNF-specific healing procedures. $ref: "../../definitions/SOL005_def.yaml#/definitions/KeyValuePairs" + healingResource: + description: > + Indicates the kinds of the virtual resource to be healed. + Permitted values: + - VL + - LINKPORT + - STORAGE + - VIRTUALCP + - COMPUTE + - OSCONTAINER + Default value is COMPUTE when the VDUs of the VNF are realized + by a set of virtual machines and OSCONTAINER when the VDUs of + the VNF are realized by a set of OS containers. + type: array + items: + type: string + enum: + - VL + - LINKPORT + - STORAGE + - VIRTUALCP + - COMPUTE + - OSCONTAINER TerminateNsRequest: description: > @@ -1191,7 +1214,10 @@ definitions: In addition, the provisions in clause 6.7 shall apply. $ref: "../../definitions/SOL005_def.yaml#/definitions/KeyValuePairs" - + vnfmId: + description: > + Identifier of the VNFM that manages the VNF instance. + $ref: "../../definitions/SOL005_def.yaml#/definitions/Identifier" VirtualCpInfo: description: > @@ -6620,14 +6646,14 @@ definitions: This type represents network address data for a virtual CP. It shall comply with the provisions defined in table 6.5.3.12a-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 1: The loadBalancerIp and the loadBalancerSourceRanges attributes are only used if the CIS cluster is set up to be + able to configure an external load balancer. Otherwise it shall be ignored. 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. NOTE 3: The attribute is only relevant if the virtual CP is instantiated in a cluster that supports configuration of IP address pools for virtual CPs. Otherwise it shall be ignored. MetalLB is an example of a solution for Kubernetes® that supports configuration of address pools for load balancer services. - NOTE 4: The loadBalancerIp and the addressPoolName attributes shall not be present at the same time. + NOTE 4: The loadBalancerIp and the addressPoolName and the externalIp attributes shall not be present at the same time. type: object required: @@ -6646,6 +6672,11 @@ definitions: Fixed address to assign to an external load balancer. See notes 1, 2 and 4. $ref: "#/definitions/IpAddress" + externalIp: + description: > + An external IP address assigned to the virtual CP. + This IP address is not managed by CISM. See note 4. + $ref: "#/definitions/IpAddress" addressPoolName: description: > Name of an address pool from which the @@ -6654,6 +6685,22 @@ definitions: type: array items: type: string + loadBalancerSourceRanges: + description: > + List of client IP address ranges allowed to access an external load balancer. See note 1. + 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" @@ -7451,6 +7498,8 @@ definitions: identifier. NOTE 2: Component mappings are defined in the VNFD in the source or destination package for the relevant change path. See clause 7.1.15.2 in ETSI GS NFV-IFA 011. + NOTE 3: In the current version of the present document, only Rolling uprade and Blue-green upgrade types are supported. + The definition of additional upgrade types is left for future specification. type: object required: @@ -7532,7 +7581,17 @@ definitions: instance in delegation mode. Otherwise shall not be present $ref: "#/definitions/CertificateConfigurationData" - + upgradeType: + description: > + Indicates upgrade type when change the current VNF Package on which a VNF instance is based. + Permitted values: + • ROLLING_UPGRADE + • BLUE_GREEN + See note 3. + type: string + enum: + - ROLLING_UPGRADE + - BLUE_GREEN DeleteVnfSnapshotData: description: > -- GitLab From 47a7057f1e58e081552c38027feb6a8d7f2857c3 Mon Sep 17 00:00:00 2001 From: Pietro Piscione Date: Thu, 11 Jul 2024 15:58:24 +0200 Subject: [PATCH 3/7] SOL005_16 to SOL005_20 --- .../SOL005NSFaultManagement_def.yaml | 31 +++++++++- .../SOL005NSPerformanceManagement_def.yaml | 8 +++ src/SOL005/definitions/SOL005_def.yaml | 58 +++++++++++++++++++ 3 files changed, 96 insertions(+), 1 deletion(-) diff --git a/src/SOL005/NSFaultManagement/definitions/SOL005NSFaultManagement_def.yaml b/src/SOL005/NSFaultManagement/definitions/SOL005NSFaultManagement_def.yaml index 8d992aa..70608b4 100644 --- a/src/SOL005/NSFaultManagement/definitions/SOL005NSFaultManagement_def.yaml +++ b/src/SOL005/NSFaultManagement/definitions/SOL005NSFaultManagement_def.yaml @@ -25,6 +25,10 @@ definitions: managedObjectId: description: > Identifier of the affected NS instance. + The Managed Objects for the present document is an NS instance. + An NS instance can have fault monitored sub-object types and identification + information is carried as defined in the respective Alarm definition as defined + in clause 7.4 of ETSI GS NFV-IFA 045, e.g., using the "faultDetails" attribute. $ref: "../../definitions/SOL005_def.yaml#/definitions/Identifier" rootCauseFaultyComponent: description: > @@ -69,6 +73,10 @@ definitions: perceivedSeverity: description: > Perceived severity of the managed object failure. + Valid values applicable to specific Alarms are specified as + "Perceived severity" values of the Alarm applicable to + Os-Ma-nfvo reference point, as defined in clause 7.4 of + ETSI GS NFV-IFA 045. $ref: "#/definitions/PerceivedSeverityType" eventTime: description: > @@ -77,14 +85,24 @@ definitions: eventType: description: > Type of event. + Valid values applicable to specific Alarms are specified as + "Event type" values of the Alarm applicable to Os-Ma-nfvo + reference point, as defined in clause 7.4 of ETSI GS NFV-IFA 045. $ref: "#/definitions/EventType" faultType: description: > Additional information to clarify the type of the fault. + Valid values applicable to specific Alarms are specified as + "Alarm definition identifier" values of the Alarm applicable + to Os-Ma-nfvo reference point, as defined in clause 7.4 of ETSI + GS NFV-IFA 045. type: string probableCause: description: > Information about the probable cause of the fault. + Valid values applicable to specific Alarms are specified as + "Probable cause" values of the Alarm applicable to Os-Ma-nfvo + reference point, as defined in clause 7.4 of ETSI GS NFV-IFA 045. type: string isRootCause: description: > @@ -100,7 +118,10 @@ definitions: $ref: "../../definitions/SOL005_def.yaml#/definitions/Identifier" faultDetails: description: > - Provides additional information about the fault.. + Provides additional information about the fault. + Valid values applicable to specific Alarms are specified as + "Fault details" values of the Alarm applicable to Os-Ma-nfvo + reference point, as defined in clause 7.4 of ETSI GS NFV-IFA 045. type: array items: type: string @@ -283,6 +304,14 @@ definitions: description: > The URI of the endpoint to send the notification to. $ref: "../../definitions/SOL005_def.yaml#/definitions/Uri" + pmJobConnection: + description: > + An access information and interface information to monitor the FM of VNF instance + by the VNFM. This can include for instance certain interface endpoint URI together + with necessary credentials to access it. + type: array + items: + $ref: "../../definitions/SOL005_def.yaml#/definitions/MonitoringConnection" _links: description: > Links for this resource. diff --git a/src/SOL005/NSPerformanceManagement/definitions/SOL005NSPerformanceManagement_def.yaml b/src/SOL005/NSPerformanceManagement/definitions/SOL005NSPerformanceManagement_def.yaml index fae7f5e..47246d1 100644 --- a/src/SOL005/NSPerformanceManagement/definitions/SOL005NSPerformanceManagement_def.yaml +++ b/src/SOL005/NSPerformanceManagement/definitions/SOL005NSPerformanceManagement_def.yaml @@ -253,6 +253,14 @@ definitions: description: > The size of the report file in bytes, if known. type: integer + pmJobConnection: + description: > + An access information and interface information of PM job to monitor + the PM of VNF instance by the VNFM. This can include for instance certain + interface endpoint URI together with necessary credentials to access it. + type: array + items: + $ref: "../../definitions/SOL005_def.yaml#/definitions/MonitoringConnection" _links: description: > Links for this resource. diff --git a/src/SOL005/definitions/SOL005_def.yaml b/src/SOL005/definitions/SOL005_def.yaml index 9699ec9..f5d8e6b 100644 --- a/src/SOL005/definitions/SOL005_def.yaml +++ b/src/SOL005/definitions/SOL005_def.yaml @@ -486,3 +486,61 @@ definitions: 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" + + MonitoringConnection: + description: > + This type represents a MonitoringConnection. + + NOTE: The VNFM can be made aware of monitoring connection information, including their identifiers to be used by + configuration means outside the scope of the present document (e.g. using relevant NFV-MANO management + APIs as defined in ETSI GS NFV-SOL 009). + type: object + required: + - id + - monitoringType + properties: + id: + description: > + Identifier of the monitoring connection. See note + $ref: "#/definitions/Identifier" + monitoringType: + description: > + Type of monitoring way. + VALUES: + • VIM_CISM + • EXTERNAL + • PAAS + type: string + enum: + - VIM_CISM + - EXTERNAL + - PAAS + vimId: + description: > + Information about VIM or CISM connection(s) for + monitoring resources for the VNF instance. + Can be set when MonitoringType is equal to + "VIM_CISM". + $ref: "#/definitions/Identifier" + paasServiceId: + description: > + Information about PaasAsset to be used. + Can be set when MonitoringType is equal to + "PAAS". + $ref: "#/definitions/Identifier" + interfaceInfo: + description: > + Information about the interface(s) to the external monitoring tool, + if available, including interface endpoint e.g. URL API version, and protocol type. + Can be set when MonitoringType is equal to “EXTERNAL”. + $ref: "#/definitions/KeyValuePairs" + accessInfo: + description: > + Authentication credentials for accessing the external monitoring tool. + Examples can include those to support different authentication schemes, + e.g. OAuth, Token, Username/password, etc. Can be set when MonitoringType is equal to “EXTERNAL”. + $ref: "#/definitions/KeyValuePairs" + extra: + description: > + Type specific additional information, if applicable. + type: string -- GitLab From 8bb4ddd7bc39f8066ccde727717adc9f611a3b3c Mon Sep 17 00:00:00 2001 From: Pietro Piscione Date: Thu, 11 Jul 2024 17:07:22 +0200 Subject: [PATCH 4/7] SOL005_21 and some fixes --- .../NFVICapacityInformation.yaml | 95 +++++++++++++++++++ .../NFVICapacityInformationNotification.yaml | 2 +- .../NSFaultManagementNotification.yaml | 2 +- .../NSLifecycleManagementNotification.yaml | 2 +- .../NSPerformanceManagementNotification.yaml | 2 +- 5 files changed, 99 insertions(+), 4 deletions(-) diff --git a/src/SOL005/NFVICapacityInformation/NFVICapacityInformation.yaml b/src/SOL005/NFVICapacityInformation/NFVICapacityInformation.yaml index e502485..513e854 100644 --- a/src/SOL005/NFVICapacityInformation/NFVICapacityInformation.yaml +++ b/src/SOL005/NFVICapacityInformation/NFVICapacityInformation.yaml @@ -145,6 +145,58 @@ paths: "504": $ref: ../responses/SOL005_resp.yaml#/components/responses/504 + /nfvi_capacity_infos/ccm/{ccmId}: + parameters: + - $ref: '#/components/parameters/CcmId' + - $ref: ../components/SOL005_params.yaml#/components/parameters/Version + - $ref: ../components/SOL005_params.yaml#/components/parameters/Authorization + get: + description: | + This method shall follow the provisions specified in the tables 10.4.3a.3.2-1 and 10.4.3a.3.2-2 for + URI query parameters, request and response data structures, and response codes. + + NOTE: This identifier can be retrieved from the "ccmId" attribute in the CapacityShortageNotification. + It can also be retrieved from the "ccmId" attribute in the message content of the response. + parameters: + - in: query + name: filter + description: > + Attribute-based filtering expression according to clause 5.2 of ETSI GS NFV-SOL 013. + The NFVO shall support receiving this parameter as part of the URI query string. + The OSS/BSS may supply this parameter. If the OSS/BSS does not supply a filter value + for the timeInterval attribute in the NfviCapacityInfo, a query of the current NFVI + capacity information available by the NFVO is requested. The following attribute names + in the NfviCapacityInfo shall be supported by the NFVO in the filter expression: + - cisClusterId + - timeInterval + - resourceType + - capacityMeasurementName + - capacity values: {totalCapacity, allocatedCapacity, reservedCapacity, availableCapacity} + schema: + type: string + - $ref: ../components/SOL005_params.yaml#/components/parameters/Accept + responses: + "200": + $ref: '#/components/responses/CcmNfviCapacityInfo.Get.200' + "400": + $ref: ../responses/SOL005_resp.yaml#/components/responses/400 + "401": + $ref: ../responses/SOL005_resp.yaml#/components/responses/401 + "403": + $ref: ../responses/SOL005_resp.yaml#/components/responses/403 + "404": + $ref: ../responses/SOL005_resp.yaml#/components/responses/404 + "405": + $ref: ../responses/SOL005_resp.yaml#/components/responses/405 + "406": + $ref: ../responses/SOL005_resp.yaml#/components/responses/406 + "500": + $ref: ../responses/SOL005_resp.yaml#/components/responses/500 + "503": + $ref: ../responses/SOL005_resp.yaml#/components/responses/503 + "504": + $ref: ../responses/SOL005_resp.yaml#/components/responses/504 + /capacity_thresholds: parameters: - $ref: ../components/SOL005_params.yaml#/components/parameters/Version @@ -322,6 +374,17 @@ components: schema: type: string + CcmId: + name: ccmId + in: path + description: | + Identifier of the CCM with associated NFVI capacity information. See note. + required: true + style: simple + explode: false + schema: + type: string + CapacityThresholdId: name: capacityThresholdId in: path @@ -425,6 +488,38 @@ components: schema: $ref: ./definitions/NFVICapacityInformation_def.yaml#/components/schemas/NfviCapacityInfo + + CcmNfviCapacityInfo.Get.200: + description: | + Shall be returned when information of an individual CCM's NFVI capacity has been read successfully. + The response body shall contain a representation of the NFVI capacity information, as defined in clause 10.5.2.4. + headers: + Version: + description: | + Version of the API used in the response. + style: simple + explode: false + schema: + type: string + WWW-Authenticate: + description: | + Challenge if the corresponding HTTP request has not provided authorization, or error details if the + corresponding HTTP request has provided an invalid authorization token. + style: simple + explode: false + schema: + type: string + Content-Type: + description: The MIME type of the body of the response. + style: simple + explode: false + schema: + type: string + content: + application/json: + schema: + $ref: ./definitions/NFVICapacityInformation_def.yaml#/components/schemas/NfviCapacityInfo + CapacityThresholds.Get.200: description: | Shall be returned when information about zero or more capacity thresholds has been queried successfully. diff --git a/src/SOL005/NFVICapacityInformationNotification/NFVICapacityInformationNotification.yaml b/src/SOL005/NFVICapacityInformationNotification/NFVICapacityInformationNotification.yaml index 2ce5a75..886c1c8 100644 --- a/src/SOL005/NFVICapacityInformationNotification/NFVICapacityInformationNotification.yaml +++ b/src/SOL005/NFVICapacityInformationNotification/NFVICapacityInformationNotification.yaml @@ -16,7 +16,7 @@ info: license: name: ETSI Forge copyright notice url: https://forge.etsi.org/etsi-forge-copyright-notice.txt - version: 1.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 + version: 1.13.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: description: ETSI GS NFV-SOL 005 V5.1.1 diff --git a/src/SOL005/NSFaultManagementNotification/NSFaultManagementNotification.yaml b/src/SOL005/NSFaultManagementNotification/NSFaultManagementNotification.yaml index 8f1728c..401471c 100644 --- a/src/SOL005/NSFaultManagementNotification/NSFaultManagementNotification.yaml +++ b/src/SOL005/NSFaultManagementNotification/NSFaultManagementNotification.yaml @@ -16,7 +16,7 @@ info: license: name: ETSI Forge copyright notice url: https://forge.etsi.org/etsi-forge-copyright-notice.txt - version: 1.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 + version: 1.14.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: description: ETSI GS NFV-SOL 005 V5.1.1 diff --git a/src/SOL005/NSLifecycleManagementNotification/NSLifecycleManagementNotification.yaml b/src/SOL005/NSLifecycleManagementNotification/NSLifecycleManagementNotification.yaml index ddb9754..49b2546 100644 --- a/src/SOL005/NSLifecycleManagementNotification/NSLifecycleManagementNotification.yaml +++ b/src/SOL005/NSLifecycleManagementNotification/NSLifecycleManagementNotification.yaml @@ -14,7 +14,7 @@ info: license: name: ETSI Forge copyright notice url: https://forge.etsi.org/etsi-forge-copyright-notice.txt - version: 2.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 + version: 2.14.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: description: ETSI GS NFV-SOL 005 V5.1.1 diff --git a/src/SOL005/NSPerformanceManagementNotification/NSPerformanceManagementNotification.yaml b/src/SOL005/NSPerformanceManagementNotification/NSPerformanceManagementNotification.yaml index 5f25864..3419344 100644 --- a/src/SOL005/NSPerformanceManagementNotification/NSPerformanceManagementNotification.yaml +++ b/src/SOL005/NSPerformanceManagementNotification/NSPerformanceManagementNotification.yaml @@ -16,7 +16,7 @@ info: license: name: ETSI Forge copyright notice url: https://forge.etsi.org/etsi-forge-copyright-notice.txt - version: 2.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 + version: 2.13.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: description: ETSI GS NFV-SOL 005 V5.1.1 -- GitLab From 966ea327c37eb7194bfa786464f6a737a7c3183d Mon Sep 17 00:00:00 2001 From: Pietro Piscione Date: Fri, 26 Jul 2024 19:24:00 +0200 Subject: [PATCH 5/7] Solved issue #19 for v5.1.1 --- src/SOL005/NSPerformanceManagement/NSPerformanceManagement.yaml | 2 -- src/SOL005/components/SOL005_params.yaml | 1 - 2 files changed, 3 deletions(-) diff --git a/src/SOL005/NSPerformanceManagement/NSPerformanceManagement.yaml b/src/SOL005/NSPerformanceManagement/NSPerformanceManagement.yaml index cae2bd4..89007b0 100644 --- a/src/SOL005/NSPerformanceManagement/NSPerformanceManagement.yaml +++ b/src/SOL005/NSPerformanceManagement/NSPerformanceManagement.yaml @@ -431,7 +431,6 @@ paths: # description: | # Version of the API requested to use when responding to this request. # in: header -# required: true # type: string # # post: @@ -650,7 +649,6 @@ paths: # description: | # Version of the API requested to use when responding to this request. # in: header -# required: true # type: string # # get: diff --git a/src/SOL005/components/SOL005_params.yaml b/src/SOL005/components/SOL005_params.yaml index b17c2e7..941b21c 100644 --- a/src/SOL005/components/SOL005_params.yaml +++ b/src/SOL005/components/SOL005_params.yaml @@ -5,7 +5,6 @@ components: description: > Version of the API requested to use when responding to this request. in: header - required: true schema: type: string -- GitLab From d0ee854bfce6c0b4f1961313f40501dd5f67385a Mon Sep 17 00:00:00 2001 From: "p.piscione" Date: Fri, 30 Aug 2024 08:39:12 +0000 Subject: [PATCH 6/7] Fixed errors mentioned of issue #38 --- .../NFVICapacityInformation.yaml | 8 +-- .../SOL005NSFaultManagement_def.yaml | 2 +- .../SOL005NSLifecycleManagement_def.yaml | 54 +++++++++---------- .../SOL005NSPerformanceManagement_def.yaml | 30 ++++++----- 4 files changed, 49 insertions(+), 45 deletions(-) diff --git a/src/SOL005/NFVICapacityInformation/NFVICapacityInformation.yaml b/src/SOL005/NFVICapacityInformation/NFVICapacityInformation.yaml index 513e854..ec22420 100644 --- a/src/SOL005/NFVICapacityInformation/NFVICapacityInformation.yaml +++ b/src/SOL005/NFVICapacityInformation/NFVICapacityInformation.yaml @@ -365,9 +365,9 @@ components: name: vimId in: path description: | - Identifier of the VIM with associated NFVI capacity information. - This identifier can be retrieved from the "vimId" attribute in the CapacityShortageNotification. - It can also be retrieved from the "vimId" attribute in the message content of the response. + Identifier of the VIM with associated NFVI capacity information. See note. + * NOTE: This identifier can be retrieved from the "vimId" attribute in the CapacityShortageNotification. + It can also be retrieved from the "vimId" attribute in the message content of the response. required: true style: simple explode: false @@ -379,6 +379,8 @@ components: in: path description: | Identifier of the CCM with associated NFVI capacity information. See note. + * NOTE: This identifier can be retrieved from the "ccmId" attribute in the CapacityShortageNotification. It can also be + retrieved from the "ccmId" attribute in the message content of the response. required: true style: simple explode: false diff --git a/src/SOL005/NSFaultManagement/definitions/SOL005NSFaultManagement_def.yaml b/src/SOL005/NSFaultManagement/definitions/SOL005NSFaultManagement_def.yaml index 70608b4..f588548 100644 --- a/src/SOL005/NSFaultManagement/definitions/SOL005NSFaultManagement_def.yaml +++ b/src/SOL005/NSFaultManagement/definitions/SOL005NSFaultManagement_def.yaml @@ -304,7 +304,7 @@ definitions: description: > The URI of the endpoint to send the notification to. $ref: "../../definitions/SOL005_def.yaml#/definitions/Uri" - pmJobConnection: + fmConnection: description: > An access information and interface information to monitor the FM of VNF instance by the VNFM. This can include for instance certain interface endpoint URI together diff --git a/src/SOL005/NSLifecycleManagement/definitions/SOL005NSLifecycleManagement_def.yaml b/src/SOL005/NSLifecycleManagement/definitions/SOL005NSLifecycleManagement_def.yaml index ede1552..9f2ed65 100644 --- a/src/SOL005/NSLifecycleManagement/definitions/SOL005NSLifecycleManagement_def.yaml +++ b/src/SOL005/NSLifecycleManagement/definitions/SOL005NSLifecycleManagement_def.yaml @@ -6646,23 +6646,22 @@ definitions: This type represents network address data for a virtual CP. It shall comply with the provisions defined in table 6.5.3.12a-1. - NOTE 1: The loadBalancerIp and the loadBalancerSourceRanges attributes are only used if the CIS cluster is set up to be - able to configure an external load balancer. Otherwise it shall be ignored. - 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. - NOTE 3: The attribute is only relevant if the virtual CP is instantiated in a cluster that supports configuration of IP - address pools for virtual CPs. Otherwise it shall be ignored. MetalLB is an example of a solution for - Kubernetes® that supports configuration of address pools for load balancer services. - NOTE 4: The loadBalancerIp and the addressPoolName and the externalIp attributes shall not be present at the same time. - + * NOTE 1: The loadBalancerIp and the loadBalancerSourceRanges attributes are only used if the CIS cluster is set up to be + able to configure an external load balancer. Otherwise it shall be ignored. + * 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. + * NOTE 3: The attribute is only relevant if the virtual CP is instantiated in a cluster that supports configuration of IP + address pools for virtual CPs. Otherwise it shall be ignored. MetalLB is an example of a solution for + Kubernetes® that supports configuration of address pools for load balancer services. + * NOTE 4: The loadBalancerIp, addressPoolName and the externalIp attributes shall not be present at the same time. type: object required: - type properties: type: description: > - Identifier of layer(s) and protocol(s). - Permitted values: IP_OVER_ETHERNET. + The type of the IP addresses. + Permitted values: IPV4, IPV6. type: string enum: - IPV4 @@ -6679,28 +6678,29 @@ definitions: $ref: "#/definitions/IpAddress" addressPoolName: description: > - Name of an address pool from which the - container cluster will assign an IP address to - the virtual CP. See notes 3 and 4. + Name of an address pool from which the CIS cluster will assign an IP address to the virtual CP. + See notes 3 and 4. type: array items: type: string loadBalancerSourceRanges: description: > List of client IP address ranges allowed to access an external load balancer. See note 1. - 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" + type: array + items: + 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" diff --git a/src/SOL005/NSPerformanceManagement/definitions/SOL005NSPerformanceManagement_def.yaml b/src/SOL005/NSPerformanceManagement/definitions/SOL005NSPerformanceManagement_def.yaml index 47246d1..e5ec6c6 100644 --- a/src/SOL005/NSPerformanceManagement/definitions/SOL005NSPerformanceManagement_def.yaml +++ b/src/SOL005/NSPerformanceManagement/definitions/SOL005NSPerformanceManagement_def.yaml @@ -188,6 +188,7 @@ definitions: - objectInstanceIds - criteria - callbackUri + - _links properties: id: description: > @@ -201,8 +202,7 @@ definitions: $ref: "../../definitions/SOL005_def.yaml#/definitions/String" objectInstanceIds: description: > - Identifiers of the NS instances for which - performance information is collected. + Identifiers of the measured object instances for which performance information is collected. type: array items: $ref: "../../definitions/SOL005_def.yaml#/definitions/Identifier" @@ -210,13 +210,13 @@ definitions: 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. + 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. + 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/SOL005_def.yaml#/definitions/IdentifierInNs" @@ -239,7 +239,7 @@ definitions: properties: href: description: > - The Uri where the report can be obtained. + The URI where the report can be obtained. $ref: "../../definitions/SOL005_def.yaml#/definitions/Uri" readyTime: description: > @@ -253,11 +253,12 @@ definitions: description: > The size of the report file in bytes, if known. type: integer + minimum: 0 pmJobConnection: description: > - An access information and interface information of PM job to monitor - the PM of VNF instance by the VNFM. This can include for instance certain - interface endpoint URI together with necessary credentials to access it. + An access information and interface information of PM job to monitor the PM of VNF + instance by the VNFM. This can include for instance certain interface endpoint URI together with + necessary credentials to access it. type: array items: $ref: "../../definitions/SOL005_def.yaml#/definitions/MonitoringConnection" @@ -274,10 +275,11 @@ definitions: $ref: "../../definitions/SOL005_def.yaml#/definitions/Link" objects: description: > - Links to resources representing the measured object - instances for which performance information is - collected. Shall be present if the measured object instance - information is accessible as a resource. + 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/SOL005_def.yaml#/definitions/Link" -- GitLab From 7370e56f5768b1e9c8b30cdafb84a277079b3b35 Mon Sep 17 00:00:00 2001 From: "p.piscione" Date: Fri, 30 Aug 2024 09:52:59 +0000 Subject: [PATCH 7/7] Fixed indentation as per issue #38 --- .../SOL005NSPerformanceManagement_def.yaml | 52 +++++++++---------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/src/SOL005/NSPerformanceManagement/definitions/SOL005NSPerformanceManagement_def.yaml b/src/SOL005/NSPerformanceManagement/definitions/SOL005NSPerformanceManagement_def.yaml index e5ec6c6..e147b3e 100644 --- a/src/SOL005/NSPerformanceManagement/definitions/SOL005NSPerformanceManagement_def.yaml +++ b/src/SOL005/NSPerformanceManagement/definitions/SOL005NSPerformanceManagement_def.yaml @@ -254,35 +254,35 @@ definitions: The size of the report file in bytes, if known. type: integer minimum: 0 - pmJobConnection: + pmJobConnection: + description: > + An access information and interface information of PM job to monitor the PM of VNF + instance by the VNFM. This can include for instance certain interface endpoint URI together with + necessary credentials to access it. + type: array + items: + $ref: "../../definitions/SOL005_def.yaml#/definitions/MonitoringConnection" + _links: + description: > + Links for this resource. + type: object + required: + - self + properties: + self: description: > - An access information and interface information of PM job to monitor the PM of VNF - instance by the VNFM. This can include for instance certain interface endpoint URI together with - necessary credentials to access it. + URI of this resource. + $ref: "../../definitions/SOL005_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/SOL005_def.yaml#/definitions/MonitoringConnection" - _links: - description: > - Links for this resource. - type: object - required: - - self - properties: - self: - description: > - URI of this resource. - $ref: "../../definitions/SOL005_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/SOL005_def.yaml#/definitions/Link" + $ref: "../../definitions/SOL005_def.yaml#/definitions/Link" CreateThresholdRequest: description: > -- GitLab