From 5a4b01ffbe140732e341d104351f2b60660c621d Mon Sep 17 00:00:00 2001 From: FernandoOliveira Date: Mon, 13 Sep 2021 12:36:02 -0400 Subject: VNF changes from the ETSI IFA011 4.2.1 relative to 4.1.1 - several VipCP changes that are mirrors from 3.X - Addition of vnfdExtInvariantId to VNF - Addition of logicalNode, requestedAdditionalCapabilities and mcioConstraintsParams to VDU Patch 2: Fixed the dos mode so that no insertion of \r. Patch 4: Added new types to VNF types disgram Issue-ID: ONAPMODEL-39 Signed-off-by: Fernando Oliveira Change-Id: I6e67d72e3f18ac20aa978f7ba2b16f8d2c23f162 --- ONAP_Information_Model/Common.notation | 162 +- ONAP_Information_Model/License.notation | 2 +- ONAP_Information_Model/Nf.notation | 2 +- ONAP_Information_Model/Ns.notation | 2 +- .../OpenModel_Profile.profile.notation | 2 +- ONAP_Information_Model/Resource.notation | 2 +- ONAP_Information_Model/Service.di | 24 +- ONAP_Information_Model/Service.notation | 254 +-- ONAP_Information_Model/Vnf.notation | 2001 ++++++++++++-------- ONAP_Information_Model/Vnf.uml | 272 ++- 10 files changed, 1719 insertions(+), 1004 deletions(-) diff --git a/ONAP_Information_Model/Common.notation b/ONAP_Information_Model/Common.notation index b7888d8..11bbe3c 100644 --- a/ONAP_Information_Model/Common.notation +++ b/ONAP_Information_Model/Common.notation @@ -1,5 +1,5 @@ - + @@ -7273,69 +7273,69 @@ - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + @@ -7542,85 +7542,85 @@ - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + diff --git a/ONAP_Information_Model/License.notation b/ONAP_Information_Model/License.notation index 05cca35..9adf00b 100644 --- a/ONAP_Information_Model/License.notation +++ b/ONAP_Information_Model/License.notation @@ -1,5 +1,5 @@ - + diff --git a/ONAP_Information_Model/Nf.notation b/ONAP_Information_Model/Nf.notation index 18176c6..b45f27b 100644 --- a/ONAP_Information_Model/Nf.notation +++ b/ONAP_Information_Model/Nf.notation @@ -1,5 +1,5 @@ - + diff --git a/ONAP_Information_Model/Ns.notation b/ONAP_Information_Model/Ns.notation index a2fd702..70cdfeb 100644 --- a/ONAP_Information_Model/Ns.notation +++ b/ONAP_Information_Model/Ns.notation @@ -1,5 +1,5 @@ - + diff --git a/ONAP_Information_Model/OpenModel_Profile.profile.notation b/ONAP_Information_Model/OpenModel_Profile.profile.notation index 8e4d51f..500eebf 100644 --- a/ONAP_Information_Model/OpenModel_Profile.profile.notation +++ b/ONAP_Information_Model/OpenModel_Profile.profile.notation @@ -1,5 +1,5 @@ - + diff --git a/ONAP_Information_Model/Resource.notation b/ONAP_Information_Model/Resource.notation index 3b6d997..302c2d8 100644 --- a/ONAP_Information_Model/Resource.notation +++ b/ONAP_Information_Model/Resource.notation @@ -1,5 +1,5 @@ - + diff --git a/ONAP_Information_Model/Service.di b/ONAP_Information_Model/Service.di index bf9abab..4204190 100644 --- a/ONAP_Information_Model/Service.di +++ b/ONAP_Information_Model/Service.di @@ -1,2 +1,24 @@ - + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ONAP_Information_Model/Service.notation b/ONAP_Information_Model/Service.notation index 215f3ee..b726969 100644 --- a/ONAP_Information_Model/Service.notation +++ b/ONAP_Information_Model/Service.notation @@ -1,5 +1,5 @@ - + @@ -5340,14 +5340,6 @@ - - - - - - - - @@ -5397,14 +5389,6 @@ - - - - - - - - @@ -5490,22 +5474,6 @@ - - - - - - - - - - - - - - - - @@ -5568,14 +5536,6 @@ - - - - - - - - @@ -5638,14 +5598,6 @@ - - - - - - - - @@ -5708,14 +5660,6 @@ - - - - - - - - @@ -5898,32 +5842,68 @@ - - - - - - - - - + + + - - - - - - - + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -5986,56 +5966,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -6098,5 +6028,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ONAP_Information_Model/Vnf.notation b/ONAP_Information_Model/Vnf.notation index 940b015..a130d57 100644 --- a/ONAP_Information_Model/Vnf.notation +++ b/ONAP_Information_Model/Vnf.notation @@ -1,5 +1,5 @@ - + @@ -3586,125 +3586,125 @@ - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + @@ -4182,155 +4182,155 @@ - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + @@ -8063,10 +8063,30 @@ + + + + + + + + + + + + + + + + + + + + @@ -8092,6 +8112,11 @@ + + + + + @@ -8102,10 +8127,20 @@ + + + + + + + + + + @@ -8132,7 +8167,7 @@ - + @@ -8141,14 +8176,29 @@ + + + + + + + + + + + + + + + @@ -8175,7 +8225,7 @@ - + @@ -8184,34 +8234,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -8247,22 +8337,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + @@ -8292,7 +8407,7 @@ - + @@ -8301,14 +8416,29 @@ + + + + + + + + + + + + + + + @@ -8324,7 +8454,7 @@ - + @@ -8333,18 +8463,38 @@ + + + + + + + + + + + + + + + + + + + + @@ -8360,7 +8510,7 @@ - + @@ -8369,10 +8519,20 @@ + + + + + + + + + + @@ -8397,18 +8557,38 @@ + + + + + + + + + + + + + + + + + + + + @@ -8438,10 +8618,20 @@ + + + + + + + + + + @@ -8465,537 +8655,764 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + - - - + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + - - - + + + + + + + + - - - - + + + + - - - - - - - - - - - + + + + + - - -

- - - - - - - + + - - - - + + + + - + - - - - + + + + - - - - - - - - - - - - + + + + + + + + + - - - + + + + + + + + - - - - + + + + - - - - - - - - - - - + + + + + - - + + - - - - + + + + - + @@ -9003,515 +9420,545 @@ - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ONAP_Information_Model/Vnf.uml b/ONAP_Information_Model/Vnf.uml index 3d57580..97ccdbf 100644 --- a/ONAP_Information_Model/Vnf.uml +++ b/ONAP_Information_Model/Vnf.uml @@ -545,6 +545,21 @@ Any modification of the content of the VNFD or the VNF Package shall result in a + + + Identifies a VNFD in a version independent manner. This attribute is invariant across versions of the VNFD that fulfill certain conditions related to the external connectivity and management of the VNF. + +Note: Different versions of a VNFD have different vnfdIds but can have the same vnfdExtInvariantId. Different versions of the VNFD with the same vnfdExtInvariantId shall expose + • same external connectivity, i.e. same number of vnfExtCpds and same identifiers + • same VNFD attributes used in an NSD when referring to this VNFD: + o VNF deployment flavours, VNF instantiation levels: in both cases the identifiers and the number of them shall be the same, but the content of e.g. a particular deployment flavour can change + o VNF indicators: same identifiers and possible values + o ScaleInfo: same scalingAspects identifiers and same levels per scalingAspect +This condition implies that VNFDs with the same vnfdExtInvariantId preserve external invariancy. Therefore, fulfilling this condition allows to use a different version of a VNFD in an NS instance without modification of the NSD on which the NS instance is based. The use of a different version is ultimately under the control of the service provider and it should consider if the NSD fulfils the requirements of the VnfExtCpds (e.g. bitrate, IP version, etc.)." + + + + Provider of the VNF and of the VNFD. @@ -852,8 +867,7 @@ NOTE: The parameters of each variable part shall be declared in the VnfLcmOper Describes CPU, Memory and acceleration requirements of the Virtualisation Container realising this Vdu. - - + @@ -880,6 +894,27 @@ NOTE: More software images can be attached to the virtualisation container using + + + The logical node requirements + + + + + + + Specifies requirements for additional capabilities. These can be for a range of purposes. One example is acceleration related capabilities. + + + + + + + The parameter names for constraints expected to be assigned to MCIOs realizing this Vdu. The value specifies the standardized semantical context of the MCIO constraints and the parameter names for the MCIO constraints in the MCIO declarative descriptor. The mcioConstraintParams attribute shall have one of the following values, expressing the associated semantical context. VALUES: • affinityNfviPop • affinityZone • affinityZoneGroup • affinityNfviNode • affinityCisNode • antiAffinityNfviPop • antiAffinityZone • antiAffinityZoneGroup • antiAffinityNfviNode • antiAffinityCisNode • localAffinityNfviPop • localAffinityZone • localAffinityZoneGroup • localAffinityNfviNode • localAffinityCisNode • localAntiAffinityNfviPop • localAntiAffinityZone • localAntiAffinityZoneGroup • localAntiAffinityNfviNode • localAntiAffinityCisNode • nodeAdditionalCapabilitySsd • nodeAdditionalCapabilityDpdk • nodeAdditionalCapabilitySriov • nodeAdditionalCapabilityGpu • nodeAdditionalCapabilityFpga • nodeAdditionalCapabilityCpuPin • nodeCapabilityLogicalNuma • nodePool For the associated semantical context of the values, refer to the description under the table. + + + + @@ -1165,12 +1200,9 @@ NOTE: Each identifier references an affinity or anti-affinity group which expres - + - Indicates whether the virtual storage descriptor shall be used as template, i.e. if the virtual storage resource shall be instantiated per VNFC instance. -If the value is true (default), a persistent virtual storage resource shall be instantiated for each VNFC instance that is based on a VDU referring to this virtual storage descriptor. -If the value is false, a single persistent virtual storage resource shall be instantiated with a lifetime independent of the lifetime of individual VNFC instances based on a VDU referring to this virtual storage descriptor. - + Indicates whether the virtual storage resource shall be instantiated per VNFC instance. If the value is true (default), a virtual storage resource shall be instantiated for each VNFC instance that is based on a VDU referring to this virtual storage descriptor and have the same lifetime as the VNFC instance. If the value is false, a single virtual storage resource shall be instantiated with a lifetime independent of the lifetime of individual VNFC instances based on a VDU referring to this virtual storage descriptor. The storage resource shall have the same lifetime as the VNF instance @@ -1396,6 +1428,31 @@ This attribute shall be present if the DF references (via the vduProfile) contai + + + Defines the minimum and maximum number of VIP CP instances created from each of the VipCpds used in this flavour. Shall be present if the deployment flavour can contain VIP CP instances. + + + + + + + Configuration parameters for the VNF Lifecycle Management operations. + + + + + References applicable LCM coordination actions that can be invoked during each of the listed VNF LCM operations. + + + + + + + Represents the minimum size of the VNF (i.e. scale level zero for all scaling aspects). +Shall be present if the "aspectDeltaDetails" attribute is present in the "ScalingAspect" information element. + + @@ -1584,6 +1641,16 @@ NOTE: If not present, it is assumed that the bitrate requirements can be derived + + + Indicates the number of VIP CP instances based on a particular VipCpd to be part of this level. +If a particular VipCpd is defined with minNumberOfInstances= maxNumberOfInstances=1 in the vipCpProfile of the DF, +that vipCpd may be omitted from the "vipCpLevel" attribute, +which shall be interpreted that one related VIP CP instance is part of this level. + + + + @@ -1618,13 +1685,21 @@ NOTE: If not present, it is assumed that the bitrate requirements can be derived - - - References the VNF external CPD which is used to instantiate external CPs. These external CPs share the virtual IP addresses allocated when a VipCp instance is created from the VipCpd. + + + Reference of the internal VLD which this VipCpd connects to. +Note: This attribute shall be present if it is present in all VduCpds referred by the intCpd attribute and have the same value as in all VduCpds and shall be absent if it is absent in all VduCpds referred by the intCpd attribute. - + + + If set to true, it indicates that the VIP address shall be different from the addresses allocated to all of the VduCp instances associated to it. +If set to false, the VIP address shall be the same as one of the VduCp instances associated to it. + + + @@ -2338,7 +2413,7 @@ To populate a VnfPackageChangeInfo information element and the underlying relate - + References applicable VNF LCM operation coordination actions. @@ -2530,6 +2605,29 @@ Shall be present in case the OS container requires storage resources. + + + + Identifier of this scaling delt + + + + + + The number of VNFC instancesbased on particuar VDUs to be created or removed. + + + + + The bitrate to be added or removed to virtual links created from particular virtual link descriptors + + + + + Number of VIP CP instances basd on a particular VipCpd to be created or removed. + + + @@ -3022,7 +3120,7 @@ NOTE: The scriptInput values are passed to the scripts in addition to the parame Software image to be loaded on the VirtualStorage resource created based on this VirtualStorageDesc. Shall be absent when used for virtual disks. - +Note: This attribute shall not be present in a VirtualStorageDesc used in a VDU realized by one or a set of OS containers. @@ -3259,6 +3357,103 @@ VALUES: + + + The VipCpProfile information element describes additional instantiation data for a given VIP CP used in a DF. + + + + Uniquely references a VIP CPD. + + + + + + Minimum number of instances of the VIP CP based on the referenced VIP CPD that is permitted to exist for this flavour. +Shall be zero or greater. + + + + + + Maximum number of instances of the VIP CP based on the referenced VIP CPD that is permitted to exist for this flavour. +Shall be greater than zero and not less than the value of "minNumberOfInstances". + + + + + + + + + + + + + + + + This information element is a container for all attributes that affect the invocation of the VNF Lifecycle Management operations, structured by operation. + + + + Configuration parameters for the InstantiateVnf operation. + + + + + + References applicable LCM coordination actions that can be invoked during each of the listed VNF LCM operations. + + + + Identifies the specific VNF LCM operation. VALUES: • INSTANTIATE • SCALE • SCALE_TO_LEVEL • CHANGE_FLAVOUR • TERMINATE • HEAL • OPERATE • CHANGE_EXT_CONN • MODIFY_INFO • CREATE_SNAPSHOT • REVERT_TO_SNAPSHOT +Note: The value "CHANGE_VNFPKG" is part of this value set as the coordination actions for the "ChangeCurrrentVnfPkg" are modelled separately in the "VnfPackageChangeInfo" information element. + + + + + + + + + Indicates the number of VIP CP instances based on a particular VipCpd to be part of this level. If a particular VipCpd is defined with minNumberOfInstances= maxNumberOfInstances=1 in the vipCpProfile of the DF, that vipCpd may be omitted from the "vipCpLevel" attribute, +which shall be interpreted that one related VIP CP instance is part of this level. + + + + Uniquely references a VIP CPD. + + + + + + Number of VIP CP instances based on the referenced VipCpd to deploy for an instantiation level or for a scaling delta. Shall be zero or greater. + + + + @@ -4164,4 +4359,55 @@ VALUES: + + + + +