From 45e9f16c5e66569a7879c6549aef91f9d1899f0f Mon Sep 17 00:00:00 2001 From: Kevin Scaggs Date: Sat, 8 Jun 2019 06:58:33 -0500 Subject: Updates to Common Updates to common related to SelectionCriteria, including creation of a diagram and moving associations from Service, updates to comments, etc. Issue-ID: MODELING-104 Change-Id: I16d6f72298624002587daeadd2ff029bf7141ee5 Signed-off-by: Kevin Scaggs --- ONAP Information Model/Common.notation | 484 +++++++++++++++++++++++++++++++++ ONAP Information Model/Common.uml | 178 +++++++----- 2 files changed, 589 insertions(+), 73 deletions(-) diff --git a/ONAP Information Model/Common.notation b/ONAP Information Model/Common.notation index 59320c8..6ecacef 100644 --- a/ONAP Information Model/Common.notation +++ b/ONAP Information Model/Common.notation @@ -7814,4 +7814,488 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ONAP Information Model/Common.uml b/ONAP Information Model/Common.uml index 112e4a3..1985bd8 100644 --- a/ONAP Information Model/Common.uml +++ b/ONAP Information Model/Common.uml @@ -797,56 +797,6 @@ NOTE: These attributes are used to control scaling boundaries. - - - SelectionCriteria finds descriptors and instances according to specific properties of those entities. - - - - Unique indentifier of this SelectionCriteria. - - - - - - - A SelectionCriteria that is an aggregation of multi9ple filters. Agregation can e for example AND or OR logical operations. - - - - - Logical operation for filters composition, e.g. logical AND or OR. - - - Logical operation for filters composition, e.g. logical AND or OR. - - - - - - A simple (atomic) selection criteria that holds a specific attribute comparision expression. - - - - - Name of compared parameter or attribute. - - - - - - - Comparison operator, e.g. equal, less than, greater or etc. - - - - - - Compared value (can be a name of a parameter in referenced class). - - - - @@ -1454,28 +1404,6 @@ It is the asbstract parent of the NsQos and VnfQos datatypes, as the NsQoS (QoS - - - - - - - - - - - - - Dynamic, configurable properites of some entity. - - - - The specific configurable properties of some entity. - - - - - @@ -1519,6 +1447,32 @@ It is the asbstract parent of the NsQos and VnfQos datatypes, as the NsQoS (QoS + + +

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

+ + + + + + + + + + @@ -1743,8 +1697,81 @@ Permitted Values: + + + SelectionCriteria finds descriptors and instances according to specific properties of those entities. + + + + Unique indentifier of this SelectionCriteria. + + + + + + + A SelectionCriteria that is an aggregation of multiple selection criterias. Agregation can e for example AND or OR logical operations. + + + + + Logical operation for filters composition, e.g. logical AND or OR. + + + Logical operation for filters composition, e.g. logical AND or OR. + + + + + + A simple (atomic) selection criteria that holds a specific attribute comparision expression. + + + + + Name of compared parameter or attribute. + + + + + + + Comparison operator, e.g. equal, less than, greater or etc. + + + + + + Compared value (can be a name of a parameter in referenced class). + + + + + + + + + + + + + + + + + + + Dynamic, configurable properites of some entity. + + + + The specific configurable properties of some entity. + + + + + - @@ -4903,4 +4930,9 @@ Permitted Values: + + + + + -- cgit 1.2.3-korg