From f9b03a06d7c827b4ef57106c00a262b79567b42f Mon Sep 17 00:00:00 2001 From: jjewitt58 Date: Fri, 24 Aug 2018 09:37:26 -0700 Subject: Weekly integration work. See log. Issue-ID: MODELING-104 Change-Id: Id0a1964a27aab13b3322c232b5f5c94b750877cb Signed-off-by: jjewitt58 --- papyrus/ONAP Information Model/Common.uml | 197 +++++ .../Integration/Integration Log.xlsx | Bin 0 -> 9336 bytes papyrus/ONAP Information Model/Resource.uml | 35 +- papyrus/ONAP Information Model/Service.uml | 285 +++--- papyrus/ONAP Information Model/Vnf.notation | 970 +++------------------ papyrus/ONAP Information Model/Vnf.uml | 588 ++++++------- 6 files changed, 727 insertions(+), 1348 deletions(-) create mode 100644 papyrus/ONAP Information Model/Integration/Integration Log.xlsx (limited to 'papyrus') diff --git a/papyrus/ONAP Information Model/Common.uml b/papyrus/ONAP Information Model/Common.uml index 278c74c..5804e36 100644 --- a/papyrus/ONAP Information Model/Common.uml +++ b/papyrus/ONAP Information Model/Common.uml @@ -263,6 +263,84 @@ 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. + + + + Identifier of this Cpd information element. + + + + + + Identifies the role of the port in the context of the traffic flow patterns in the VNF or parent NS. + +For example a VNF with a tree flow pattern within the VNF will have legal cpRoles of ROOT and LEAF. + + + + + + + + + Provides human-readable information on the purpose of the CP (e.g. CP for control plane traffic). + + + + + + + + + Identifies the protocol layering information the CP uses for connectivity purposes and associated information. There shall be one cpProtocol for each layer protocol as indicated by the attribute layerProtocol. + +Editor's note: the attribute "layerProtocol" still needs further discussion and not included in this table. + + + + + + + + Information about whether the CP instantiated from this CPD is in Trunk mode (802.1Q or other). + + + + + + + For specifying floating IP(s) to be shared among Cpds, which are reserved for vnfReservedCpd described in the VNFD. + + + + + + + + + The AffinityOrAntiAffinityGroup class describes the affinity or anti-affinity relationship. + + + + Identifies an affinity or anti-affinity group to which the affinity or anti-affinity rule applies. + + + + + + Specifies whether the rule is an affinity rule or an anti-affinity rule. + + + + + Specifies the scope of the rule. + + + @@ -626,6 +704,92 @@ NOTE: The present document does not specify the means to declare different bitra + + + 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. +Per VNF, the affinity/anti-affinity rules defined using this information element, using the AffinityOrAntiAffinityGroup information element, and using the placement constraints in the GrantLifecycleOperation as defined in ETSI GS NFV IFA 007 [i.3] should be conflict-free. In case of conflicts, the placement constraints in the GrantLifecycleOperation shall take precedence. + + + + + Specifies whether the rule is an affinity rule or an anti-affinity rule. + + + + + + Specifies the scope of the rule. + + + + + + Type of network supported. + + + + + + + A CpProtocolData information element describes and associates the protocol layer that a CP uses together with other protocol and connection point information. + + + + One of the values of the attribute layerProtocol of the Cpd IE. + + + + + + Provides information on the addresses to be assigned to the CP(s) instantiated from the CPD. + + + + + + + + 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. + + + + + + Provides the information on the MAC addresses to be assigned to the CP(s) instantiated from the parent CPD. +Shall be present when the addressType is MAC address. + + + + + + + Provides the information on the IP addresses to be assigned to the CP instantiated from the parent CPD. +Shall be present when the addressType is IP address. + + + + + + + + Specifies the type of rule. + + + + + + + Defines the scope of the rule. + + + + + + @@ -3162,4 +3326,37 @@ Note: current data type (String) may be changed to Common Resource Datatype L3Ad + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/papyrus/ONAP Information Model/Integration/Integration Log.xlsx b/papyrus/ONAP Information Model/Integration/Integration Log.xlsx new file mode 100644 index 0000000..baab645 Binary files /dev/null and b/papyrus/ONAP Information Model/Integration/Integration Log.xlsx differ diff --git a/papyrus/ONAP Information Model/Resource.uml b/papyrus/ONAP Information Model/Resource.uml index d63ce19..e8711bc 100644 --- a/papyrus/ONAP Information Model/Resource.uml +++ b/papyrus/ONAP Information Model/Resource.uml @@ -1,5 +1,5 @@ - + @@ -214,7 +214,7 @@ NOTE: Every VNF, VL and nested NS whose descriptor is referenced by the NS DF sh Specifies affinity or anti-affinity relationship applicable between the VNF instances created using different VNFDs, the Virtual Link instances created using different NsVirtualLinkDescs or the nested NS instances created using different NSDs in the same affinity or anti-affinity group. - + @@ -337,7 +337,7 @@ NOTE 2: The presence of a VNFD or PNFD identifier in a VNFFGD does not imply tha The SAPD class specifies the information used to instantiate the service access points of an NS. A Sapd inherits from the Cpd class. All attributes of the Cpd are also attributes of the Sapd. - + @@ -350,7 +350,7 @@ If it is set to True, management and orchestration functions are responsible for References the descriptor of VNF or PNF external connection points the SAPs instantiated from this SAPD are mapped to. - + @@ -366,11 +366,14 @@ If it is set to True, management and orchestration functions are responsible for The Pnfd class is a deployment template enabling on-boarding PNFs and referencing them from an NSD. It focuses on connectivity aspects only. + + + Identifier of this Pnfd class. It uniquely identifies the PNFD. - + @@ -383,25 +386,33 @@ NOTE: The provider of the PNFD might be different from the provider of the PNF. Identifies the version of the PNFD - + Provides a signature to prevent tampering. - + - + Specifies the characteristics of one or more connection points where to connect the PNF to a VL. - + + + A PnfExtCpd is a type of Cpd and describes the characteristics of an external interface, a.k.a external CP, where to connect the PNF to a VL. +A PnfExtCpd inherits from the Cpd Class. + + + + + @@ -505,6 +516,12 @@ One and only one of the attributes shall be included (i.e. there is a XOR relati + + + + + + diff --git a/papyrus/ONAP Information Model/Service.uml b/papyrus/ONAP Information Model/Service.uml index 6461a96..4370dfa 100644 --- a/papyrus/ONAP Information Model/Service.uml +++ b/papyrus/ONAP Information Model/Service.uml @@ -1,5 +1,5 @@ - + @@ -602,7 +602,6 @@ If null, then represents to the end of time Identifies this nfpd class within a VNFFGD. - @@ -610,18 +609,12 @@ If null, then represents to the end of time The rule may be expressed as a criteria constructed out of atomic assertions linked by Boolean operators AND, OR and NOT. NOTE: Examples of atomic assertions are assertions on packet header fields’ values, date and time ranges, etc. - - - References the descriptor of a connection point to be traversed by the traffic flows matching the criteria. This shall be a connection point attached to one of the constituent VNFs and PNFs of the parent VNFFG, or a SAP of one of the constituent nested NSs of the parent VNFFG. NOTE: When multiple values are provided, the order is significant and specifies the sequence of connection points to be traversed. - - - @@ -669,9 +662,6 @@ If not present, the default instantiation level as declared in the VNFD shall be Identifier(s) of the affinity or anti-affinity group(s) the VnfProfile belongs to. NOTE: Each identifier references an affinity or anti-affinity group which expresses affinity or anti-affinity relationships between the VNF instance(s) created using this VnfProfile and the VNF instance(s) created using other VnfProfile(s) in the same group. - - - @@ -726,7 +716,7 @@ NOTE: Each identifier references an affinity or anti-affinity group which expres 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. - + @@ -869,7 +859,7 @@ NS levels may be used in the context of NS scaling and in this case they are ref Identifies an affinity or anti-affinity group the NSs created according to this NsProfile belong to. - + @@ -1006,15 +996,11 @@ NOTE: Cardinality of zero is only valid for a non-instantiated NS. Identier of this Vnffg class. - Identifier of the constituent NFs of the VNFFG - - - @@ -1028,17 +1014,11 @@ NOTE: Cardinality of zero is only valid for a non-instantiated NS. Identifiers of the CP instances attached to the constituent VNFs and PNFs or the sap instances of the VNFFG. NOTE: It indicates an exhaustive list of all the CP instances and SAP instances of the VNFFG. - - - Information on the NFPs of this VNFFG. - - - @@ -1052,18 +1032,12 @@ NOTE: It indicates an exhaustive list of all the CP instances and SAP instances Virtualised network resource(s) realizing this VL. - - - Respresents the port of a NS VL. - - - @@ -1485,7 +1459,6 @@ NOTE: It indicates an exhaustive list of all the CP instances and SAP instances Cpd used to deploy this PNF CP. - @@ -1507,15 +1480,6 @@ NOTE: It indicates an exhaustive list of all the CP instances and SAP instances - - - A PnfExtCpd is a type of Cpd and describes the characteristics of an external interface, a.k.a external CP, where to connect the PNF to a VL. -A PnfExtCpd inherits from the Cpd Class. - - - - - @@ -1526,13 +1490,11 @@ A PnfExtCpd inherits from the Cpd Class. Identifies a VNFD. - Identifies a VNF indicator within the VNFD. - @@ -1548,9 +1510,6 @@ A PnfExtCpd inherits from the Cpd Class. References the descriptor of a connection point on a VNF/PNF or a SAP which connects to virtual links instantiated from the profile identified in the virtualLinkProfileId attribute. - - - @@ -1586,7 +1545,6 @@ NOTE 3: When the corresponding NS level is used in the context of NS scaling, t Specifies the bit rate requirements for the NS level. NOTE: It shall be in the range of minBitrateRequirements - maxBitrateRequirements, as specified in the referenced VirtualLinkProfile. - @@ -1628,21 +1586,21 @@ NOTE 3: When the corresponding NS level is used in the context of NS scaling, t - + - + - + - + - + @@ -1655,107 +1613,107 @@ NOTE 3: When the corresponding NS level is used in the context of NS scaling, t - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -1791,7 +1749,9 @@ NOTE 3: When the corresponding NS level is used in the context of NS scaling, t - + + + @@ -1866,59 +1826,59 @@ NOTE 3: When the corresponding NS level is used in the context of NS scaling, t - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -1926,14 +1886,14 @@ NOTE 3: When the corresponding NS level is used in the context of NS scaling, t - + - + @@ -1942,7 +1902,7 @@ NOTE 3: When the corresponding NS level is used in the context of NS scaling, t - + @@ -1964,9 +1924,6 @@ NOTE 3: When the corresponding NS level is used in the context of NS scaling, t - - - @@ -2023,113 +1980,113 @@ NOTE 3: When the corresponding NS level is used in the context of NS scaling, t - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -2144,42 +2101,62 @@ NOTE 3: When the corresponding NS level is used in the context of NS scaling, t - - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + diff --git a/papyrus/ONAP Information Model/Vnf.notation b/papyrus/ONAP Information Model/Vnf.notation index f1e0753..359bbff 100644 --- a/papyrus/ONAP Information Model/Vnf.notation +++ b/papyrus/ONAP Information Model/Vnf.notation @@ -13,11 +13,6 @@ - - - - - @@ -27,11 +22,6 @@ - - - - - @@ -41,11 +31,6 @@ - - - - - @@ -55,11 +40,6 @@ - - - - - @@ -69,11 +49,6 @@ - - - - - @@ -83,11 +58,6 @@ - - - - - @@ -97,11 +67,6 @@ - - - - - @@ -111,11 +76,6 @@ - - - - - @@ -125,11 +85,6 @@ - - - - - @@ -139,11 +94,6 @@ - - - - - @@ -153,11 +103,6 @@ - - - - - @@ -167,11 +112,6 @@ - - - - - @@ -181,11 +121,6 @@ - - - - - @@ -195,11 +130,6 @@ - - - - - @@ -209,11 +139,6 @@ - - - - - @@ -239,11 +164,6 @@ - - - - - @@ -262,11 +182,6 @@ - - - - - @@ -276,11 +191,6 @@ - - - - - @@ -290,11 +200,6 @@ - - - - - @@ -304,11 +209,6 @@ - - - - - @@ -318,11 +218,6 @@ - - - - - @@ -332,11 +227,6 @@ - - - - - @@ -346,11 +236,6 @@ - - - - - @@ -360,11 +245,6 @@ - - - - - @@ -390,11 +270,6 @@ - - - - - @@ -410,11 +285,6 @@ - - - - - @@ -424,11 +294,6 @@ - - - - - @@ -438,11 +303,6 @@ - - - - - @@ -452,11 +312,6 @@ - - - - - @@ -466,11 +321,6 @@ - - - - - @@ -480,11 +330,6 @@ - - - - - @@ -510,11 +355,6 @@ - - - - - @@ -530,11 +370,6 @@ - - - - - @@ -544,11 +379,6 @@ - - - - - @@ -558,11 +388,6 @@ - - - - - @@ -572,11 +397,6 @@ - - - - - @@ -586,11 +406,6 @@ - - - - - @@ -600,11 +415,6 @@ - - - - - @@ -614,11 +424,6 @@ - - - - - @@ -628,11 +433,6 @@ - - - - - @@ -642,11 +442,6 @@ - - - - - @@ -656,11 +451,6 @@ - - - - - @@ -670,11 +460,6 @@ - - - - - @@ -684,11 +469,6 @@ - - - - - @@ -714,11 +494,6 @@ - - - - - @@ -734,11 +509,6 @@ - - - - - @@ -748,11 +518,6 @@ - - - - - @@ -762,11 +527,6 @@ - - - - - @@ -776,11 +536,6 @@ - - - - - @@ -790,11 +545,6 @@ - - - - - @@ -807,11 +557,6 @@ - - - - - @@ -837,11 +582,6 @@ - - - - - @@ -857,11 +597,6 @@ - - - - - @@ -871,11 +606,6 @@ - - - - - @@ -901,11 +631,6 @@ - - - - - @@ -921,11 +646,6 @@ - - - - - @@ -935,11 +655,6 @@ - - - - - @@ -965,11 +680,6 @@ - - - - - @@ -988,11 +698,6 @@ - - - - - @@ -1002,11 +707,6 @@ - - - - - @@ -1016,11 +716,6 @@ - - - - - @@ -1030,11 +725,6 @@ - - - - - @@ -1060,11 +750,6 @@ - - - - - @@ -1144,11 +829,6 @@ - - - - - @@ -1161,11 +841,6 @@ - - - - - @@ -1175,11 +850,6 @@ - - - - - @@ -1189,11 +859,6 @@ - - - - - @@ -1203,11 +868,6 @@ - - - - - @@ -1233,11 +893,6 @@ - - - - - @@ -1261,11 +916,6 @@ - - - - - @@ -1275,11 +925,6 @@ - - - - - @@ -1318,11 +963,6 @@ - - - - - @@ -1334,7 +974,7 @@ - + @@ -1897,11 +1537,6 @@ - - - - - @@ -1911,11 +1546,6 @@ - - - - - @@ -1925,11 +1555,6 @@ - - - - - @@ -1939,11 +1564,6 @@ - - - - - @@ -1953,11 +1573,6 @@ - - - - - @@ -1967,11 +1582,6 @@ - - - - - @@ -1981,11 +1591,6 @@ - - - - - @@ -1995,11 +1600,6 @@ - - - - - @@ -2009,11 +1609,6 @@ - - - - - @@ -2023,11 +1618,6 @@ - - - - - @@ -2037,11 +1627,6 @@ - - - - - @@ -2051,11 +1636,6 @@ - - - - - @@ -2065,20 +1645,10 @@ - - - - - - - - - - @@ -2093,11 +1663,6 @@ - - - - - @@ -2123,11 +1688,6 @@ - - - - - @@ -2143,11 +1703,6 @@ - -