From 850034eedc4140b969c35c58098a61590b124f8c Mon Sep 17 00:00:00 2001 From: Kevin Scaggs Date: Fri, 13 Sep 2019 17:10:30 -0500 Subject: Updates to License Issue-ID: MODELING-104 Some further updates to license. Change-Id: I1b7193f03616387a25dede3434bfdf23e89d87ae Signed-off-by: Kevin Scaggs --- ONAP Information Model/License.notation | 689 ++++++++++++++------------------ ONAP Information Model/License.uml | 311 +++++++------- 2 files changed, 428 insertions(+), 572 deletions(-) diff --git a/ONAP Information Model/License.notation b/ONAP Information Model/License.notation index 3fdf38b..dfefe66 100644 --- a/ONAP Information Model/License.notation +++ b/ONAP Information Model/License.notation @@ -30,7 +30,7 @@ - + @@ -105,7 +105,7 @@ - + @@ -335,7 +335,7 @@ - + @@ -345,6 +345,11 @@ + + + + + @@ -491,7 +496,7 @@ - + @@ -501,7 +506,7 @@ - + @@ -521,7 +526,7 @@ - + @@ -608,8 +613,8 @@ - - + + @@ -736,7 +741,10 @@ - + + +

+ @@ -870,7 +878,7 @@ - + @@ -934,18 +942,6 @@ - - -

- - - - - - - - - @@ -991,9 +987,9 @@ - + - + @@ -1247,7 +1243,7 @@ - + @@ -1257,117 +1253,66 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - - - + + + + - + - - + + - - - + + + - + - - + + - - - + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1391,7 +1336,7 @@ - + @@ -1401,123 +1346,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1547,7 +1375,7 @@ - + @@ -1557,45 +1385,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1670,7 +1459,7 @@ - + @@ -1680,6 +1469,142 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1696,26 +1621,6 @@ - - - - - - - - - - - - - - - - - - - - @@ -1726,36 +1631,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1766,16 +1641,6 @@ - - - - - - - - - - @@ -1793,9 +1658,9 @@ - + - + @@ -1804,19 +1669,29 @@ - + - + + + + + + + + + + + - - - - - - - - - + + + + + + + + + @@ -1920,15 +1795,6 @@ - - - - - - - - - @@ -1956,24 +1822,6 @@ - - - - - - - - - - - - - - - - - - @@ -2002,7 +1850,7 @@ - + @@ -2188,6 +2036,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2317,6 +2209,16 @@ + + + + + + + + + + @@ -2369,11 +2271,6 @@ - - - - - @@ -2471,7 +2368,7 @@ - + @@ -2559,10 +2456,10 @@ - + - + @@ -2706,7 +2603,7 @@ - + diff --git a/ONAP Information Model/License.uml b/ONAP Information Model/License.uml index eade43f..7576456 100644 --- a/ONAP Information Model/License.uml +++ b/ONAP Information Model/License.uml @@ -8,7 +8,7 @@ VLM is really just a Party -'Simplified' attributes for this Vendor are VendorName, and Description, which can be gotten from the Pary model +'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. @@ -27,82 +27,122 @@ MRN should also be provided, but is not required. 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) + 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 licenseKeyPool can contain some number of LicenseKeys. + - - - - - +

- + + LicenseKey can have some number of service provider based limits applied to it. + + + + lLicenseKeyPool can have some number of service provider specified PoolLimits + + - +

+ + LicenseKey can have some number of vendor based limits applied to it. + - - -

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

- + + An EntitlementPool and the associated Entitlements can have some number of Service Provider based limits. + + + + EntitlementPool can have some number of service provider specified limits. + + - +

- + + An EntitlementPool and the associated Entitlements can have some number of Vendor based limits. + + + + The EntitlementPool can have some number of Vendor specified limits. + + - +

- + + A FeatureGroup can have one or more EntitlementPools associated with it. + + + + The EntitlementPool can be related to one FeatureGroup + + + FeatureGroup can be related to some number of EntitlementPools. + - +

- + + FeatureGroup can have 1 or more LicenseKeyPools and related LicenseKeys related to it. + + + + LicenseKeyPool is related to one FeatureGroup + - + + + A feature group can be related to some number of LicenseKeyPools + + @@ -121,11 +161,17 @@ MRN should also be provided, but is not required.

- + + + A FeatureGroup must be related to a Vnfd. + + + Vnfd can have some number of feature groups + @@ -149,22 +195,28 @@ MRN should also be provided, but is not required.

+ + A Vendor can have some number of LicenseAgreements. + + + A LicenseAgreement is related to some vendor. + - +

- - - + + + EntitlementPool can contain some number of EntitlementInstances + - @@ -182,29 +234,6 @@ MRN should also be provided, but is not required. - - - - Lifecycle stage or state (e.g., Instantiation or Activation) at which the license key is applied to the software. - - - - - - - - - - - Valid values: -Universal, Unique -Universal - a single license key value that may be used with any number of instances of the software. -Unique - a unique license key value is required for each instance of the software. - - - - - 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. @@ -278,9 +307,15 @@ A license key group is not specific to a feature group. A license key group may + + Identifier that stays the same irrespective of version. + + + The version of this entity. + @@ -289,60 +324,15 @@ A license key group is not specific to a feature group. A license key group may - - - - Specifies the use rights for the software as described by the license. The use rights may be quantified by various metrics: # users, # software instances, # units. Customer RTU is within the customer subscription. Entitlement is related to how the service provider purchased the software from the supplier, 1 RTU may equate to 5 instances of the software. - -Either no key, universal key, or unique key per instance required. - - - - - Identifier for the entitlement as described by the vendor in their price list / catalog / contract. - - - - - - The minimum number of entitlements that need to be purchased. For example, the entitlements must be purchased in a block of 100. If no minimum is required, the value will be zero. - - - - - - A list of any reporting requirements on the usage of the software product. (e.g.: quarterly usage reports are required) + + + LicenseKeyPool can contain some number of LicenseKeyInstances. - - - - - - - Type of license applicable to the software product. (e.g.: fixed-term, perpetual, trial, subscription.) - - - - - Valid values: -year, quarter, month, day. -Not applicable when license type is Perpetual. - - - - - - Number of years, quarters, months, or days for which the license is valid. -Not applicable when license type is Perpetual. - - - + + - - - A Service Provider internally generated asset tag (id). @@ -375,41 +365,15 @@ Not applicable when license type is Perpetual. - - - UUID of the LicenseKeyGroupDesc as provided by SDC that this key is related to. - - - + + Vendor provided license key file that is entered into the vendor software to activiate / unlock it. + - - - - 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. @@ -465,30 +429,31 @@ 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). + + + - - - - - + + The requestor of the entitlement. + + + The assignment status of the entitlement (assigned, available, ...). + + + The date the entitlement was assigned. + - - - - - - - - @@ -585,9 +550,15 @@ when 90% of the pool is in-use, trigger an additional purchase of inventory. Identifier that stays the same irrespective of version. + + Identifier that stays the same irrespective of version. + + + The version of this entity. + @@ -601,16 +572,12 @@ 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. - -Management of the collection. - - - - + + + EntitlementPool can contain some number of EntitlementInstances. + + + @@ -826,23 +793,14 @@ Not applicable when license type is Perpetual. - - - - - - - - - @@ -857,7 +815,6 @@ Not applicable when license type is Perpetual. - @@ -876,10 +833,12 @@ Not applicable when license type is Perpetual. - - - + + + + + -- cgit 1.2.3-korg