From eb64e88cfa509d5d9228c327dcdc39e77454fc2d Mon Sep 17 00:00:00 2001 From: Kevin Scaggs Date: Fri, 8 Feb 2019 21:57:54 -0600 Subject: Updates to common Completed VES 7.1 draft and further updates to license. Issue-ID: MODELING-104 Change-Id: I6c4b67c6534036e4fd40d015d1ac54f337b83a13 Signed-off-by: Kevin Scaggs --- ONAP Information Model/Common.notation | 1178 +++++++++++++++++++------------- ONAP Information Model/Common.uml | 324 ++++++--- 2 files changed, 942 insertions(+), 560 deletions(-) (limited to 'ONAP Information Model') diff --git a/ONAP Information Model/Common.notation b/ONAP Information Model/Common.notation index 792e687..7c98309 100644 --- a/ONAP Information Model/Common.notation +++ b/ONAP Information Model/Common.notation @@ -325,22 +325,16 @@ - - + + + +
+ - - - - - - - - - @@ -362,9 +356,12 @@ - + + +
+ @@ -396,9 +393,12 @@ - + - + + +
+ @@ -430,9 +430,12 @@ - + - + + +
+ @@ -468,35 +471,12 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + + +
+ @@ -523,9 +503,12 @@ - + - + + +
+ @@ -597,9 +580,12 @@ - + - + + +
+ @@ -638,6 +624,13 @@ + + multiplicity + visibility + name + type + derived + @@ -653,9 +646,12 @@ - + - + + +
+ @@ -682,9 +678,12 @@ - + + +
+ @@ -729,9 +728,12 @@ - + - + + +
+ @@ -751,9 +753,12 @@ - + - + + +
+ @@ -773,9 +778,12 @@ - + - + + +
+ @@ -805,7 +813,10 @@ - + + +
+ @@ -832,6 +843,9 @@ + +
+ @@ -895,9 +909,12 @@ - + + +
+ @@ -917,43 +934,12 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + + +
+ @@ -997,9 +983,12 @@ - + + +
+ @@ -1107,29 +1096,12 @@ - - - - - - - - - - - - - - - - - - - - - + + +
+ @@ -1149,7 +1121,65 @@ - + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1157,6 +1187,16 @@ + + + + + + + + + + @@ -1705,7 +1745,7 @@ - + @@ -2316,7 +2356,7 @@ - + @@ -4665,6 +4705,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4688,7 +4773,7 @@ - + @@ -4727,7 +4812,7 @@ - + @@ -4743,6 +4828,78 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4766,7 +4923,7 @@ - + @@ -4805,7 +4962,7 @@ - + @@ -4844,7 +5001,7 @@ - + @@ -4891,7 +5048,7 @@ - + @@ -4901,6 +5058,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4934,7 +5122,7 @@ - + @@ -4946,16 +5134,16 @@ - + - + - - + + @@ -4991,13 +5179,13 @@ - + - + @@ -5036,7 +5224,7 @@ - + @@ -5056,9 +5244,9 @@ - + - + @@ -5089,31 +5277,37 @@ - + + + - + + - + + - + + - + + - + @@ -5143,10 +5337,24 @@ - + + + + + + + + + + + + + + + @@ -7276,7 +7484,7 @@ - + @@ -7364,15 +7572,6 @@ - - - - - - - - - @@ -7509,6 +7708,117 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -7619,7 +7929,7 @@ - + @@ -7774,6 +8084,16 @@ + + + + + + + + + + @@ -8178,28 +8498,6 @@ - - - - - - - - - - - - - - - - - - - - - - @@ -9266,13 +9564,16 @@ - + + +
+ @@ -9282,6 +9583,9 @@ + +
+ @@ -9291,6 +9595,9 @@ + +
+ @@ -9300,6 +9607,9 @@ + +
+ @@ -9309,6 +9619,9 @@ + +
+ @@ -9318,6 +9631,9 @@ + +
+ @@ -9327,6 +9643,9 @@ + +
+ @@ -9335,16 +9654,10 @@ - - - - - - - - - + +
+ @@ -9422,7 +9735,7 @@ - + @@ -9431,7 +9744,7 @@ - + @@ -9440,7 +9753,7 @@ - + @@ -9467,15 +9780,6 @@ - - - - - - - - - @@ -9485,7 +9789,7 @@ - + @@ -9494,7 +9798,7 @@ - + @@ -9655,7 +9959,7 @@ - + @@ -9772,7 +10076,7 @@ - + @@ -9827,11 +10131,11 @@ - + - + @@ -9888,7 +10192,7 @@ - + @@ -9925,7 +10229,7 @@ - + @@ -10007,7 +10311,7 @@ - + @@ -10032,13 +10336,13 @@ - + - + @@ -10145,15 +10449,6 @@ - - - - - - - - - @@ -10304,15 +10599,6 @@ - - - - - - - - - @@ -10478,15 +10764,6 @@ - - - - - - - - - @@ -10724,15 +11001,6 @@ - - - - - - - - - @@ -11270,15 +11538,6 @@ - - - - - - - - - @@ -11480,15 +11739,6 @@ - - - - - - - - - @@ -14464,15 +14714,6 @@ - - - - - - - - - @@ -14770,15 +15011,6 @@ - - - - - - - - - @@ -15160,15 +15392,6 @@ - - - - - - - - - @@ -15271,15 +15494,6 @@ - - - - - - - - - @@ -15418,15 +15632,6 @@ - - - - - - - - - @@ -15529,15 +15734,6 @@ - - - - - - - - - @@ -16078,15 +16274,6 @@ - - - - - - - - - @@ -16290,7 +16477,7 @@ - + @@ -16329,7 +16516,7 @@ - + @@ -16407,7 +16594,7 @@ - + @@ -16446,7 +16633,7 @@ - + @@ -16524,7 +16711,7 @@ - + @@ -16563,7 +16750,7 @@ - + @@ -16647,9 +16834,9 @@ - + - + @@ -16720,8 +16907,8 @@ - - + + @@ -16731,7 +16918,7 @@ - + @@ -16794,8 +16981,8 @@ - - + + @@ -16815,7 +17002,7 @@ - + @@ -16881,15 +17068,6 @@ - - - - - - - - - @@ -16908,15 +17086,6 @@ - - - - - - - - - @@ -17064,16 +17233,7 @@ - - - - - - - - - - + @@ -17373,6 +17533,16 @@ + + + + + + + + + + @@ -17559,8 +17729,8 @@ - - + + @@ -17570,7 +17740,7 @@ - + @@ -17596,8 +17766,8 @@ - - + + @@ -17664,59 +17834,32 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - + - - + + - - - + + + - + - - + + - - - + + + - + - - + + @@ -17741,7 +17884,7 @@ - + @@ -17780,7 +17923,7 @@ - + @@ -17819,7 +17962,7 @@ - + @@ -17835,15 +17978,6 @@ - - - - - - - - - @@ -17894,7 +18028,7 @@ - + @@ -17933,7 +18067,7 @@ - + @@ -17972,7 +18106,7 @@ - + @@ -17982,6 +18116,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -18075,9 +18253,9 @@ - - - + + + @@ -18101,20 +18279,20 @@
- +
- + - - - + + + @@ -18144,55 +18322,111 @@ - - + + + + - + + - + + - + + - + + + + - + + - + + - + + - + + - + + - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -19428,11 +19662,6 @@ - - - - - @@ -20189,7 +20418,7 @@ - + @@ -20246,7 +20475,7 @@ - + @@ -20339,7 +20568,7 @@ - + @@ -20387,7 +20616,7 @@ - + @@ -20435,7 +20664,7 @@ - + @@ -20483,7 +20712,7 @@ - + @@ -20531,7 +20760,7 @@ - + @@ -20579,7 +20808,7 @@ - + @@ -20636,7 +20865,7 @@ - + @@ -20693,7 +20922,7 @@ - + @@ -20750,7 +20979,7 @@ - + @@ -20807,7 +21036,7 @@ - + @@ -21476,6 +21705,13 @@ + + multiplicity + visibility + name + type + derived + diff --git a/ONAP Information Model/Common.uml b/ONAP Information Model/Common.uml index e02cff0..826613d 100644 --- a/ONAP Information Model/Common.uml +++ b/ONAP Information Model/Common.uml @@ -171,7 +171,7 @@ If null, then represents to the end of time - ateTime - RFC 2822 standard date/time format. + DateTime - RFC 2822 standard date/time format. RFC 2822 format day-of-week, dd MM yyyy HH’:’mm’:’ss ‘GMT’ @@ -179,6 +179,11 @@ day-of-week, dd MM yyyy HH’:’mm’:’ss ‘GMT’ e.g. Tue, 21 Jun 2016 14:05:20 GMT + + + 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 + + @@ -572,7 +577,7 @@ For fault events, startEpochMicrosec is the timestamp of the initial alarm; if t - Array of JSON objects described by name, schema and other meta-information, if needed. + Array of Schema objects described by name, schema and other meta-information, if needed. @@ -1071,10 +1076,11 @@ Note: current data type (String) may be changed to Common Resource Datatype L3Ad - + New state of the entity, for example: ‘inService’, ‘maintenance’, ‘outOfService’ + @@ -1083,13 +1089,14 @@ Note: current data type (String) may be changed to Common Resource Datatype L3Ad Version of the notificationFields block as “#.#” where # is a digit; see section 1 for the correct digits to use. - + Previous state of the entity. For example: "inService", "outOfService", "maintenance" + @@ -1122,9 +1129,9 @@ For example: "inService", "outOfService", "maintenance& - + - Array of JSON objects described by name, schema and other meta-information. + Array of schema objects described by name, schema and other meta-information. @@ -1343,12 +1350,12 @@ Note: current data type (String) may be changed to Common Resource Datatype L3Ad - + New state of the entity: ‘inService’, ‘maintenance’, ‘outOfService’ - + Previous state of the entity: ‘inService’, ‘maintenance’, ‘outOfService’ @@ -3898,6 +3905,9 @@ Field Type Required? Description + + Array of monitored object local distinguished name ids per 3GPP TS 32.300 + @@ -4120,12 +4130,6 @@ Field Type Required? Description 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. @@ -4154,11 +4158,6 @@ Field Type Required? Description - - - 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 - - Array of named hashMaps @@ -4171,14 +4170,17 @@ Field Type Required? Description - + - 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. + SchemaObject - The SchemaObject datatype provides an object schema, name and other meta-information along with one or more object instances that conform to the schema. + + Note: The VES Spec has this as a Json based object. + - objectInstances - Contains one or more instances of the JSON object. + objectInstances - Contains one or more instances of the SchemaObjectInstance object. @@ -4186,14 +4188,14 @@ Field Type Required? Description - objectName - Name of the json object. + objectName - Name of the object. - objectSchema - JSON schema for the object. + objectSchema - schema for the object. @@ -4202,7 +4204,7 @@ Field Type Required? Description - objectSchemaUrl - URL to the JSON schema for the object. + objectSchemaUrl - URL to the schema for the object. @@ -4220,7 +4222,7 @@ Field Type Required? Description - nfSubscriptionId - Identifies an OpenConfig telemetry subscription on a network function, which configures the network function to send complex object data associated with the jsonObject. + nfSubscriptionId - Identifies an OpenConfig telemetry subscription on a network function, which configures the network function to send complex object data associated with the SchemaObject. @@ -4228,14 +4230,17 @@ Field Type Required? Description - + - jsonObjectInstance [ ] - The jsonObjectInstance datatype provides meta-information about an instance of a jsonObject along with the actual object instance. + SchemaObjectInstance [ ] - The SchemabjectInstance datatype provides meta-information about an instance of a SchemaObject along with the actual object instance. - + + Note: The VES Spec has this as a Json based object. + + - jsonObject - Optional recursive specification on jsonObject + SchemaObject - Optional recursive specification on SchemaObject @@ -4243,21 +4248,27 @@ Field Type Required? Description - objectInstance - Contains an instance conforming to the jsonObject schema + objectInstance - Contains an instance conforming to the SchemaObject schema + + objectInstanceEpochMicrosec - the unix time, aka epoch time, associated with this objectInstance--as microseconds elapsed since 1 Jan 1970 not including leap seconds. + + - + - objectKeys - An ordered set of keys that identifies this particular instance of jsonObject (e.g., that places it in a hierarchy). + objectKeys - An ordered set of keys that identifies this particular instance of SchemaObject (e.g., that places it in a hierarchy). + + @@ -4275,16 +4286,11 @@ Field Type Required? Description - - + + - - - - - - - + + @@ -4304,14 +4310,17 @@ Field Type Required? Description - + - arrayOfJsonObject - The arrayOfJsonObject datatype provides an array of json objects, each of which is described by name, schema and other meta-information. + arrayOfSchemaObject - The arrayOfSchemaObject datatype provides an array of json objects, each of which is described by name, schema and other meta-information. - + + Note: The VES Spec has this as a Json based object. + + - arrayOfJsonObject - arrayOfJsonObject datatype provides an array of json objects, each of which is described by name, schema and other meta-information. + arrayOfSchemaObject - arrayOfSchemaObject datatype provides an array of SchemaObjects, each of which is described by name, schema and other meta-information. @@ -4368,7 +4377,7 @@ Note: in ATTServiceSpecification - VesEventListener v5.4.1 type = field []. - + @@ -4454,6 +4463,34 @@ Debug 7 debug-level messages + + Numeric code from 0 to 23 for facility: + 0 kernel messages + 1 user-level messages + 2 mail system + 3 system daemons + 4 security/authorization messages + 5 messages generated internally by syslogd + 6 line printer subsystem + 7 network news subsystem + 8 UUCP subsystem + 9 clock daemon + 10 security/authorization messages + 11 FTP daemon + 12 NTP subsystem + 13 log audit + 14 log alert + 15 clock daemon (note 2) + 16 local use 0 (local0) + 17 local use 1 (local1) + 18 local use 2 (local2) + 19 local use 3 (local3) + 20 local use 4 (local4) + 21 local use 5 (local5) + 22 local use 6 (local6) + 23 local use 7 (local7 + + kernel messages @@ -4917,17 +4954,30 @@ Debug 7 debug-level messages - - - Units of the entitlement/license term. Valid values: year, quarter, month, day. - - - - - - - - + + Does a License Agreement have to have at least one feature group? + + + Definition of VLM + + + Wil the VLM have a name, or just a Vendor Name (do we refine inherited name to VendorName)? + + + If Rooted, updates will occur to this class. + + + See description from SAM Doc + + + There are a bunch of attributes feature group attributes in SAm Definitions - maybe not in SDC?? + + + Only EntitlementPoolDesc Currently being used are Name and MRN. Everything else is optional. + + + Only attributes presently used are name, metric type and metric value. + @@ -4946,10 +4996,13 @@ Debug 7 debug-level messages
- - + + + + + + - @@ -5102,7 +5155,10 @@ Debug 7 debug-level messages - + + + + @@ -5131,7 +5187,7 @@ Debug 7 debug-level messages - + Valid values: Universal, Unique @@ -5139,6 +5195,7 @@ Universal - a single license key value that may be used with any number of insta Unique - a unique license key value is required for each instance of the software. + @@ -5207,10 +5264,31 @@ A license key group is not specific to a feature group. A license key group may Identifier for the entitlement as described by the vendor in their price list / catalog /contract. + + + + The Vendor License Model enbables a service provider to track the usage of vendor products used used in resources created in ASDC. + +VLM is used to track instaantiations ("entitlements") of the vendor provided software used by the servi e provider for given resources. + + + + + A VLM is actually be a "Party". + + + There should only be on VLM per vendor (given it appears to be "party", but there is no restriction. + + + + The name of the vendor providing this resource. + + + @@ -5261,7 +5339,6 @@ Not applicable when license type is Perpetual. - @@ -5301,6 +5378,10 @@ Limits can be applied by the vendor or the service provider. + + Units time is specified in (day, month, hour, minute, second, millisecond. + + @@ -5365,7 +5446,7 @@ An entitlement pool is not specific to a feature group. An entitlement pool may - + Identifier for the entitlement as described by the vendor in their price list / catalog /contract. @@ -5435,23 +5516,53 @@ If an Entitlement Pool or License Key Group is associated with a particular Feat - + + + + - + + + An agreement between the service provider and a given vendor granting the service provider to use the vendor's products. Generally the license agreement is specific to a family of vendor products and/or to some service provider's project/product or product family. + + - - + + + License agreement description. + + + + + Free form text. Includes information such as operating system or hypervisor required for the software. This may also contain factors to be considered in deployment/placement of the software instances. These requirements and constraints may need to be abstracted as policies or other business rules. + + - + + + Term of the license: +-fixed term +-perpetual +-unlimited +-subscription + + + + + + + OCL + true + @@ -5504,6 +5615,17 @@ Not applicable when license type is Perpetual. + + + Units of the entitlement/license term. Valid values: year, quarter, month, day. + + + + + + + + @@ -6096,6 +6218,33 @@ Not present in the ITU or CIM specs. "Guard" Policies - serve as overarching conditions. + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -7374,7 +7523,7 @@ Value: - + @@ -7440,13 +7589,6 @@ Value: - - - Identifies the version of the descriptor. - - - - @@ -7584,11 +7726,7 @@ Value: - - - Is BusinessInteraction Rooted? Query out to Michel and Cecile. - - + @@ -7707,7 +7845,6 @@ Value: - @@ -8474,7 +8611,6 @@ Value: - @@ -8569,13 +8705,11 @@ Value: - - @@ -8614,8 +8748,6 @@ Value: - - @@ -8892,4 +9024,18 @@ Value: + + + + + + + + + + + + + + -- cgit 1.2.3-korg