From 85babb45898dfe6286e70636db220bfb3023edfd Mon Sep 17 00:00:00 2001 From: Bertrand Souville Date: Wed, 23 Apr 2025 19:13:40 +0200 Subject: [PATCH 1/3] Align with SOL(25)169 --- src/SOL003/General_Definitions/SOL003_def.yaml | 17 ++++++++++++++++- .../SOL003VNFLifecycleManagement_def.yaml | 9 ++++++++- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/src/SOL003/General_Definitions/SOL003_def.yaml b/src/SOL003/General_Definitions/SOL003_def.yaml index 56fab7b4..4a5acaf8 100644 --- a/src/SOL003/General_Definitions/SOL003_def.yaml +++ b/src/SOL003/General_Definitions/SOL003_def.yaml @@ -442,6 +442,8 @@ definitions: to the same namespace as defined by the corresponding "containerNamespace" attribute in the "resourceHandle" a attribute in the "NetAttDefResourceData". * NOTE 4: Either linkPortId or netAttDefResourceId may be included, but not both. + * Editor's Note: Specification of CpSecurityGroupData data type is FFS + due to dependency on SOL001/descriptor work. anyOf: - required: - linkPortId @@ -498,6 +500,19 @@ definitions: type: array items: $ref: "#/definitions/CpProtocolData" + cpSecurityGroupData: + description: > + Parameters for modifying and overriding security groups + information bound to this CP. The parameters identify + which "SecurityGroupRule" specified in the VNFD is + activated/deactivated and for an activated security group + rule the values of attributes defined in the VNFD that can + be overridden such as "portRangeMin" and "portRangeMax". + If no security group configuration is provided for a given + "SecurityGroupRule" specified in the VNFD as part of this + attribute, the VNFM shall use the configuration as specified + in the VNFD. + $ref: "#/definitions/CpSecurityGroupData" CpProtocolData: description: > @@ -1614,4 +1629,4 @@ definitions: - MODIFY_INFO - CREATE_SNAPSHOT - REVERT_TO_SNAPSHOT - - CHANGE_VNFPKG \ No newline at end of file + - CHANGE_VNFPKG diff --git a/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml b/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml index 1da90b1d..a41b0352 100644 --- a/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml +++ b/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml @@ -3872,6 +3872,8 @@ definitions: attachment definition resource is needed to fulfil the connectivity requirements of the external CP, e.g. to build a link redundant mated pair in SR-IOV cases. NOTE 4: When more than one netAttDefResourceId is indicated, all shall belong to the same namespace. + Editor's Note: Specification of CpSecurityGroupInfo data type is FFS due to dependency on SOL001/ + descriptor work. type: object required: - id @@ -3962,6 +3964,11 @@ definitions: type: array items: $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" + cpSecurityGroupInfo: + description: > + List of active security group rules applied to this external CP instance. The attribute identifies which + "SecurityGroupRule" specified in the VNFD are activated and the values of its attributes. + $ref: "#/definitions/CpSecurityGroupInfo" VnfOperationalStateType: description: > STARTED: The VNF instance is up and running. @@ -4676,4 +4683,4 @@ definitions: description: > Name of an address pool from which an IP address is assigned to the virtual CP. - type: string \ No newline at end of file + type: string -- GitLab From 34c0b418de45ad5a09bbcefe274ca706eb5aeb47 Mon Sep 17 00:00:00 2001 From: Bertrand Souville Date: Wed, 23 Apr 2025 19:32:36 +0200 Subject: [PATCH 2/3] Fix validation issues --- src/SOL003/General_Definitions/SOL003_def.yaml | 1 - .../definitions/SOL003VNFLifecycleManagement_def.yaml | 1 - 2 files changed, 2 deletions(-) diff --git a/src/SOL003/General_Definitions/SOL003_def.yaml b/src/SOL003/General_Definitions/SOL003_def.yaml index 4a5acaf8..b7bc2bc2 100644 --- a/src/SOL003/General_Definitions/SOL003_def.yaml +++ b/src/SOL003/General_Definitions/SOL003_def.yaml @@ -512,7 +512,6 @@ definitions: "SecurityGroupRule" specified in the VNFD as part of this attribute, the VNFM shall use the configuration as specified in the VNFD. - $ref: "#/definitions/CpSecurityGroupData" CpProtocolData: description: > diff --git a/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml b/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml index a41b0352..b7fdd8b6 100644 --- a/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml +++ b/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml @@ -3968,7 +3968,6 @@ definitions: description: > List of active security group rules applied to this external CP instance. The attribute identifies which "SecurityGroupRule" specified in the VNFD are activated and the values of its attributes. - $ref: "#/definitions/CpSecurityGroupInfo" VnfOperationalStateType: description: > STARTED: The VNF instance is up and running. -- GitLab From c4128b45c6ab4da5cb62ec82f9f5ee71e36b931e Mon Sep 17 00:00:00 2001 From: Bertrand Souville Date: Wed, 21 May 2025 10:57:51 +0200 Subject: [PATCH 3/3] Mainly fixed time sync on local machine --- .../SOL003VNFLifecycleManagement_def.yaml | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml b/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml index b7fdd8b6..26b40dc2 100644 --- a/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml +++ b/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml @@ -3864,16 +3864,16 @@ definitions: description: > This type represents information about an external CP of a VNF. - NOTE 1: The attributes "associatedVnfcCpId", "associatedVipCpId", "associatedVirtualCpId" and - "associatedVnfVirtualLinkId" are mutually exclusive. Exactly one shall be present. - NOTE 2: An external CP instance is not associated to a link port in the cases indicated for the - “extLinkPorts” attribute in clause 4.4.1.11. - NOTE 3: Cardinality greater than 1 is only applicable for specific cases where more than one network - attachment definition resource is needed to fulfil the connectivity requirements of the external - CP, e.g. to build a link redundant mated pair in SR-IOV cases. - NOTE 4: When more than one netAttDefResourceId is indicated, all shall belong to the same namespace. - Editor's Note: Specification of CpSecurityGroupInfo data type is FFS due to dependency on SOL001/ - descriptor work. + * NOTE 1: The attributes "associatedVnfcCpId", "associatedVipCpId", "associatedVirtualCpId" and + "associatedVnfVirtualLinkId" are mutually exclusive. Exactly one shall be present. + * NOTE 2: An external CP instance is not associated to a link port in the cases indicated for the + “extLinkPorts” attribute in clause 4.4.1.11. + * NOTE 3: Cardinality greater than 1 is only applicable for specific cases where more than one network + attachment definition resource is needed to fulfil the connectivity requirements of the external + CP, e.g. to build a link redundant mated pair in SR-IOV cases. + * NOTE 4: When more than one netAttDefResourceId is indicated, all shall belong to the same namespace. + * Editor's Note: Specification of CpSecurityGroupInfo data type is FFS due to dependency on SOL001/ + descriptor work. type: object required: - id -- GitLab