From 7be93eb7f483bcdd557b22ea202e6cd1e6bb297a Mon Sep 17 00:00:00 2001 From: Kevin Scaggs Date: Fri, 4 Oct 2019 05:53:19 -0500 Subject: Updates to Common Made updates to SelectionCriteria and ParameterGroups, fixing typos and updating stereotypes from experimental to preliminary. Issue-ID: MODELING-104 Change-Id: I6d33eed523c20791ce9df4306b0c232f80ea2619 Signed-off-by: Kevin Scaggs --- ONAP Information Model/Common.notation | 258 +++++++++++++++++++++++++++------ ONAP Information Model/Common.uml | 75 ++++++---- 2 files changed, 255 insertions(+), 78 deletions(-) diff --git a/ONAP Information Model/Common.notation b/ONAP Information Model/Common.notation index db73853..136fdc1 100644 --- a/ONAP Information Model/Common.notation +++ b/ONAP Information Model/Common.notation @@ -7850,10 +7850,10 @@ - - + + - + @@ -8142,14 +8142,6 @@ - - - - - - - - @@ -8176,13 +8168,53 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -8213,7 +8245,7 @@ - + @@ -8234,7 +8266,7 @@ - + @@ -8255,7 +8287,7 @@ - + @@ -8283,34 +8315,14 @@ - - - - - - - - - - - - - - - - - - - - - + - + @@ -8334,6 +8346,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -8608,7 +8680,7 @@ - + @@ -8774,6 +8846,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -8885,7 +8997,7 @@ - + @@ -8919,7 +9031,7 @@ - + @@ -8960,11 +9072,11 @@ - + - + @@ -9053,11 +9165,11 @@ - + - + @@ -9077,9 +9189,59 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ONAP Information Model/Common.uml b/ONAP Information Model/Common.uml index f60c231..526feec 100644 --- a/ONAP Information Model/Common.uml +++ b/ONAP Information Model/Common.uml @@ -1478,7 +1478,7 @@ It is the asbstract parent of the NsQos and VnfQos datatypes, as the NsQoS (QoS - +

@@ -1766,10 +1766,7 @@ Permitted Values: - Logical operation for filters composition, e.g. logical AND or OR. - - - Logical operation for filters composition, e.g. logical AND or OR. + Logical operation for filters composition, e.g. logical AND, OR, XOR. @@ -1778,9 +1775,13 @@ Permitted Values: A simple (atomic) selection criteria that holds a specific attribute comparision expression. - + Name of compared parameter or attribute. + + + + Name of compared parameter or attribute. @@ -4981,17 +4982,11 @@ Permitted Values: - - - - - - @@ -5008,10 +5003,7 @@ Permitted Values: - - - @@ -5030,29 +5022,52 @@ Permitted Values: - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit 1.2.3-korg