diff --git a/src/SOL005/NSLifecycleManagement/definitions/SOL005NSLifecycleManagement_def.yaml b/src/SOL005/NSLifecycleManagement/definitions/SOL005NSLifecycleManagement_def.yaml index 34a335215f798fdb5fe1e7de8f6f7156a4489c58..47952061ded4d87aff5ca7d4c250e7ed38866ca7 100644 --- a/src/SOL005/NSLifecycleManagement/definitions/SOL005NSLifecycleManagement_def.yaml +++ b/src/SOL005/NSLifecycleManagement/definitions/SOL005NSLifecycleManagement_def.yaml @@ -1848,15 +1848,16 @@ definitions: description: > This type represents information about an external CP of a VNF. It shall comply with the provisions defined in Table 6.5.3.70-1. - NOTE 1: The attributes 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 6.5.3.26. - 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 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 6.5.3.26. + * 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 @@ -1955,6 +1956,10 @@ definitions: type: array items: $ref: "../../definitions/SOL005_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. CpGroupInfo: description: > @@ -7203,32 +7208,35 @@ definitions: shall use the network attachment definition resource of secondary container cluster network when connecting the CP to the external VL. - NOTE 1: The following conditions apply to the attributes "linkPortId" and "cpProtocolData" - for an external CP instance connected or to be connected to a virtual network not - categorized as secondary container cluster network: - - At least one of the "linkPortId" and "cpProtocolData" attributes shall be present for - an external CP instance representing a subport that is to be created, or an external CP instance - that is to be created by creating the corresponding VNFC or VNF instance during the current or - a subsequent LCM operation, or for an existing external CP instance that is to be re-configured - or added to a particular external virtual link. - - If the "cpProtocolData" attribute is absent, the "linkPortId" attribute shall be provided - referencing a pre-created link port with pre-configured address information. - - If both "cpProtocolData" and "linkportId" are provided, the API consumer shall ensure that + * NOTE 1: The following conditions apply to the attributes "linkPortId" and "cpProtocolData" + for an external CP instance connected or to be connected to a virtual network not + categorized as secondary container cluster network: + - At least one of the "linkPortId" and "cpProtocolData" attributes shall be present for + an external CP instance representing a subport that is to be created, or an external CP instance + that is to be created by creating the corresponding VNFC or VNF instance during the current or + a subsequent LCM operation, or for an existing external CP instance that is to be re-configured + or added to a particular external virtual link. + - If the "cpProtocolData" attribute is absent, the "linkPortId" attribute shall be provided + referencing a pre-created link port with pre-configured address information. + - If both "cpProtocolData" and "linkportId" are provided, the API consumer shall ensure that the cpProtocolData can be used with the pre-created link port referenced by "linkPortId". - NOTE 2: In case the NFVO manages its own identifier space, the NFVO may remap this identifier - when communicating with the VNFM. If the NFVO knows that there can be an identifier collision - when communicating with the VNFM by using the identifier from the OSS/BSS, the NFVO shall remap it. - NOTE 3: The following conditions apply to the attributes "netAttDefResourceId" and "cpProtocolData" for an external CP - instance connected or to be connected to a secondary container cluster network: - − Void. - − At least one of these attributes shall be present for a to-be-created external CP instance or an existing - external CP instance. - NOTE 4: Cardinality greater than 1 is only applicable for specific cases where more than one network - attachment definition resource is needed to fulfil the connectivity requirements of the external CP, - e.g. to build a link redundant mated pair in SR-IOV cases. When more than one "netAttDefResourceId" - is indicated, all shall belong to the same namespace as defined by the corresponding - "containerNamespace" attribute in the "resourceHandle" attribute in the "NetAttDefResourceData". - NOTE 5: Either "linkPortId" or "netAttDefResourceId" may be included, but not both. + * NOTE 2: In case the NFVO manages its own identifier space, the NFVO may remap this identifier + when communicating with the VNFM. If the NFVO knows that there can be an identifier collision + when communicating with the VNFM by using the identifier from the OSS/BSS, the NFVO shall remap it. + * NOTE 3: The following conditions apply to the attributes "netAttDefResourceId" and "cpProtocolData" for an external CP + instance connected or to be connected to a secondary container cluster network: + − Void. + − At least one of these attributes shall be present for a to-be-created external CP instance or an existing + external CP instance. + * NOTE 4: Cardinality greater than 1 is only applicable for specific cases where more than one network + attachment definition resource is needed to fulfil the connectivity requirements of the external CP, + e.g. to build a link redundant mated pair in SR-IOV cases. When more than one "netAttDefResourceId" + is indicated, all shall belong to the same namespace as defined by the corresponding + "containerNamespace" attribute in the "resourceHandle" attribute in the "NetAttDefResourceData". + * NOTE 5: 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. + type: object oneOf: - required: @@ -7277,6 +7285,18 @@ definitions: type: array items: $ref: "#/definitions/IdentifierInVnf" + 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 will use the configuration as specified + in the VNFD. IdentifierInNs: description: >