From a53daf4f50443ac114574495c9d709badebda449 Mon Sep 17 00:00:00 2001 From: Kevin Scaggs Date: Fri, 6 Sep 2019 15:17:01 -0500 Subject: Updates to License Refinements to license and entitlement instance. Issue-ID: MODELING-104 Change-Id: I971221e59df357e098d7f30b573c8fb92aa2dbf6 Signed-off-by: Kevin Scaggs --- ONAP Information Model/License.notation | 212 ++++++++++++++++++++++---------- ONAP Information Model/License.uml | 150 +++++++++++++++------- 2 files changed, 251 insertions(+), 111 deletions(-) diff --git a/ONAP Information Model/License.notation b/ONAP Information Model/License.notation index 41c4b73..3fdf38b 100644 --- a/ONAP Information Model/License.notation +++ b/ONAP Information Model/License.notation @@ -613,7 +613,10 @@ - + + +
+ @@ -774,7 +777,7 @@ - + @@ -784,7 +787,7 @@ - + @@ -867,7 +870,7 @@ - + @@ -901,7 +904,7 @@ - +
@@ -931,7 +934,10 @@ - + + +
+ @@ -940,6 +946,15 @@ + + + + + + + + + @@ -963,7 +978,7 @@ - + @@ -973,15 +988,10 @@ - - - - - - + @@ -1077,7 +1087,7 @@ - + @@ -1114,7 +1124,7 @@ - + @@ -1154,8 +1164,8 @@ - - + + @@ -1169,22 +1179,28 @@ + + - + + - + + - + + - + + @@ -1887,7 +1903,7 @@ - + @@ -1895,6 +1911,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1918,17 +1997,17 @@ - + - + - + @@ -1972,7 +2051,10 @@ - + + +
+ @@ -2026,7 +2108,10 @@ - + + +
+ @@ -2035,6 +2120,15 @@ + + + + + + + + + @@ -2094,11 +2188,6 @@ - - - - - @@ -2128,12 +2217,12 @@ - + - - + + @@ -2143,7 +2232,7 @@ - + @@ -2159,13 +2248,13 @@ - + - - + + @@ -2196,7 +2285,7 @@ - + @@ -2901,6 +2990,11 @@ + + + + + @@ -2937,10 +3031,10 @@ - - - - + + + + @@ -2972,20 +3066,6 @@ - - - - - - - - - - - - - - @@ -2997,8 +3077,8 @@ - - + + @@ -3028,7 +3108,7 @@ - + @@ -3065,7 +3145,7 @@ - + @@ -3077,12 +3157,12 @@ - + - + @@ -3156,7 +3236,7 @@ - + @@ -3186,7 +3266,7 @@ - + diff --git a/ONAP Information Model/License.uml b/ONAP Information Model/License.uml index b83cc3d..eade43f 100644 --- a/ONAP Information Model/License.uml +++ b/ONAP Information Model/License.uml @@ -11,14 +11,11 @@ 'Simplified' attributes for this Vendor are VendorName, and Description, which can be gotten from the Pary model - Only EntitlementPoolDesc attributes currently being used are Name and MRN. Other fields are present but not supported in downstream systems. + Only EntitlementPoolDesc attributes currently being used are Name and MRN. Only attributes presently used are name, metric type and metric value. - - What do we do with keyFunction,LicenseKeyType, etc? - Only name and type are required. MRN should also be provided, but is not required. @@ -29,28 +26,12 @@ MRN should also be provided, but is not required. A&AI does know about the asset tag as an attribute of the Vnf Instance - - Deleted "extra" Increment - updated common - -Removed Vendor to Entitlement Pool Relationship (Updated Party) - VnfInstance points back to Entitlement and the key (asset tags) - - -
- - - - - - - - - - - + + Maybe add a license key type (file and string) + @@ -185,6 +166,20 @@ Removed Vendor to Entitlement Pool Relationship (Updated Party) + + +
+ + + + + + + + + + + @@ -245,7 +240,7 @@ 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. - + @@ -359,6 +354,8 @@ Not applicable when license type is Perpetual. Vendor provided license key value that is entered into the vendor software to activiate / unlock it. + + @@ -384,6 +381,11 @@ Not applicable when license type is Perpetual. + + + + + @@ -462,6 +464,31 @@ Limits can be applied by the vendor or the service provider. Specifies the use rights for the software as described by the license. + + + + + + + + + + + + + + + + + + + + + + + + + @@ -563,6 +590,17 @@ when 90% of the pool is in-use, trigger an additional purchase of inventory. + + + 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. + + + @@ -681,7 +719,7 @@ Not applicable when license type is Perpetual. - + @@ -704,33 +742,30 @@ Not applicable when license type is Perpetual. - + - + - - - - - + + + - - - + + - + - - + + @@ -740,7 +775,7 @@ Not applicable when license type is Perpetual. - + @@ -781,17 +816,11 @@ Not applicable when license type is Perpetual. - - - - - - @@ -822,4 +851,35 @@ Not applicable when license type is Perpetual. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit 1.2.3-korg