From 6dea1ea0a5febbc60d3e6a01a48a17405e537b5f Mon Sep 17 00:00:00 2001 From: Pietro Piscione Date: Wed, 13 Dec 2023 15:54:14 +0100 Subject: [PATCH 01/10] SOL005_02, SOL005_03, SOL005_04, SOL005_25, SOL005_26, SOL005_28, SOL005_29, SOL005_32, SOL005_48 --- src/SOL005/APIVersion/APIVersion.yaml | 4 +- .../NFVICapacityInformation.yaml | 4 +- .../NFVICapacityInformationNotification.yaml | 4 +- src/SOL005/NSDManagement/NSDManagement.yaml | 6 +- .../NSDManagementNotification.yaml | 4 +- .../NSFaultManagement/NSFaultManagement.yaml | 4 +- .../NSFaultManagementNotification.yaml | 4 +- .../NSLCMCoordination/NSLCMCoordination.yaml | 4 +- .../NSLifecycleManagement.yaml | 6 +- .../SOL005NSLifecycleManagement_def.yaml | 231 ++++++++++++++++++ .../NSLifecycleManagementNotification.yaml | 4 +- .../NSPerformanceManagement.yaml | 4 +- .../NSPerformanceManagementNotification.yaml | 4 +- .../VNFPackageManagement.yaml | 4 +- .../VNFPackageManagementNotification.yaml | 4 +- .../VNFSnapshotPackageManagement.yaml | 4 +- 16 files changed, 263 insertions(+), 32 deletions(-) diff --git a/src/SOL005/APIVersion/APIVersion.yaml b/src/SOL005/APIVersion/APIVersion.yaml index 2dc88b2..38d98d2 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.4.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/04.04.01_60/gs_NFV-SOL005v040401p.pdf + 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 servers: - url: http://127.0.0.1/ diff --git a/src/SOL005/NFVICapacityInformation/NFVICapacityInformation.yaml b/src/SOL005/NFVICapacityInformation/NFVICapacityInformation.yaml index 26729a4..903fff6 100644 --- a/src/SOL005/NFVICapacityInformation/NFVICapacityInformation.yaml +++ b/src/SOL005/NFVICapacityInformation/NFVICapacityInformation.yaml @@ -19,8 +19,8 @@ info: version: 1.11.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 005 V4.4.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/04.04.01_60/gs_NFV-SOL005v040401p.pdf + 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 servers: - url: http://127.0.0.1/nfvici/v1 diff --git a/src/SOL005/NFVICapacityInformationNotification/NFVICapacityInformationNotification.yaml b/src/SOL005/NFVICapacityInformationNotification/NFVICapacityInformationNotification.yaml index da48d84..d8aec98 100644 --- a/src/SOL005/NFVICapacityInformationNotification/NFVICapacityInformationNotification.yaml +++ b/src/SOL005/NFVICapacityInformationNotification/NFVICapacityInformationNotification.yaml @@ -19,8 +19,8 @@ info: version: 1.11.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 005 V4.4.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/04.04.01_60/gs_NFV-SOL005v040401p.pdf + 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 servers: - url: http://127.0.0.1/callback/v1 diff --git a/src/SOL005/NSDManagement/NSDManagement.yaml b/src/SOL005/NSDManagement/NSDManagement.yaml index e6e4114..03a5bae 100644 --- a/src/SOL005/NSDManagement/NSDManagement.yaml +++ b/src/SOL005/NSDManagement/NSDManagement.yaml @@ -16,11 +16,11 @@ info: license: name: ETSI Forge copyright notice url: https://forge.etsi.org/etsi-forge-copyright-notice.txt - version: 2.11.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 + version: 2.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 005 V4.4.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/04.04.01_60/gs_NFV-SOL005v040401p.pdf + 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 servers: - url: http://127.0.0.1/nsd/v2 diff --git a/src/SOL005/NSDManagementNotification/NSDManagementNotification.yaml b/src/SOL005/NSDManagementNotification/NSDManagementNotification.yaml index 20c4cf9..6f6d88c 100644 --- a/src/SOL005/NSDManagementNotification/NSDManagementNotification.yaml +++ b/src/SOL005/NSDManagementNotification/NSDManagementNotification.yaml @@ -19,8 +19,8 @@ info: version: 2.11.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 005 V4.4.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/04.04.01_60/gs_NFV-SOL005v040401p.pdf + 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 servers: - url: http://127.0.0.1/callback/v2 diff --git a/src/SOL005/NSFaultManagement/NSFaultManagement.yaml b/src/SOL005/NSFaultManagement/NSFaultManagement.yaml index d6424b9..de02068 100644 --- a/src/SOL005/NSFaultManagement/NSFaultManagement.yaml +++ b/src/SOL005/NSFaultManagement/NSFaultManagement.yaml @@ -19,8 +19,8 @@ info: version: 1.11.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 005 V4.4.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/04.04.01_60/gs_NFV-SOL005v040401p.pdf + 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 servers: - url: http://127.0.0.1/nsfm/v1 diff --git a/src/SOL005/NSFaultManagementNotification/NSFaultManagementNotification.yaml b/src/SOL005/NSFaultManagementNotification/NSFaultManagementNotification.yaml index 5b595f4..dcf3eea 100644 --- a/src/SOL005/NSFaultManagementNotification/NSFaultManagementNotification.yaml +++ b/src/SOL005/NSFaultManagementNotification/NSFaultManagementNotification.yaml @@ -19,8 +19,8 @@ info: version: 1.11.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 005 V4.4.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/04.04.01_60/gs_NFV-SOL005v040401p.pdf + 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 servers: - url: http://127.0.0.1/callback/v1 diff --git a/src/SOL005/NSLCMCoordination/NSLCMCoordination.yaml b/src/SOL005/NSLCMCoordination/NSLCMCoordination.yaml index 03e7ae5..c1e780e 100644 --- a/src/SOL005/NSLCMCoordination/NSLCMCoordination.yaml +++ b/src/SOL005/NSLCMCoordination/NSLCMCoordination.yaml @@ -19,8 +19,8 @@ info: version: 1.11.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 005 V4.4.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/04.04.01_60/gs_NFV-SOL005v040401p.pdf + 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 servers: - url: http://127.0.0.1/lcmcoord/v1 diff --git a/src/SOL005/NSLifecycleManagement/NSLifecycleManagement.yaml b/src/SOL005/NSLifecycleManagement/NSLifecycleManagement.yaml index 1c7a7c7..81945e2 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.11.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 + version: 2.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 005 V4.4.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/04.04.01_60/gs_NFV-SOL005v040401p.pdf + 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 servers: - url: http://127.0.0.1/nslcm/v2 diff --git a/src/SOL005/NSLifecycleManagement/definitions/SOL005NSLifecycleManagement_def.yaml b/src/SOL005/NSLifecycleManagement/definitions/SOL005NSLifecycleManagement_def.yaml index a77d3fc..a4582ae 100644 --- a/src/SOL005/NSLifecycleManagement/definitions/SOL005NSLifecycleManagement_def.yaml +++ b/src/SOL005/NSLifecycleManagement/definitions/SOL005NSLifecycleManagement_def.yaml @@ -156,6 +156,202 @@ definitions: items: $ref: "../../definitions/SOL005_def.yaml#/definitions/DateTime" + + CertificateConfigurationInfo: + description: > + This type provides input information related to certificate management + type: object + required: + - securityPolicy + properties: + certificateBaseProfile: + description: Information for certificate profile. + type: array + items: + $ref: "../../definitions/SOL005_def.yaml#/definitions/Identifier" + securityPolicy: + description: Information for security policy to be satisfied for certificate. + type: array + items: + $ref: "#/definitions/SecurityPolicy" + delegationSupportedCertificateManagements: + description: Describes supported certificate management information. + $ref: "../../definitions/SOL005_def.yaml#/definitions/KeyValuePairs" + cmfInfo: + description: Information of CMF. + $ref: "#/definitions/CmfInfo" + + + + + CmfInfo: + type: object + description: > + This type provides input information related to CMF for certificate management + required: + - id + - endPoint + - supportedProtocol + properties: + id: + description: > + Identifier of this CMF information. + $ref: "../../definitions/SOL005_def.yaml#/definitions/Identifier" + endPoint: + description: > + End point of CMF instance. + type: object + required: + - ipAddress + - link + properties: + ipAddress: + description: > + An IP address of this end point. + $ref: "#/definitions/IpAddress" + link: + description: > + A link to this end point. + $ref: "../../definitions/SOL005_def.yaml#/definitions/Link" + supportedProtocol: + type: array + description: > + Supported protocol by CMF instance. + Permitted values: + CMP + CMPv2 + EST + SCEP + minumumElement: 1 + items: + type: string + enum: + - CMP + - CMPv2 + - EST + - SCEP + certificateChain: + description: Certificate chain that this CMF provides. + type: array + items: + $ref: "../../definitions/SOL005_def.yaml#/definitions/KeyValuePairs" + + + SecurityPolicy: + type: object + description: > + This type represents the input information related to certificate management. + required: + - id + properties: + id: + description: > + The identifier of this security policy. + $ref: "../../definitions/SOL005_def.yaml#/definitions/Identifier" + maxValidityPeriod: + description: > + Allowed max validity period for certificates (in days). + $ref: "../../definitions/SOL005_def.yaml#/definitions/Number" + allowedAlgorithm: + description: > + Allowed signature algorithm. + type: string + minimumKeyLength: + description: > + Minimum key length for certificates (in bytes). + $ref: "../../definitions/SOL005_def.yaml#/definitions/Number" + + + CertBaseProfile: + type: object + description: > + This type provides input information to override certificate base profile for certificate management. + NOTE: At least one overriding attributes shall be present, otherwise shall be absent. + minProperties: 2 + required: + - id + properties: + id: + description: > + The identifier of this certificate profile. + $ref: "../../definitions/SOL005_def.yaml#/definitions/Identifier" + issuer: + description: > + Issuer of certificates. See note. + type: string + issuerUniqueIdentifier: + description: > + Identifier of this issuer of certificates. See note. + type: string + subject: + description: > + Subject of certificates. See note. + $ref: "#/definitions/CertSubjectData" + subjectUniqueIdentifier: + description: > + Identifier of this subject of certificates. See note. + $ref: "../../definitions/SOL005_def.yaml#/definitions/Identifier" + basicConstraints: + description: > + Basic constraints of certificates. See note. + type: string + issuerAltName: + description: > + Alternative name of issuer of certificates in this NS. See note. + type: array + items: + type: string + subjectAltName: + description: > + Alternative name of subject of certificates. Shall be present + when this certificate is used for encrypted communication using + IP address and subjectAltName attribute of CertificateBaseProfile + in CertificateDesc of VNFD is empty (see ETSI GS NFV-IFA 011, clause 7.1.19.4). + See note. + type: array + items: + type: string + nameConstraints: + description: > + Name constraints of certificates. See note. + type: array + items: + type: string + + + + CertSubjectData: + type: object + + description: > + This type provides input information related to subject of certificate. + NOTE: At least one overriding attributes shall be present, otherwise shall be absent. + properties: + minProperties: 1 + commonName: + description: > + Information of certification target subject FQDN. + Can be set empty when this certificate is used for encrypted communication using IP address. + See note. + type: string + organization: + description: Information of certification target subject Organization. See note. + type: string + country: + description: Information of certification target subject Country. See note + type: string + state: + description: Information of certification target subject State. See note + type: string + locality: + description: nformation of certification target subject Locality. See note + type: string + emailAddress: + description: Information of certification contact email address. See note. + type: string + + + CreateNsRequest: type: object required: @@ -199,6 +395,41 @@ definitions: - GRACEFUL - FORCEFUL + + + + PaasServiceHandle: + description: > + This type provides information enabling the access and use of the PaaS Service by a VNF instance + or some other NS constituent. The type and format of the handle depends on the form that the PaaS + Service is formed. + type: object + required: + - id + properties: + id: + description: > + Identifier of this PaaS Service handle. + $ref: "../../definitions/SOL005_def.yaml#/definitions/Identifier" + interfaceInfo: + description: > + Information of the interface or interfaces to the PaaS Service instance, if applicable, + such as the URI of an interface endpoint to communicate with the PaaS Service instance. + $ref: "../../definitions/SOL005_def.yaml#/definitions/KeyValuePairs" + accessInfo: + description: > + Authentication credentials for accessing the PaaS Service instance. + If the PaasServiceHandle structure is part of an HTTP GET response payload body, + sensitive attributes that are children of this attribute (such as passwords) + shall not be included. + $ref: "../../definitions/SOL005_def.yaml#/definitions/KeyValuePairs" + extra: + description: > + PaaS Service instance specific additional information. The applicable structure, + and whether or not this attribute is available, is dependent on the type of the PaaS Service. + $ref: "../../definitions/SOL005_def.yaml#/definitions/KeyValuePairs" + + NsInstance: description: > This type represents a response for Query NS operation. diff --git a/src/SOL005/NSLifecycleManagementNotification/NSLifecycleManagementNotification.yaml b/src/SOL005/NSLifecycleManagementNotification/NSLifecycleManagementNotification.yaml index 979d5b8..0a769bd 100644 --- a/src/SOL005/NSLifecycleManagementNotification/NSLifecycleManagementNotification.yaml +++ b/src/SOL005/NSLifecycleManagementNotification/NSLifecycleManagementNotification.yaml @@ -17,8 +17,8 @@ info: version: 2.11.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 005 V4.4.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/04.04.01_60/gs_NFV-SOL005v040401p.pdf + 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 servers: - url: http://127.0.0.1/callback/v2 diff --git a/src/SOL005/NSPerformanceManagement/NSPerformanceManagement.yaml b/src/SOL005/NSPerformanceManagement/NSPerformanceManagement.yaml index e5568da..4f0a936 100644 --- a/src/SOL005/NSPerformanceManagement/NSPerformanceManagement.yaml +++ b/src/SOL005/NSPerformanceManagement/NSPerformanceManagement.yaml @@ -19,8 +19,8 @@ info: version: 2.11.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 005 V4.4.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/04.04.01_60/gs_NFV-SOL005v040401p.pdf + 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 servers: - url: http://127.0.0.1/nspm/v2 diff --git a/src/SOL005/NSPerformanceManagementNotification/NSPerformanceManagementNotification.yaml b/src/SOL005/NSPerformanceManagementNotification/NSPerformanceManagementNotification.yaml index 1eff66e..c2baed3 100644 --- a/src/SOL005/NSPerformanceManagementNotification/NSPerformanceManagementNotification.yaml +++ b/src/SOL005/NSPerformanceManagementNotification/NSPerformanceManagementNotification.yaml @@ -19,8 +19,8 @@ info: version: 2.11.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 005 V4.4.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/04.04.01_60/gs_NFV-SOL005v040401p.pdf + 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 servers: - url: http://127.0.0.1/callback/v2 diff --git a/src/SOL005/VNFPackageManagement/VNFPackageManagement.yaml b/src/SOL005/VNFPackageManagement/VNFPackageManagement.yaml index 899bc16..4833a52 100644 --- a/src/SOL005/VNFPackageManagement/VNFPackageManagement.yaml +++ b/src/SOL005/VNFPackageManagement/VNFPackageManagement.yaml @@ -19,8 +19,8 @@ info: version: 2.11.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 005 V4.4.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/04.04.01_60/gs_NFV-SOL005v040401p.pdf + 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 servers: - url: http://127.0.0.1/vnfpkgm/v2 diff --git a/src/SOL005/VNFPackageManagementNotification/VNFPackageManagementNotification.yaml b/src/SOL005/VNFPackageManagementNotification/VNFPackageManagementNotification.yaml index 81874d2..d9c3fc5 100644 --- a/src/SOL005/VNFPackageManagementNotification/VNFPackageManagementNotification.yaml +++ b/src/SOL005/VNFPackageManagementNotification/VNFPackageManagementNotification.yaml @@ -19,8 +19,8 @@ info: version: 2.11.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 005 V4.4.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/04.04.01_60/gs_NFV-SOL005v040401p.pdf + 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 servers: - url: http://127.0.0.1/callback/v2 diff --git a/src/SOL005/VNFSnapshotPackageManagement/VNFSnapshotPackageManagement.yaml b/src/SOL005/VNFSnapshotPackageManagement/VNFSnapshotPackageManagement.yaml index df5159c..0f1eec4 100644 --- a/src/SOL005/VNFSnapshotPackageManagement/VNFSnapshotPackageManagement.yaml +++ b/src/SOL005/VNFSnapshotPackageManagement/VNFSnapshotPackageManagement.yaml @@ -19,8 +19,8 @@ info: version: 1.11.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 005 V4.4.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/04.04.01_60/gs_NFV-SOL005v040401p.pdf + 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 servers: - url: http://127.0.0.1/vnfsnapshotpkgm/v1 -- GitLab From af35b61d992c3fc3b61c81544cf171b39d5725bd Mon Sep 17 00:00:00 2001 From: Pietro Piscione Date: Wed, 13 Dec 2023 23:53:04 +0100 Subject: [PATCH 02/10] SOL005 to SOL009, SOL0017, SOL023, SOL024, SOL027, SOL031, SOL033, SOL049 --- .../SOL005NSLifecycleManagement_def.yaml | 485 +++++++++++++++++- 1 file changed, 464 insertions(+), 21 deletions(-) diff --git a/src/SOL005/NSLifecycleManagement/definitions/SOL005NSLifecycleManagement_def.yaml b/src/SOL005/NSLifecycleManagement/definitions/SOL005NSLifecycleManagement_def.yaml index a4582ae..263cf14 100644 --- a/src/SOL005/NSLifecycleManagement/definitions/SOL005NSLifecycleManagement_def.yaml +++ b/src/SOL005/NSLifecycleManagement/definitions/SOL005NSLifecycleManagement_def.yaml @@ -182,6 +182,47 @@ definitions: $ref: "#/definitions/CmfInfo" + CmfData: + type: object + description: > + This type provides input information related to CMF for certificate management. + required: + - endPoint + - supportedProtocol + properties: + endPoint: + description: > + End point of CMF instance. + type: object + required: + - ipAddress + - link + properties: + ipAddress: + description: > + An IP address of this end point. + $ref: "#/definitions/IpAddress" + link: + description: > + A link to this end point. + $ref: "../../definitions/SOL005_def.yaml#/definitions/Link" + supportedProtocol: + type: array + description: > + Supported protocol by CMF instance. + Permitted values: + * CMP + * CMPv2 + * EST + * SCEP + minumumElement: 1 + items: + type: string + enum: + - CMP + - CMPv2 + - EST + - SCEP CmfInfo: @@ -222,7 +263,7 @@ definitions: CMPv2 EST SCEP - minumumElement: 1 + minItems: 1 items: type: string enum: @@ -262,12 +303,13 @@ definitions: $ref: "../../definitions/SOL005_def.yaml#/definitions/Number" - CertBaseProfile: + CertificateBaseProfile: type: object description: > - This type provides input information to override certificate base profile for certificate management. - NOTE: At least one overriding attributes shall be present, otherwise shall be absent. - minProperties: 2 + This type provides input information to override certificate + base profile for certificate management. + NOTE: At least one overriding attributes shall be present, + otherwise shall be absent. required: - id properties: @@ -318,20 +360,18 @@ definitions: items: type: string - - + CertSubjectData: type: object - description: > This type provides input information related to subject of certificate. NOTE: At least one overriding attributes shall be present, otherwise shall be absent. - properties: - minProperties: 1 + properties: commonName: description: > Information of certification target subject FQDN. - Can be set empty when this certificate is used for encrypted communication using IP address. + Can be set empty when this certificate is used for + encrypted communication using IP address. See note. type: string organization: @@ -350,8 +390,6 @@ definitions: description: Information of certification contact email address. See note. type: string - - CreateNsRequest: type: object required: @@ -372,7 +410,49 @@ definitions: description: > Human-readable description of the NS instance to be created. type: string - + certificateConfigurationData: + description: > + Configuration for certificate management such as + certificate profile, information of CMF and security policy + in this NS. It shall be present when using delegation + mode, otherwise it shall be absent. + $ref: "#/definitions/CertificateConfigurationData" + + CertificateConfigurationData: + description: > + This type represents the input information related to certificate management. + type: object + required: + - overridingCertificateProfile + properties: + overridingCertificateProfile: + description: > + Overriding certificate profile. This overrides the + certificateBaseProfile provided in the VNFD, and + the CA and CMF can additionally override aspects + of this certificateBaseProfile at later point in the + VNF lifecycle if necessary to meet operator + security policy. + type: array + items: + $ref: "#/definitions/CertificateBaseProfile" + + securityPolicy: + description: > + Security policy to be satisfied for certificate. + type: array + minItems: 1 + items: + $ref: "#/definitions/SecurityPolicy" + cmfData: + description: > + Information for CMF. Shall be present in delegation mode. + type: array + minItems: 1 + items: + #$ref: "#/definitions/CmfData" + type: string + CancelModeType: description: > Cancellation mode. @@ -397,6 +477,67 @@ definitions: + PaasServiceInfo: + description: > + This type provides information about a PaaS Service that is used + by a VNF instance or some other NS constituent. he PaasServiceInfo is + comprised of various sets of information. Some information comes from the + descriptors (e.g.,VNFD or NSD), other information comes from the PaaS Service + assets provided by the NFVO to the VNFM, and other information is provided + as runtime information about the usage of the PaaS Service. + + NOTE: Either a "nsPaasServiceRequestId" or a "vnfPaasServiceRequestId" shall + be provided, but not both. + type: object + required: + - id + - paasServiceId + - paasServiceType + - paasServiceHandle + properties: + id: + description: > + Identifier of this PaaS Service Information.. + $ref: "../../definitions/SOL005_def.yaml#/definitions/Identifier" + paasServiceId: + description: > + Identifier of the assigned PaaS Service as managed by the PaaS + Services Management (PSM) function. + $ref: "../../definitions/SOL005_def.yaml#/definitions/Identifier" + paasServiceType: + description: > + The type of PaaS Service. The value of this attribute is + expected to be matched against values of the + registered PaaS Services in the PSR. + type: string + paasServiceVersion: + description: > + Version of the PaaS Service. It shall be present if the + PaaS Service is versioned + $ref: "../../definitions/SOL005_def.yaml#/definitions/Version" + nsPaasServiceRequestId: + description: > + Identifier of the PaaS Service request in the NSD that + maps to the assigned PaaS Service. See note + $ref: "#/definitions/IdentifierInNsd" + vnfPaasServiceRequestId: + description: > + Identifier of the PaaS Service request in the VNFD + that maps to the assigned PaaS Service. See note. + $ref: "#/definitions/IdentifierInVnfd" + paasServiceHandle: + description: > + A handle enabling the access and use of the PaaS + Service by the NS constituent. + $ref: "#/definitions/PaasServiceHandle" + additionalInfo: + description: > + Additional information which is specific to the PaaS + Service, its type, and which is available from the PaaS + Service instance + $ref: "../../definitions/SOL005_def.yaml#/definitions/KeyValuePairs" + + PaasServiceHandle: description: > @@ -429,6 +570,63 @@ definitions: and whether or not this attribute is available, is dependent on the type of the PaaS Service. $ref: "../../definitions/SOL005_def.yaml#/definitions/KeyValuePairs" + MirroringInfo: + description: > + This type represents the runtime information that the NFVO holds about a Data Flow Mirroring. + + NOTE: It is responsibility of the NFVO to map the mirroringIds exposed towards the API consumer + on the Os-Ma-nfvo reference point with the corresponding identifiers of the data flow mirroring + that are created towards the VIM. + type: object + required: + - mirroringId + - mirroringName + - description + - collectorDetails + - vnfInstanceId + - cpInstanceId + - dataFlowData + properties: + mirroringId: + description: > + Identifier of the NS instance. + $ref: "../../definitions/SOL005_def.yaml#/definitions/Identifier" + mirroringName: + description: > + Name of Data Flow Mirroring. + type: string + description: + description: > + Information description of Data Flow Mirroring + type: string + collectorDetails: + description: > + Information about where the mirrored flow is to be delivered + $ref: "#/definitions/CollectorDetails" + vnfInstanceId: + description: > + Identifier of the VNF instance from where the data flows + are requested to be mirrored. + type: array + minItems: 1 + items: + $ref: "../../definitions/SOL005_def.yaml#/definitions/Identifier" + cpInstanceId: + description: > + Identifier of the CP instance from where the data flows + are mirrored. + type: array + minItems: 1 + items: + $ref: "../../definitions/SOL005_def.yaml#/definitions/Identifier" + dataFlowData: + description: > + Information about the data flows to be mirrored + type: array + minItems: 1 + items: + $ref: "#/definitions/DataFlowData" + NsInstance: description: > @@ -473,15 +671,13 @@ definitions: description: > Describes version dependencies currently valid for the nested NS instance. Identifies versions of descriptors of other constituents in the NSD upon which the nested NS depends. - The dependencies may be described for the NSD referenced in this NsInfo with nsdId and for + The dependencies may be described for the NSD referenced in this NsInstance with nsdId and for NSDs with the same "nsdExtInvariantId". There shall not be more than one versionDependency present with the same dependentConstituentId. - It may be present for the NsInfo of a nested NS. It shall not be present otherwise. + It may be present for the NsInstance of a nested NS. It shall not be present otherwise. type: array items: $ref: "#/definitions/VersionDependency" - - nsdInfoId: description: > Identifier of the NSD information object on which the @@ -586,6 +782,13 @@ definitions: type: array items: $ref: "#/definitions/WanConnectionInfo" + dataFlowMirroringInfo: + description: > + Information related to Data Flow Mirroring associated to this NS instance + type: array + items: + $ref: "#/definitions/MirroringInfo" + _links: type: object description: Links to resources related to this resource. @@ -2755,7 +2958,29 @@ definitions: items: $ref: "#/definitions/DataFlowMirroringData" - + DeployableModulesInConstituentVnf: + description: > + This type represents the input information to indicate the selected deployable + modules of a VNF instance. + type: object + required: + - profileId + - selectedDeployableModule + properties: + profileId: + description: > + Indicates a profileId of a VNF instance where the + selection of the deployable modules applies + $ref: "#/definitions/IdentifierInNsd" + selectedDeployableModule: + description: > + References a selected deployable module, as + defined in the VNFD, for the VNF instances created + from the VNF profile indicated in profileId attribute. + type: array + items: + $ref: "#/definitions/IdentifierInVnf" + ParamsForNestedNs: description: > This type specifies additional parameters on a per-nested NS instance basis. @@ -2808,6 +3033,13 @@ definitions: that the NFVO keeps about the profile. See note 3. $ref: "#/definitions/OverridingVersionDependency" + deployableModulesInConstituentVnf: + description: > + Indicates the selected deployable modules of a VNF + instance which is a constituent of the NS instance + type: array + items: + $ref: "#/definitions/DeployableModulesInConstituentVnf" ParamsForVnf: @@ -3220,6 +3452,64 @@ definitions: $ref: "../../definitions/SOL005_def.yaml#/definitions/DateTime" + SelectVnfDeployableModuleData: + description: > + This type represents the information used to select the deployable modules + of an existing VNF instance. It is used to select deployable modules of a VNF + instance that were previously not selected or to unselect deployable modules + of a VNF instance that were previously selected. The target size expressed + as a list of scale levels only refers to VNFCs that are instantiated as a + result of this operation. The NFVO shall then invoke the SelectVnfDeployableModules + operation towards the appropriate VNFM. + + NOTE: Thus, the “select deployable modules of a VNF instance” NS update type cannot be used as a scale VNF + operation to scale VNFCs that were already instantiated. + type: object + required: + - vnfInstanceId + properties: + vnfInstanceId: + description: > + Identifier of the VNF instance + $ref: "../../definitions/SOL005_def.yaml#/definitions/Identifier" + selectedDeployableModule: + description: > + References a selected deployable module, as defined + in the VNFD, for the VNF instance. VNFCs based on + VDUs that belong to deployable modules listed in this + attribute will be instantiated if not already instantiated. + VNFCs based on VDUs that belong to deployable + modules not listed in this attribute and that were + already instantiated will be terminated. + type: array + items: + $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVnfd" + targetScaleLevelInfo: + description: > + For each VNF scaling aspect, it defines the target scale level to which + the VNF is to be scaled. If this attribute is not present or if there + are VDUs that belong to selected deployable modules that take no + part in any of the scaling aspects indicated in this attribute, the + VNFCs based on those VDUs shall be instantiated according to the currently + valid VNF scale level or instantiation level. This attribute should only + contain scale level information of scaling aspects associated to VDUs that + will be used to instantiate VNFCs as a result of this operation. If it + contains other scale level information it shall be ignored. See note. + The VNF Provider defines in the VNFD whether or not a particular VNF + supports scaling according to this parameter. Such a property in the + VNFD applies for all instances of a particular VNF. + type: array + items: + $ref: "#/definitions/VnfScaleInfo" + additionalParam: + description: > + Additional parameters passed by the OSS/BSS as + input to the Select VNF deployable modules operation, + specific to the VNF being affected by the operation, as + declared in the VNFD (see clause 7.1.5.14 in ETSI GS + NFV IFA 011) + $ref: "../../definitions/SOL005_def.yaml#/definitions/KeyValuePairs" + UpdateNsRequest: description: > This operation supports the update of a NS instance operation. @@ -3287,6 +3577,10 @@ definitions: * MODIFY_WAN_CONNECTION_INFO: Modify WAN related connectivity information. * CREATE_NS_VIRTUAL_LINK: Create an NsVirtualLink instance. * DELETE_NS_VIRTUAL_LINK: Delete an NsVirtualLink instance. + * CREATE_DATA_FLOW_MIRRORING: Create a new data flow mirroring + * DELETE_DATA_FLOW_MIRRORING: Delete an existing data flow mirroring + * UPDATE_DATA_FLOW_MIRRORING: Update an existing data flow mirroring + * SELECT_VNF_DEPL_MODULES: Select deployable modules of a VNF instance type: string enum: - ADD_VNF @@ -3316,6 +3610,10 @@ definitions: - MODIFY_WAN_CONNECTION_INFO - CREATE_NS_VIRTUAL_LINK - DELETE_NS_VIRTUAL_LINK + - CREATE_DATA_FLOW_MIRRORING + - DELETE_DATA_FLOW_MIRRORING + - UPDATE_DATA_FLOW_MIRRORING + - SELECT_VNF_DEPL_MODULES addVnfIstance: description: > Identifies an existing VNF instance to be added to the @@ -3537,6 +3835,43 @@ definitions: If not present, default value applies. See notes 6, 7, 8, 9 and 10. $ref: "#/definitions/FeasibilityCheckReserveType" + createDataFlowMirroring: + description: > + Information of the Data Flow Mirroring that are + associated with the NS instance. This parameter + shall be present only if updateType = CREATE_DATA_FLOW_MIRRORING + type: array + items: + $ref: "#/definitions/CreateDataFlowMirroring" + deleteDataFlowMirroringId: + description: > + Identifier of the "DataFlowMirroringData" structure that + are associated with the NS instance to be deleted. This + parameter shall be present only if updateType = + DELETE_DATA_FLOW_MIRRORING + type: array + items: + $ref: "../../definitions/SOL005_def.yaml#/definitions/Identifier" + updateDataFlowMirroring: + description: > + Information on the Data Flow Mirroring associated to the + NS instance to be updated. This parameter shall be + present only if updateType = + UPDATE_DATA_FLOW_MIRRORING + type: array + items: + $ref: "#/definitions/UpdateDataFlowMirroring" + + selectVnfDeployableModuleData: + description: > + Specify the data needed for selecting deployable + modules of a VNF instance. This parameter shall be + present only if updateType= + SELECT_VNF_DEPL_MODULES. + type: array + items: + $ref: "#/definitions/SelectVnfDeployableModuleData" + InstantiateVnfData: @@ -4641,7 +4976,7 @@ definitions: This type provides information about added, deleted and modified VNFs. NOTE: At least one of the attributes "changedVnfInfo", "changedExtConnectivity" - or "modificationsTriggeredByVnfPkgChange" shall be present. Not more than one + or "modificationsTriggeredByVnfPkgChange" or “changedCertificateInfo” shall be present. Not more than one of "changedVnfInfo" and "modificationsTriggeredByVnfPkgChange" shall be present. type: object required: @@ -4720,7 +5055,8 @@ definitions: changedInfo: description: > Information about the changed VNF instance - information, including VNF configurable properties,if applicable. + information, including VNF configurable properties, + and certificate content if applicable. When the "changedInfo" attribute is present, either the "changedVnfInfo" attribute or the "changedExtConnectivity" attribute or both shall be present. @@ -4760,6 +5096,113 @@ definitions: Shall be absent if the "operation" attribute is different from "CHANGE_VNFPKG". See note. $ref: "#/definitions/ModificationsTriggeredByVnfPkgChange" + changedCertificateInfo: + description: > + Information about changed certificate, if + applicable. See note + type: array + items: + $ref: "#/definitions/CertificateInfo" + + CertificateContent: + description: > + This type provides input information related to certificate content. + + NOTE : The CertificateDesc data type is defined in clause 7.1.19.2 of + ETSI GS NFV IFA 011 + type: object + required: + - id + - certficateDescId + - certificateType + properties: + id: + description: > + Identifier of this certificate. + $ref: "../../definitions/SOL005_def.yaml#/definitions/Identifier" + certficateDescId: + description: > + Identifier of certificate description in VNFD to be used to issue this + certificate. See note. + $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVnfd" + certificateType: + description: > + Type of this certificate. + Values: + * VNFCI_CERT + * VNFOAM_CERT + type: string + enum: + - VNFCI_CERT + - NFOAM_CERT + supportedCertificateManagement: + description: > + Describes supported certificate management information. + $ref: "../../definitions/SOL005_def.yaml#/definitions/KeyValuePairs" + version: + description: > + Version of this certificate + $ref: "../../definitions/SOL005_def.yaml#/definitions/Version" + serialNumber: + description: > + Serial number of this certificate + type: integer + signatureAlgorithm: + description: > + Algorithm of this certificate’s signature. + type: string + issuer: + description: > + Issuer of this certificate. + type: string + notBefore: + description: > + Start date of valid period for this certificate. + $ref: "../../definitions/SOL005_def.yaml#/definitions/DateTime" + notAfter: + description: > + End date of valid period for this certificate. + $ref: "../../definitions/SOL005_def.yaml#/definitions/DateTime" + subject: + description: > + Subject of this certificate. + type: string + publicKeyAlgorithm: + description: > + Algorithm of this certificate’s public key + type: string + certificateExtensions: + description: > + Extension of this certificate. + type: string + + + CertificateInfo: + description: > + This type provides input information related to certificate and certificate management. + type: object + required: + - id + properties: + id: + description: > + Identifier of this certificate information. + $ref: "../../definitions/SOL005_def.yaml#/definitions/Identifier" + certificateConfigurationInfo: + description: > + Configuration for certificate management such as + certificate profile, information of CMF and security + policy + $ref: "#/definitions/CertificateConfigurationInfo" + certificateContents: + description: > + Information for contents of issued certificates. The + information contained in this attribute may be updated + over time during the VNF LCM, e.g. certificate(s) + renewal. + type: array + items: + $ref: "#/definitions/CertificateContent" AffectedPnf: description: > -- GitLab From 099b2c684ef8fb12a0a9d7c9a3bcb115edcd613e Mon Sep 17 00:00:00 2001 From: Pietro Piscione Date: Thu, 14 Dec 2023 10:58:01 +0100 Subject: [PATCH 03/10] SOL005_10 to SOL005_16 both included --- .../SOL005NSLifecycleManagement_def.yaml | 110 ++++++++++++++++-- 1 file changed, 100 insertions(+), 10 deletions(-) diff --git a/src/SOL005/NSLifecycleManagement/definitions/SOL005NSLifecycleManagement_def.yaml b/src/SOL005/NSLifecycleManagement/definitions/SOL005NSLifecycleManagement_def.yaml index 263cf14..88b5dcb 100644 --- a/src/SOL005/NSLifecycleManagement/definitions/SOL005NSLifecycleManagement_def.yaml +++ b/src/SOL005/NSLifecycleManagement/definitions/SOL005NSLifecycleManagement_def.yaml @@ -3060,6 +3060,13 @@ 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. + NOTE 5: If the referenced targetScaleLevelInfo attribute contain information related to VNFCs + that will not be instantiated due to the selection of deployable modules, when passed + to the VNFM, the information is stored in the VNFM for later use and included in the + instantiatedVnfInfo, as described in clause 5.5.2.4 of ETSI GS NFV-SOL 003. + NOTE 6: When the ParamsForVnf information element is used in as part of AssocNewNsdVersionData it can be + applied to already existing VNF instances. + type: object required: - vnfProfileId @@ -3103,12 +3110,11 @@ definitions: 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 note 4 + constituents (e.g. VDU level) to be instantiated. + See notes 4 and 5. type: array items: $ref: "#/definitions/VnfScaleInfo" - - vnfInstanceName: description: > Human-readable name of the VNF instance to be created. @@ -3151,8 +3157,18 @@ 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 [29]. + NFV-IFA 011. $ref: "../../definitions/SOL005_def.yaml#/definitions/KeyValuePairs" + selectedDeployableModule: + description: > + References a selected deployable module, as defined in + the VNFD. Only VNFCs based on VDUs that belong to + deployable modules listed in this attribute are requested + to be instantiated or preserved if they were already + instantiated. See note 6 + type: array + items: + $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVnfd" LocationConstraints: description: > @@ -4088,6 +4104,15 @@ definitions: type: array items: $ref: "#/definitions/OverridingVersionDependency" + selectedDeployableModule: + description: > + References a selected deployable module, as + defined in the VNFD. Only VNFCs based on + VDUs that belong to deployable modules listed in + this attribute are requested to be instantiated. + type: array + items: + $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVnfd" @@ -4182,6 +4207,25 @@ definitions: operation defined in ETSI GS NFV-SOL 003. $ref: "../../definitions/SOL005_def.yaml#/definitions/KeyValuePairs" + selectedDeployableModule: + description: > + References a selected deployable module, as defined in + the VNFD. Only VNFCs based on VDUs that belong to + deployable modules listed in this attribute are requested + to be instantiated or preserved if they were already + instantiated. + type: array + items: + $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVnfd" + certificateConfigurationData: + description: > + Configuration for certificate management such as + certificate profile and security policy in this VNF. Can be + present when setting a new certificate to the VNF + instance in delegation mode. Otherwise shall not be + present. + $ref: "#/definitions/CertificateConfigurationData" + OperateVnfData: description: > This type represents a VNF instance for which the operational state @@ -4337,6 +4381,14 @@ definitions: the external connectivity change process, specific to the VNF instance being changed. $ref: "../../definitions/SOL005_def.yaml#/definitions/KeyValuePairs" + certificateConfigurationData: + description: > + Configuration for certificate management such as + certificate profile and security policy in this VNF. Can be + present when setting a new certificate to the VNF + instance in delegation mode. Otherwise shall not be + present. + $ref: "#/definitions/CertificateConfigurationData" AssocNewNsdVersionData: description: > @@ -4699,6 +4751,14 @@ definitions: Identifier of the instantiation level of the deployment flavour to be instantiated. If not present, the default instantiation level as declared in the NSD is instantiated. $ref: "#/definitions/IdentifierInNsd" + deployableModulesInConstituentVnf: + description: > + Indicates the selected deployable modules of a VNF instance which is a constituent + of the NS instance. If this attribute is not present, the deployable modules + that were selected in the VNF instance prior to the NS LCM operation remain valid. + type: array + items: + $ref: "#/definitions/DeployableModulesInConstituentVnf" AddPnfData: description: > @@ -5898,7 +5958,12 @@ definitions: an instantiation level of that DF as defined in the VNFD, or given as a list of scale levels, one per scaling aspect of that DF. Instantiation levels and scaling aspects are declared in the VNFD. The NFVO shall then invoke the ScaleVnfToLevel operation towards the appropriate VNFM. - NOTE: Either the vnfInstantiationLevelId attribute or the vnfScaleInfo attribute shall be included. + + NOTE 1: Either the vnfInstantiationLevelId attribute or the vnfScaleInfo attribute shall be included. + NOTE 2: If the referenced instantiationLevel or the scaleInfo attribute contain information related to VNFCs that are not + going to be instantiated due to the selection of deployable modules, when passed to the VNFM, the information + is stored in the VNFM for later use and included in the instantiatedVnfInfo, as described in clause 5.5.2.6 of + ETSI GS NFV-SOL 003. type: object anyOf: - required: @@ -5909,13 +5974,13 @@ definitions: vnfInstantiationLevelId: description: > Identifier of the target instantiation level of the current - deployment flavor to which the VNF is requested to be scaled. See note. + deployment flavor to which the VNF is requested to be scaled. See notes 1 and 2. $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVnfd" vnfScaleInfo: description: > For each scaling aspect of the current deployment flavor, indicates the target scale level to which the VNF - is to be scaled. See note. + is to be scaled. See notes 1 and 2. type: array items: $ref: "#/definitions/VnfScaleInfo" @@ -7273,9 +7338,12 @@ definitions: * Changes related to the VNFD, such as correction of bugs in the VNFD, changes in the naming scheme of VNFD components (e.g. name of the VDU, vduId), and adding/removing descriptors of VNF Package changes (VnfPackageChangeInfo). - NOTE: A VnfProfile, NsProfile or PnfProfile may contain multiple VersionDependencies as it may describe the version - dependencies of the descriptor referenced in the profile or of other descriptors with the same external invariant - identifier. + NOTE 1: A VnfProfile, NsProfile or PnfProfile may contain multiple VersionDependencies as it may describe the version + dependencies of the descriptor referenced in the profile or of other descriptors with the same external invariant + 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. + type: object required: - vnfInstanceId @@ -7335,6 +7403,28 @@ definitions: type: array items: $ref: "#/definitions/OverridingVersionDependency" + selectedDeployableModule: + description: > + References a selected deployable module, as defined in the VNFD. + If this attribute is present only VNFCs based on VDUs that belong to deployable + modules listed in this attribute are requested to be instantiated or preserved + if they were already instantiated. + If this attribute is not present the deployable modules that were selected before + the operation, and that still are defined in the VNFD in the destination package, + or the corresponding ones according to the component + mappings, remain valid. See note 2. + type: array + items: + $ref: "#/definitions/IdentifierInVnf" + certificateConfigurationData: + description: > + Configuration for certificate management such as + certificate profile and security policy in this VNF. Can be + present when setting a new certificate to the VNF + instance in delegation mode. Otherwise shall not be + present + $ref: "#/definitions/CertificateConfigurationData" + DeleteVnfSnapshotData: description: > -- GitLab From 90550517b2c009b46316c9e0c5dde89e7399d978 Mon Sep 17 00:00:00 2001 From: Pietro Piscione Date: Thu, 14 Dec 2023 11:32:25 +0100 Subject: [PATCH 04/10] SOL005_18 to SOL005_22 included --- .../SOL005NSLifecycleManagement_def.yaml | 122 ++++++++++++++++-- 1 file changed, 110 insertions(+), 12 deletions(-) diff --git a/src/SOL005/NSLifecycleManagement/definitions/SOL005NSLifecycleManagement_def.yaml b/src/SOL005/NSLifecycleManagement/definitions/SOL005NSLifecycleManagement_def.yaml index 88b5dcb..c4badf7 100644 --- a/src/SOL005/NSLifecycleManagement/definitions/SOL005NSLifecycleManagement_def.yaml +++ b/src/SOL005/NSLifecycleManagement/definitions/SOL005NSLifecycleManagement_def.yaml @@ -489,11 +489,18 @@ definitions: NOTE: Either a "nsPaasServiceRequestId" or a "vnfPaasServiceRequestId" shall be provided, but not both. type: object - required: - - id - - paasServiceId - - paasServiceType - - paasServiceHandle + oneOf: + - required: + - paasServiceId + - paasServiceType + - paasServiceHandle + - nsPaasServiceRequestId + - required: + - paasServiceId + - paasServiceType + - paasServiceHandle + - vnfPaasServiceRequestId + properties: id: description: > @@ -519,12 +526,12 @@ definitions: description: > Identifier of the PaaS Service request in the NSD that maps to the assigned PaaS Service. See note - $ref: "#/definitions/IdentifierInNsd" + $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInNsd" vnfPaasServiceRequestId: description: > Identifier of the PaaS Service request in the VNFD that maps to the assigned PaaS Service. See note. - $ref: "#/definitions/IdentifierInVnfd" + $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVnfd" paasServiceHandle: description: > A handle enabling the access and use of the PaaS @@ -874,7 +881,7 @@ definitions: the values of attributes in the VnfInstance that have corresponding attributes in the VNFD shall be kept in sync with the values in the VNFD. NOTE 2: ETSI GS NFV-SOL 001 specifies the structure and format of the VNFD based on TOSCA specifications. - NOTE 3: VNF configurable properties are sometimes also referred to as configuration parameters applicable + NOTE 3: These attributes are sometimes also referred to as configuration parameters applicable to a VNF. Some of these are set prior to instantiation and cannot be modified if the VNF is instantiated, some are set prior to instantiation (are part of initial configuration) and can be modified later, and others can be set only after instantiation. The applicability of certain configuration may depend @@ -885,6 +892,10 @@ definitions: multi-site VL instance (refer to clause 6.5.3.59). NOTE 5: Even though externally-managed internal VLs are also used for VNF-internal connectivity, they shall not be listed in the "vnfVirtualLinkResourceInfo" attribute as this would be redundant. + NOTE 6: The scale level indicated in “scaleStatus” for a scaling aspect that has not been deployed due to the selection + of deployable modules will be used to instantiate the related VNFCs if a VNF LCM operation changes the + selected deployable modules and the related VNFCs are instantiated, unless the VNF LCM operation explicitly + indicates the scale level for the aspect. type: object required: - id @@ -977,6 +988,17 @@ definitions: In addition, the provisions in clause 6.7 shall apply. $ref: "../../definitions/SOL005_def.yaml#/definitions/KeyValuePairs" + certificateInfo: + description: > + Information about certificate and certificate management in this VNF. Shall + be present when using delegation mode, otherwise shall be absent. + This attribute can be modified with the PATCH method. + Content of this attribute shall not be either added (if previously not set) or + removed (if previously set) by using the "ModifyVnfInfoData" structure. + Modifications to these attributes can be requested using the "ModifyVnfInfoData" + structure. + See note 3 + $ref: "#/definitions/CertificateInfo" vimId: description: > Identifier of a VIM that manages resources for the VNF instance. @@ -1012,8 +1034,14 @@ definitions: $ref: "#/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. + 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. For an aspect that has not been deployed because it consists of VDUs that + belong to a deployable module that has not been selected (or to multiple deployable modules, none of + which have been selected), it indicates the scale level that has been requested in the instantiation + or in a scaling operation, or, if none has been requested in any of them, the scale level + applicable to the aspect based on the default instantiation level. See note 6. + See clause B.2 of ETSI GS NFV-SOL 003 for an explanation of VNF scaling. type: array items: $ref: "#/definitions/VnfScaleInfo" @@ -1026,6 +1054,15 @@ definitions: type: array items: $ref: "#/definitions/VnfScaleInfo" + selectedDeployableModule: + description: > + References a currently selected deployable + module, as defined in the VNFD, that has + already completed the instantiation of its + VNFCs. + type: array + items: + $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVnf" extCpInfo: description: > Information about the external CPs exposed by the VNF instance. @@ -1111,6 +1148,12 @@ definitions: type: array items: $ref: "#/definitions/McioInfo" + vnfPaasServiceInfo: + description: > + Information on the PaaS Services assigned and used by the VNF instance. + type: array + items: + $ref: "#/definitions/PaasServiceInfo" metadata: description: > Additional VNF-specific attributes that provide @@ -1145,10 +1188,14 @@ definitions: VirtualCpInfo: - description: 'This type represents the 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 + description: > + 'This type represents the information related to a virtual CP instance of a VNF. + + NOTE 1: 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 "vduId" values.' + NOTE 2: The information can be omitted because it is already available as part of the external CP information in the + VnfExtCpInfo structure type: object required: - cpInstanceId @@ -1175,6 +1222,8 @@ definitions: cpProtocolInfo: description: > Protocol information for this CP. There shall be one cpProtocolInfo for each layer protocol supported. + This attribute may be omitted if the virtual CP is + exposed as an external CP. See note 2 type: array items: $ref: "#/definitions/CpProtocolInfo" @@ -1323,6 +1372,16 @@ definitions: Additional information which is specific to the MCIO, its type, and which is available from the CISM. See note 2. $ref: "../../definitions/SOL005_def.yaml#/definitions/KeyValuePairs" + certificateContentId: + description: > + The identifier of certificate that this MCIO instance + uses. Shall be present when using in delegation- + mode. Otherwise shall not be present. + type: array + items: + $ref: "../../definitions/SOL005_def.yaml#/definitions/Identifier" + + LccnLinks: type: object required: @@ -1848,6 +1907,14 @@ definitions: Shall be present in case this CP instance maps to an internal VL (including externally-managed internal VL). See note 1. $ref: "#/definitions/IdentifierInVnf" + certificateContentId: + description: > + The identifier of certificate that this VNF CP instance + uses. Shall be present when using in delegation-mode. + Otherwise shall not be present. + type: array + items: + $ref: "../../definitions/SOL005_def.yaml#/definitions/Identifier" CpGroupInfo: description: > @@ -2575,10 +2642,41 @@ definitions: description: > Metadata about this CP. $ref: "../../definitions/SOL005_def.yaml#/definitions/KeyValuePairs" + certificateContentId: + description: > + The identifier of certificate that this VNFC CP instance + uses. Shall be present when using in delegation-mode. + Otherwise shall not be present. + type: array + items: + $ref: "../../definitions/SOL005_def.yaml#/definitions/Identifier" + metadata: description: > Metadata about this resource. $ref: "../../definitions/SOL005_def.yaml#/definitions/KeyValuePairs" + trunkPortsInfo: + description: > + Collections of CPs of the VNFC instance in trunk(s). + Shall be present when the VNFC has CPs working in + trunk mode, as parent port of a trunk, and other CPs + working as subports of the same trunk, and the referred + CP instances are also present in the vnfcCpInfo attribute + type: array + items: + #$ref: "#/definitions/TrunkPortsInfo" + type: object + certificateContentId: + description: > + The identifier of certificate that this VNFC instance uses. + Shall be present when using in delegation-mode. + Otherwise shall not be present. + type: array + items: + $ref: "../../definitions/SOL005_def.yaml#/definitions/Identifier" + + + VnfVirtualLinkResourceInfo: description: > -- GitLab From 49a54f03f4e3ef9023908c5899861e62ca303321 Mon Sep 17 00:00:00 2001 From: Pietro Piscione Date: Thu, 14 Dec 2023 11:43:06 +0100 Subject: [PATCH 05/10] SOL005_1, SOL005_34 to SOL005_40 included --- src/SOL005/NFVICapacityInformation/NFVICapacityInformation.yaml | 2 +- src/SOL005/NSFaultManagement/NSFaultManagement.yaml | 2 +- src/SOL005/NSLCMCoordination/NSLCMCoordination.yaml | 2 +- .../definitions/SOL005NSLifecycleManagement_def.yaml | 1 + src/SOL005/NSPerformanceManagement/NSPerformanceManagement.yaml | 2 +- src/SOL005/VNFPackageManagement/VNFPackageManagement.yaml | 2 +- .../VNFSnapshotPackageManagement.yaml | 2 +- 7 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/SOL005/NFVICapacityInformation/NFVICapacityInformation.yaml b/src/SOL005/NFVICapacityInformation/NFVICapacityInformation.yaml index 903fff6..0e1d2de 100644 --- a/src/SOL005/NFVICapacityInformation/NFVICapacityInformation.yaml +++ b/src/SOL005/NFVICapacityInformation/NFVICapacityInformation.yaml @@ -16,7 +16,7 @@ info: license: name: ETSI Forge copyright notice url: https://forge.etsi.org/etsi-forge-copyright-notice.txt - version: 1.11.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 + version: 1.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: description: ETSI GS NFV-SOL 005 V4.5.1 diff --git a/src/SOL005/NSFaultManagement/NSFaultManagement.yaml b/src/SOL005/NSFaultManagement/NSFaultManagement.yaml index de02068..5052510 100644 --- a/src/SOL005/NSFaultManagement/NSFaultManagement.yaml +++ b/src/SOL005/NSFaultManagement/NSFaultManagement.yaml @@ -16,7 +16,7 @@ info: license: name: ETSI Forge copyright notice url: https://forge.etsi.org/etsi-forge-copyright-notice.txt - version: 1.11.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 + version: 1.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: description: ETSI GS NFV-SOL 005 V4.5.1 diff --git a/src/SOL005/NSLCMCoordination/NSLCMCoordination.yaml b/src/SOL005/NSLCMCoordination/NSLCMCoordination.yaml index c1e780e..14c509f 100644 --- a/src/SOL005/NSLCMCoordination/NSLCMCoordination.yaml +++ b/src/SOL005/NSLCMCoordination/NSLCMCoordination.yaml @@ -16,7 +16,7 @@ info: license: name: ETSI Forge copyright notice url: https://forge.etsi.org/etsi-forge-copyright-notice.txt - version: 1.11.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 + version: 1.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: description: ETSI GS NFV-SOL 005 V4.5.1 diff --git a/src/SOL005/NSLifecycleManagement/definitions/SOL005NSLifecycleManagement_def.yaml b/src/SOL005/NSLifecycleManagement/definitions/SOL005NSLifecycleManagement_def.yaml index c4badf7..10c425c 100644 --- a/src/SOL005/NSLifecycleManagement/definitions/SOL005NSLifecycleManagement_def.yaml +++ b/src/SOL005/NSLifecycleManagement/definitions/SOL005NSLifecycleManagement_def.yaml @@ -865,6 +865,7 @@ definitions: enum: - Deployment - StatefulSet + - DaemonSet VnfInstance: description: > diff --git a/src/SOL005/NSPerformanceManagement/NSPerformanceManagement.yaml b/src/SOL005/NSPerformanceManagement/NSPerformanceManagement.yaml index 4f0a936..ef7dc33 100644 --- a/src/SOL005/NSPerformanceManagement/NSPerformanceManagement.yaml +++ b/src/SOL005/NSPerformanceManagement/NSPerformanceManagement.yaml @@ -16,7 +16,7 @@ info: license: name: ETSI Forge copyright notice url: https://forge.etsi.org/etsi-forge-copyright-notice.txt - version: 2.11.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 + version: 2.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: description: ETSI GS NFV-SOL 005 V4.5.1 diff --git a/src/SOL005/VNFPackageManagement/VNFPackageManagement.yaml b/src/SOL005/VNFPackageManagement/VNFPackageManagement.yaml index 4833a52..dab3821 100644 --- a/src/SOL005/VNFPackageManagement/VNFPackageManagement.yaml +++ b/src/SOL005/VNFPackageManagement/VNFPackageManagement.yaml @@ -16,7 +16,7 @@ info: license: name: ETSI Forge copyright notice url: https://forge.etsi.org/etsi-forge-copyright-notice.txt - version: 2.11.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 + version: 2.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: description: ETSI GS NFV-SOL 005 V4.5.1 diff --git a/src/SOL005/VNFSnapshotPackageManagement/VNFSnapshotPackageManagement.yaml b/src/SOL005/VNFSnapshotPackageManagement/VNFSnapshotPackageManagement.yaml index 0f1eec4..75b97ee 100644 --- a/src/SOL005/VNFSnapshotPackageManagement/VNFSnapshotPackageManagement.yaml +++ b/src/SOL005/VNFSnapshotPackageManagement/VNFSnapshotPackageManagement.yaml @@ -16,7 +16,7 @@ info: license: name: ETSI Forge copyright notice url: https://forge.etsi.org/etsi-forge-copyright-notice.txt - version: 1.11.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 + version: 1.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: description: ETSI GS NFV-SOL 005 V4.5.1 -- GitLab From 658db899a9eeff8d5d63d6d1774aaf9ebc17a188 Mon Sep 17 00:00:00 2001 From: Pietro Piscione Date: Fri, 12 Jan 2024 14:33:14 +0100 Subject: [PATCH 06/10] Fix on bug TrunkPortsInfo data model missing. --- .../SOL005NSLifecycleManagement_def.yaml | 22 +++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/src/SOL005/NSLifecycleManagement/definitions/SOL005NSLifecycleManagement_def.yaml b/src/SOL005/NSLifecycleManagement/definitions/SOL005NSLifecycleManagement_def.yaml index 10c425c..0ae2b98 100644 --- a/src/SOL005/NSLifecycleManagement/definitions/SOL005NSLifecycleManagement_def.yaml +++ b/src/SOL005/NSLifecycleManagement/definitions/SOL005NSLifecycleManagement_def.yaml @@ -2665,8 +2665,7 @@ definitions: CP instances are also present in the vnfcCpInfo attribute type: array items: - #$ref: "#/definitions/TrunkPortsInfo" - type: object + $ref: "#/definitions/TrunkPortsInfo" certificateContentId: description: > The identifier of certificate that this VNFC instance uses. @@ -2678,6 +2677,25 @@ definitions: + TrunkPortsInfo: + description: > + The information element provides rntime information of a collection of CP(s) of the VNFC instance which + has one CP working in trunk mode, as parent port of a trunk, and other CPs working as supports of the same trunk. + type: object + required: + - parentPort + properties: + parentPort: + description: > + Reference to the CP instance which is used as parent port in the trunk. + $ref: "../../definitions/SOL005_def.yaml#/definitions/Identifier" + subPortList: + description: > + Reference to the CP instance(s) working as subport(s) in the trunk. + type: array + items: + $ref: "../../definitions/SOL005_def.yaml#/definitions/Identifier" + VnfVirtualLinkResourceInfo: description: > -- GitLab From 061b39df5488a2a4ee00c22519817ed408e39df3 Mon Sep 17 00:00:00 2001 From: Pietro Piscione Date: Tue, 23 Jan 2024 10:44:41 +0100 Subject: [PATCH 07/10] Bug fix on VnfcResourceInfo data type --- .../SOL005NSLifecycleManagement_def.yaml | 32 ++++--------------- 1 file changed, 7 insertions(+), 25 deletions(-) diff --git a/src/SOL005/NSLifecycleManagement/definitions/SOL005NSLifecycleManagement_def.yaml b/src/SOL005/NSLifecycleManagement/definitions/SOL005NSLifecycleManagement_def.yaml index 0ae2b98..7567382 100644 --- a/src/SOL005/NSLifecycleManagement/definitions/SOL005NSLifecycleManagement_def.yaml +++ b/src/SOL005/NSLifecycleManagement/definitions/SOL005NSLifecycleManagement_def.yaml @@ -2548,6 +2548,7 @@ definitions: - id - vduId - computeResource + - trunkPortsInfo properties: id: description: > @@ -2617,40 +2618,23 @@ definitions: type: array items: $ref: "#/definitions/CpProtocolInfo" - 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/IdentifierInVnf" vnfLinkPortId: description: > Identifier of the "vnfLinkPorts" 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/IdentifierInVnf" - netAttDefResourceId: + parentCpId: 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 4 and 5. - 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/IdentifierInVnf" + 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/IdentifierInVnf" metadata: description: > Metadata about this CP. $ref: "../../definitions/SOL005_def.yaml#/definitions/KeyValuePairs" - certificateContentId: - description: > - The identifier of certificate that this VNFC CP instance - uses. Shall be present when using in delegation-mode. - Otherwise shall not be present. - type: array - items: - $ref: "../../definitions/SOL005_def.yaml#/definitions/Identifier" metadata: description: > @@ -2675,8 +2659,6 @@ definitions: items: $ref: "../../definitions/SOL005_def.yaml#/definitions/Identifier" - - TrunkPortsInfo: description: > The information element provides rntime information of a collection of CP(s) of the VNFC instance which -- GitLab From e56c9adf0d3a574ffc28c84d48d2290ae9d04052 Mon Sep 17 00:00:00 2001 From: Pietro Piscione Date: Wed, 31 Jan 2024 15:23:11 +0100 Subject: [PATCH 08/10] Fixed error in VnfcResourceInfo data type and fix typo on additionalParam --- .../SOL005NSLifecycleManagement_def.yaml | 54 ++++++++++--------- 1 file changed, 28 insertions(+), 26 deletions(-) diff --git a/src/SOL005/NSLifecycleManagement/definitions/SOL005NSLifecycleManagement_def.yaml b/src/SOL005/NSLifecycleManagement/definitions/SOL005NSLifecycleManagement_def.yaml index 7567382..c411a47 100644 --- a/src/SOL005/NSLifecycleManagement/definitions/SOL005NSLifecycleManagement_def.yaml +++ b/src/SOL005/NSLifecycleManagement/definitions/SOL005NSLifecycleManagement_def.yaml @@ -2548,7 +2548,6 @@ definitions: - id - vduId - computeResource - - trunkPortsInfo properties: id: description: > @@ -2618,12 +2617,6 @@ definitions: type: array items: $ref: "#/definitions/CpProtocolInfo" - vnfLinkPortId: - description: > - Identifier of the "vnfLinkPorts" 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/IdentifierInVnf" parentCpId: description: > Identifier of another VNFC CP instance that corresponds to the parent port of a trunk that the present VNFC @@ -2631,25 +2624,36 @@ definitions: 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/IdentifierInVnf" + vnfLinkPortId: + description: > + Identifier of the "vnfLinkPorts" 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/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 4 and 5. + 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/IdentifierInVnf" metadata: description: > Metadata about this CP. $ref: "../../definitions/SOL005_def.yaml#/definitions/KeyValuePairs" - + certificateContentId: + description: > + The identifier of certificate that this VNFC CP instance + uses. Shall be present when using in delegation-mode. + Otherwise shall not be present. + type: array + items: + $ref: "../../definitions/SOL005_def.yaml#/definitions/Identifier" metadata: description: > Metadata about this resource. - $ref: "../../definitions/SOL005_def.yaml#/definitions/KeyValuePairs" - trunkPortsInfo: - description: > - Collections of CPs of the VNFC instance in trunk(s). - Shall be present when the VNFC has CPs working in - trunk mode, as parent port of a trunk, and other CPs - working as subports of the same trunk, and the referred - CP instances are also present in the vnfcCpInfo attribute - type: array - items: - $ref: "#/definitions/TrunkPortsInfo" certificateContentId: description: > The identifier of certificate that this VNFC instance uses. @@ -3101,7 +3105,7 @@ definitions: description: > Identifier of a NsProfile to which the additional parameters apply. $ref: "#/definitions/IdentifierInNsd" - additionalParam: + additionalParams: description: > Additional parameters that are to be applied on a per nested NS instance. type: array @@ -3616,12 +3620,10 @@ definitions: type: array items: $ref: "#/definitions/VnfScaleInfo" - additionalParam: + additionalParams: description: > - Additional parameters passed by the OSS/BSS as - input to the Select VNF deployable modules operation, - specific to the VNF being affected by the operation, as - declared in the VNFD (see clause 7.1.5.14 in ETSI GS + Additional parameters passed by the OSS/BSS as input to the Select VNF deployable modules operation, + specific to the VNF being affected by the operation, as declared in the VNFD (see clause 7.1.5.14 in ETSI GS NFV IFA 011) $ref: "../../definitions/SOL005_def.yaml#/definitions/KeyValuePairs" @@ -4363,7 +4365,7 @@ definitions: taken out of service during graceful stop, before stopping the VNF. See note. type: integer - additionalParam: + additionalParams: description: > Additional parameters passed by the OSS/BSS as input to the Operate VNF operation, specific to the VNF being -- GitLab From 1d35bae280d70612095c1b13d74c19971434bfa4 Mon Sep 17 00:00:00 2001 From: Pietro Piscione Date: Tue, 6 Feb 2024 09:48:23 +0100 Subject: [PATCH 09/10] Fix on issues after SOL005 feedback --- .../NFVICapacityInformationNotification.yaml | 2 +- .../NSDManagementNotification.yaml | 2 +- .../NSFaultManagementNotification.yaml | 2 +- .../SOL005NSLifecycleManagement_def.yaml | 73 ++++++++++--------- .../NSLifecycleManagementNotification.yaml | 2 +- .../NSPerformanceManagementNotification.yaml | 2 +- .../VNFPackageManagementNotification.yaml | 2 +- 7 files changed, 46 insertions(+), 39 deletions(-) diff --git a/src/SOL005/NFVICapacityInformationNotification/NFVICapacityInformationNotification.yaml b/src/SOL005/NFVICapacityInformationNotification/NFVICapacityInformationNotification.yaml index d8aec98..8bc2c9d 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.11.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 + version: 1.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: description: ETSI GS NFV-SOL 005 V4.5.1 diff --git a/src/SOL005/NSDManagementNotification/NSDManagementNotification.yaml b/src/SOL005/NSDManagementNotification/NSDManagementNotification.yaml index 6f6d88c..4cc00b9 100644 --- a/src/SOL005/NSDManagementNotification/NSDManagementNotification.yaml +++ b/src/SOL005/NSDManagementNotification/NSDManagementNotification.yaml @@ -16,7 +16,7 @@ info: license: name: ETSI Forge copyright notice url: https://forge.etsi.org/etsi-forge-copyright-notice.txt - version: 2.11.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 + version: 2.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: description: ETSI GS NFV-SOL 005 V4.5.1 diff --git a/src/SOL005/NSFaultManagementNotification/NSFaultManagementNotification.yaml b/src/SOL005/NSFaultManagementNotification/NSFaultManagementNotification.yaml index dcf3eea..acda133 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.11.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 + version: 1.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: description: ETSI GS NFV-SOL 005 V4.5.1 diff --git a/src/SOL005/NSLifecycleManagement/definitions/SOL005NSLifecycleManagement_def.yaml b/src/SOL005/NSLifecycleManagement/definitions/SOL005NSLifecycleManagement_def.yaml index c411a47..32b3a81 100644 --- a/src/SOL005/NSLifecycleManagement/definitions/SOL005NSLifecycleManagement_def.yaml +++ b/src/SOL005/NSLifecycleManagement/definitions/SOL005NSLifecycleManagement_def.yaml @@ -206,23 +206,23 @@ definitions: description: > A link to this end point. $ref: "../../definitions/SOL005_def.yaml#/definitions/Link" - supportedProtocol: - type: array - description: > - Supported protocol by CMF instance. - Permitted values: - * CMP - * CMPv2 - * EST - * SCEP - minumumElement: 1 - items: - type: string - enum: - - CMP - - CMPv2 - - EST - - SCEP + supportedProtocol: + type: array + description: > + Supported protocol by CMF instance. + Permitted values: + * CMP + * CMPv2 + * EST + * SCEP + minItems: 1 + items: + type: string + enum: + - CMP + - CMPv2 + - EST + - SCEP CmfInfo: @@ -324,7 +324,7 @@ definitions: issuerUniqueIdentifier: description: > Identifier of this issuer of certificates. See note. - type: string + $ref: "../../definitions/SOL005_def.yaml#/definitions/Identifier" subject: description: > Subject of certificates. See note. @@ -424,6 +424,7 @@ definitions: type: object required: - overridingCertificateProfile + - securityPolicy properties: overridingCertificateProfile: description: > @@ -435,8 +436,7 @@ definitions: security policy. type: array items: - $ref: "#/definitions/CertificateBaseProfile" - + $ref: "#/definitions/CertificateBaseProfile" securityPolicy: description: > Security policy to be satisfied for certificate. @@ -447,11 +447,7 @@ definitions: cmfData: description: > Information for CMF. Shall be present in delegation mode. - type: array - minItems: 1 - items: - #$ref: "#/definitions/CmfData" - type: string + $ref: "#/definitions/CmfData" CancelModeType: description: > @@ -647,7 +643,9 @@ definitions: The "zero" value expresses the highest priority and the fact that the NS instance based on this DF cannot be pre-empted during resource allocation. NOTE 3: Examples for the usage of priority include conflict resolution in case of resource shortage - + + NOTE 4: Information about PaaS Services assigned to VNF instances shall only be included in the corresponding + VnfInstance (see clause 6.5.3.57) type: object required: - id @@ -795,7 +793,14 @@ definitions: type: array items: $ref: "#/definitions/MirroringInfo" - + nsPaasServiceInfo: + description: > + Information on the PaaS Services assigned and used by an NS constituent + other than VNF instances. See note 4. + type: array + items: + $ref: "#/definitions/PaasServiceInfo" + _links: type: object description: Links to resources related to this resource. @@ -1063,7 +1068,7 @@ definitions: VNFCs. type: array items: - $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVnf" + $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVnfd" extCpInfo: description: > Information about the external CPs exposed by the VNF instance. @@ -3082,8 +3087,7 @@ definitions: from the VNF profile indicated in profileId attribute. type: array items: - $ref: "#/definitions/IdentifierInVnf" - + $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVnfd" ParamsForNestedNs: description: > This type specifies additional parameters on a per-nested NS instance basis. @@ -5335,7 +5339,7 @@ definitions: certificateExtensions: description: > Extension of this certificate. - type: string + $ref: "../../definitions/SOL005_def.yaml#/definitions/KeyValuePairs" CertificateInfo: @@ -6770,7 +6774,7 @@ definitions: 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: A link port is not needed for an external CP instance that exposes a 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 address is allocated as VIP address, @@ -6778,6 +6782,9 @@ definitions: 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 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 is a Kubernetes® instance is a network attachment definition (NAD). type: object @@ -7516,7 +7523,7 @@ definitions: mappings, remain valid. See note 2. type: array items: - $ref: "#/definitions/IdentifierInVnf" + $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVnfd" certificateConfigurationData: description: > Configuration for certificate management such as diff --git a/src/SOL005/NSLifecycleManagementNotification/NSLifecycleManagementNotification.yaml b/src/SOL005/NSLifecycleManagementNotification/NSLifecycleManagementNotification.yaml index 0a769bd..6f7db86 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.11.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 + version: 2.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: description: ETSI GS NFV-SOL 005 V4.5.1 diff --git a/src/SOL005/NSPerformanceManagementNotification/NSPerformanceManagementNotification.yaml b/src/SOL005/NSPerformanceManagementNotification/NSPerformanceManagementNotification.yaml index c2baed3..538b2d1 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.11.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 + version: 2.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: description: ETSI GS NFV-SOL 005 V4.5.1 diff --git a/src/SOL005/VNFPackageManagementNotification/VNFPackageManagementNotification.yaml b/src/SOL005/VNFPackageManagementNotification/VNFPackageManagementNotification.yaml index d9c3fc5..11cc958 100644 --- a/src/SOL005/VNFPackageManagementNotification/VNFPackageManagementNotification.yaml +++ b/src/SOL005/VNFPackageManagementNotification/VNFPackageManagementNotification.yaml @@ -16,7 +16,7 @@ info: license: name: ETSI Forge copyright notice url: https://forge.etsi.org/etsi-forge-copyright-notice.txt - version: 2.11.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 + version: 2.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: description: ETSI GS NFV-SOL 005 V4.5.1 -- GitLab From 5b733a926d2686a1c09e6c751433726757a129e6 Mon Sep 17 00:00:00 2001 From: Giacomo Bernini Date: Fri, 8 Mar 2024 18:03:19 +0000 Subject: [PATCH 10/10] Update Readme.md --- Readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Readme.md b/Readme.md index 9144ea2..86b474f 100644 --- a/Readme.md +++ b/Readme.md @@ -1,7 +1,7 @@ # NFV SOL005 APIs This repository hosts the [OpenAPI](https://www.openapis.org/) specificatons and other documentation -for the APIs defined in ETSI NFV GSs SOL005 v4.4.1. +for the APIs defined in ETSI NFV GSs SOL005 v4.5.1. The APIs described in this repository are defined for the `Os-Ma-nfvo` reference point. -- GitLab