From 3ffdec6a9dca4017e088007e524523e5fc63e815 Mon Sep 17 00:00:00 2001
From: Kevin Scaggs <ks0567@att.com>
Date: Fri, 11 Oct 2019 16:08:44 -0500
Subject: Slight Updates to Common

Slight updates made to ParameterGroup - stereotype corrections and
SelectionCriteria - slight definition update.

Issue-ID: MODELING-104

Change-Id: Idb0cfdbdf061960acb64eb406b5c34dec755873f
Signed-off-by: Kevin Scaggs <ks0567@att.com>
---
 ONAP Information Model/Common.notation | 27 ++++++++++++++++++++-------
 ONAP Information Model/Common.uml      |  9 +++++++--
 2 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/ONAP Information Model/Common.notation b/ONAP Information Model/Common.notation
index 136fdc1..f9e611d 100644
--- a/ONAP Information Model/Common.notation	
+++ b/ONAP Information Model/Common.notation	
@@ -7850,11 +7850,6 @@
       </children>
       <children xmi:type="notation:BasicCompartment" xmi:id="_SNI2kInbEemVXsYTZj8frQ" type="Class_AttributeCompartment">
         <children xmi:type="notation:Shape" xmi:id="_X4DyAInbEemVXsYTZj8frQ" type="Property_ClassAttributeLabel">
-          <children xmi:type="notation:DecorationNode" xmi:id="_sVve0OU7Eem4RuIQi6fMsw" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_sVve0eU7Eem4RuIQi6fMsw" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sVve0uU7Eem4RuIQi6fMsw"/>
-          </children>
           <element xmi:type="uml:Property" href="Common.uml#_U92FMILsEemyVus8T4NvCQ"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_X4DyAYnbEemVXsYTZj8frQ"/>
         </children>
@@ -8886,6 +8881,14 @@
       <element xsi:nil="true"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iu1upeU-Eem4RuIQi6fMsw" x="1020" y="20"/>
     </children>
+    <children xmi:type="notation:Shape" xmi:id="_m_9BQOqeEemQocZcEjFuLQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_m_9BQeqeEemQocZcEjFuLQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_m__dgOqeEemQocZcEjFuLQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="Common.uml#_vro5oL6ZEem4xcGs3yJOww"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_m_9BQuqeEemQocZcEjFuLQ" x="720" y="320"/>
+    </children>
     <styles xmi:type="notation:StringValueStyle" xmi:id="_diV8QZ0LEem7-cWktwUxRA" name="diagram_compatibility_version" stringValue="1.4.0"/>
     <styles xmi:type="notation:DiagramStyle" xmi:id="_diV8Qp0LEem7-cWktwUxRA"/>
     <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_diV8Q50LEem7-cWktwUxRA" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
@@ -9134,11 +9137,11 @@
     <edges xmi:type="notation:Connector" xmi:id="_vr5_YL6ZEem4xcGs3yJOww" type="Association_Edge" source="_ZqwuUL6XEem4xcGs3yJOww" target="_kxY8oJ2qEemXg71wwI_kPA">
       <children xmi:type="notation:DecorationNode" xmi:id="_vr5_Y76ZEem4xcGs3yJOww" type="Association_StereotypeLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Lx5HwL6cEem4xcGs3yJOww" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_vr5_ZL6ZEem4xcGs3yJOww" x="-1" y="-17"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_vr5_ZL6ZEem4xcGs3yJOww" x="5" y="7"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_vr5_Zb6ZEem4xcGs3yJOww" type="Association_NameLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_LyEt8L6cEem4xcGs3yJOww" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_vr5_Zr6ZEem4xcGs3yJOww" x="3" y="-13"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_vr5_Zr6ZEem4xcGs3yJOww" x="2" y="-13"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_vr5_Z76ZEem4xcGs3yJOww" visible="false" type="Association_TargetRoleLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_LyRiQL6cEem4xcGs3yJOww" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -9243,5 +9246,15 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_iu28xOU-Eem4RuIQi6fMsw"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_iu28xeU-Eem4RuIQi6fMsw"/>
     </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_nAAEkOqeEemQocZcEjFuLQ" type="StereotypeCommentLink" source="_vr5_YL6ZEem4xcGs3yJOww" target="_m_9BQOqeEemQocZcEjFuLQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_nAAEkeqeEemQocZcEjFuLQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_nAAroeqeEemQocZcEjFuLQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="Common.uml#_vro5oL6ZEem4xcGs3yJOww"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_nAAEkuqeEemQocZcEjFuLQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_nAAEk-qeEemQocZcEjFuLQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_nAAroOqeEemQocZcEjFuLQ"/>
+    </edges>
   </notation:Diagram>
 </xmi:XMI>
diff --git a/ONAP Information Model/Common.uml b/ONAP Information Model/Common.uml
index 526feec..e1bd4ee 100644
--- a/ONAP Information Model/Common.uml	
+++ b/ONAP Information Model/Common.uml	
@@ -1761,7 +1761,7 @@ Permitted Values:&#xD;
         </packagedElement>
         <packagedElement xmi:type="uml:Class" xmi:id="_A_9MMF0VEemiOP02o5T8tA" name="SelectionCriteriaComposite">
           <ownedComment xmi:type="uml:Comment" xmi:id="_JOTcQILpEemyVus8T4NvCQ" annotatedElement="_A_9MMF0VEemiOP02o5T8tA">
-            <body>A SelectionCriteria that is an aggregation of multiple selection criterias.   Agregation can e for example AND or OR logical operations.</body>
+            <body>A SelectionCriteria that is an aggregation of multiple selection criterias.   Agregation can be for example AND, OR, or XOR logical operations.</body>
           </ownedComment>
           <generalization xmi:type="uml:Generalization" xmi:id="_qQWgYF0XEemiOP02o5T8tA" general="_AkO5gF0VEemiOP02o5T8tA"/>
           <ownedAttribute xmi:type="uml:Property" xmi:id="_lo6SIILdEemyVus8T4NvCQ" name="compositeOperator" type="_rMIDEILdEemyVus8T4NvCQ">
@@ -1862,6 +1862,9 @@ Permitted Values:&#xD;
             <ownedComment xmi:type="uml:Comment" xmi:id="_xdDV4MprEemxyP_sJGfnPA" annotatedElement="_aTHl4MprEemxyP_sJGfnPA">
               <body>The specification that a range of values increases in steps, such as a range from 0 to 100 in steps of 5 with the resulting permitted values being 0, 5, 10, 15,...100. This complements the valueFrom and  valueTo attributes.  </body>
             </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_xvYYYOqeEemQocZcEjFuLQ">
+              <body>The specification that a range of values increases in steps, such as a range from 0 to 100 in steps of 5 with the resulting permitted values being 0, 5, 10, 15,...100. This complements the valueFrom and  valueTo attributes.  </body>
+            </ownedComment>
             <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ogkJoM5pEemcqf4p4jcudw"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ogq3UM5pEemcqf4p4jcudw" value="1"/>
@@ -5028,7 +5031,6 @@ Permitted Values:&#xD;
   <OpenModel_Profile:OpenModelAttribute xmi:id="_6P160MpjEemxyP_sJGfnPA" base_StructuralFeature="_6P1TwMpjEemxyP_sJGfnPA"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_9_9WcMpjEemxyP_sJGfnPA" base_StructuralFeature="_9_8vYMpjEemxyP_sJGfnPA"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_aTIM8MprEemxyP_sJGfnPA" base_StructuralFeature="_aTHl4MprEemxyP_sJGfnPA"/>
-  <OpenModel_Profile:Experimental xmi:id="_4Poc8MprEemxyP_sJGfnPA" base_Element="_aTHl4MprEemxyP_sJGfnPA"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_yJAAUM5lEemcqf4p4jcudw" base_StructuralFeature="_yI8V8M5lEemcqf4p4jcudw"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_XJtjwM8zEemfevCNCQbkKw" base_StructuralFeature="_XJrHgM8zEemfevCNCQbkKw"/>
   <OpenModel_Profile:Experimental xmi:id="_yV7dcM8zEemfevCNCQbkKw" base_Element="_T7JtYM6AEemcqf4p4jcudw"/>
@@ -5070,4 +5072,7 @@ Permitted Values:&#xD;
   <OpenModel_Profile:Preliminary xmi:id="_id_PMOU-Eem4RuIQi6fMsw" base_Element="_biUdMKMJEemYd6Tamcc5WQ"/>
   <OpenModel_Profile:Preliminary xmi:id="_upD9kOVBEem4RuIQi6fMsw" base_Element="_rMIDEILdEemyVus8T4NvCQ"/>
   <OpenModel_Profile:Preliminary xmi:id="_wOwJAOVBEem4RuIQi6fMsw" base_Element="_1kyswILtEemyVus8T4NvCQ"/>
+  <OpenModel_Profile:Preliminary xmi:id="_msAxkOqeEemQocZcEjFuLQ" base_Element="_vro5oL6ZEem4xcGs3yJOww"/>
+  <OpenModel_Profile:Preliminary xmi:id="_wlpJIOqeEemQocZcEjFuLQ" base_Element="_aTHl4MprEemxyP_sJGfnPA"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_xviwcOqeEemQocZcEjFuLQ" base_Comment="_xvYYYOqeEemQocZcEjFuLQ" language="org.eclipse.papyrus.uml.textedit.property.xtext.UmlProperty"/>
 </xmi:XMI>
-- 
cgit 1.2.3-korg