From 922fcdc516c95eb8c68d1c7d3c928e74e6aa5e1a Mon Sep 17 00:00:00 2001 From: jjewitt58 Date: Wed, 20 Feb 2019 11:50:56 -0800 Subject: Align the VNFD model with IFA011 2.5.1 Issue-ID: MODELING-104 Change-Id: I8ccb0d2e91f02e8a7747bf6b6611ce91b4860605 Change-Id: I8ccb0d2e91f02e8a7747bf6b6611ce91b4860605 Signed-off-by: jjewitt58 --- ONAP Information Model/.project | 2 +- ONAP Information Model/Common.notation | 112 ---- ONAP Information Model/Common.uml | 100 ++-- .../GenDoc/ONAP GenDoc Template.docx | Bin 43676 -> 43775 bytes ...ONAP Model GenDoc Template-Landscape-v3-02.docx | Bin 50916 -> 50504 bytes .../GenDoc/ONAP Model Structure.docx | Bin 42072 -> 44790 bytes .../ModelStructure/OnapModelStructure.docx | Bin 0 -> 46348 bytes ONAP Information Model/Party.uml | 91 ++-- ONAP Information Model/Vnf.notation | 578 ++++++++------------- ONAP Information Model/Vnf.uml | 242 +++++---- 10 files changed, 439 insertions(+), 686 deletions(-) create mode 100644 ONAP Information Model/ModelStructure/OnapModelStructure.docx (limited to 'ONAP Information Model') diff --git a/ONAP Information Model/.project b/ONAP Information Model/.project index dcd9a6c..1271b05 100644 --- a/ONAP Information Model/.project +++ b/ONAP Information Model/.project @@ -1,6 +1,6 @@ - ONAP Information Model + ONAP Information Model-2019-02-19 diff --git a/ONAP Information Model/Common.notation b/ONAP Information Model/Common.notation index 5cbf59e..ff02f7a 100644 --- a/ONAP Information Model/Common.notation +++ b/ONAP Information Model/Common.notation @@ -2490,82 +2490,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2944,22 +2868,6 @@ - - - - - - - - - - - - - - - - @@ -3419,26 +3327,6 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/ONAP Information Model/Common.uml b/ONAP Information Model/Common.uml index ff6927d..67a1120 100644 --- a/ONAP Information Model/Common.uml +++ b/ONAP Information Model/Common.uml @@ -6786,7 +6786,7 @@ NOTE: This allows to provide one or more localization languages to support sel - + Specifies affinity and anti-affinity rules applicable between VLs instantiated from the referenced VLD. @@ -6801,13 +6801,13 @@ NOTE : Each identifier references an affinity or anti-affinity group which expr - + Specifies the maximum bitrate requirements for a VL instantiated according to this profile. NOTE: These attributes are used to control scaling boundaries. - + Specifies the minimum bitrate requirements for a VL instantiated according to this profile. NOTE: These attributes are used to control scaling boundaries. @@ -7065,6 +7065,9 @@ Shall be present when the addressType is IP address. + + The L2AddressData information element supports providing information about Layer 2 level addressing applicable to a CP. + Specify if the MAC address assignment is the responsibility of management and orchestration function or not. @@ -7117,7 +7120,7 @@ NOTE: The address type should be aligned with the address type supported by the - Identifies the protocol this VL gives access to + Identifies the protocol to which this VL gives access. @@ -7126,26 +7129,6 @@ NOTE: The address type should be aligned with the address type supported by the - - - The LinkBitrateRequirements datatype describes the requirements in terms of bitrate for a Virtual Link. - - - - Specifies the throughput requirement of the link (e.g. bitrate of E-Line, root bitrate of E-Tree, aggregate capacity of E-LAN). - - - - - - Specifies the throughput requirement of leaf connections to the link when applicable to the connectivity type (e.g. for E-Tree and E-LAN branches). -NOTE: The present document does not specify the means to declare different bitrate requirements for leaf connections (e.g. E-LAN leaves). - - - - - - The LinkBitrateRequirements information element describes the requirements in terms of bitrate for a VL. @@ -7167,21 +7150,6 @@ NOTE: The present document does not specify the means to declare different bitra - - - - Specifies whether the rule is an affinity rule or an anti-affinity rule. - - - - - - - Specifies the scope of the rule. - - - - The LocalAffinityOrAntiAffinityRule describes the affinity or anti-affinity rule applicable between the virtualization containers to be created based on a particular VDU, or between internal VLs to be created based on a particular VnfVirtualLinkDesc. @@ -7274,9 +7242,7 @@ transparency for this L2 protocol or not. - Specifies the network type for this L2 -protocol. Possible values: FLAT, VLAN, -VXLAN, GRE. + Specifies the network type for this L2 protocol. @@ -7418,13 +7384,9 @@ Note: The value of ipv6RaMode and ipv6AddressMode must be same. - Specifies IPv6 address mode. Possible -values: -• SLAAC. -• DHCPV6-STATEFUL. -• DHCPV6-STATELESS. + Specifies IPv6 address mode. May be present when the value of the -ipVersion attribute is "IPV6" and shall be +ipVersion attribute is IPV6 and shall be absent otherwise. @@ -7959,10 +7921,6 @@ It is the asbstract parent of the NsQos and VnfQos datatypes, as the NsQoS (QoS - - - - @@ -8284,8 +8242,6 @@ It is the asbstract parent of the NsQos and VnfQos datatypes, as the NsQoS (QoS - - @@ -9214,4 +9170,40 @@ It is the asbstract parent of the NsQos and VnfQos datatypes, as the NsQoS (QoS + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ONAP Information Model/GenDoc/ONAP GenDoc Template.docx b/ONAP Information Model/GenDoc/ONAP GenDoc Template.docx index 05066f9..1040c94 100644 Binary files a/ONAP Information Model/GenDoc/ONAP GenDoc Template.docx and b/ONAP Information Model/GenDoc/ONAP GenDoc Template.docx differ diff --git a/ONAP Information Model/GenDoc/ONAP Model GenDoc Template-Landscape-v3-02.docx b/ONAP Information Model/GenDoc/ONAP Model GenDoc Template-Landscape-v3-02.docx index 09829d5..569d66c 100644 Binary files a/ONAP Information Model/GenDoc/ONAP Model GenDoc Template-Landscape-v3-02.docx and b/ONAP Information Model/GenDoc/ONAP Model GenDoc Template-Landscape-v3-02.docx differ diff --git a/ONAP Information Model/GenDoc/ONAP Model Structure.docx b/ONAP Information Model/GenDoc/ONAP Model Structure.docx index 93c9b20..5fac349 100644 Binary files a/ONAP Information Model/GenDoc/ONAP Model Structure.docx and b/ONAP Information Model/GenDoc/ONAP Model Structure.docx differ diff --git a/ONAP Information Model/ModelStructure/OnapModelStructure.docx b/ONAP Information Model/ModelStructure/OnapModelStructure.docx new file mode 100644 index 0000000..999af9b Binary files /dev/null and b/ONAP Information Model/ModelStructure/OnapModelStructure.docx differ diff --git a/ONAP Information Model/Party.uml b/ONAP Information Model/Party.uml index 6726e2a..7e968b7 100644 --- a/ONAP Information Model/Party.uml +++ b/ONAP Information Model/Party.uml @@ -1,37 +1,62 @@ - - - - - - + + + + + + + + + + + + + + + + + + + + +
+ + + + + + +
+ + + + - - - - - - - - - - - - -
+ + + + + +
+
+
+
+
- - - - - -
+ + - - - - - - - - + + + + + + + + + + + + + + diff --git a/ONAP Information Model/Vnf.notation b/ONAP Information Model/Vnf.notation index 41e0e48..32edc05 100644 --- a/ONAP Information Model/Vnf.notation +++ b/ONAP Information Model/Vnf.notation @@ -856,76 +856,6 @@ - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -994,7 +924,7 @@ - + @@ -1156,6 +1086,81 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1264,11 +1269,11 @@ - + - + @@ -1444,7 +1449,7 @@ - + @@ -1592,16 +1597,6 @@ - - - - - - - - - - @@ -1612,37 +1607,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1820,6 +1784,70 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2118,7 +2146,7 @@ - + @@ -2381,7 +2409,7 @@ - + @@ -2392,8 +2420,8 @@ - -
+ +
@@ -2516,7 +2544,7 @@ - + @@ -2625,41 +2653,32 @@ - - - + + + - + - - + + - - - + + + - + - - + + - - - + + + - + - - - - - - - - - - - + + @@ -2684,7 +2703,7 @@ - + @@ -2844,7 +2863,7 @@ - + @@ -2956,9 +2975,9 @@ - - - + + + @@ -2967,7 +2986,7 @@ - + @@ -3034,12 +3053,12 @@ - + - + @@ -3102,7 +3121,7 @@ - + @@ -3187,35 +3206,41 @@ - -
+ +
+
- + + - + + - + + - + + - + + - + - + @@ -3271,32 +3296,38 @@ - + - + + + - + + - + + - + + - + + @@ -3306,31 +3337,37 @@ + + - + + - + + - + +
- + + - + - + @@ -3361,11 +3398,11 @@ - + - + @@ -3762,7 +3799,7 @@ - + @@ -4159,7 +4196,7 @@ - + @@ -7871,59 +7908,6 @@ - - -
-
-
- - - - - - - - -
-
-
- - - -
- - - - - - - - - - -
-
-
- - - - - - - - - - - - - - - - - - - - @@ -8240,16 +8224,6 @@ - - - - - - - - - - @@ -9398,120 +9372,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ONAP Information Model/Vnf.uml b/ONAP Information Model/Vnf.uml index 594b4e3..18f08f4 100644 --- a/ONAP Information Model/Vnf.uml +++ b/ONAP Information Model/Vnf.uml @@ -1382,6 +1382,11 @@ BaseConfigGroup may establish internal networks such as OAM (VNF Mgmt) or MNS (M + + 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. + + Specifies requirements on a virtual network interface realising the CPs instantiated from this CPD. @@ -1406,41 +1411,6 @@ When the VnfExtCpd is mapped to a VduCpd, the values for the attributes type, su - - - A VNFD Element Group is a mechanism for associating elements of a VNFD (Vdus and VnfVirtualLinkDesc(s)) for a -certain purpose, for example, scaling aspects. - -A given element can belong to multiple groups. - - - - Unique identifier of this group in the VNFD. - - - - - - Human readable description of the group. - - - - - - References to Vdus that are part of this group. - - - - - - - References to VnfVirtualLinkDesc that are part of this group. - - - - - - The VnfIndicator information element defines the indicator the VNF supports. @@ -1601,6 +1571,41 @@ NOTE: If not present, it is assumed that the bitrate requirements can be derived + + + A VNFD Element Group is a mechanism for associating elements of a VNFD (Vdus and VnfVirtualLinkDesc(s)) for a +certain purpose, for example, scaling aspects. + +A given element can belong to multiple groups. + + + + Unique identifier of this group in the VNFD. + + + + + + Human readable description of the group. + + + + + + References to Vdus that are part of this group. + + + + + + + References to VnfVirtualLinkDesc that are part of this group. + + + + + + Every Vnf contains a BaseConfigGroup. @@ -1660,9 +1665,6 @@ Diversity - Resources are geo-diverse ( cannot be co-located). - - - @@ -1870,9 +1872,6 @@ Diversity - Resources are geo-diverse ( cannot be co-located). - - - @@ -2189,7 +2188,6 @@ If not present, the default instantiation level as declared in the VNFD shall be Specifies affinity and anti-affinity rules applicable between VNF instances created from this profile. - @@ -2285,8 +2283,8 @@ 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. - - + + @@ -2373,6 +2371,9 @@ This could include the number of CPU cores on this logical node, a memory config + + The VirtualMemoryData information element supports the specification of requirements related to virtual memory of a virtual compute resource. + Amount of virtual Memory (e.g. in MB). @@ -2515,14 +2516,14 @@ NOTE: A cardinality of "0" indicates that configuring this present VNF - "Extension" attributes of VnfInfo that are writeable. + "Extension" attributes of VnfInfo that are writeable. NOTE: The exact data structure describing the attribute is left for data model solution specification, but it should include: name, and any constraints on the values, such as ranges, predefined values, etc. - Metadata" attributes of VnfInfo that are writeable + Metadata" attributes of VnfInfo that are writeable. NOTE: The exact data structure describing the attribute is left for data model solution specification, but it should include: name, and any constraints on the values, such as ranges, predefined values, etc. @@ -2609,7 +2610,7 @@ NOTE: The MANO or NFVI may not support the recommended collectionPeriod based on - + @@ -2695,7 +2696,7 @@ NOTE: The MANO or NFVI may not support the recommended collectionPeriod based on - Specifies the periodicity at which the producer will collect performance information. + Specifies the periodicity at which the producer will collect performance information. Note: at the end of each reportingPeriod, the producer will inform the consumer about availability of the performance data collected for each completed collection period during this reportingPeriod. While the exact definition of the types for collectionPeriod and reportingPeriod is left for further specification, it is recommended that the reportingPeriod be equal or a multiple of the collectionPeriod. In the latter case, the performance data for the collection periods within one reporting period would be reported together. @@ -2711,6 +2712,17 @@ NOTE: The MANO or NFVI may not support the recommended collectionPeriod based on The VirtualLinkBitRateLevel information element specifies bitrate requirements applicable to a virtual link instantiated from a particular VnfVirtualLinkDesc. + + + Uniquely identifies a VnfVirtualLinkDesc + + + + + Bitrate requirements for an instantiation level or bitrate delta for a scaling step. + + + @@ -2728,8 +2740,8 @@ NOTE: The MANO or NFVI may not support the recommended collectionPeriod based on Indicator for whether the resource is considered operational. Valid values are in-service-path and out-of-service-path. - - + + @@ -2738,19 +2750,19 @@ NOTE: The MANO or NFVI may not support the recommended collectionPeriod based on - - + + The VnfIndicatorData datatype identifies a VNF indicator in a VNFD. - + Identifies a VNFD. - + Identifies a VNF indicator within the VNFD. @@ -2840,13 +2852,12 @@ 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. - @@ -2867,7 +2878,7 @@ The attached VDUs shall connect to the same internal VLD. Consumer type. - + Describe qualities of Qos：total_bytes_sec、total_iops_sec. @@ -2896,12 +2907,14 @@ The attached VDUs shall connect to the same internal VLD. - - - - + + The VirtualLinkProtocolData describes the protocol layer and associated protocol data for a virtual link + + + One of the values of the attribute layerProtocol of the ConnectivityType IE. + @@ -3057,18 +3070,6 @@ The attached VDUs shall connect to the same internal VLD. - - - - - - - - - - - - @@ -3148,15 +3149,6 @@ The attached VDUs shall connect to the same internal VLD. - - - - - - - - - @@ -3275,18 +3267,6 @@ The attached VDUs shall connect to the same internal VLD. - - - - - - - - - - - - @@ -3367,13 +3347,9 @@ The attached VDUs shall connect to the same internal VLD. - - - - @@ -3396,15 +3372,6 @@ The attached VDUs shall connect to the same internal VLD. - - - - - - - - - @@ -3444,13 +3411,6 @@ The attached VDUs shall connect to the same internal VLD. - - - - - - - @@ -3518,15 +3478,6 @@ The attached VDUs shall connect to the same internal VLD. - - - - - - - - - @@ -3550,9 +3501,6 @@ The attached VDUs shall connect to the same internal VLD. - - - @@ -3737,4 +3685,46 @@ The attached VDUs shall connect to the same internal VLD. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit 1.2.3-korg