From 817f6d724c684549c8da09ac993f163dd8830301 Mon Sep 17 00:00:00 2001 From: Kevin Scaggs Date: Thu, 29 Aug 2019 15:49:32 -0500 Subject: Updates to License Further updates to license, including refiements of attributes to LicenseKeyInstance. Issue-ID: MODELING-104 Change-Id: I4e889aa61f605c92318fb2c940f148e352d02d37 Signed-off-by: Kevin Scaggs --- ONAP Information Model/License.notation | 462 ++++++-------------------------- ONAP Information Model/License.uml | 162 ++++------- 2 files changed, 125 insertions(+), 499 deletions(-) diff --git a/ONAP Information Model/License.notation b/ONAP Information Model/License.notation index 02d5347..41c4b73 100644 --- a/ONAP Information Model/License.notation +++ b/ONAP Information Model/License.notation @@ -877,45 +877,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -931,51 +892,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -997,60 +913,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1069,16 +931,7 @@ - - - - - - - - - - + @@ -1110,7 +963,7 @@ - + @@ -1123,46 +976,51 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -1190,16 +1048,6 @@ - - - - - - - - - - @@ -1309,46 +1157,40 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1699,45 +1541,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1947,16 +1750,6 @@ - - - - - - - - - - @@ -2170,23 +1963,6 @@ - - - - - - - - -

- - - - - - - - @@ -2284,42 +2060,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2354,13 +2094,10 @@ - - - - - - - + + + + @@ -2430,40 +2167,6 @@ - - -

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2525,16 +2228,6 @@ - - - - - - - - - - @@ -2777,6 +2470,11 @@ + + + + + diff --git a/ONAP Information Model/License.uml b/ONAP Information Model/License.uml index 4810a24..b83cc3d 100644 --- a/ONAP Information Model/License.uml +++ b/ONAP Information Model/License.uml @@ -29,28 +29,27 @@ 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) + + + +

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

- - - - + + + + - @@ -76,13 +75,6 @@ MRN should also be provided, but is not required. - - -

- - - -

@@ -108,16 +100,6 @@ MRN should also be provided, but is not required. - - -

- - - - - - -

@@ -193,6 +175,16 @@ MRN should also be provided, but is not required. + + +

+ + + + + + + @@ -303,27 +295,6 @@ A license key group is not specific to a feature group. A license key group may - - - The Vendor License Model enbables a service provider to track the usage of vendor products used used in resources created in ASDC. - -VLM is used to track instaantiations ("entitlements") of the vendor provided software used by the servi e provider for given resources. - - - - - A VLM is actually be a "Party". - - - There should only be on VLM per vendor (given it appears to be "party", but there is no restriction. - - - - The name of the vendor providing this resource. - - - - 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. @@ -378,56 +349,35 @@ Not applicable when license type is Perpetual. + + A Service Provider internally generated asset tag (id). + - - - - - - - - - - - - - - - + + Vendor provided license key value that is entered into the vendor software to activiate / unlock it. + - - - - - - - - - - - - - - - - - - + + The requestor of the license key. + + + The assignment status of the license (assigned, available, ...). + + + The date the license key was assigned. + - - - UUID of the LicenseKeyGroupDesc as provided by SDC that this key is related to. @@ -604,14 +554,6 @@ when 90% of the pool is in-use, trigger an additional purchase of inventory. - - - This field contains information to tell a Designer how the entitlement must be purchased. For example, if the entitlement must be purchased in blocks of 1000, the increment would be 1000. - - - - - Identifier that stays the same irrespective of version. @@ -767,7 +709,7 @@ Not applicable when license type is Perpetual. - + @@ -842,7 +784,6 @@ Not applicable when license type is Perpetual. - @@ -851,26 +792,12 @@ Not applicable when license type is Perpetual. - - - - - - - - - - - - - - @@ -894,4 +821,5 @@ Not applicable when license type is Perpetual. + -- cgit 1.2.3-korg