From 3d6e8f6732a1da1d0ecd533f035523cc3866e34e Mon Sep 17 00:00:00 2001 From: Bertrand Souville Date: Wed, 21 May 2025 11:42:17 +0200 Subject: [PATCH] Align with SOL(25)170 --- .../General_Definitions/SOL002_def.yaml | 17 +++++++++++-- .../SOL002VNFLifecycleManagement_def.yaml | 24 ++++++++++++------- 2 files changed, 30 insertions(+), 11 deletions(-) diff --git a/src/SOL002/General_Definitions/SOL002_def.yaml b/src/SOL002/General_Definitions/SOL002_def.yaml index 531e8af1..a8d37573 100644 --- a/src/SOL002/General_Definitions/SOL002_def.yaml +++ b/src/SOL002/General_Definitions/SOL002_def.yaml @@ -735,6 +735,8 @@ definitions: to the same namespace as defined by the corresponding "containerNamespace" attribute in the "resourceHandle" 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 @@ -776,7 +778,18 @@ 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. netAttDefResourceId: description: > Identifier of the “NetAttDefResourceData” structure that @@ -1855,4 +1868,4 @@ definitions: - MODIFY_INFO - CREATE_SNAPSHOT - REVERT_TO_SNAPSHOT - - CHANGE_VNFPKG \ No newline at end of file + - CHANGE_VNFPKG diff --git a/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml b/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml index 060e72b1..b4786c7c 100644 --- a/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml +++ b/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml @@ -2885,14 +2885,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. + * 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 @@ -2981,6 +2983,10 @@ definitions: This attribute shall be supported when delegation mode in certificate management is applicable. type: array $ref: "../../General_Definitions/SOL002_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. CertificateInfo: description: > @@ -3767,4 +3773,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