From 149a9fb31eab12a86d28f73aaa2ba4a05343e0fe Mon Sep 17 00:00:00 2001 From: Kevin Scaggs Date: Wed, 3 Jul 2019 15:44:54 -0500 Subject: Updates to License Made some updates to license on the instance side. Still a work in progress. Issue-ID: MODELING-104 Change-Id: I2c6cc358bd72c5c31f0491d4e5489aa30478be31 Signed-off-by: Kevin Scaggs --- ONAP Information Model/License.notation | 395 +++++++++++++++++++++++++++----- ONAP Information Model/License.uml | 120 ++++++++-- 2 files changed, 438 insertions(+), 77 deletions(-) (limited to 'ONAP Information Model') diff --git a/ONAP Information Model/License.notation b/ONAP Information Model/License.notation index b2467e0..8822ebe 100644 --- a/ONAP Information Model/License.notation +++ b/ONAP Information Model/License.notation @@ -8,11 +8,6 @@ - - - - - @@ -33,11 +28,6 @@ - - - - - @@ -138,11 +128,6 @@ - - - - - @@ -339,6 +324,11 @@ + + + + + @@ -731,6 +721,15 @@ + + + + + + + + + @@ -754,7 +753,7 @@ - + @@ -847,7 +846,7 @@ - + @@ -902,6 +901,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -925,7 +951,7 @@ - + @@ -977,7 +1003,7 @@ - + @@ -986,7 +1012,7 @@ - + @@ -1004,33 +1030,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - -

@@ -1174,12 +1173,12 @@ - + - + @@ -1215,6 +1214,62 @@ + + + + + + + + + + + + + + + + + + + multiplicity + visibility + defaultValue + name + type + derived + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1368,7 +1423,7 @@ - + @@ -1398,7 +1453,7 @@ - + @@ -1429,7 +1484,7 @@ - + @@ -1473,6 +1528,16 @@ + + + + + + + + + + @@ -2233,6 +2298,15 @@ + + + + + + + + + @@ -2428,6 +2502,15 @@ + + + + + + + + + @@ -2617,11 +2700,6 @@ - - - - - @@ -2696,7 +2774,7 @@ - + @@ -2800,7 +2878,7 @@ - + @@ -3697,4 +3775,203 @@ + + + + + + + + + + + + + + + + + + + + + + + + multiplicity + visibility + defaultValue + name + type + derived + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + multiplicity + visibility + defaultValue + name + type + derived + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ONAP Information Model/License.uml b/ONAP Information Model/License.uml index 7158dcd..df5f299 100644 --- a/ONAP Information Model/License.uml +++ b/ONAP Information Model/License.uml @@ -35,15 +35,18 @@ MRN should also be provided, but is not required. ASDC has a pool (group) desc, not license or entitlement desc because they are not in SDC. - - Michelle to verify if NumofCpus, COres, and VPMO apply - Instances (pools, entitlmenets, and keys) are in ALTS - outside of ONAP A&AI does know about the asset tag as an attribute of the Vnf Instance + + Also need the actual Vnf Instance. ALTS also tracks the actual instances of VNFs. + + + Do we need thresholdvalue on the desc side? +

@@ -88,6 +91,38 @@ MRN should also be provided, but is not required. + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+ + + + @@ -335,13 +370,15 @@ A license key group is not specific to a feature group. A license key group may - A ‘one-time’ value indicates that each instance of the software must be related to a unique license key (string). When no longer needed, the key may not be reused. + + Units can be either absolute or a percentage (%). - - + + @@ -370,6 +407,9 @@ A license key group is not specific to a feature group. A license key group may + + + @@ -466,15 +506,6 @@ Not applicable when license type is Perpetual. - - - - - - - - - @@ -506,10 +537,35 @@ Not applicable when license type is Perpetual. + + UUID of the LicenseKeyGroupDesc as provided by SDC that this key is related to. + - + + + + The license key may be ‘universal’ or ‘unique’ or ‘one-time’. +- A ‘universal’ value indicates that the same exact license key (string) may be associated with all instances of the software. + +- A ‘unique’ value indicates that each instance of the software must be related to a unique license key (string). When no longer needed, the key may be returned to the license key pool for reuse. + +- A ‘one-time’ value indicates that each instance of the software must be related to a unique license key (string). When no longer needed, the key may not be reused. + + + + + + + + + + + + + + A variable set of values that identify the limits that may be imposed by an entitlement instance in the pool. Multiple constraints may be applicable for an instance of entitlement in the pool. For example, an entitlement based on GB and number of sessions. Increments, aggregation function, time scope, threshold value may repeat for each metric in the list. @@ -629,6 +685,8 @@ 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. + + @@ -675,6 +733,9 @@ when 90% of the pool is in-use, trigger an additional purchase of inventory. + + + @@ -683,6 +744,9 @@ when 90% of the pool is in-use, trigger an additional purchase of inventory. Management of the collection. + + + @@ -846,9 +910,6 @@ Not applicable when license type is Perpetual. - - - @@ -871,4 +932,27 @@ Not applicable when license type is Perpetual. + + + + + + + + + + + + + + + + + + + + + + + -- cgit 1.2.3-korg