From b231e4651bafb60748b0643da089776e8dca2885 Mon Sep 17 00:00:00 2001 From: Kevin Scaggs Date: Fri, 1 Feb 2019 13:27:03 -0600 Subject: Updates to Common Updated VES to 7.1, including 3gpp domain events as well as slight common datatypes updates. Also updated draft material on root class model. Issue-ID: MODELING-104 Change-Id: I8c7b8c9555296dc9b30caadac9a56ce6fba15567 Signed-off-by: Kevin Scaggs --- ONAP Information Model/Common.notation | 1921 ++++++++++++++++++++++++++++++-- ONAP Information Model/Common.uml | 671 ++++++++--- 2 files changed, 2367 insertions(+), 225 deletions(-) diff --git a/ONAP Information Model/Common.notation b/ONAP Information Model/Common.notation index 7660871..792e687 100644 --- a/ONAP Information Model/Common.notation +++ b/ONAP Information Model/Common.notation @@ -1151,78 +1151,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1416,7 +1344,7 @@ - + @@ -1944,7 +1872,7 @@ - + @@ -1956,7 +1884,7 @@ - + @@ -1964,9 +1892,9 @@ - - - + + + @@ -2199,9 +2127,12 @@ - + + +

+ - + @@ -6219,15 +6150,6 @@ - - - - - - - - - @@ -20314,7 +20236,7 @@ - + @@ -20407,7 +20329,7 @@ - + @@ -20423,25 +20345,39 @@ + + + + + + + + + - + - + + + + + + - + @@ -20451,6 +20387,483 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -20484,7 +20897,7 @@ - + @@ -20496,7 +20909,7 @@ - + @@ -20504,9 +20917,9 @@ - - - + + + @@ -20518,5 +20931,1315 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + multiplicity + visibility + name + type + modifiers + derived + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + multiplicity + visibility + name + type + modifiers + derived + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ONAP Information Model/Common.uml b/ONAP Information Model/Common.uml index dd9057f..e02cff0 100644 --- a/ONAP Information Model/Common.uml +++ b/ONAP Information Model/Common.uml @@ -4,7 +4,14 @@ - + + + + + + + + The SecurityParameters contains the signature of a NSD, VLD, PNFD or VNFFGD instance together with information required to validate the signature. @@ -523,7 +530,7 @@ For fault events, startEpochMicrosec is the timestamp of the initial alarm; if t - Offset to GMT to indicate local time zone for device formatted as ‘UTC+/-hh.mm’; see https://en.wikipedia.org/wiki/List_of_time_zone_abbreviations for UTC offset examples + Offset to GMT to indicate local time zone for device formatted as ‘UTC+/-hh:mm’; see https://en.wikipedia.org/wiki/List_of_time_zone_abbreviations for UTC offset examples @@ -797,14 +804,6 @@ For fault events, startEpochMicrosec is the timestamp of the initial alarm; if t - - - gtpPerFlowMetrics - Mobility GTP Protocol per flow metrics. - - - - - gtpProtocolType - GTP protocol @@ -1022,7 +1021,10 @@ Note: current data type (String) may be changed to Common Resource Datatype L3Ad - + + + Mobility GTP Protocol per flow metrics + @@ -2785,7 +2787,7 @@ Field Type Required? Description - + processIdentifier @@ -3835,18 +3837,302 @@ Field Type Required? Description - + + + 3GPP measurement collection structure + + + + The measDataCollection datatype defines a 3GPP measurement collection structure aligned with the 3GPP PM format + + + + 3GPP PM reporting file format version from pre-standard TS 28.550 v2.0.0 + + + + + + + + Granularity period for the PM report in seconds + + + + + + + + Array of monitored object local distinguished name ids per 3GPP TS 32.300 + + + + + + + + Distinguished name per 3GPP TS 28.550 + + + + + + + + Software version for the NF providing the PM data as specified in 3GPP TS 28.550 + + + + + + + + User Definable name for the measured object per 3GPP TS 28.550 + + + + + + + + + + + + + + Name of the measurement job + + + + + + + + Measurement group Identifier + + + + + + + Measurement group Identifier + + + + + + + Array of measurement identifiers associated with the measurement results expressed as integers for efficiency rather than strings + + + + + + + Array of measurement identifiers associated with the measurement results expressed as integers for efficiency rather than strings + + + + + + + Array of measValues + + + + + + + + The measInfoIdInteger datatype provides an integer measurement group identifier; + + + + Integer measurement group Identifier + + + + + + + The measInfoIdString datatype provides a string measurement group identifier; + + + + String measurement group Identifier + + + + + + + The measTypesInteger datatype provides an array of integer measurement identifiers associated with the measurement results + + + + Array of integer measurement identifiers associated with the measurement results + + + + + + + + + The measTypesString datatype provides an array of string measurement identifiers associated with the measurement results + + + + Array of string measurement identifiers associated with the measurement results + + + + + + + + + The measValues datatype provides 3GPP measurement values + + + + Additional key-value pairs if needed + + + + + + + Enumeration: ‘true’, ‘false’. Indicates if the values are suspect + + + VES 7.1 Spec has this attribute as a string. + + + + + + Array of results + + + + + + + Array of results + + + + + + + Array of results + + + + + + + Array of results + + + + + + + + The measResultInteger datatype provides an integer 3GPP PM measurement result; + + + + Integer reference to the counter + + + + + + Integer counter value + + + + + + + The measResultNull datatype provides a null 3GPP PM measurement result + + + + Integer reference to the counter + + + + + + Enumeration: ‘true’ or ‘false’ + + + The VES 7.1 Spec has this attribute as a string. + + + + + + + The measResultNumber datatype provides a number 3GPP PM measurement result + + + + Integer reference to the counter + + + + + + Number counter value + + + + + + The measResultString datatype provides a string 3GPP PM measurement result; + + + + Integer reference to the counter + + + + + + String counter value + + + + + + The hashMap datatype is an ‘associative array’, which is an unordered collection of key-value pairs of the form “key”: “value”, where each key and value are strings. Keys must use camel casing to separate words and acronyms; only the first letter of each acronym shall be capitalized. + + + Hashmap name. + - + + + A given entry in the hashmap, which is a key/value pair. + + + + @@ -3987,13 +4273,13 @@ Field Type Required? Description + - @@ -4001,9 +4287,20 @@ Field Type Required? Description - - + + + Enumeration: ‘CRIT’, ‘MAJ’ + + + + + Key is the name of the counter and value is the current value of the counter + + + + Last threshold that was crossed + @@ -4527,6 +4824,81 @@ Debug 7 debug-level messages + + +

+ + + Fields specific to 3gpp types of events + + + + + +

+ + + + + +

+ + + @@ -4541,88 +4913,6 @@ Debug 7 debug-level messages Treated associatedAlertList as a String with multiplicity of * - - - The hashMap datatype is an ‘associative array’, which is an unordered collection of key-value pairs of the form “key”: “value”, where each key and value are strings. Keys must use camel casing to separate words and acronyms; only the first letter of each acronym shall be capitalized. - - - - - - - - - - - - - - - - - - -

- - - - - - - 3GPP PM reporting file format version from pre-standard TS 28.550 v2.0.0 - - - - - - - - Granularity period for the PM report in seconds - - - - - - - - Array of monitored object local distinguished name ids per 3GPP TS 32.300 - - - - - - - - Distinguished name per 3GPP TS 28.550 - - - - - - - - Software version for the NF providing the PM data as specified in 3GPP TS 28.550 - - - - - - - - User Definable name for the measured object per 3GPP TS 28.550 - - - - - - - - -

- - - - @@ -7026,7 +7316,31 @@ Value: A set of common business entities that collectively serve as the foundation of the ONAP Information Model.. This set of entities enables the entities in different domains of the Information Model to be associated with each other, providing greater overall coherence. - + + + +

+ + + + + + + + + +

+ + + + + + + + + + + Perhaps all these attributes can be moved up to OnboardingNfDescriptor @@ -7055,31 +7369,58 @@ Value: - - -

- - - - - - - - - -

- - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -7115,7 +7456,12 @@ Value: Represents a user-friendly identifier of an object. It is a (possibly ambiguous) name by which the object is commonly known in some limited scope (such as an organization) and conforms to the naming conventions of the country or culture with which it is associated. It is NOT used as a naming attribute (i.e., to uniquely identify an instance of the object). + + Represents a user-friendly identifier of an object. It is a (possibly ambiguous) name by which the object is commonly known in some limited scope (such as an organization) and conforms to the naming conventions of the country or culture with which it is associated. It is NOT used as a naming attribute (i.e., to uniquely identify an instance of the object). + + + @@ -7499,7 +7845,6 @@ Value: - @@ -8343,9 +8688,6 @@ Value: - - - @@ -8473,4 +8815,81 @@ Value: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit 1.2.3-korg