From aadc1dab2ce967939b8a8ebc5de2560e6da2d115 Mon Sep 17 00:00:00 2001 From: Kevin Scaggs Date: Fri, 12 Apr 2019 15:43:03 -0500 Subject: Updates to License Made some updates to the license model, specifying what is in the model versus what is being used by downstream systems. Issue-ID: MODELING-104 Change-Id: I4e8f3e611086dca3ea829017d4f95d7afc64ab8a Signed-off-by: Kevin Scaggs --- ONAP Information Model/License.notation | 441 +++++++++++++++++++------------- ONAP Information Model/License.uml | 103 +++++--- 2 files changed, 337 insertions(+), 207 deletions(-) diff --git a/ONAP Information Model/License.notation b/ONAP Information Model/License.notation index e54aa28..9f60e18 100644 --- a/ONAP Information Model/License.notation +++ b/ONAP Information Model/License.notation @@ -653,30 +653,6 @@ - - -

- - - - - - - - - - - -

- - - - - - - - -

@@ -701,29 +677,59 @@ - - -

- - - + + + - + - - + + - - -

- - - + + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -748,7 +754,7 @@ - + @@ -832,7 +838,7 @@ - + @@ -1055,7 +1061,17 @@ - + + + + + + + + + + + @@ -1281,7 +1297,7 @@ - + @@ -1354,7 +1370,7 @@ - + @@ -1393,7 +1409,7 @@ - + @@ -1537,7 +1553,7 @@ - + @@ -1654,7 +1670,7 @@ - + @@ -1693,7 +1709,7 @@ - + @@ -1816,7 +1832,7 @@ - + @@ -1942,6 +1958,28 @@ + + + + + + + + + + + + + + + + + + + + + + @@ -2045,7 +2083,7 @@ - + @@ -2138,7 +2176,7 @@ - + @@ -2216,7 +2254,7 @@ - + @@ -2226,54 +2264,15 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + @@ -2314,7 +2313,10 @@ - + + +

+ @@ -2322,20 +2324,6 @@ - - - - - - - - - - - - - - @@ -2345,14 +2333,59 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + @@ -2377,7 +2410,7 @@ - + @@ -2387,6 +2420,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2433,16 +2520,6 @@ - - - - - - - - - - @@ -2471,69 +2548,38 @@ - + - - - - - - - - - - - - - - - -

- - - - - - -

- - - - - - - - - - - - - - + + - + + - + + - + + - + + - + @@ -2623,8 +2669,8 @@ - - + + @@ -2654,8 +2700,8 @@ - - + + @@ -2664,7 +2710,7 @@ - + @@ -2685,9 +2731,50 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ONAP Information Model/License.uml b/ONAP Information Model/License.uml index 9e1c00d..7934efd 100644 --- a/ONAP Information Model/License.uml +++ b/ONAP Information Model/License.uml @@ -1,5 +1,5 @@ - + @@ -8,13 +8,13 @@ VLM is really just a Party -'Simplified' attributes for this Vendor are VendorName, and Description +'Simplified' attributes for this Vendor are VendorName, and Description, which can be gotten from the Pary model 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 EntitlementPoolDesc attributes currently being used are Name and MRN. Other fields are present but not supported in downstream systems. Only attributes presently used are name, metric type and metric value. @@ -22,6 +22,31 @@ What do we do with keyFunction,LicenseKeyType, etc? + + StartDate and ExpiryDate attributes are covered by validFor. Note that these fields are presently not used. + + + Description and Status is not presently required, but from a modeling view, it should be. + + + Only name and type are required. +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. + + + +

+ + + + + + + + + @@ -242,6 +267,9 @@ Controllers will request license keys from ALTS using the UUID of the group, as A license key group is not specific to a feature group. A license key group may be related to multiple feature groups of a software item or even to multiple software items. + + + Pool limits applied by the service provider @@ -271,30 +299,24 @@ A license key group is not specific to a feature group. A license key group may Units can be either absolute or a percentage (%). + + Specified threshold value for the license key pool. - - - - Start date. - - - - - - Expiry date. - - + + Specifies how the key must be purchased. If in blocks of 1000, the increment would be 1000. + + @@ -304,6 +326,9 @@ A license key group is not specific to a feature group. A license key group may + + + @@ -455,6 +480,21 @@ An entitlement pool is not specific to a feature group. An entitlement pool may + + Note: The only fields being used in this class are Name and MRN (manufactureReferenceNumber. The rest are optional. + + + Note: StateDate and ExpiryDate are covered by the inherited validFor attribute. + + + Note: description is required according to the inherited attribute, but it presently is optional. + + + Note: description is required according to the inherited attribute, but it presently is optional. + + + + Pool limits applied by the service provider @@ -495,6 +535,11 @@ An entitlement pool is not specific to a feature group. An entitlement pool may A description of a threshold that will be assessed for some business purpose (e.g. 20% of entitlement pool remains available). (The threshold of interest to DCAE or Capacity Planning, etc.) This may be an absolute value or a percentage. For example: when 90% of the pool is in-use, trigger an additional purchase of inventory. + + + + A description of a threshold that will be assessed for some business purpose (e.g. 20% of entitlement pool remains available). (The threshold of interest to DCAE or Capacity Planning, etc.) This may be an absolute value or a percentage. For example: +when 90% of the pool is in-use, trigger an additional purchase of inventory. @@ -516,21 +561,11 @@ when 90% of the pool is in-use, trigger an additional purchase of inventory. - - - Start date + + + Identifier that stays the same irrespective of version. - - - - - - - Expiry date - - - - + @@ -687,5 +722,13 @@ Not applicable when license type is Perpetual. - + + + + + + + + + -- cgit 1.2.3-korg