From bfbae2300f487ee493181af9f7e1fda2b1ead063 Mon Sep 17 00:00:00 2001 From: Kevin Scaggs Date: Fri, 10 Aug 2018 14:57:50 -0500 Subject: Updates to common and vnf models Common updates include further build of the VES spec VNf udpates include refinements per comments form Xu and Jessie as well as some allotted resource work. Issue-ID: MODELING-104 Change-Id: I0a6b817bf0db0a3103c8d66a5c91d28fc31ffd3b Signed-off-by: Kevin Scaggs --- papyrus/ONAP Information Model/Common.notation | 323 ++++++++++++++++- papyrus/ONAP Information Model/Common.uml | 223 +++++++++--- papyrus/ONAP Information Model/Vnf.notation | 462 ++++++++++++++++++++++--- papyrus/ONAP Information Model/Vnf.uml | 165 +++++++-- 4 files changed, 1034 insertions(+), 139 deletions(-) diff --git a/papyrus/ONAP Information Model/Common.notation b/papyrus/ONAP Information Model/Common.notation index bafd3e2..91405a4 100644 --- a/papyrus/ONAP Information Model/Common.notation +++ b/papyrus/ONAP Information Model/Common.notation @@ -542,7 +542,7 @@ - + @@ -1272,7 +1272,7 @@ - + @@ -1292,7 +1292,7 @@ - + @@ -1392,7 +1392,7 @@ - + @@ -1432,7 +1432,7 @@ - + @@ -1499,7 +1499,7 @@ - + @@ -3600,7 +3600,7 @@ - + @@ -3859,7 +3859,7 @@ - + @@ -4047,7 +4047,7 @@ - + @@ -5990,6 +5990,76 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -6002,7 +6072,7 @@ - + @@ -6010,6 +6080,230 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -6022,7 +6316,7 @@ - + @@ -6042,7 +6336,7 @@ - + @@ -6064,6 +6358,11 @@ + + + + + diff --git a/papyrus/ONAP Information Model/Common.uml b/papyrus/ONAP Information Model/Common.uml index f609fc1..8c5848e 100644 --- a/papyrus/ONAP Information Model/Common.uml +++ b/papyrus/ONAP Information Model/Common.uml @@ -295,7 +295,10 @@ Note: the description of this class are different in ETSI GS NFV IFA 011 and ETS combined NewState and OldStae into NotificationState - + + Fill in attribute defs and check attribute multiplicity + + arrayOfJsonObject - The arrayOfJsonObject datatype provides an array of json objects, each of which is described by name, schema and other meta-information. @@ -309,7 +312,7 @@ Note: the description of this class are different in ETSI GS NFV IFA 011 and ETS - + object - objects are model elements that represent instances of a class or of classes @@ -350,7 +353,7 @@ Note: the description of this class are different in ETSI GS NFV IFA 011 and ETS - + namedHashMap [ ] - The namedHashmap datatype is a hashMap which is associated with and described by a name. @@ -482,7 +485,7 @@ In the value set and its semantics, this type is equivalent to the Uri SMIv2 tex This primitive type is a superset of the standard UML numbering primitives, e.g. Integer and Real. - + priority - processing priority. @@ -536,7 +539,7 @@ ONAP event messages are serialized as a unicode ASCII character string which may - + commonEventHeader - Fields common to all events. @@ -722,7 +725,7 @@ Example: +4, -5 - + eventBody, if it exists, will contain exactly one of the following depending on the type of event as specified by the eventHeader domain field. @@ -832,7 +835,7 @@ Example: +4, -5 - + codecsInUse - the codecsInUse datatype consists of the following fields describing the number of times an identified codec was used over the measurementInterval @@ -851,7 +854,7 @@ Example: +4, -5 - + faultFields - Fields specific to fault events @@ -951,13 +954,13 @@ Enumeration; valid values are - + - + additionalFields - Additional expansion fields if needed. @@ -1153,7 +1156,7 @@ Enumeration; valid values are - + Fields specific to mobility flow events @@ -1453,7 +1456,7 @@ Note: current data type (String) may be changed to Common Resource Datatype L3Ad - + namedHashMap [ ] - The namedHashmap datatype is a hashMap which is associated with and described by a name. @@ -1476,7 +1479,7 @@ Note: in ATTServiceSpecification - VesEventListener v5.4.1 type = field []. - + Fields specific to notification events @@ -1550,7 +1553,7 @@ For example: "inService", "outOfService", "maintenance& - + otherFields - The otherFields datatype defines fields for events belonging to the 'other' domain of the commonEventHeader domain enumeration. @@ -1584,7 +1587,7 @@ For example: "inService", "outOfService", "maintenance& - + @@ -1621,14 +1624,14 @@ For example: "inService", "outOfService", "maintenance& - + - + sipSignalingFields - The sipSignalingFields datatype communicates information about SIP signaling messages, parameters and signaling state. @@ -1714,18 +1717,97 @@ Note: current data type (String) may be changed to Common Resource Datatype L3Ad - - - - + + + stateChangeFields - Fields specific to state change events. + + + + Additional stateChange fields if needed + + + + + + + New state of the entity: ‘inService’, ‘maintenance’, ‘outOfService’ + + + + + Previous state of the entity: ‘inService’, ‘maintenance’, ‘outOfService’ + + + + + Version of the stateChangeFields block as “#.#” where # is a digit; see section 1 for the correct digits to use. + + + + + + Card or port name of the entity that changed state + + + + + + + syslogFields - Fields specific to syslog events. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + lastEpochMicrosec - the latest unix time aka epoch time associated with the event from any component--as microseconds elapsed since 1 Jan 1970 not including leap seconds @@ -1737,7 +1819,7 @@ Note: current data type (String) may be changed to Common Resource Datatype L3Ad - + Array of named hashMaps @@ -1749,7 +1831,7 @@ Note: current data type (String) may be changed to Common Resource Datatype L3Ad - + cpuUsage - The cpuUsage datatype defines the usage of an identifier CPU. @@ -1880,7 +1962,7 @@ Note: current data type (String) may be changed to Common Resource Datatype L3Ad - + diskUsage - The diskUsage datatype defines the usage of a disk device. @@ -2281,7 +2363,7 @@ Note: current data type (String) may be changed to Common Resource Datatype L3Ad - + ephemeralConfigured - Configured ephemeral storage capacity in GB. @@ -2326,7 +2408,7 @@ Note: current data type (String) may be changed to Common Resource Datatype L3Ad - + @@ -2341,7 +2423,7 @@ Note: current data type (String) may be changed to Common Resource Datatype L3Ad - + The hugePages datatype provides metrics on system hugePages @@ -2404,7 +2486,7 @@ Note: current data type (String) may be changed to Common Resource Datatype L3Ad - + jsonObject - The jsonObject datatype provides a JSON object schema, name and other meta-information along with one or more object instances that conform to the schema. @@ -2461,7 +2543,7 @@ Note: current data type (String) may be changed to Common Resource Datatype L3Ad - + jsonObjectInstance [ ] - The jsonObjectInstance datatype provides meta-information about an instance of a jsonObject along with the actual object instance. @@ -2493,32 +2575,32 @@ Note: current data type (String) may be changed to Common Resource Datatype L3Ad - + domain - Event domain enumeration: ‘fault’, ‘heartbeat’, ‘measurementsForVfScaling’, ‘mobileFlow’, ‘other’, ‘sipSignaling’, ‘stateChange’, ‘syslog’, ‘thresholdCrossingAlert’, ‘voiceQuality’ - - - - - - - - - - - - + + + + + + + + + + + + - - - - + + + + - + vendorNfNameFields - The vendorNfNameFields provides vendor, nf and nfModule identifying information. @@ -3179,4 +3261,47 @@ Note: current data type (String) may be changed to Common Resource Datatype L3Ad + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/papyrus/ONAP Information Model/Vnf.notation b/papyrus/ONAP Information Model/Vnf.notation index 77594a4..f8b2a70 100644 --- a/papyrus/ONAP Information Model/Vnf.notation +++ b/papyrus/ONAP Information Model/Vnf.notation @@ -245,7 +245,7 @@ - + @@ -1066,7 +1066,7 @@ - + @@ -1239,7 +1239,7 @@ - + @@ -1324,7 +1324,7 @@ - + @@ -1367,9 +1367,9 @@ - - - + + + @@ -1405,7 +1405,7 @@ - + @@ -1446,7 +1446,7 @@ - + @@ -1466,9 +1466,9 @@ - + - + @@ -1497,7 +1497,7 @@ - + @@ -1588,7 +1588,7 @@ - + @@ -1611,7 +1611,7 @@ - + @@ -1735,7 +1735,7 @@ - + @@ -1782,27 +1782,33 @@ + + - + + - + + - + + - + + - + @@ -1842,7 +1848,7 @@ - + @@ -5036,15 +5042,6 @@ - - - - - - - - - @@ -10234,7 +10231,7 @@ - + @@ -10278,7 +10275,7 @@ - + @@ -10322,7 +10319,7 @@ - + @@ -10366,7 +10363,7 @@ - + @@ -10410,7 +10407,7 @@ - + @@ -10454,7 +10451,7 @@ - + @@ -10467,7 +10464,178 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -10502,8 +10670,8 @@ - - + + @@ -10526,7 +10694,7 @@ - +

@@ -10536,9 +10704,9 @@ - + - + @@ -10557,7 +10725,7 @@ - + @@ -10578,8 +10746,8 @@ - - + + @@ -10609,7 +10777,7 @@ - + @@ -10620,7 +10788,7 @@ - + @@ -10636,27 +10804,207 @@ - + - - - + + + - - - + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/papyrus/ONAP Information Model/Vnf.uml b/papyrus/ONAP Information Model/Vnf.uml index 51dc443..5be846a 100644 --- a/papyrus/ONAP Information Model/Vnf.uml +++ b/papyrus/ONAP Information Model/Vnf.uml @@ -1,6 +1,20 @@ + + +

+ + + + + + + + + + + @@ -420,6 +434,29 @@ NOTE 2: virtualLinkProfile needs to be provided for all VLs that the CPs of the + + +

+ + + + + + + + + +

+ + + + + + + + + + @@ -471,7 +508,21 @@ onboardedVnfPkgInfoId - need class for VnfPkg? Yes - probably need more discus Move from Vnf submodel to Service Submodel - + + A Resource is something that goes into the resource catalog from which services are made. +. +Per the above definition, +A virtual link is a resource +A license is not a resource +A Cp is not a resource + + + Do we need a VnfVL? + + + Need to assess need for service topology for the internal model from a design view. + + Type of address @@ -594,7 +645,7 @@ References: tosca-nfv-YAML-v1.0-wd05-rev02 (tosca.nodes.nfv.vnfd, but node details are not defined) ETSI GS NFV-IFA 011 V2.1.3 (VNFD) - + Provider of the VNF and of the VNFD. @@ -740,13 +791,6 @@ NOTE: This allows to provide one or more localization languages to support selec - - - Describes the associated elements of a VNFD for a certain purpose during VNF lifecycle management. - - - - Defines descriptors of virtual compute resources to be used by the VNF. @@ -775,6 +819,13 @@ NOTE: This allows to provide one or more localization languages to support selec + + + Describes the associated elements of a VNFD for a certain purpose during VNF lifecycle management. + + + + @@ -843,8 +894,7 @@ ETSI GS NFV-IFA 011 V2.1.3 - -Identifies the operating system used in the software image. This attribute may also identify if a 32 bit or 64 bit software image is used. + Identifies the operating system used in the software image. This attribute may also identify if a 32 bit or 64 bit software image is used. support: @@ -1023,6 +1073,7 @@ NOTE: Each identifier references an affinity or anti-affinity group which expres + Unique identifier of this internal VLD in VNFD. @@ -1031,6 +1082,9 @@ NOTE: Each identifier references an affinity or anti-affinity group which expres + + Specifies the protocol exposed by a VL and the flow pattern supported by the VL. + @@ -1219,6 +1273,9 @@ NOTE: In case of referencing an intCpd via its identifier, the virtualNetworkInt + + Reference to the internal VDU CPD which is used to instantiate internal CPs. These internal CPs are, in turn, exposed as external CPs defined by this external CPD. + @@ -1243,10 +1300,16 @@ A given element can belong to multiple groups. + + References to Vdus that are part of this group. + + + References to VnfVirtualLinkDesc that are part of this group. + @@ -1520,6 +1583,12 @@ All the VDUs referenced in the level shall be part of the corresponding DF and t + + Specifies bitrate requirements applicable to virtual links created from particular virtual link descriptors for this level. + +NOTE: If not present, it is assumed that the bitrate requirements can be derived from those specified in the VduCpd instances applicable to the internal VL. If present in both the InstantiationLevel and the VduCpd instances applicable to the internal VL, the highest value takes precedence. + + @@ -1628,7 +1697,6 @@ Diversity - Resources are geo-diverse ( cannot be co-located). - @@ -1656,7 +1724,7 @@ Diversity - Resources are geo-diverse ( cannot be co-located). - + An implementation of an NF that can be deployed on a Network Function Virtualisation Infrastructure (NFVI). @@ -1858,7 +1926,7 @@ Diversity - Resources are geo-diverse ( cannot be co-located). - + An internal component of a VNF providing a VNF Provider a defined sub-set of that VNF's functionality, with the main characteristic that a single instance of this component maps 1:1 against a single Virtualisation Container. @@ -1982,13 +2050,10 @@ Diversity - Resources are geo-diverse ( cannot be co-located). - + A Service instance can generate virtual Network Function instances, acting as a "Network Function Provider" of sorts. These Network Functions are different from the Network Functions that comprise the "Provider Service" itself. (E.g., a virtual PE Service comprised of a "vPERouter" and a "vPEForwarder" VNF can collectively provide a "VRF" Network Function, which includes both routing and forwarding functionality.) We distinguish the Network Functions that are provided by a Service instance from the Network Functions that comprise a Service Instance by using the term "Allotted Resource" for the former. - - An allotted resource is a slice of some resource. - @@ -2002,6 +2067,15 @@ Diversity - Resources are geo-diverse ( cannot be co-located). + + + + + + + + + @@ -2383,7 +2457,7 @@ NOTE: A cardinality of "0" indicates that configuring this present VNF - + Describes VNF lifecycle event(s) or an external stimulus detected on a VNFM reference point. @@ -2848,7 +2922,6 @@ NOTE: The MANO or NFVI may not support the recommended collectionPeriod based on - @@ -3194,7 +3267,6 @@ NOTE: The MANO or NFVI may not support the recommended collectionPeriod based on - @@ -3605,4 +3677,55 @@ NOTE: The MANO or NFVI may not support the recommended collectionPeriod based on + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit 1.2.3-korg