From d621ef46b5475d9f448b9fdeb00563d5745df440 Mon Sep 17 00:00:00 2001 From: jjewitt58 Date: Mon, 11 Feb 2019 13:03:25 -0800 Subject: Papyrus weekly admin changes Issue-ID: MODELING-104 Change-Id: Ib7f1e0ab732a83baa19a58e49785d7dcafbf64a5 Signed-off-by: jjewitt58 --- ONAP Information Model/Common.notation | 30 ---- ONAP Information Model/Common.uml | 120 +++++++++++----- ONAP Information Model/Ns.uml | 4 +- ONAP Information Model/Pnf.notation | 9 -- ONAP Information Model/Vnf.notation | 247 ++++++++------------------------- ONAP Information Model/Vnf.uml | 246 +++++++++++++------------------- 6 files changed, 244 insertions(+), 412 deletions(-) (limited to 'ONAP Information Model') diff --git a/ONAP Information Model/Common.notation b/ONAP Information Model/Common.notation index 7c98309..27013c2 100644 --- a/ONAP Information Model/Common.notation +++ b/ONAP Information Model/Common.notation @@ -8971,11 +8971,6 @@ - - - - - @@ -9038,38 +9033,18 @@ - - - - - - - - - - - - - - - - - - - - @@ -9090,11 +9065,6 @@ - - - - - diff --git a/ONAP Information Model/Common.uml b/ONAP Information Model/Common.uml index 826613d..4fa1837 100644 --- a/ONAP Information Model/Common.uml +++ b/ONAP Information Model/Common.uml @@ -6296,9 +6296,6 @@ White - Not Ready for Review Common part of the various VLDs. - - - Uniquely identifies a VLD in the parent descriptor. @@ -6545,8 +6542,9 @@ Note: the description of this class are different in ETSI GS NFV IFA 011 and ETS - A Cpd information element describes network connectivity to a compute resource or a VL. This is an abstract class used -as parent for the various Cpd classes. + The Cpd class specifies the characteristics of connection points attached to NFs and NSs. This is an abstract class used as parent for the various Cpd classes. + +Note 1: the description of this class is different in ETSI GS NFV IFA 011 and ETSI GS NFV IFA 014. The present definition uses the definition in ETSI GS NFV IFA 014 as it is the more general. @@ -6554,7 +6552,7 @@ as parent for the various Cpd classes. - + Identifies the role of the port in the context of the traffic flow patterns in the VNF or parent NS. @@ -6591,18 +6589,19 @@ Editor's note: the attribute "layerProtocol" still needs further discu - - - For specifying floating IP(s) to be shared among Cpds, which are reserved for vnfReservedCpd described in the VNFD. - + + + Identifies which protocol the CP uses for connectivity purposes (Ethernet, MPLS, ODU2, IPV4, IPV6, Pseudo-Wire, etc.). - - + + - The AffinityOrAntiAffinityGroup class describes the affinity or anti-affinity relationship. + The AffinityOrAntiAffinityGroup class describes the affinity or anti-affinity relationship. For NSs, those rules are applicable between the VNF instances created using different VnfProfiles, the Virtual Link instances created using different VlProfiles or the nested NS instances created using different NsProfiles. + +For VNFs, those rules are applicable between the virtualization containers to be created based on different VDUs, or between internal VLs to be created based on different VnfVirtualLinkDesc(s). @@ -7015,7 +7014,7 @@ NOTE: These attributes are used to control scaling boundaries. The AddressData information element supports providing information about the addressing scheme and parameters applicable to a CP. - + Describes the type of the address to be assigned to the CP instantiated from the parent CPD. The content type shall be aligned with the address type supported by the layerProtocol attribute of the parent CPD. @@ -7040,11 +7039,11 @@ Shall be present when the addressType is IP address. - The ConnectivityType datatype specifies the protocol exposed by a VL and the flow pattern supported by the VL. + The ConnectivityType datatype specifies the protocol exposed by a VL and the flow pattern supported by the VL.The top layer protocol of the VL protocol stack shall always be provided. The lower layer protocols may be included when there are specific requirements on these layers. - Identifies the protocol this VL gives access to (Ethernet, MPLS, ODU2, IPV4, IPV6, Pseudo-Wire). + Identifies the protocols to which this VL gives access (Ethernet, MPLS, ODU2, IPV4, IPV6, Pseudo-Wire). @@ -7069,10 +7068,10 @@ Shall be present when the addressType is IP address. - Provides information on the addresses to be assigned to the CP(s) instantiated from the CPD. + Provides information on the address to be assigned to the CP(s) instantiated from the CPD. - - + + @@ -7107,7 +7106,7 @@ If it is set to True, it is the management and orchestration function responsibi - + Define address type. @@ -7211,13 +7210,6 @@ Per VNF, the affinity/anti-affinity rules defined using this information element - - - Type of network supported. - - - - The L2ProtocolData information element describes the L2 protocol related data for a virtual link. @@ -7225,7 +7217,7 @@ Per VNF, the affinity/anti-affinity rules defined using this information element The L2ProtocolData information element describes the L2 protocol related data for a virtual link. - + Network name associated with this L2 protocol. @@ -7290,7 +7282,7 @@ transparency for this L2 protocol or not. - + Specifies the network type for this L2 protocol. Possible values: FLAT, VLAN, @@ -7459,6 +7451,56 @@ Value: + + + The QoS datatype specifies quality of service parameters applicable to a VL. +It is the asbstract parent of the NsQos and VnfQos datatypes, as the NsQoS (QoS in ETSI GS NFV IFA 014) includes a priority attribute, while VnfQoS (QoS in ETSI GS NFV IFA 011) does not. + + + + + Maximum latency in ms. + + + + + + Maximum jitter in ms. + + + + + Maximum packet loss ratio. Cardinality is 0 if no packetLossRatio requirement exists. + + + + + + + Qos ID. + + + + + Human readable Qos name. + + + + + + Detailed requirements of Qos, including maximum bandwidth limitation{max_kbps}、maximum burst bandwidth limitation{max_burst_kbps} 、direction{egress|ingress},etc. + + + + + + + + Type of address + + + + @@ -8149,7 +8191,6 @@ Value: - @@ -8872,12 +8913,11 @@ Value: - + - @@ -8895,7 +8935,6 @@ Value: - @@ -8910,9 +8949,6 @@ Value: - - - @@ -9038,4 +9074,16 @@ Value: + + + + + + + + + + + + diff --git a/ONAP Information Model/Ns.uml b/ONAP Information Model/Ns.uml index 5bf2392..df1dc57 100644 --- a/ONAP Information Model/Ns.uml +++ b/ONAP Information Model/Ns.uml @@ -119,7 +119,7 @@ - + The NSD class is a deployment template whose instances are used by the NFVO for the lifecycle management of NSs. For all attributes in this class, the Producer is SDC and the Consumer is SDC/UUI/VFC @@ -537,7 +537,7 @@ NOTE 2: A minimum set of external stimulus includes: the receipt of request mess The NsQoS datatype specifies quality of service parameters applicable to a NS VL. - + diff --git a/ONAP Information Model/Pnf.notation b/ONAP Information Model/Pnf.notation index 4bdc646..406c1a1 100644 --- a/ONAP Information Model/Pnf.notation +++ b/ONAP Information Model/Pnf.notation @@ -192,15 +192,6 @@ - - - - - - - - - diff --git a/ONAP Information Model/Vnf.notation b/ONAP Information Model/Vnf.notation index 45bf803..41e0e48 100644 --- a/ONAP Information Model/Vnf.notation +++ b/ONAP Information Model/Vnf.notation @@ -868,7 +868,7 @@ - + @@ -880,7 +880,7 @@ - + @@ -889,7 +889,7 @@ - + @@ -898,7 +898,7 @@ - + @@ -923,13 +923,13 @@ - + - + @@ -1595,7 +1595,7 @@ - + @@ -2086,6 +2086,15 @@ + + + + + + + + + @@ -2109,7 +2118,7 @@ - + @@ -2340,17 +2349,14 @@ - - -
- - - + + + - + - - + + @@ -2375,7 +2381,7 @@ - + @@ -2487,48 +2493,6 @@ - - -
-
-
- - - - - - - - - - - -
-
-
- - - - - - - - - - - -
-
-
- - - - - - - - - @@ -2667,7 +2631,7 @@ - + @@ -2676,7 +2640,7 @@ - + @@ -2685,7 +2649,7 @@ - + @@ -2694,7 +2658,7 @@ - + @@ -2826,7 +2790,7 @@ - + @@ -2933,7 +2897,7 @@ - + @@ -2985,16 +2949,16 @@ - + - - - + + + @@ -3025,7 +2989,7 @@ - + @@ -3107,7 +3071,7 @@ - + @@ -3147,7 +3111,7 @@ - + @@ -3312,7 +3276,7 @@ - + @@ -3757,48 +3721,6 @@ - - -
-
-
- - - - - - - - - - - -
-
-
- - - - - - - - - - - -
-
-
- - - - - - - - - @@ -4774,13 +4696,13 @@ - + - + @@ -5039,7 +4961,7 @@ - + @@ -6666,28 +6588,6 @@ - - - - - - - - - - - - - - - - - - - - - - @@ -6796,7 +6696,7 @@ - + @@ -6805,7 +6705,7 @@ - + @@ -6814,7 +6714,7 @@ - + @@ -6828,7 +6728,7 @@ - + @@ -6842,7 +6742,7 @@ - + @@ -6856,7 +6756,7 @@ - + @@ -6870,7 +6770,7 @@ - + @@ -7603,14 +7503,6 @@ - - - - - - - - @@ -7630,7 +7522,7 @@ - + @@ -8188,16 +8080,6 @@ - - - - - - - - - - @@ -8221,7 +8103,7 @@ - + @@ -8543,11 +8425,11 @@ - + - + @@ -8555,13 +8437,13 @@ - + - + @@ -8708,7 +8590,7 @@ - + @@ -8936,13 +8818,13 @@ - + - + @@ -9310,7 +9192,7 @@ - + @@ -9334,7 +9216,7 @@ - + @@ -9484,17 +9366,6 @@ - - - - - - - - - - - diff --git a/ONAP Information Model/Vnf.uml b/ONAP Information Model/Vnf.uml index e3b7e8a..594b4e3 100644 --- a/ONAP Information Model/Vnf.uml +++ b/ONAP Information Model/Vnf.uml @@ -281,7 +281,9 @@ NOTE 2: virtualLinkProfile needs to be provided for all VLs that the CPs of the
- + + + @@ -1163,43 +1165,6 @@ NOTE: Each identifier references an affinity or anti-affinity group which expres - - - A communication channel that connects two or more devices, nodes, or entities. - - - - - - - Unique identifier of this internal VLD in VNFD. - - - - - - - Specifies the protocol exposed by a VL and the flow pattern supported by the VL. - - - - - - Specifies test access facilities expected on the VL (e.g. none, passive monitoring, or active (intrusive) loopbacks at endpoints). - - - - - - - - Provides human-readable information on the purpose of the VL (e.g. control plane traffic). - - - - - - A VduCpd information element is a type of Cpd and describes network connectivity between a VNFC instance (based on this VDU) and an internal VL. @@ -1273,10 +1238,11 @@ NOTE: Each identifier references an affinity or anti-affinity group which expres - + Describe the Qos requirements of the VduCpd. + @@ -1287,6 +1253,15 @@ NOTE: Each identifier references an affinity or anti-affinity group which expres + + + For specifying floating IP(s) to be shared among Cpds, which are reserved for vnfReservedCpd described in the VNFD. + + + + + + @@ -1457,10 +1432,11 @@ A given element can belong to multiple groups. - + References to VnfVirtualLinkDesc that are part of this group. + @@ -1501,7 +1477,7 @@ A given element can belong to multiple groups. The VirtualLinkDescFlavour describes additional instantiation data for a given internal VL used in a DF. - + QoS of the VL. @@ -2088,27 +2064,6 @@ NOTE : Each identifier references an affinity or anti-affinity group which expr - - - Network segment ID (VLAN/VxLAN ID). - - - - - - - - - - - - - Specify if a vrouter comes from an external network. - - - - - Specifies the protocol data for a VL instantiated according to this profile. Cardinality 0 is used when no protocol data needs to be specified. @@ -2330,7 +2285,9 @@ This could include the number of CPU cores on this logical node, a memory config 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. @@ -2351,7 +2308,9 @@ This could include the number of CPU cores on this logical node, a memory config 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. - + + + @@ -2516,52 +2475,6 @@ This could include the number of CPU cores on this logical node, a memory config - - - The QoS information element describes QoS data for a given VL used in a DF. - - - - Maximum latency in ms. - - - - - - - Maximum jitter in ms. - - - - - - Maximum packet loss ratio. Cardinality is 0 if no packetLossRatio requirement exists. - - - - - - - - Qos ID. - - - - - - Human readable Qos name. - - - - - - Detailed requirements of Qos, including maximum bandwidth limitation{max_kbps}、maximum burst bandwidth limitation{max_burst_kbps} 、direction{egress|ingress},etc. - - - - - - This datatype defines the configurable properties of a VNF (e.g. related to auto scaling and auto healing). For a VNF instance, the value of these properties can be modified by the VNFM @@ -2927,21 +2840,15 @@ Shall be absent when used for virtual disks. - + Reference of the internal VLD which this file storage connects to. The attached VDUs shall connect to the same internal VLD. + - - - Type of address - - - - @@ -3014,6 +2921,14 @@ The attached VDUs shall connect to the same internal VLD. + + + The QoS as applied to the vnf. + + + + + @@ -3028,6 +2943,12 @@ The attached VDUs shall connect to the same internal VLD. + + + + + + @@ -3136,11 +3057,18 @@ The attached VDUs shall connect to the same internal VLD. - - - - - + + + + + + + + + + + + @@ -3220,9 +3148,15 @@ The attached VDUs shall connect to the same internal VLD. - - - + + + + + + + + + @@ -3341,11 +3275,18 @@ The attached VDUs shall connect to the same internal VLD. - - - - - + + + + + + + + + + + + @@ -3455,10 +3396,15 @@ The attached VDUs shall connect to the same internal VLD. - - - - + + + + + + + + + @@ -3499,9 +3445,12 @@ The attached VDUs shall connect to the same internal VLD. - - - + + + + + + @@ -3569,9 +3518,15 @@ The attached VDUs shall connect to the same internal VLD. - - - + + + + + + + + + @@ -3583,9 +3538,6 @@ The attached VDUs shall connect to the same internal VLD. - - - @@ -3649,7 +3601,6 @@ The attached VDUs shall connect to the same internal VLD. - @@ -3687,7 +3638,6 @@ The attached VDUs shall connect to the same internal VLD. - @@ -3765,7 +3715,6 @@ The attached VDUs shall connect to the same internal VLD. - @@ -3785,4 +3734,7 @@ The attached VDUs shall connect to the same internal VLD. + + + -- cgit 1.2.3-korg