From 38fca938f3da15c6667abf90c42cbb9b9d313146 Mon Sep 17 00:00:00 2001 From: Kevin Scaggs Date: Fri, 15 Mar 2019 16:50:41 -0500 Subject: Slight changes to Business Interaction Made VesEvent a generalization of Notification Issue-ID: MODELING-104 Change-Id: Ie04fc3cacb65216e4c76706594f6d6025189d73c Signed-off-by: Kevin Scaggs --- ONAP Information Model/Common.uml | 105 ++++---------------------------------- 1 file changed, 10 insertions(+), 95 deletions(-) (limited to 'ONAP Information Model') diff --git a/ONAP Information Model/Common.uml b/ONAP Information Model/Common.uml index 44ffcf0..bf5e201 100644 --- a/ONAP Information Model/Common.uml +++ b/ONAP Information Model/Common.uml @@ -1722,10 +1722,14 @@ Permitted Values: - + + + + + - + @@ -1776,13 +1780,13 @@ Permitted Values: - + - + - + @@ -3029,24 +3033,12 @@ Permitted Values: - - - - - - - - - - - - @@ -3056,12 +3048,6 @@ Permitted Values: - - - - - - @@ -3089,60 +3075,6 @@ Permitted Values: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3212,9 +3144,6 @@ Permitted Values: - - - @@ -3341,9 +3270,6 @@ Permitted Values: - - - @@ -4278,12 +4204,6 @@ Permitted Values: - - - - - - @@ -4476,12 +4396,6 @@ Permitted Values: - - - - - - @@ -4935,4 +4849,5 @@ Permitted Values: + -- cgit 1.2.3-korg From 1f735cfac3a5a7bb8678838ae4af6879e7396fdb Mon Sep 17 00:00:00 2001 From: Kevin Scaggs Date: Fri, 15 Mar 2019 16:51:30 -0500 Subject: Some minor refinement and clean-up of license. Issue-ID: MODELING-104 Change-Id: Ibadabaa0f29f47b60862b02ed5ef3e37674b54ee Signed-off-by: Kevin Scaggs --- ONAP Information Model/License.notation | 1391 +++++++++++-------------------- ONAP Information Model/License.uml | 1248 ++++++++++++++------------- 2 files changed, 1120 insertions(+), 1519 deletions(-) (limited to 'ONAP Information Model') diff --git a/ONAP Information Model/License.notation b/ONAP Information Model/License.notation index 1058250..e54aa28 100644 --- a/ONAP Information Model/License.notation +++ b/ONAP Information Model/License.notation @@ -16,33 +16,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -66,7 +39,7 @@ - + @@ -148,51 +121,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -255,7 +183,7 @@ - + @@ -341,7 +269,7 @@ - + @@ -359,33 +287,62 @@ - - - - - - - - - - - - - - - - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -408,37 +365,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -449,37 +375,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -610,7 +505,7 @@ - + @@ -622,7 +517,7 @@ - + @@ -637,16 +532,82 @@ - - - + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -764,15 +725,6 @@ - - - - - - - - - @@ -839,24 +791,6 @@ - - - - - - - - - - - - - - - - - - @@ -875,15 +809,6 @@ - - - - - - - - - @@ -977,33 +902,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1162,7 +1060,7 @@ - + @@ -1419,148 +1317,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1598,7 +1354,7 @@ - + @@ -1703,7 +1459,7 @@ - + @@ -1742,7 +1498,7 @@ - + @@ -1781,7 +1537,7 @@ - + @@ -1820,7 +1576,7 @@ - + @@ -1859,7 +1615,7 @@ - + @@ -1898,7 +1654,7 @@ - + @@ -1937,7 +1693,7 @@ - + @@ -1976,7 +1732,7 @@ - + @@ -1986,43 +1742,96 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2053,17 +1862,6 @@ - - - - - - - - - - - @@ -2094,60 +1892,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2158,17 +1902,6 @@ - - - - - - - - - - - @@ -2179,17 +1912,6 @@ - - - - - - - - - - - @@ -2200,17 +1922,6 @@ - - - - - - - - - - - @@ -2221,16 +1932,15 @@ - - - - - - - - - - + + + + + + + + + @@ -2294,24 +2004,6 @@ - - - - - - - - - - - - - - - - - - @@ -2330,15 +2022,6 @@ - - - - - - - - - @@ -2372,156 +2055,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

- - - - - - - - - - - - - - - - @@ -2582,33 +2115,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2769,10 +2275,122 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -2785,16 +2403,6 @@ - - - - - - - - - - @@ -2835,99 +2443,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2955,8 +2470,8 @@ - - + + @@ -2992,41 +2507,10 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3052,6 +2536,158 @@ + + + + + + + + + + + + + +

+ + + + + + +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3104,11 +2740,6 @@ - - - - - @@ -3149,7 +2780,7 @@ - + @@ -3188,7 +2819,7 @@ - + @@ -3254,7 +2885,7 @@ - + @@ -3332,7 +2963,7 @@ - + @@ -3345,7 +2976,7 @@ - + @@ -3376,7 +3007,7 @@ - + @@ -3389,7 +3020,7 @@ - + @@ -3479,7 +3110,7 @@ - + @@ -3599,7 +3230,7 @@ - + @@ -3619,7 +3250,7 @@ - + @@ -3866,16 +3497,8 @@ - + - - - - - - - - diff --git a/ONAP Information Model/License.uml b/ONAP Information Model/License.uml index 3565662..9e1c00d 100644 --- a/ONAP Information Model/License.uml +++ b/ONAP Information Model/License.uml @@ -1,463 +1,440 @@ - - - - Does a License Agreement have to have at least one feature group? - - - Definition of VLM - - - Wil the VLM have a name, or just a Vendor Name (do we refine inherited name to VendorName)? - - - If Rooted, updates will occur to this class. - - - See description from SAM Doc - - - There are a bunch of attributes feature group attributes in SAm Definitions - maybe not in SDC?? - - - Only EntitlementPoolDesc Currently being used are Name and MRN. Everything else is optional. - - - Only attributes presently used are name, metric type and metric value. - - - What do we do with keyFunction,LicenseKeyType, etc? - - - - - -

- - - - - - - - - - -

- - - - - - - - - -

- - - - - -

- - - - - - -

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

- - - - - - - - - -

- - - - - -

- - - - - - - - - -

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

- - - - - - - - - -

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

- - - - - - - - + + + + + Does a License Agreement have to have at least one feature group? + + + VLM is really just a Party + +'Simplified' attributes for this Vendor are VendorName, and Description + + + There are a bunch of attributes feature group attributes in SAm Definitions - maybe not in SDC?? + + + Only EntitlementPoolDesc Currently being used are Name and MRN. Everything else is optional. + + + Only attributes presently used are name, metric type and metric value. + + + What do we do with keyFunction,LicenseKeyType, etc? + - - - - - - - - - Lifecycle stage or state (e.g., Instantiation or Activation) at which the license key is applied to the software. - - - - - - - - - - - Valid values: + + + +

+ + + + + + + + + +

+ + + + + +

+ + + + + + +

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

+ + + + + + + + + +

+ + + + + +

+ + + + + + + + + +

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

+ + + + + + + + + +

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

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

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

+ + + + + + + + + + + + + + + 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. + + + + + + + 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). 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. - - - - - - - Pool limits applied by the service provider - - - - - - - Pool limits applied by the vendor. - - - - - - The license key may be ‘universal’ or ‘unique’ or ‘one-time’. + + + Pool limits applied by the service provider + + + + + + + Pool limits applied by the vendor. + + + + + + + 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. - - - - - Units can be either absolute or a percentage (%). - - - - - Specified threshold value for the license key pool. - - - - - - Start date. - - - - - - Expiry date. - - - - - - Specifies how the key must be purchased. If in blocks of 1000, the increment would be 1000. - - - - - - Identifier for the entitlement as described by the vendor in their price list / catalog /contract. - - - - - - - - - The Vendor License Model enbables a service provider to track the usage of vendor products used used in resources created in ASDC. + + + + + Units can be either absolute or a percentage (%). + + + + + Specified threshold value for the license key pool. + + + + + + Start date. + + + + + + Expiry date. + + + + + + Specifies how the key must be purchased. If in blocks of 1000, the increment would be 1000. + + + + + + Identifier for the entitlement as described by the vendor in their price list / catalog /contract. + + + + + + + + + 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. + + 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. 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) - - - - - - - Type of license applicable to the software product. (e.g.: fixed-term, perpetual, trial, subscription.) - - - - - Valid values: + + + 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) + + + + + + + + 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. + + + + + Number of years, quarters, months, or days for which the license is valid. Not applicable when license type is Perpetual. - - - - - - - - - - - - - - - - - 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. + + + + + + + + + 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. Limits can be applied by the vendor or the service provider. - - - - - - - Specifies if this pool holds entitlements based on usage of the software (number of users), number of sessions, country, line of business, etc. - - - - - - The value of some limit being applied. - - - - - - Type of aggregation being performed (Peak or Average) - - - - - - The units of the limit (Trunks, Users, Subscribers, Sessions, tentants, Tokens, Seats, TB, GB, MB, ...) - - - - - Units time is specified in (day, month, hour, minute, second, millisecond. + + + Specifies if this pool holds entitlements based on usage of the software (number of users), number of sessions, country, line of business, etc. - - - - - - - - LimitMetricType if Other enumeration is selected. - - - - - - - - - Represents an instance of a EntitlementDesc. + + + + + The value of some limit being applied. + + + + + + Type of aggregation being performed (Peak or Average) + + + + + + + The units of the limit (Trunks, Users, Subscribers, Sessions, tentants, Tokens, Seats, TB, GB, MB, ...) + + + + + Units time is specified in (day, month, hour, minute, second, millisecond. + + + + + + + + + LimitMetricType if Other enumeration is selected. + + + + + + + + + Represents an instance of a EntitlementDesc. 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. + + + + + An EntitlementPool is created for each type of Entitlement that is required for the software products. An EntitlementPool is not specific to a Feature Group. An Entitlement Pool may be related to multiple Feature Groups of a software product or even to multiple software products. @@ -477,237 +454,238 @@ An entitlement pool is not specific to a feature group. An entitlement pool may - - - - - - - Pool limits applied by the service provider - - - - - - - Pool limits applied by the vendor. - - - - - - - EntitlementPoolDesc is the basis for an EntitlementPoolInstance. - - - - - - - Identifier for the entitlement as described by the vendor in their price list / catalog /contract. - - - - - 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. + + + Pool limits applied by the service provider + + + + + + + Pool limits applied by the vendor. + + + + + + + EntitlementPoolDesc is the basis for an EntitlementPoolInstance. + + + + + + + Identifier for the entitlement as described by the vendor in their price list / catalog /contract. + + + + + + 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. - - - - - - - - A description of a threshold that will be assessed for some business purpose (e.g. 20% of entitlement pool remains available). (The threshold of interest to DCAE or Capacity Planning, etc.) This may be an absolute value or a percentage. For example: + + + + + + + + A description of a threshold that will be assessed for some business purpose (e.g. 20% of entitlement pool remains available). (The threshold of interest to DCAE or Capacity Planning, etc.) This may be an absolute value or a percentage. For example: when 90% of the pool is in-use, trigger an additional purchase of inventory. - - - - - - - - Specifies the Units for the ThresholdValue. - - - - - - - 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. - - - - - - - - Start date - - - - - - - - Expiry date - - - - - - - - - An EntitlementPool describes the characteristics of a type of entitlement and the behavior of the entitlement instances in the pool. + + + + + + + + Specifies the Units for the ThresholdValue. + + + + + + + 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. + + + + + + + + Start date + + + + + + + + Expiry date + + + + + + + + + An EntitlementPool describes the characteristics of a type of entitlement and the behavior of the entitlement instances in the pool. Management of the collection. - - - - - Feature groups represent a set of the features of the software. Feature groups may be defined by the vendor and/or by the service provider. Software may be related to multiple feature groups. At least one feature group will be related to software. If no sub-sets are needed, a single feature group will be defined that represents the base or core capabilities of the software. + + + + + Feature groups represent a set of the features of the software. Feature groups may be defined by the vendor and/or by the service provider. Software may be related to multiple feature groups. At least one feature group will be related to software. If no sub-sets are needed, a single feature group will be defined that represents the base or core capabilities of the software. If an Entitlement Pool or License Key Group is associated with a particular Feature Group, the Feature Group becomes a “constraint” for the pool/group. - - - - - - - - - - - - - - - - - An agreement between the service provider and a given vendor granting the service provider to use the vendor's products. Generally the license agreement is specific to a family of vendor products and/or to some service provider's project/product or product family. - - - - - - - - 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. + + + + + + + + + + + + + An agreement between the service provider and a given vendor granting the service provider to use the vendor's products. Generally the license agreement is specific to a family of vendor products and/or to some service provider's project/product or product family. - - - - - - - Term of the license: + + + + + + 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. + + + + + + + + + Term of the license: -fixed term -perpetual -unlimited -subscription - - - - - - OCL - true - - - - - - - - - - - - - - - - Valid values: + + + + + + OCL + true + + + + + + + + + + + + + + + + Valid values: year, quarter, month, day. Not applicable when license type is Perpetual. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Units of the entitlement/license term. Valid values: year, quarter, month, day. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Units of the entitlement/license term. Valid values: year, quarter, month, day. - - - - - - - - - -

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

+ + + + + + + + + + + + + + + + + + + + + + -- cgit 1.2.3-korg From bbe8e6c153cbd1db6ab308df923e25db235b8ace Mon Sep 17 00:00:00 2001 From: Kevin Scaggs Date: Fri, 15 Mar 2019 16:53:08 -0500 Subject: Other half of Common Missed including this in the common commit. Issue-ID: MODELING-104 Change-Id: Ida49b50544775db77af9a464326665e21a7f0b9a Signed-off-by: Kevin Scaggs --- ONAP Information Model/Common.notation | 214 ++++++++++++++++++--------------- 1 file changed, 116 insertions(+), 98 deletions(-) (limited to 'ONAP Information Model') diff --git a/ONAP Information Model/Common.notation b/ONAP Information Model/Common.notation index 9dcff66..64c26b2 100644 --- a/ONAP Information Model/Common.notation +++ b/ONAP Information Model/Common.notation @@ -4655,37 +4655,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -4925,7 +4894,7 @@ - + @@ -4935,6 +4904,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4961,17 +4969,6 @@ - - - - - - - - - - - @@ -5014,27 +5011,6 @@ - - - - - - - - - - - - - - - - - - - - - @@ -5066,17 +5042,6 @@ - - - - - - - - - - - @@ -5107,28 +5072,6 @@ - - - - - - - - - - - - - - - - - - - - - - @@ -5152,14 +5095,89 @@ + - + + + + + + + + + + + + + + + + + + + + + + + + +

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

+ + + + + + + + + + + + + + + + + + + + + + -- cgit 1.2.3-korg From 6292a3eaf8ab7db4ced49f4eb190b5d303116d06 Mon Sep 17 00:00:00 2001 From: Kevin Scaggs Date: Fri, 15 Mar 2019 16:54:17 -0500 Subject: Slight update to Party Added a PartyRole of Vendor to be used as part of license work. Issue-ID: MODELING-104 Change-Id: Icbd134a5a44c0b3b203033e295da5c6d885ac70e Signed-off-by: Kevin Scaggs --- ONAP Information Model/Party.uml | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'ONAP Information Model') diff --git a/ONAP Information Model/Party.uml b/ONAP Information Model/Party.uml index cd7b185..5daa70b 100644 --- a/ONAP Information Model/Party.uml +++ b/ONAP Information Model/Party.uml @@ -203,4 +203,10 @@ + + + + + + -- cgit 1.2.3-korg