From d1902a5f7d52c92abae2f3d1585250d1875eab45 Mon Sep 17 00:00:00 2001 From: jjewitt58 Date: Fri, 8 Feb 2019 11:11:11 -0800 Subject: Update VNFD model to IFA011 v2.5.1 Issue-ID: MODELING-104 Change-Id: I3047eb5d1b50d70aabd00350a6770256de53b240 Signed-off-by: jjewitt58 --- ONAP Information Model/Vnf.uml | 1021 +++++++++++++++++++++++++--------------- 1 file changed, 654 insertions(+), 367 deletions(-) (limited to 'ONAP Information Model/Vnf.uml') diff --git a/ONAP Information Model/Vnf.uml b/ONAP Information Model/Vnf.uml index 0ef0e72..e3b7e8a 100644 --- a/ONAP Information Model/Vnf.uml +++ b/ONAP Information Model/Vnf.uml @@ -1,5 +1,5 @@ - + @@ -20,25 +20,6 @@ - - -

- - - Represents the type of network connectivity mandated by the VNF provider between two or more CPs which includes at least one internal CP. - - - References to VnfVirtualLinkDesc that are part of this group. - - - - - - - - - -

@@ -87,7 +68,7 @@ - +

@@ -145,24 +126,11 @@ NOTE: More software images can be attached to the virtualisation container using - - -

- - - Describes a specific flavour of the VL with specific bitrate requirements. - - - - - - - - +

- + @@ -177,12 +145,6 @@ NOTE: More software images can be attached to the virtualisation container using - - -

- - -

@@ -245,24 +207,12 @@ NOTE 2: virtualLinkProfile needs to be provided for all VLs that the CPs of the - - -

- - -

@@ -326,15 +276,6 @@ NOTE 2: virtualLinkProfile needs to be provided for all VLs that the CPs of the - - -

- - - - - -

@@ -459,8 +400,104 @@ NOTE 2: virtualLinkProfile needs to be provided for all VLs that the CPs of the + + +

+ + + + + +

+ + + Uniquely references a VLD. + + + + + +

+ + + + + +

+ + + Reference to the internal Virtual Link Descriptor (VLD) to which CPs instantiated from this external CP Descriptor (CPD) connect. + + + + + +

+ + + + + + + + +

+ + + + + +

+ + + + + + + + +

+ + + + + +

+ + + Specify instantiation priority and dependencies of VDU. + + + + + + - + Describes the associated elements of a VNFD for a certain purpose during VNF lifecycle management. @@ -472,12 +509,8 @@ NOTE 2: virtualLinkProfile needs to be provided for all VLs that the CPs of the 4. Is monitoring param a class or a data type? Jessie: It is a datatype. Due to it's relationship to event, maybe a class?? 5. Class versus datatype?? - - Not Defined in Clean - - ResourceDesc??? @@ -517,103 +550,6 @@ This will probably need to move to common Attributes in beige - added or changed - - - Type of address - - - - - - - An AllottedLink is a link provided (or allotted) by some service instance. The Allottedlink may be incorporated into the topology of some consuming service like other links. - - - - - - - - Unique identifier of the storage Qos in VNFD. - - - - - - Name of storage QoS. - - - - - - Consumer type. - - - - - Describe qualities of Qos：total_bytes_sec、total_iops_sec. - - - - - - - - - - Unique identifier of volume type in VNFD. - - - - - - Name of volume type. - - - - - - Backend volume name of cinder. - - - - - - -

- - - Specify instantiation priority and dependencies of VDU. - - - - - - - - - - - - Specifies the L2 protocol data for this virtual link. Shall be present when the associatedLayerProtocol attribute indicates a L2 protocol and shall be absent otherwise. - - - - - - - - Specifies the L3 protocol data for this virtual link. Shall be present when the associatedLayerProtocol attribute indicates a L3 protocol and shall be absent otherwise. - - - - - - - - - - @@ -625,9 +561,7 @@ A VNFC instance created based on the VDU maps to a single virtualisation contain A VNFC will only be in one VNFDesc. If a vendor wants to use the VNFC in mupliple VNFDesc (their product) they can do so, but it will be 'repeated'. -References: -tosca-nfv-YAML-v1.0-wd05-rev02 -ETSI GS NFV-IFA 011 V2.1.3 + @@ -652,7 +586,7 @@ ETSI GS NFV-IFA 011 V2.1.3 - Boot order of valid boot devices. + Boot order of valid boot devices. "key/name" indicates the the boot index "value" references a descriptor from which a valid boot device is created e.g. VirtualStorageDesc from which a VirtualStorage instance is created. NOTE: If no boot order is defined the default boot order defined in the VIM or NFVI shall be used. @@ -663,7 +597,7 @@ NOTE: If no boot order is defined the default boot order defined in the VIM or N - Describes constraints on the NFVI for the VNFC instance(s) created from this Vdu. For example, aspects of a secure hosting environment for the VNFC instance that involve additional entities or processes. + Describes constraints on the NFVI for the VNFC instance(s) created from this Vdu. For example, aspects of a secure hosting environment for the VNFC instance that involve additional entities or processes. "key/name" includes "AvailabilityZone", "HostAggregates". NOTE: These are constraints other than stipulating that a VNFC instance has access to a certain resource, as a prerequisite to instantiation. The attributes virtualComputeDesc and virtualStorageDesc define the resources required for instantiation of the VNFC instance. @@ -692,9 +626,30 @@ NOTE: These are constraints other than stipulating that a VNFC instance has acce Describes the configurable properties of all VNFC instances based on this VDU. - + + + Contains a string or a URL to a file contained in the VNF package used to customize a virtualised compute resource at boot time. The bootData may contain variable parts that are replaced by deployment specific values before being sent to the VIM. +NOTE: The parameters of each variable part shall be declared in the VnfLcmOperationsConfiguration information element as "volatile" parameters available to the bootData template during the respective VNF lifecycle management operation execution and/or in the extension attribute of the VnfInfoModifiableAttributes information element as "persistent" parameters available to the bootData template during the lifetime of the VNF instance. For VNF lifecycle management operations resulting in multiple VNFC instantiations, the VNFM supports the means to provide the appropriate parameters to appropriate VNFC instances Experimental + + + + + + + Contains a string or a URL to a file contained in the VNF package used to customize a virtualised compute resource at boot time. The bootData may contain variable parts that are replaced by deployment specific values before being sent to the VIM. +NOTE: The parameters of each variable part shall be declared in the VnfLcmOperationsConfiguration information element as "volatile" parameters available to the bootData template during the respective VNF lifecycle management operation execution and/or in the extension attribute of the VnfInfoModifiableAttributes information element as "persistent" parameters available to the bootData template during the lifetime of the VNF instance. For VNF lifecycle management operations resulting in multiple VNFC instantiations, the VNFM supports the means to provide the appropriate parameters to appropriate VNFC instances Experimental + + + + + + + + + + - Describes network connectivity between a VNFC instance (based on this Vdu) and an Virtual Link (VL). + Describes network connectivity between a VNFC instance (based on this Vdu) and an internal Virtual Link (VL). @@ -730,9 +685,7 @@ NOTE: More software images can be attached to the virtualisation container using A Vnfd, or VNF Descriptor, is template which describes a VNF in terms of deployment and operational behaviour requirements. It also contains connectivity, interface and virtualised resource requirements. -References: -tosca-nfv-YAML-v1.0-wd05-rev02 (tosca.nodes.nfv.vnfd, but node details are not defined) -ETSI GS NFV-IFA 011 V2.1.3 (VNFD) + @@ -753,13 +706,13 @@ ETSI GS NFV-IFA 011 V2.1.3 (VNFD) Software version of the VNF. This is changed when there is any change to the software that is included in the VNF Package. - + Identifies the version of the VNFD. - + @@ -779,7 +732,7 @@ ETSI GS NFV-IFA 011 V2.1.3 (VNFD) - Identifies VNFM(s) compatible with the VNF described in this version of the VNFD. + Identifies VNFM(s) compatible with the VNF described in this version of the VNFD. Use the name of micro-service of the vnfm drive. For vendor specific VNFM, the value composes of "vendorname" and "vnfmdriver", e.g. "mycompanyvnfmdriver"; for generic VNFM, the value is "gvnfmdriver". @@ -787,7 +740,7 @@ ETSI GS NFV-IFA 011 V2.1.3 (VNFD) - Information about localization languages of the VNF (includes e.g. strings in the VNFD). + Information about localization languages of the VNF (includes e.g. strings in the VNFD). Refer to ISO936 https://www.iso.org/iso-639-language-codes.html NOTE: This allows to provide one or more localization languages to support selecting a specific localization language at VNF instantiation time. @@ -815,7 +768,7 @@ Any modification of the content of the VNFD or the VNF Package shall result in a - Information about localization languages of the VNF (includes e.g. strings in the VNFD). + Information about localization languages of the VNF (includes e.g. strings in the VNFD). Refer to ISO936 https://www.iso.org/iso-639-language-codes.html NOTE: This allows to provide one or more localization languages to support selecting a specific localization language at VNF instantiation time. @@ -896,13 +849,6 @@ NOTE: This allows to provide one or more localization languages to support selec - - - Represents the type of network connectivity mandated by the VNF provider between two or more CPs which includes at least one internal CP. - - - - Reserved IP Address for VNF which is not bounded to any specific VNFC, but assigned manually from outside and potentially shared as a floating IP among VNFCs. @@ -917,14 +863,28 @@ NOTE: This allows to provide one or more localization languages to support selec + + + Defines descriptors of software images to be used by the VNF. +NOTE: This shall be used to describe both the software image loaded on the virtualization container used to realize a VDU and the software images to be stored on VirtualStorage resources (e.g., volumes) attached to a virtualization container. + + + + + + + + Represents the type of network connectivity mandated by the VNF provider between two or more CPs which includes at least one internal CP. + + + + The SwImageDesc information element describes requested additional capability for a particular VDU. Such a capability may be for acceleration or specific tasks. Storage not necessarily related to the compute, may be Network Attached Storage (NAS) -References: -tosca-nfv-YAML-v1.0-wd05-rev02 -ETSI GS NFV-IFA 011 V2.1.3 + @@ -943,7 +903,7 @@ ETSI GS NFV-IFA 011 V2.1.3 The version of this software image. - + @@ -986,7 +946,7 @@ ETSI GS NFV-IFA 011 V2.1.3 Identifies the operating system used in the software image. This attribute may also identify if a 32 bit or 64 bit software image is used. - support: + @@ -1000,42 +960,36 @@ ETSI GS NFV-IFA 011 V2.1.3 - - - The minimal disk size requirement for this software image. The value of the "size of storage" attribute of the VirtualStorageDesc referencing this SwImageDesc shall not be smaller than the value of minDisk. + + + This is a reference to the actual software image. The reference can be relative to the root of the VNF Package or can be a URL - + + The VduProfile describes additional instantiation data for a given VDU used in a DF. - - - Uniquely identifies a VDU. - - - - - Minimum number of instances of the VNFC based on this VDU that is permitted to exist for this flavour. + Minimum number of instances of the VNFC based on this VDU that is permitted to exist for this flavour. Shall be zero or greater. - Maximum number of instances of the VNFC based on this VDU that is permitted to exist for this flavour. + Maximum number of instances of the VNFC based on this VDU that is permitted to exist for this flavour. Shall be zero or greater. - Specifies affinity or anti-affinity rules applicable between the virtualisation containers (e.g. virtual machines) to be created based on this VDU. - + Specifies affinity or anti-affinity rules applicable between the virtualization containers (e.g. virtual machines) to be created based on this VDU. When the cardinality is greater than 1, both affinity rule(s) and anti-affinity rule(s) with different scopes (e.g. "Affinity with the scope resource zone and anti-affinity with the scope NFVI node") are applicable to the virtualization containers (e.g. virtual machines) to be created based on this VDU. +When the cardinality is greater than 1, both affinity rule(s) and anti-affinity rule(s) with different scopes (e.g. "Affinity with the scope resource zone and anti-affinity with the scope NFVI node") are applicable to the virtualization containers (e.g. virtual machines) to be created based on this VDU. @@ -1084,6 +1038,10 @@ NOTE: Each identifier references an affinity or anti-affinity group which expres + + + + @@ -1095,13 +1053,6 @@ NOTE: Each identifier references an affinity or anti-affinity group which expres - - - The logical Node requirements. - - - - Specifies requirements for additional capabilities. These may be for a range of purposes. One example is acceleration related capabilities. @@ -1127,8 +1078,25 @@ NOTE: Each identifier references an affinity or anti-affinity group which expres The virtual CPU(s) of the virtualised compute. + + + The associated logical node requirements. + + + + + + + The local or ephemeral disk(s) of the virtualised compute. + + + + + + The VirtualStorageDesc information element supports the specifications of requirements related to persistent virtual storage resources. Ephemeral virtual storage is specified in VirtualComputeDesc information element. + Unique identifier of this VirtualStorageDesc in the VNFD. @@ -1138,8 +1106,7 @@ NOTE: Each identifier references an affinity or anti-affinity group which expres - Type of virtualised storage resource -(e.g. volume, object). + Type of virtualised storage resource (BLOCK, OBJECT, FILE). @@ -1152,32 +1119,26 @@ NOTE: Each identifier references an affinity or anti-affinity group which expres - - - An array of key-value pairs that articulate the storage deployment requirements. - + + + Specifies the details of block storage. It shall be present when the "typeOfStorage" attribute is set to "BLOCK". It shall be absent otherwise. - - - + + - - - Indicate if the storage support RDMA. - + + + Specifies the details of object storage. It shall be present when the "typeOfStorage" attribute is set to "OBJECT". It shall be absent - - - + + - - - Software image to be loaded on the VirtualStorage resource created based on this VirtualStorageDesc. - + + + Specifies the details of file storage. It shall be present when the "typeOfStorage" attribute is set to "FILE". It shall be absent otherwise. - - - + + @@ -1202,7 +1163,7 @@ NOTE: Each identifier references an affinity or anti-affinity group which expres - + A communication channel that connects two or more devices, nodes, or entities. @@ -1238,20 +1199,6 @@ NOTE: Each identifier references an affinity or anti-affinity group which expres - - - Defines the virtualised resources monitoring parameters on VLD level. - - - - - - - Describes a specific flavour of the VL with specific bitrate requirements. - - - - @@ -1333,6 +1280,13 @@ NOTE: Each identifier references an affinity or anti-affinity group which expres + + + Reference(s) of the Virtual Link Descriptor to which this Connection Point Descriptor(s) connects. + + + + @@ -1351,6 +1305,21 @@ NOTE: Each identifier references an affinity or anti-affinity group which expres + + + This attribute references the "instantiationLevel" entry which defines the default instantiation level for this DF. It shall be present if there are multiple "instantiationLevel" entries. + + + + + + + + Specifies the virtualised resource related performance metrics to be tracked by the VNFM. + + + + Defines the internal VLD along with additional data which is used in this DF. @@ -1429,6 +1398,13 @@ BaseConfigGroup may establish internal networks such as OAM (VNF Mgmt) or MNS (M + + + Declares the VNF indicators that are supported by this VNF (specific to this DF). + + + + @@ -1441,13 +1417,19 @@ NOTE: In case of referencing an intCpd via its identifier, the virtualNetworkInt - + - Reference to the internal VDU CPD which is used to instantiate internal CPs. These internal CPs are, in turn, exposed as external CPs defined by this external CPD. + A VnfExtCpd is a type of Cpd and describes an external interface, a.k.a external CP, exposed by this VNF enabling connection with a VL. +When the VnfExtCpd is mapped to a VduCpd, the values for the attributes type, subType and description shall be identical for both elements. + + + + + @@ -1629,18 +1611,19 @@ NOTE: If not present, it is assumed that the bitrate requirements can be derived The VduLevel information element indicates for a given VDU in a given level the number of instances to deploy. - - - Uniquely identifies a VDU. - - - Number of instances of VNFC based on this VDU to deploy for an instantiation level or for a scaling delta. + + + Uniquely identifies a VDU. + + + + @@ -2052,6 +2035,12 @@ Diversity - Resources are geo-diverse ( cannot be co-located). The VirtualLinkProfile describes additional instantiation data for a given VL used in a DF. + + + Uniquely identifies this VirtualLinkProfile class + + + Specifies affinity or anti-affinity rules applicable between the VLs based on this VnfVirtualLinkDesc. @@ -2063,17 +2052,6 @@ When the cardinality is greater than 1, both affinity rule(s) and anti-affinity - - - Identifier(s) of the affinity or anti-affinity group(s) the VnfVirtualLinkDesc belongs to. - -NOTE: Each identifier references an affinity or anti-affinity group which expresses affinity or anti-affinity relationship between the VL(s) using this VnfVirtualLinkDesc and the VL(s) using other VnfVirtualLinkDesc(s) in the same group. - - - - - - Specifies the minimum bitrate requirements for a VL instantiated according to this profile. @@ -2088,47 +2066,27 @@ NOTE: Each identifier references an affinity or anti-affinity group which expres - - - Specifies initiation parameters for the virtual link. - - - - - - - - Type of the network - - - - - - - - Indicating whether DHCP is enabled. Default is "FALSE" if not specified otherwise. - - - - - - - - Indicating whether "VLAN Transparent Mode" is supported. Default is "FALSE" if not specified otherwise. - - - - - - + Identifies a flavour within the VnfVirtualLinkDesc. - - - Uniquely identifies a Vnf VLD. + + + Identifies an affinity or anti-affinity group the VLs instantiated according to the VlProfile belong to. +NOTE : Each identifier references an affinity or anti-affinity group which expresses affinity or anti-affinity relationship between the VL(s) using this VirtualLinkProfile and the VL(s) using other VirtualLinkProfile(s) in the same group. + + + + + + + + + Uniquely references a VLD. + + @@ -2163,6 +2121,24 @@ NOTE: Each identifier references an affinity or anti-affinity group which expres The ScalingAspect class describes the details of an aspect used for horizontal scaling. + + + Unique identifier of this aspect in the VNFD. + + + + + + Human readable name of the aspect. + + + + + + Human readable description of the aspect. + + + @@ -2324,9 +2300,62 @@ NOTE: It indicates an exhaustive list of all the CP instances and SAP instances + + + A software image + + + + + This information element describes compute, memory and I/O requirements that are to be associated with the logical node of infrastructure. The logical node requirements are a sub-component of the VDU level requirements. As an example for illustration purposes, a logical node correlates to the concept of a NUMA cell in libvirt terminology. + + + + Identifies this set of logical node requirements. + + + + + + The logical node-level compute, memory and I/O requirements. An array of key-value pairs that articulate the deployment requirements. +This could include the number of CPU cores on this logical node, a memory configuration specific to a logical node (e.g. such as available in the Linux kernel via the libnuma library) or a requirement related to the association of an I/O device with the logical node. + + + + + + + + + + Represents the type of network connectivity mandated by the VNF vendor between two or more Connection Points which includes at least one Internal Connection Point. + + + + + Specifies the virtualised resource related performance metrics on VLD level to be tracked by the VNFM. + + + + + + + Describes a specific flavour of the VL with specific bitrate requirements. + + + + + + + + An AllottedLink is a link provided (or allotted) by some service instance. The Allottedlink may be incorporated into the topology of some consuming service like other links. + + + + - + This information element describes compute, memory and I/O requirements that are to be associated with the logical node of infrastructure. The logical node requirements are a sub-component of the VDU level requirements. As an example for illustration purposes, a logical node correlates to the concept of a NUMA cell in libvirt terminology. @@ -2586,7 +2615,7 @@ NOTE: A cardinality of "0" indicates that configuring this present VNF - + Describes VNF lifecycle event(s) or an external stimulus detected on a VNFM reference point. @@ -2631,7 +2660,7 @@ NOTE: The scriptInput values are passed to the scripts in addition to the parame - Specifies the virtualised resource related performance metric to be tracked by the VNFM, e.g. for auto-scaling purposes. The VNFM collects the values of performance metrics identified by this information element from the VIM(s) using one or more locally initiated PM Jobs. These values can be used as inputs to auto-scaling rules. + Specifies the virtualized resource related performance metric to be tracked by the VNFM, e.g. for auto-scaling purposes. The VNFM collects the values of performance metrics identified by this information element from the VIM(s) using one or more locally initiated PM Jobs. These values can be used as inputs to auto-scaling rules. @@ -2648,9 +2677,12 @@ NOTE: The scriptInput values are passed to the scripts in addition to the parame + + Identifies the virtualized resource performance metric. + - + An attribute that describes the recommended periodicity at which to collect the performance information. @@ -2698,11 +2730,10 @@ NOTE: The MANO or NFVI may not support the recommended collectionPeriod based on The ScaleInfo information element represents a scale level for a particular scaling aspect. - + Reference to the scaling aspect. - @@ -2831,6 +2862,158 @@ NOTE 3: When the corresponding NS level is used in the context of NS scaling, t + + + Specifies the details of the block storage resource. + + + + Size of virtualised storage resource in GB. + + + + + + An array of key-value pairs that articulate the storage deployment requirements. + + + + + + + + Indicates if the storage supports rdma. + + + + + + + + Software image to be loaded on the VirtualStorage resource created based on this VirtualStorageDesc. +Shall be absent when used for virtual disks. + + + + + + + + + The ObjectStorageData information element specifies the details of object storage resource. + + + + Max size of virtualised storage resource in GB. + + + + + + + + + The FileStorageData information element specifies the details of file storage resource. + + + + Size of virtualised storage resource in GB. + + + + + + The shared file system protocol (e.g. NFS, CIFS). + + + + + + Reference of the internal VLD which this file storage connects to. +The attached VDUs shall connect to the same internal VLD. + + + + + + + Type of address + + + + + + + + Unique identifier of the storage Qos in VNFD. + + + + + + Name of storage QoS. + + + + + + Consumer type. + + + + + Describe qualities of Qos：total_bytes_sec、total_iops_sec. + + + + + + + + + + Unique identifier of volume type in VNFD. + + + + + + Name of volume type. + + + + + + Backend volume name of cinder. + + + + + + + + + + + + + + + Specifies the L2 protocol data for this virtual link. Shall be present when the associatedLayerProtocol attribute indicates a L2 protocol and shall be absent otherwise. + + + + + + + + Specifies the L3 protocol data for this virtual link. Shall be present when the associatedLayerProtocol attribute indicates a L3 protocol and shall be absent otherwise. + + + + + + @@ -2848,8 +3031,6 @@ NOTE 3: When the corresponding NS level is used in the context of NS scaling, t - - @@ -2862,14 +3043,10 @@ NOTE 3: When the corresponding NS level is used in the context of NS scaling, t - - - + - - @@ -2877,9 +3054,7 @@ NOTE 3: When the corresponding NS level is used in the context of NS scaling, t - - @@ -2896,7 +3071,7 @@ NOTE 3: When the corresponding NS level is used in the context of NS scaling, t - + @@ -2910,7 +3085,7 @@ NOTE 3: When the corresponding NS level is used in the context of NS scaling, t - + @@ -2918,8 +3093,8 @@ NOTE 3: When the corresponding NS level is used in the context of NS scaling, t - - + + @@ -2931,7 +3106,6 @@ NOTE 3: When the corresponding NS level is used in the context of NS scaling, t - @@ -2945,9 +3119,7 @@ NOTE 3: When the corresponding NS level is used in the context of NS scaling, t - - @@ -2956,7 +3128,6 @@ NOTE 3: When the corresponding NS level is used in the context of NS scaling, t - @@ -2965,16 +3136,11 @@ NOTE 3: When the corresponding NS level is used in the context of NS scaling, t - - - - + - - @@ -2982,7 +3148,7 @@ NOTE 3: When the corresponding NS level is used in the context of NS scaling, t - + @@ -2997,7 +3163,7 @@ NOTE 3: When the corresponding NS level is used in the context of NS scaling, t - + @@ -3006,13 +3172,8 @@ NOTE 3: When the corresponding NS level is used in the context of NS scaling, t - - - - - @@ -3020,13 +3181,12 @@ NOTE 3: When the corresponding NS level is used in the context of NS scaling, t - + - @@ -3068,7 +3228,7 @@ NOTE 3: When the corresponding NS level is used in the context of NS scaling, t - + @@ -3080,8 +3240,6 @@ NOTE 3: When the corresponding NS level is used in the context of NS scaling, t - - @@ -3142,7 +3300,6 @@ NOTE 3: When the corresponding NS level is used in the context of NS scaling, t - @@ -3156,7 +3313,6 @@ NOTE 3: When the corresponding NS level is used in the context of NS scaling, t - @@ -3181,13 +3337,8 @@ NOTE 3: When the corresponding NS level is used in the context of NS scaling, t - - - - - @@ -3195,7 +3346,6 @@ NOTE 3: When the corresponding NS level is used in the context of NS scaling, t - @@ -3215,7 +3365,6 @@ NOTE 3: When the corresponding NS level is used in the context of NS scaling, t - @@ -3233,19 +3382,14 @@ NOTE 3: When the corresponding NS level is used in the context of NS scaling, t - - - - - @@ -3258,7 +3402,6 @@ NOTE 3: When the corresponding NS level is used in the context of NS scaling, t - @@ -3368,8 +3511,6 @@ NOTE 3: When the corresponding NS level is used in the context of NS scaling, t - - @@ -3384,7 +3525,6 @@ NOTE 3: When the corresponding NS level is used in the context of NS scaling, t - @@ -3397,7 +3537,6 @@ NOTE 3: When the corresponding NS level is used in the context of NS scaling, t - @@ -3498,4 +3637,152 @@ NOTE 3: When the corresponding NS level is used in the context of NS scaling, t + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +