From 4c7e62fd36eedf023a87418ea7f993d016c8c288 Mon Sep 17 00:00:00 2001 From: Fred Oliveira Date: Thu, 6 Aug 2020 20:34:02 -0400 Subject: Changes to the resource model corresponding to IFA011 v2.7.1 Added vipcpd, checksumData and vnfinterfacedetails classes Other Changes: VDU::configurableProperties - Cardinality changed to 0..1; cardinatlity 0 when the VNFCs do not have configurable properties CPD::cpProtocol & CPD::trunkMode - Cardinality changed to allow 0 VduCpd::vnicType: Added SMART-NIC as an allowable value SwImageDesc:Provider - New attribute of type string with cardinality 0..1 which describes the provider of the software image. VnfDf:supportedVnfInterface - New attribute of type VnfInterfaceDetails with cardinality 0..N which indicates which interfaces the VNF produces and provides additional details on how to access the interface endpoints. VnfConfigurableProperties::vnfminterfaceinfo - New attribute with cardinality 0..1 which contains info enabling access to the NFV-MANO interfaces produced by the VNFM VnfConfigurableProperties::vnfmOauthServerinfo - New attribute with cardinality 0..1 which contains info to enable discovery of the authorization server protecting access to the VNFM interfaces VnfConfigurableProperties::vnfOauthServerinfo - New attribute with cardinality 0..1 which contains info to enable discoveryof the authorization server to validate the access tokens provided by the VNFM when the VNFM accesses the VNF interfaces Other changes Corrected a number of errors in the model, mostly with uninitialized strings. Changed the 2.5.1 references to 2.7.1 Issue-ID: MODELING-334 Signed-off-by: Fernando Oliveira Change-Id: I7c004f67bfec7cdf1fafb10ca62dc2e74f76a298 --- ONAP_Information_Model/Common.notation | 390 +- ONAP_Information_Model/Common.uml | 67 +- ONAP_Information_Model/Nf.notation | 144 +- ONAP_Information_Model/Ns.notation | 527 +- ONAP_Information_Model/Service.notation | 12380 +++++++++++++++--------------- ONAP_Information_Model/Vnf.notation | 3735 +++++---- ONAP_Information_Model/Vnf.uml | 383 +- 7 files changed, 9087 insertions(+), 8539 deletions(-) diff --git a/ONAP_Information_Model/Common.notation b/ONAP_Information_Model/Common.notation index 3f5f3ae..b962bd4 100644 --- a/ONAP_Information_Model/Common.notation +++ b/ONAP_Information_Model/Common.notation @@ -1332,14 +1332,6 @@ - - - - - - - - @@ -1443,14 +1435,6 @@ - - - - - - - - @@ -1482,14 +1466,6 @@ - - - - - - - - @@ -1521,14 +1497,6 @@ - - - - - - - - @@ -1560,14 +1528,6 @@ - - - - - - - - @@ -1617,14 +1577,6 @@ - - - - - - - - @@ -1870,14 +1822,6 @@ - - - - - - - - @@ -1924,14 +1868,6 @@ - - - - - - - - @@ -1963,14 +1899,6 @@ - - - - - - - - @@ -2020,14 +1948,6 @@ - - - - - - - - @@ -2059,14 +1979,6 @@ - - - - - - - - @@ -2098,110 +2010,108 @@ - - - - - - - - - - - - - - - - - + + + - - - - - - - + + + + + - - - - - - - + + + + + - - - - - - - + + + + + - - - - - - - + + + + + - - - - - - - + + + + + - - - - - - - + + + + + - - - - - - - + + + + + - - - - - - - + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2275,16 +2185,6 @@ - - - - - - - - - - @@ -2296,26 +2196,6 @@ - - - - - - - - - - - - - - - - - - - - @@ -2503,6 +2383,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ONAP_Information_Model/Common.uml b/ONAP_Information_Model/Common.uml index 4575357..2f89e2e 100644 --- a/ONAP_Information_Model/Common.uml +++ b/ONAP_Information_Model/Common.uml @@ -526,7 +526,7 @@ For example a VNF with a tree flow pattern within the VNF will have legal cpRole Editor's note: the attribute "layerProtocol" still needs further discussion and not included in this table. - + @@ -535,6 +535,7 @@ Editor's note: the attribute "layerProtocol" still needs further discu + @@ -1122,13 +1123,9 @@ 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. - - The L2ProtocolData information element describes the L2 protocol related data for a virtual link. - - Network name associated with this L2 -protocol. + Network name associated with this L2 protocol. @@ -1136,21 +1133,17 @@ protocol. - Specifies the network type for this L2 -protocol. Possible values: FLAT, VLAN, -VXLAN, GRE. + Specifies the network type for this L2 protocol. Possible values: FLAT, VLAN, VXLAN, GRE. -Note: If this attribute is included in the VNFD, the attribute value shall be provided at run-time, unless a default value -is provided at design time in the VNFD. If a default value is provided at design-time, this value may be -overridden at run-time. +Note: If this attribute is included in the VNFD, the attribute value shall be provided at run-time, unless a default value is provided at design time in the VNFD. +If a default value is provided at design-time, this value may be overridden at run-time. - Specifies whether to support VLAN -transparency for this L2 protocol or not. + Specifies whether to support VLAN transparency for this L2 protocol or not. @@ -1158,8 +1151,7 @@ transparency for this L2 protocol or not. - Specifies the maximum transmission unit -(MTU) value for this L2 protocol. + Specifies the maximum transmission unit (MTU) value for this L2 protocol. @@ -1167,7 +1159,7 @@ transparency for this L2 protocol or not. - Network segment ID. + If present, specifies a specific virtualised network segment, which depends on the network type. For e.g. VLAN ID for VLAN network type and tunnel ID for GRE/VXLAN network types. @@ -1203,9 +1195,6 @@ transparency for this L2 protocol or not. The L3ProtocolData information element describes the L3 protocol related data for a virtual link. - - The L3ProtocolData information element describes the L3 protocol related data for a virtual link. - Network name associated with this L3 @@ -1265,31 +1254,23 @@ overridden at run-time. - Indicates whether DHCP (Dynamic Host -Configuration Protocol) is enabled or -disabled for this L3 protocol. + Indicates whether DHCP (Dynamic Host Configuration Protocol) is enabled or disabled for this L3 protocol. NOTE : If this attribute is included in the VNFD, the attribute value shall be provided at run-time, unless a default value is provided at design time in the VNFD. If a default value is provided at design-time, this value may be overridden at run-time. - - Indicating whether DHCP is enabled. Default is "FALSE" if not specified otherwise. - - Specifies IPv6 address mode. Possible -values: + Specifies IPv6 address mode. Possible values: • SLAAC. • DHCPV6-STATEFUL. • DHCPV6-STATELESS. -May be present when the value of the -ipVersion attribute is "IPV6" and shall be -absent otherwise. +May be present when the value of the ipVersion attribute is "IPV6" and shall be absent otherwise. NOTE : If this attribute is included in the VNFD, the attribute value shall be provided at run-time, unless a default value is provided at design time in the VNFD. If a default value is provided at design-time, this value may be @@ -4467,8 +4448,6 @@ Permitted Values: - - @@ -4688,21 +4667,20 @@ Permitted Values: - - - - - - + + + + + + - + - - + @@ -5012,4 +4990,9 @@ Permitted Values: + + + + + diff --git a/ONAP_Information_Model/Nf.notation b/ONAP_Information_Model/Nf.notation index 892ab77..18176c6 100644 --- a/ONAP_Information_Model/Nf.notation +++ b/ONAP_Information_Model/Nf.notation @@ -49,14 +49,6 @@ - - - - - - - - @@ -83,14 +75,6 @@ - - - - - - - - @@ -126,14 +110,6 @@ - - - - - - - - @@ -160,45 +136,49 @@ - - - - - - - - - - - - - - - - - + + + - - - - - - - + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + @@ -210,26 +190,6 @@ - - - - - - - - - - - - - - - - - - - - @@ -240,4 +200,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ONAP_Information_Model/Ns.notation b/ONAP_Information_Model/Ns.notation index e90f27b..b3d5f78 100644 --- a/ONAP_Information_Model/Ns.notation +++ b/ONAP_Information_Model/Ns.notation @@ -104,14 +104,6 @@ - - - - - - - - @@ -170,14 +162,6 @@ - - - - - - - - @@ -209,14 +193,6 @@ - - - - - - - - @@ -248,14 +224,6 @@ - - - - - - - - @@ -314,70 +282,52 @@ - - - - - - - - - - - - - - - - - + + + - - - - - - - + + + + + - - - - - - - + + + + + - - - - - - - + + + + + - - - - - - - + + + + + - - - - + + + + + + + + @@ -482,6 +432,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1672,14 +1672,6 @@ - - - - - - - - @@ -1703,11 +1695,6 @@ - - - - - @@ -1750,14 +1737,6 @@ - - - - - - - - @@ -1789,14 +1768,6 @@ - - - - - - - - @@ -1862,14 +1833,6 @@ - - - - - - - - @@ -1901,14 +1864,6 @@ - - - - - - - - @@ -1940,14 +1895,6 @@ - - - - - - - - @@ -1979,14 +1926,6 @@ - - - - - - - - @@ -2018,14 +1957,6 @@ - - - - - - - - @@ -2057,14 +1988,6 @@ - - - - - - - - @@ -2096,14 +2019,6 @@ - - - - - - - - @@ -2138,22 +2053,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - @@ -2175,16 +2160,6 @@ - - - - - - - - - - @@ -2210,16 +2185,6 @@ - - - - - - - - - - @@ -2252,16 +2217,6 @@ - - - - - - - - - - @@ -2293,16 +2248,6 @@ - - - - - - - - - - @@ -2314,26 +2259,6 @@ - - - - - - - - - - - - - - - - - - - - @@ -2407,16 +2332,6 @@ - - - - - - - - - - @@ -2442,16 +2357,6 @@ - - - - - - - - - - @@ -2506,16 +2411,6 @@ - - - - - - - - - - @@ -2610,5 +2505,105 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ONAP_Information_Model/Service.notation b/ONAP_Information_Model/Service.notation index e2ccdd7..e1c412d 100644 --- a/ONAP_Information_Model/Service.notation +++ b/ONAP_Information_Model/Service.notation @@ -1,6190 +1,6190 @@ - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
-
- - - - - - - - - - - -
-
-
-
- - - - - - - - - - - -
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
-
- - - - - - - - - - - -
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
-
- - - - - - - - - - - -
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
-
- - - - - - - - - - - -
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
-
-
- - - - - - - - -
-
-
-
- - - - - - - - - - - -
-
-
-
- - - - - - - - - - - -
-
-
-
- - - -
- - - - - - - - - - -
-
-
-
- - - - - - - - - - - -
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
-
-
- - - - - - - - -
-
-
-
- - - - - - -
-
-
-
- - - - - - -
-
-
-
- - - - - - -
-
-
-
- - - - - - -
-
-
-
- - - - - - -
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+
+ + + + + + + + + + + +
+
+
+
+ + + + + + + + + + + +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+
+ + + + + + + + + + + +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+
+ + + + + + + + + + + +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+
+ + + + + + + + + + + +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+
+
+ + + + + + + + +
+
+
+
+ + + + + + + + + + + +
+
+
+
+ + + + + + + + + + + +
+
+
+
+ + + +
+ + + + + + + + + + +
+
+
+
+ + + + + + + + + + + +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+
+
+ + + + + + + + +
+
+
+
+ + + + + + +
+
+
+
+ + + + + + +
+
+
+
+ + + + + + +
+
+
+
+ + + + + + +
+
+
+
+ + + + + + +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ONAP_Information_Model/Vnf.notation b/ONAP_Information_Model/Vnf.notation index 0c098f4..d01880f 100644 --- a/ONAP_Information_Model/Vnf.notation +++ b/ONAP_Information_Model/Vnf.notation @@ -165,7 +165,7 @@ - + @@ -400,14 +400,9 @@ - - - - - - - - + + + @@ -792,70 +787,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -926,22 +857,6 @@ - - - - - - - - - - - - - - - - @@ -973,14 +888,6 @@ - - - - - - - - @@ -1028,15 +935,7 @@ - - - - - - - - - + @@ -1078,14 +977,6 @@ - - - - - - - - @@ -1153,14 +1044,6 @@ - - - - - - - - @@ -1260,13 +1143,209 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + @@ -1369,8 +1448,8 @@ - - + + @@ -1433,87 +1512,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -1701,19 +1700,9 @@ - + - - - - - - - - - - @@ -1773,29 +1762,9 @@ - + - - - - - - - - - - - - - - - - - - - - @@ -1821,50 +1790,36 @@ - - - - - - - - - - + + - + + - + + - + + - + + - + - - - - - - - - - - - + @@ -1891,16 +1846,6 @@ - - - - - - - - - - @@ -1955,16 +1900,6 @@ - - - - - - - - - - @@ -1996,6 +1931,238 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2302,6 +2469,25 @@ + +
+ + + + + + + + + + + + + + + + + @@ -2325,7 +2511,7 @@ - + @@ -2442,38 +2628,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2559,14 +2713,6 @@ - - - - - - - -
@@ -2614,14 +2760,6 @@ - - - - - - - - @@ -2695,14 +2833,6 @@ - - - - - - - - @@ -2770,14 +2900,6 @@ - - - - - - - - @@ -2845,14 +2967,6 @@ - - - - - - - - @@ -2949,15 +3063,7 @@ - - - - - - - - - + @@ -3013,13 +3119,135 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + @@ -3055,7 +3283,7 @@ - + @@ -3120,56 +3348,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3209,29 +3387,9 @@ - + - - - - - - - - - - - - - - - - - - - - @@ -3294,16 +3452,6 @@ - - - - - - - - - - @@ -3335,37 +3483,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3397,16 +3514,6 @@ - - - - - - - - - -
@@ -3568,19 +3675,9 @@ - + - - - - - - - - - - @@ -3609,19 +3706,9 @@ - + - - - - - - - - - - @@ -3647,6 +3734,168 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3698,14 +3947,6 @@ - - - - - - - - @@ -3822,14 +4063,6 @@ - - - - - - - - @@ -3888,14 +4121,6 @@ - - - - - - - - @@ -3952,15 +4177,7 @@ - - - - - - - - - + @@ -4038,14 +4255,6 @@ - - - - - - - - @@ -4113,14 +4322,6 @@ - - - - - - - - @@ -4161,14 +4362,6 @@ - - - - - - - -
@@ -4203,14 +4396,6 @@ - - - - - - - - @@ -4278,91 +4463,157 @@ - - - - - - - - - - - - - - - - - + + + - - - - - - - + + + + + - - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4392,17 +4643,7 @@ - - - - - - - - - - - + @@ -4431,20 +4672,10 @@ - - + + - - - - - - - - - - @@ -4476,16 +4707,6 @@ - - - - - - - - - - @@ -4517,16 +4738,6 @@ - - - - - - - - - - @@ -4589,16 +4800,6 @@ - - - - - - - - - - @@ -4658,6 +4859,137 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4709,14 +5041,6 @@ - - - - - - - - @@ -4760,14 +5084,6 @@ - - - - - - - - @@ -4817,14 +5133,6 @@ - - - - - - - - @@ -4856,14 +5164,6 @@ - - - - - - - - @@ -4895,14 +5195,6 @@ - - - - - - - - @@ -4934,40 +5226,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -5015,14 +5273,6 @@ - - - - - - - - @@ -5054,14 +5304,6 @@ - - - - - - - - @@ -5098,80 +5340,84 @@ - - - - - - - - - - - - - - - - - + + + - - - - - - - + + + + + - - - - - - - + + + + + - - - - - - - + + + + + - - - - - - - + + + + + - - - - - - - + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -5227,61 +5473,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -5321,16 +5512,6 @@ - - - - - - - - - - @@ -5449,28 +5630,118 @@ - - - - - - - - - - -
- - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + +
@@ -5655,14 +5926,6 @@ - - - - - - - - @@ -5838,14 +6101,6 @@ - - - - - - - - @@ -5877,14 +6132,6 @@ - - - - - - - - @@ -5916,14 +6163,6 @@ - - - - - - - - @@ -5955,14 +6194,6 @@ - - - - - - - - @@ -6011,22 +6242,6 @@ - - - - - - - - - - - - - - - - @@ -6062,14 +6277,6 @@ - - - - - - - - @@ -6080,32 +6287,76 @@ - - - - - - - - - + + + - - - - - - - + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -6137,16 +6388,6 @@ - - - - - - - - - - @@ -6178,16 +6419,6 @@ - - - - - - - - - - @@ -6219,16 +6450,6 @@ - - - - - - - - - - @@ -6291,35 +6512,85 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + @@ -7501,6 +7772,10 @@ + + + + @@ -7509,62 +7784,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -7573,14 +7792,6 @@ - - - - - - - - @@ -7597,195 +7808,35 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -8002,30 +8053,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -8087,14 +8114,6 @@ - - - - - - - - @@ -8147,14 +8166,6 @@ - - - - - - - - @@ -8189,22 +8200,6 @@ - - - - - - - - - - - - - - - -
@@ -8251,14 +8246,6 @@ - - - - - - - - @@ -8284,14 +8271,6 @@ - - - - - - - - @@ -8371,399 +8350,855 @@ - - - - + + + + - + - - - - - - - - - - + + + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + + + + + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + + + + + + + + + + + - - - + + + + + + + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + + + + + + + + + + + - - - + + + + + + + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - - - - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - - - - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ONAP_Information_Model/Vnf.uml b/ONAP_Information_Model/Vnf.uml index 7bb4ef9..7c17506 100644 --- a/ONAP_Information_Model/Vnf.uml +++ b/ONAP_Information_Model/Vnf.uml @@ -1,15 +1,15 @@ - + - +
Defines descriptors of virtual compute resources to be used by the VNF. - + @@ -241,17 +241,6 @@ NOTE 2: virtualLinkProfile needs to be provided for all VLs that the CPs of the - - -
- - - - - - - -
@@ -276,27 +265,6 @@ NOTE 2: virtualLinkProfile needs to be provided for all VLs that the CPs of the - - -
- - - - - - - - -
- - - - - - - - -
@@ -533,6 +501,27 @@ The NetworkFunctionDesc can be designed to have some number (zero to many). + + +
+ + + + + +
+ + + + + + + + +
+ + + @@ -664,6 +653,7 @@ 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. + @@ -672,14 +662,6 @@ NOTE: The parameters of each variable part shall be declared in the VnfLcmOper - - - - 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 - - - @@ -788,7 +770,7 @@ NOTE: This allows to provide one or more localization languages to support selec - + Defines the VNF-specific extension and metadata attributes of the VnfInfo that are writeable via the ModifyVnfInfo operation. @@ -925,6 +907,13 @@ NOTE: This shall be used to describe both the software image loaded on the vir + + + Describes virtual IP addresses to be shared among instances of connection points. + + + + @@ -951,11 +940,12 @@ NOTE: This shall be used to describe both the software image loaded on the vir - - - The checksum of the software image file. + + + The provider of this software image. If not present the provider of the software image is assumed to be same as the VNF provider. + @@ -1013,6 +1003,7 @@ NOTE: This shall be used to describe both the software image loaded on the vir + @@ -1424,6 +1415,13 @@ BaseConfigGroup may establish internal networks such as OAM (VNF Mgmt) or MNS (M + + + Indicates which interfaces the VNF produces and provides additional details on how to access the interface endpoints. + + + + @@ -1431,28 +1429,38 @@ BaseConfigGroup may establish internal networks such as OAM (VNF Mgmt) or MNS (M 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. - -NOTE: In case of referencing an intCpd via its identifier, the virtualNetworkInterfaceRequirements attribute of the referenced intCpd applies. - + + + References the internal Virtual Link Descriptor (VLD) to which CPs instantiated from this external CP Descriptor (CPD) connect. +One and only one of the following attributes shall be present: intVirtualLinkDesc or intCpd or vipCpd. - - + + - 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. + References 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. One and only one of the following attributes shall be present: intVirtualLinkDesc or intCpd or vipCpd. - - - + + + References the VIP CPD which is used to instantiate CPs to hold virtual IP addresses. These CPs are, in turn, exposed as external CPs defined by this external CPD. One and only one of the following attributes shall be present: intVirtualLinkDesc or intCpd or vipCpd . + + + + + + + Specifies requirements on a virtual network interface realising the CPs instantiated from this CPD. + +NOTE: In case of referencing an intCpd via its identifier, the virtualNetworkInterfaceRequirements attribute of the referenced intCpd applies. + + + + @@ -1644,7 +1652,7 @@ A given element can belong to multiple groups. References to VnfVirtualLinkDesc that are part of this group. - + @@ -2446,6 +2454,62 @@ Note: IFA011 defines this as an enum, but as the list is not complete, made this + + + A VipCpd is a type of Cpd and describes a requirement to allocate one or a set of virtual IP addresses. A VipCpd inherits from the Cpd Class . All attributes of the Cpd are also attributes of the VipCpd. When intCpds are indicated, instances of VduCps created from those intCpds share the addresses created from the VipCpd. When vnfExtCpds are indicated, instances of VnfExtCps created from those vnfExtCpds share the addresses created from the VipCpd. + + + + + + + References the internal VDU CPD which is used to instantiate internal CPs. These internal CPs share the virtual IP addresses allocated when a VipCp instance is created from the VipCpd. + + + + + + + + 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. + + + + + + + + It indicates the function the virtual IP address is used for. + + + + + + + + The VnfInterfaceDetails information element specifies the details of an interface produced by the VNF on the Ve-Vnfm reference point. + + + + References one or more CPDs from which to instantiate external CPs through which interface endpoints on the VNF side can be reached by the VNFM. + + + + + + + Provide additional data to access the interface endpoint (e.g. API URI prefix). + + + + + + Specifies an interface produced by the VNF. + + + + + @@ -2469,7 +2533,7 @@ Note: IFA011 defines this as an enum, but as the list is not complete, made this Identifies the minimum version of the requested additional capability. - + @@ -2477,7 +2541,7 @@ Note: IFA011 defines this as an enum, but as the list is not complete, made this Identifies the preferred version of the requested additional capability. - + @@ -2598,7 +2662,8 @@ Note: IFA011 defines this as an enum, but as the list is not complete, made this - 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 + This information element provides a means to define in the VNFD attributes that represent the configurable properties of a VNF. Configurable properties can be standardized as listed below (e.g. related to auto scaling, auto healing and interface configuration), or can be VNF-specific as defined by the VNF provider. +For a VNF instance, the value of these properties can be queried and modified through the VNFM, using the Query VNF and Modify VNF Information operations. Modifying these values affects directly the configuration of an existing VNF instance. If a configurable property is defined in the VNFD, an initial value may be defined as well. @@ -2622,6 +2687,24 @@ NOTE: A cardinality of "0" indicates that configuring this present VNF + + + Contains information enabling access to the NFV-MANO interfaces produced by the VNFM (e.g. URIs and credentials) + + + + + + Contains information to enable discovery of the authorization server protecting access to VNFM interface + + + + + + Contains information to enable discovery of the authorization server to validate the access tokens provided by the VNFM when the VNFM accesses the VNF interfaces, if that functionality (token introspection) is supported by the authorization server. + + + @@ -2636,14 +2719,14 @@ NOTE: A cardinality of "0" indicates that configuring this present VNF - "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. + All additional VNF-specific attributes of VnfInfo that affect the lifecycle management of a VNF instance. For each VNF instance, these attributes are stored persistently by the VNFM and can be queried and modified through the VNFM. These attributes are intended to be consumed by the VNFM or by the lifecycle management scripts during the execution of VNF lifecycle management operations. Modifying these values has no direct effect on the VNF instance; however, modified values can be considered during subsequent VNF lifecycle management operations, which means that the modified values can indirectly affect the configuration of the VNF instance. - 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. + Additional VNF-specific attributes of VnfInfo that provide metadata describing the VNF instance and that are defined by the VNF provider. See note 2. For each VNF instance, these attributes are stored persistently by the VNFM and can be queried and modified through the VNFM. These attributes are intended to provide information to functional blocks external to the VNFM and will not be used by the VNFM or the VNF lifecycle management scripts when executing lifecycle management operations. Modifying these attributes has no effect on the VNF instance. It only affects the attribute values stored by the VNFM. @@ -2718,14 +2801,7 @@ NOTE: The scriptInput values are passed to the scripts in addition to the parame - An attribute that describes the recommended periodicity at which to collect the performance information. - -VNFM determines if this parameter is considered. - -The vendor may provide this information as a guidance for creating PmJobs if needed. - -NOTE: The MANO or NFVI may not support the recommended collectionPeriod based on their functionalities, and can reject the requests based on the recommended collectionPeriod in this case. - + An attribute that describes the periodicity at which to collect the performance information. @@ -2738,7 +2814,7 @@ NOTE: The MANO or NFVI may not support the recommended collectionPeriod based on - This datatype defines the configurable properties of a VNFC. For a VNFC instance, the value of these properties can be modified through the VNFM. + This information element provides a means to define additional VNF-specific attributes that represent the configurable properties of a VNFC. For a VNFC instance, the values of these properties can be queried and modified through the VNFM. Modifying these values affects directly the configuration of an existing VNFC instance. @@ -2759,6 +2835,7 @@ NOTE: The MANO or NFVI may not support the recommended collectionPeriod based on + @@ -2865,7 +2942,11 @@ NOTE: The MANO or NFVI may not support the recommended collectionPeriod based on - + + + This information element is a cont operations, structured by operation. + + @@ -3065,6 +3146,23 @@ The attached VDUs shall connect to the same internal VLD. + + + The ChecksumData information element supports providing information about the result of performing a checksum operation over some arbitrary data. + + + + Species the algorithm used to obtain the checksum value. + + + + + + Contains the result of applying the algorithm indicated by the algorithm attribute to the data to which this ChecksumData refers. + + + + @@ -3114,9 +3212,6 @@ The attached VDUs shall connect to the same internal VLD. - - - @@ -3168,7 +3263,6 @@ The attached VDUs shall connect to the same internal VLD. - @@ -3400,13 +3494,11 @@ The attached VDUs shall connect to the same internal VLD. - - @@ -3616,33 +3708,30 @@ The attached VDUs shall connect to the same internal VLD. - - - - + - + - + - + - + @@ -3654,7 +3743,7 @@ The attached VDUs shall connect to the same internal VLD. - + @@ -3681,9 +3770,9 @@ The attached VDUs shall connect to the same internal VLD. - - - + + + @@ -3691,16 +3780,16 @@ The attached VDUs shall connect to the same internal VLD. - + - - + + - + @@ -3710,34 +3799,34 @@ The attached VDUs shall connect to the same internal VLD. - + - + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + @@ -3745,7 +3834,6 @@ The attached VDUs shall connect to the same internal VLD. - @@ -3777,8 +3865,8 @@ The attached VDUs shall connect to the same internal VLD. - - + + @@ -3790,8 +3878,8 @@ The attached VDUs shall connect to the same internal VLD. - - + + @@ -3880,4 +3968,51 @@ The attached VDUs shall connect to the same internal VLD. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit 1.2.3-korg