From 8a7af273c9d863f4545b46ac3b1c80249f90f300 Mon Sep 17 00:00:00 2001 From: Kevin Scaggs Date: Fri, 20 Sep 2019 15:21:17 -0500 Subject: Finalization License Model Draft Final updates to draft of license model - ready for review. Issue-ID: MODELING-104 Change-Id: I98c6e11aeb927a098246c3a10c58b25d8b6a18a7 Signed-off-by: Kevin Scaggs --- ONAP Information Model/License.notation | 652 ++++++++++++++++++++++++-------- ONAP Information Model/License.uml | 141 ++++--- 2 files changed, 572 insertions(+), 221 deletions(-) diff --git a/ONAP Information Model/License.notation b/ONAP Information Model/License.notation index dfefe66..51101f0 100644 --- a/ONAP Information Model/License.notation +++ b/ONAP Information Model/License.notation @@ -30,7 +30,7 @@ - + @@ -230,7 +230,7 @@ - + @@ -240,22 +240,11 @@ - - - - - - - - - - - @@ -345,11 +334,6 @@ - - - - - @@ -425,7 +409,7 @@ - + @@ -499,51 +483,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -616,9 +555,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - +

@@ -888,7 +858,7 @@ - + @@ -951,6 +921,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -974,7 +971,7 @@ - + @@ -987,9 +984,9 @@ - + - + @@ -1018,7 +1015,7 @@ - + @@ -1180,7 +1177,7 @@ - + @@ -1192,17 +1189,17 @@ - + - + - - + + @@ -1220,6 +1217,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1243,7 +1360,7 @@ - + @@ -1313,6 +1430,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1336,7 +1480,7 @@ - + @@ -1352,6 +1496,114 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1375,7 +1627,7 @@ - + @@ -1511,6 +1763,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1529,7 +1808,7 @@ - + @@ -1595,7 +1874,7 @@ - + @@ -1658,8 +1937,8 @@ - - + + @@ -1669,8 +1948,8 @@ - - + + @@ -1693,6 +1972,28 @@ + + + + + + + + + + + + + + + + + + + + + + @@ -1780,7 +2081,7 @@ - + @@ -1822,6 +2123,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1850,7 +2178,7 @@ - + @@ -2005,12 +2333,12 @@ - + - + @@ -2036,12 +2364,7 @@ - - - - - - + @@ -2070,7 +2393,7 @@ - + @@ -2219,6 +2542,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2271,8 +2625,13 @@ + + + + + - + @@ -2311,7 +2670,7 @@ - + @@ -2407,7 +2766,7 @@ - + @@ -2446,7 +2805,7 @@ - + @@ -2456,11 +2815,6 @@ - - - - - @@ -2514,7 +2868,7 @@ - + @@ -2540,8 +2894,8 @@ - - + + @@ -2572,8 +2926,8 @@ - - + + @@ -2616,36 +2970,36 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2811,7 +3165,7 @@ - + @@ -2833,7 +3187,7 @@ - + @@ -2887,11 +3241,6 @@ - - - - - @@ -2913,7 +3262,7 @@ - + @@ -2928,15 +3277,20 @@ - + + + + + + - + diff --git a/ONAP Information Model/License.uml b/ONAP Information Model/License.uml index 7576456..23ddf28 100644 --- a/ONAP Information Model/License.uml +++ b/ONAP Information Model/License.uml @@ -2,16 +2,13 @@ - - Does a License Agreement have to have at least one feature group? - VLM is really just a Party 'Simplified' attributes for this Vendor are VendorName, and Description, which can be gotten from the Party model (PartyRole) - Only EntitlementPoolDesc attributes currently being used are Name and MRN. + Only EntitlementPool attributes currently being used are Name and MRN. Only attributes presently used are name, metric type and metric value. @@ -21,27 +18,10 @@ MRN should also be provided, but is not required. - Instances (pools, entitlmenets, and keys) are in a license management system that is outside of ONAP + Entitlement and key instances and their association to pools are in a license management system that is outside of ONAP - A&AI does know about the asset tag as an attribute of the Vnf Instance - - - VnfInstance points back to Entitlement and the key (asset tags). - -Vnf to entitlement in A&AI, but not in model? - - - Maybe add a license key type (file and string) - - - Do not need licenseKey ;/ License file?? - - - FeatureGroup can have 1 or more EntitlementPools and related Entitlements related to it. - - - Valid Relationship?? + A&AI stores the entitlement asset tag as an attribute of the Vnf Instance @@ -53,6 +33,13 @@ Vnf to entitlement in A&AI, but not in model? A licenseKeyPool can contain some number of LicenseKeys. + + + LicenseKeyPool can contain some number of LicenseKeyInstances. + + + + @@ -153,29 +140,11 @@ Vnf to entitlement in A&AI, but not in model? - + - - -

- - - - A FeatureGroup must be related to a Vnfd. - - - - - - - Vnfd can have some number of feature groups - - - - - +

@@ -217,21 +186,55 @@ Vnf to entitlement in A&AI, but not in model? EntitlementPool can contain some number of EntitlementInstances + + + EntitlementPool can contain some number of EntitlementInstances. + + + + - +

- - - - + + + + +

+ + + A Vnf can have some number of feature groups. A feature group can apply to one or more Vnfs. + + + + + + + + + + + + + +

+ + + + + + + + + @@ -324,15 +327,11 @@ A license key group is not specific to a feature group. A license key group may - - - LicenseKeyPool can contain some number of LicenseKeyInstances. - - - - + + + A Service Provider internally generated asset tag (id). @@ -344,7 +343,7 @@ A license key group is not specific to a feature group. A license key group may Vendor provided license key value that is entered into the vendor software to activiate / unlock it. - + @@ -428,6 +427,9 @@ Limits can be applied by the vendor or the service provider. Specifies the use rights for the software as described by the license. + + + A Service Provider internally generated asset tag (id). @@ -572,13 +574,6 @@ when 90% of the pool is in-use, trigger an additional purchase of inventory. - - - EntitlementPool can contain some number of EntitlementInstances. - - - - @@ -638,12 +633,6 @@ If an Entitlement Pool or License Key Group is associated with a particular Feat - - - OCL - true - - @@ -709,6 +698,10 @@ Not applicable when license type is Perpetual. + + LicenseInventory and Purchasing outside the scope of ONAP + + @@ -716,6 +709,7 @@ Not applicable when license type is Perpetual. + @@ -729,7 +723,7 @@ Not applicable when license type is Perpetual. - + @@ -751,7 +745,7 @@ Not applicable when license type is Perpetual. - + @@ -816,7 +810,6 @@ Not applicable when license type is Perpetual. - @@ -841,4 +834,8 @@ Not applicable when license type is Perpetual. + + + + -- cgit 1.2.3-korg