From 21d141cae1e75bac01c3b469addc59afc0af6a2e Mon Sep 17 00:00:00 2001 From: Kevin Scaggs Date: Fri, 22 Nov 2019 09:49:20 -0600 Subject: Minor Updates to License Added Reference Stereotypes to all classes and datatypes indicating as built. Also had to recreate License Key and Entitlement diagrams - they were frozen for some reason. Also made slight updates to a couple class definitions. Issue-ID: MODELING-104 Change-Id: Id92b97ab17a596605735a75a39ff1ead53b2b19c Signed-off-by: Kevin Scaggs --- ONAP Information Model/License.notation | 2620 ++++++++++++++++--------------- ONAP Information Model/License.uml | 77 +- 2 files changed, 1409 insertions(+), 1288 deletions(-) diff --git a/ONAP Information Model/License.notation b/ONAP Information Model/License.notation index 51101f0..a631443 100644 --- a/ONAP Information Model/License.notation +++ b/ONAP Information Model/License.notation @@ -587,621 +587,6 @@ - - - -

- - - - - - - - -

- - - - - - - - - - - -

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

- - - - - - -

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1995,643 +1380,64 @@ - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + - + - - + + - - - + + + - + - - + + - - - + + + - + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -3043,7 +1849,7 @@ - + @@ -3069,7 +1875,7 @@ - + @@ -3107,7 +1913,7 @@ - + @@ -3165,7 +1971,7 @@ - + @@ -3187,7 +1993,7 @@ - + @@ -3209,7 +2015,7 @@ - + @@ -3239,7 +2045,63 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3247,19 +2109,89 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3544,4 +2476,1172 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ONAP Information Model/License.uml b/ONAP Information Model/License.uml index 23ddf28..e7babac 100644 --- a/ONAP Information Model/License.uml +++ b/ONAP Information Model/License.uml @@ -194,18 +194,6 @@ MRN should also be provided, but is not required. - - -

- - - - - - - - -

@@ -223,16 +211,28 @@ MRN should also be provided, but is not required. - - -

+ + +

+ + + + + + + + + + + +

- - - + + + - - + + @@ -240,8 +240,8 @@ MRN should also be provided, but is not required. 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. -Controllers will request license keys from ALTS using the UUID of the group, as directed by the ASDC models for the software (i.e. VFs). +The license key group model provides a description to systems such as Asset Inventory for the license keys that are provided by a vendor. The Asset Inventory system will create a “group” and purchasing systems will send the inventory of license keys/files to be held by Asset Inventory in the appropriate group. +Controllers will request license keys from Asset Inventory using the UUID of the group, as directed by the ASDC models for the software (i.e. VFs). A license key group is not specific to a feature group. A license key group may be related to multiple feature groups of a software item or even to multiple software items. @@ -329,6 +329,9 @@ A license key group is not specific to a feature group. A license key group may + + Represents an instance of a license key + @@ -423,7 +426,7 @@ Limits can be applied by the vendor or the service provider. - Represents an instance of a EntitlementDesc. + Represents an instance of a Entitlement Specifies the use rights for the software as described by the license. @@ -467,9 +470,6 @@ Purchased entitlements are inventoried in the Entitlement Pools. Multiple pools for the same type of entitlement may be created based on the constraints. - - - An Entitlement Pool is created for each type of Entitlement that is required for the software products. Each Entitlement Pool is assigned a Name and Description for modeling purposes and is uniquely identified by a UUID. In addition, a list of characteristics of the Entitlement Pool are defined. Controllers will request entitlements. @@ -802,7 +802,6 @@ Not applicable when license type is Perpetual. - @@ -835,7 +834,29 @@ Not applicable when license type is Perpetual. - + + + + + + + + + + + + + + + + + + + + + + + -- cgit 1.2.3-korg