From 80aefd50add0afce7b4a89aa862a4329ade959b6 Mon Sep 17 00:00:00 2001 From: Kevin Scaggs Date: Fri, 7 Feb 2020 12:37:41 -0600 Subject: Updates to License submodel Made some updates to the license submodel per recent comments from Ericsson Issue-ID: MODELING-104 Change-Id: I5beff300d57b9de9659fe9abf6b430217b3a76e2 Signed-off-by: Kevin Scaggs --- ONAP Information Model/License.notation | 42 ++++++++++----------------------- ONAP Information Model/License.uml | 33 ++++++++++---------------- 2 files changed, 26 insertions(+), 49 deletions(-) diff --git a/ONAP Information Model/License.notation b/ONAP Information Model/License.notation index a631443..9bac050 100644 --- a/ONAP Information Model/License.notation +++ b/ONAP Information Model/License.notation @@ -638,15 +638,6 @@ - - - - - - - - - @@ -882,11 +873,20 @@ - + + +

+ + + + + + + @@ -1388,11 +1388,6 @@ - - - - - @@ -1431,11 +1426,6 @@ - - - - - @@ -2519,15 +2509,6 @@ - - - - - - - - - @@ -2547,6 +2528,9 @@ + +

+ diff --git a/ONAP Information Model/License.uml b/ONAP Information Model/License.uml index e7babac..c0c105d 100644 --- a/ONAP Information Model/License.uml +++ b/ONAP Information Model/License.uml @@ -107,8 +107,8 @@ MRN should also be provided, but is not required. FeatureGroup can be related to some number of EntitlementPools. - - + + @@ -129,6 +129,8 @@ MRN should also be provided, but is not required. A feature group can be related to some number of LicenseKeyPools + + @@ -298,17 +300,6 @@ 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. - - - - - Identifier that stays the same irrespective of version. @@ -367,10 +358,13 @@ A license key group is not specific to a feature group. A license key group may - + Vendor provided license key file that is entered into the vendor software to activiate / unlock it. + + Vendor provided license key file that is entered into the vendor software to activiate / unlock it. + @@ -472,9 +466,9 @@ Multiple pools for the same type of entitlement may be created based on the cons 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. +Controllers may request entitlements. + -An entitlement pool is not specific to a feature group. An entitlement pool may be related to multiple feature groups of a software item or even to multiple software items. @@ -511,10 +505,10 @@ An entitlement pool is not specific to a feature group. An entitlement pool may - Identifier for the entitlement as described by the vendor in their price list / catalog /contract. + Reference number for the entitlement as described by the vendor in their price list / catalog /contract. - + @@ -793,10 +787,8 @@ Not applicable when license type is Perpetual. - - @@ -859,4 +851,5 @@ Not applicable when license type is Perpetual. + -- cgit 1.2.3-korg