From 965b7f3ea141d674f1957f554fdc7d3f16163e5a Mon Sep 17 00:00:00 2001 From: Kevin Scaggs Date: Tue, 20 Aug 2019 15:55:02 -0500 Subject: Updates to License Updates to license includes removal of desc / instance pattern - just have entitlement groups and license pools along with entitlements and licenses. Issue-ID: MODELING-104 Change-Id: I4879f0ec7be295df1ff154d43abf9ef0f9ae582c Signed-off-by: Kevin Scaggs --- ONAP Information Model/License.notation | 1487 +++++++++++-------------------- ONAP Information Model/License.uml | 255 ++---- 2 files changed, 611 insertions(+), 1131 deletions(-) diff --git a/ONAP Information Model/License.notation b/ONAP Information Model/License.notation index 8822ebe..02d5347 100644 --- a/ONAP Information Model/License.notation +++ b/ONAP Information Model/License.notation @@ -1,44 +1,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -68,7 +30,7 @@ - + @@ -84,20 +46,11 @@ - - - - - - - - - - - + + - + @@ -111,6 +64,24 @@ + + + + + + + + + + + + + + + + + + @@ -128,8 +99,13 @@ + + + + + - + @@ -264,15 +240,15 @@ - + - + - + @@ -286,6 +262,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -314,7 +335,7 @@ - + @@ -324,27 +345,12 @@ - - - - - - - - - - - - - - - @@ -464,7 +470,7 @@ - + @@ -476,16 +482,16 @@ - + - + - + @@ -515,7 +521,7 @@ - + @@ -572,32 +578,38 @@ - + + + - + + - + + - + + - + + - - + + @@ -730,6 +742,15 @@ + + + + + + + + + @@ -753,7 +774,7 @@ - + @@ -846,7 +867,7 @@ - + @@ -895,72 +916,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1155,7 +1110,7 @@ - + @@ -1168,18 +1123,13 @@ - + - - - - - @@ -1204,7 +1154,7 @@ - + @@ -1214,62 +1164,6 @@ - - - - - - - - - - - - - - - - - - - multiplicity - visibility - defaultValue - name - type - derived - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1333,7 +1227,7 @@ - + @@ -1374,16 +1268,6 @@ - - - - - - - - - - @@ -1394,68 +1278,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1463,7 +1285,7 @@ - + @@ -1475,19 +1297,19 @@ - + - + - - - + + + - + @@ -1528,16 +1350,6 @@ - - - - - - - - - - @@ -2284,62 +2096,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2369,15 +2125,7 @@ - - - - - - - - - + @@ -2387,7 +2135,7 @@ - + @@ -2534,25 +2282,7 @@ - - - - - - - - - - - - - - - - - - - + @@ -2590,203 +2320,54 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - - - - - - - - - + + + - - - - - - - - - - - - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - - - - + + + + + + + + + + + + + + + + @@ -2849,48 +2430,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + +
+ @@ -2928,7 +2471,7 @@ - + @@ -2948,19 +2491,49 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - - - + + + + + + + + + + + + + @@ -3014,8 +2587,13 @@ + + + + + - + @@ -3064,60 +2642,12 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3169,45 +2699,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3247,11 +2738,6 @@ - - - - - @@ -3317,16 +2803,6 @@ - - - - - - - - - - @@ -3337,16 +2813,6 @@ - - - - - - - - - - @@ -3357,37 +2823,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3395,7 +2830,7 @@ - + @@ -3410,19 +2845,19 @@
- +
- + - + @@ -3432,7 +2867,7 @@ - + @@ -3448,13 +2883,13 @@ - + - - + + @@ -3485,7 +2920,7 @@ - + @@ -3524,9 +2959,9 @@ - + - + @@ -3775,203 +3210,309 @@ - - - - - - - - - - - - - - - - - - - - - - - - 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 df5f299..4810a24 100644 --- a/ONAP Information Model/License.uml +++ b/ONAP Information Model/License.uml @@ -10,9 +10,6 @@ '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 attributes currently being used are Name and MRN. Other fields are present but not supported in downstream systems. @@ -22,32 +19,17 @@ 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. - - Instances (pools, entitlmenets, and keys) are in ALTS - outside of ONAP + Instances (pools, entitlmenets, and keys) 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 - - Also need the actual Vnf Instance. ALTS also tracks the actual instances of VNFs. - - - Do we need thresholdvalue on the desc side? - - +
@@ -70,59 +52,6 @@ MRN should also be provided, but is not required. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - @@ -135,26 +64,6 @@ MRN should also be provided, but is not required. - - -
- - - - - - - - - -
- - - - - - -
@@ -187,16 +96,6 @@ MRN should also be provided, but is not required. - - -
- - - - - - -
@@ -209,12 +108,6 @@ MRN should also be provided, but is not required. - - -
- - -
@@ -225,16 +118,6 @@ MRN should also be provided, but is not required. - - -
- - - - - - -
@@ -335,7 +218,7 @@ Unique - a unique license key value is required for each instance of the softwar - + A License Key Group is created for each type of License Key that is required for the software. Each License Key Group is assigned a Name and Description for modeling purposes and is uniquely identified by a UUID. In addition, a list of characteristics of the License Key Group are defined. The license key group model provides a description to systems like ALTS for the license keys that are provided by a vendor. ALTS will create a “group” and Purchasing systems (GPS and HP Asset Center) will send the inventory of license keys/files to be held by ALTS in the appropriate group. @@ -370,15 +253,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 (%). - - + + @@ -400,6 +283,9 @@ 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. + + Identifier for the entitlement as described by the vendor in their price list / catalog /contract. + @@ -410,6 +296,12 @@ 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. + + + @@ -543,7 +435,7 @@ Not applicable when license type is Perpetual. - + The license key may be ‘universal’ or ‘unique’ or ‘one-time’. @@ -621,7 +513,7 @@ Limits can be applied by the vendor or the service provider. Specifies the use rights for the software as described by the license. - + An EntitlementPool is created for each type of Entitlement that is required for the software products. @@ -673,14 +565,7 @@ An entitlement pool is not specific to a feature group. An entitlement pool may - - - EntitlementPoolDesc is the basis for an EntitlementPoolInstance. - - - - - + Identifier for the entitlement as described by the vendor in their price list / catalog /contract. @@ -737,7 +622,7 @@ when 90% of the pool is in-use, trigger an additional purchase of inventory. - + An EntitlementPool describes the characteristics of a type of entitlement and the behavior of the entitlement instances in the pool. @@ -755,12 +640,26 @@ If an Entitlement Pool or License Key Group is associated with a particular Feat + + Name of the feature group + + + Description of the feature group. + + + + + The featureGroupPartNumber specifies the SKU or reference number that the Vendor has for the Vnf that this FeatureGroup is related to. + + + The featureGroupPartNumber specifies the Vnf that this FeatureGroup is related to. + @@ -772,12 +671,6 @@ If an Entitlement Pool or License Key Group is associated with a particular Feat - - - 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. @@ -867,6 +760,62 @@ Not applicable when license type is Perpetual. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
@@ -924,14 +873,6 @@ Not applicable when license type is Perpetual. - - - - - - - - @@ -944,15 +885,13 @@ Not applicable when license type is Perpetual. - - - - - - - - - + + + + + + + -- cgit 1.2.3-korg