From a0005189cc9dc8be31dc41acd45e9a8846236b68 Mon Sep 17 00:00:00 2001
From: Kevin Scaggs <ks0567@att.com>
Date: Fri, 6 Sep 2019 15:14:46 -0500
Subject: Updates to Common

Updates to both SelectionCriteri and ParameterGroup as posted to the
WIKI.

Issue-ID: MODELING-104

Change-Id: I67be4627a44e16454f6e2ff2804f199512b9a968
Signed-off-by: Kevin Scaggs <ks0567@att.com>
---
 ONAP Information Model/Common.notation | 90 ++++++++++++++++++++++------------
 1 file changed, 58 insertions(+), 32 deletions(-)

(limited to 'ONAP Information Model/Common.notation')

diff --git a/ONAP Information Model/Common.notation b/ONAP Information Model/Common.notation
index afd0156..6017a61 100644
--- a/ONAP Information Model/Common.notation	
+++ b/ONAP Information Model/Common.notation	
@@ -7850,10 +7850,10 @@
       </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="_X4IqgInbEemVXsYTZj8frQ" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_X4IqgYnbEemVXsYTZj8frQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+          <children xmi:type="notation:DecorationNode" xmi:id="_zwB5YM8yEemfevCNCQbkKw" visible="false" type="StereotypeLabel">
+            <styles xmi:type="notation:StringValueStyle" xmi:id="_zwB5Yc8yEemfevCNCQbkKw" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_X4IqgonbEemVXsYTZj8frQ"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zwB5Ys8yEemfevCNCQbkKw"/>
           </children>
           <element xmi:type="uml:Property" href="Common.uml#_U92FMILsEemyVus8T4NvCQ"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_X4DyAYnbEemVXsYTZj8frQ"/>
@@ -7876,14 +7876,23 @@
           <element xmi:type="uml:Property" href="Common.uml#_W1j0wILsEemyVus8T4NvCQ"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_X4FAI4nbEemVXsYTZj8frQ"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_X4FAJInbEemVXsYTZj8frQ" type="Property_ClassAttributeLabel">
-          <children xmi:type="notation:DecorationNode" xmi:id="_X4TCkInbEemVXsYTZj8frQ" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_X4TCkYnbEemVXsYTZj8frQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+        <children xmi:type="notation:Shape" xmi:id="_XKUnwM8zEemfevCNCQbkKw" type="Property_ClassAttributeLabel">
+          <children xmi:type="notation:DecorationNode" xmi:id="_XKauYM8zEemfevCNCQbkKw" visible="false" type="StereotypeLabel">
+            <styles xmi:type="notation:StringValueStyle" xmi:id="_XKauYc8zEemfevCNCQbkKw" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_X4TCkonbEemVXsYTZj8frQ"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XKauYs8zEemfevCNCQbkKw"/>
+          </children>
+          <element xmi:type="uml:Property" href="Common.uml#_XJrHgM8zEemfevCNCQbkKw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_XKUnwc8zEemfevCNCQbkKw"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_d7DfQM80EemfevCNCQbkKw" type="Property_ClassAttributeLabel">
+          <children xmi:type="notation:DecorationNode" xmi:id="_d7IXwM80EemfevCNCQbkKw" visible="false" type="StereotypeLabel">
+            <styles xmi:type="notation:StringValueStyle" xmi:id="_d7IXwc80EemfevCNCQbkKw" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_d7IXws80EemfevCNCQbkKw"/>
           </children>
           <element xmi:type="uml:Property" href="Common.uml#_h8AhkILoEemyVus8T4NvCQ"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_X4FAJYnbEemVXsYTZj8frQ"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_d7DfQc80EemfevCNCQbkKw"/>
         </children>
         <styles xmi:type="notation:TitleStyle" xmi:id="_SNI2kYnbEemVXsYTZj8frQ"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_SNI2konbEemVXsYTZj8frQ"/>
@@ -7908,7 +7917,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SNVD0onbEemVXsYTZj8frQ"/>
       </children>
       <element xmi:type="uml:Class" href="Common.uml#_BZSSMF0VEemiOP02o5T8tA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SM8pUYnbEemVXsYTZj8frQ" x="640" y="340" height="121"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SM8pUYnbEemVXsYTZj8frQ" x="640" y="340" width="361" height="141"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_SNajYInbEemVXsYTZj8frQ" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_SNajYYnbEemVXsYTZj8frQ"/>
@@ -8209,7 +8218,7 @@
       <styles xmi:type="notation:FontStyle" xmi:id="_SOsVwYnbEemVXsYTZj8frQ"/>
       <element xmi:type="uml:Generalization" href="Common.uml#_6LSTEF0XEemiOP02o5T8tA"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_SOsVwonbEemVXsYTZj8frQ" points="[780, 340, -643984, -643984]$[780, 320, -643984, -643984]$[600, 320, -643984, -643984]$[600, 280, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SkzvsInbEemVXsYTZj8frQ" id="(0.4794520547945205,0.0)"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SkzvsInbEemVXsYTZj8frQ" id="(0.3878116343490305,0.0)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Sk0WwInbEemVXsYTZj8frQ" id="(0.4984423676012461,1.0)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_U2eQVonbEemVXsYTZj8frQ" type="StereotypeCommentLink" source="_U2Q08InbEemVXsYTZj8frQ" target="_U2eQUonbEemVXsYTZj8frQ">
@@ -8565,6 +8574,14 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_f_ixosp1EemxyP_sJGfnPA"/>
           </children>
+          <styles xmi:type="notation:StringListValueStyle" xmi:id="_Ec5mwM5sEemcqf4p4jcudw" name="maskLabel">
+            <stringListValue>multiplicity</stringListValue>
+            <stringListValue>visibility</stringListValue>
+            <stringListValue>defaultValue</stringListValue>
+            <stringListValue>name</stringListValue>
+            <stringListValue>type</stringListValue>
+            <stringListValue>derived</stringListValue>
+          </styles>
           <element xmi:type="uml:Property" href="Common.uml#_aTHl4MprEemxyP_sJGfnPA"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_f_XLc8p1EemxyP_sJGfnPA"/>
         </children>
@@ -8591,7 +8608,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J6w5cp2fEemXg71wwI_kPA"/>
       </children>
       <element xmi:type="uml:Class" href="Common.uml#_J6iP8J2fEemXg71wwI_kPA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J6nIcZ2fEemXg71wwI_kPA" x="100" y="420" width="241" height="121"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J6nIcZ2fEemXg71wwI_kPA" x="60" y="420" width="281" height="121"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_J6yHkJ2fEemXg71wwI_kPA" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_J6yHkZ2fEemXg71wwI_kPA"/>
@@ -8664,41 +8681,50 @@
           <element xmi:type="uml:Property" href="Common.uml#_NiuwEL6YEem4xcGs3yJOww"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_NjOfUb6YEem4xcGs3yJOww"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_P--wEL6YEem4xcGs3yJOww" type="Property_ClassAttributeLabel">
-          <children xmi:type="notation:DecorationNode" xmi:id="_P_RrAL6YEem4xcGs3yJOww" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_P_RrAb6YEem4xcGs3yJOww" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+        <children xmi:type="notation:Shape" xmi:id="_yoNE0M5lEemcqf4p4jcudw" type="Property_ClassAttributeLabel">
+          <children xmi:type="notation:DecorationNode" xmi:id="_yov3YM5lEemcqf4p4jcudw" visible="false" type="StereotypeLabel">
+            <styles xmi:type="notation:StringValueStyle" xmi:id="_yov3Yc5lEemcqf4p4jcudw" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yov3Ys5lEemcqf4p4jcudw"/>
+          </children>
+          <element xmi:type="uml:Property" href="Common.uml#_yI8V8M5lEemcqf4p4jcudw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_yoNE0c5lEemcqf4p4jcudw"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_XmQaEM5oEemcqf4p4jcudw" type="Property_ClassAttributeLabel">
+          <children xmi:type="notation:DecorationNode" xmi:id="_XmoNgM5oEemcqf4p4jcudw" visible="false" type="StereotypeLabel">
+            <styles xmi:type="notation:StringValueStyle" xmi:id="_XmoNgc5oEemcqf4p4jcudw" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_P_RrAr6YEem4xcGs3yJOww"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XmoNgs5oEemcqf4p4jcudw"/>
           </children>
           <element xmi:type="uml:Property" href="Common.uml#_P-fn4L6YEem4xcGs3yJOww"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_P--wEb6YEem4xcGs3yJOww"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_XmQaEc5oEemcqf4p4jcudw"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_Fd2dQMBREem3GPFSfqjGLQ" type="Property_ClassAttributeLabel">
-          <children xmi:type="notation:DecorationNode" xmi:id="_FeDRkMBREem3GPFSfqjGLQ" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_FeDRkcBREem3GPFSfqjGLQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+        <children xmi:type="notation:Shape" xmi:id="_XmRBIM5oEemcqf4p4jcudw" type="Property_ClassAttributeLabel">
+          <children xmi:type="notation:DecorationNode" xmi:id="_Xmse8M5oEemcqf4p4jcudw" visible="false" type="StereotypeLabel">
+            <styles xmi:type="notation:StringValueStyle" xmi:id="_Xmse8c5oEemcqf4p4jcudw" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FeDRksBREem3GPFSfqjGLQ"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Xmse8s5oEemcqf4p4jcudw"/>
           </children>
           <element xmi:type="uml:Property" href="Common.uml#_FVSXIMBREem3GPFSfqjGLQ"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_Fd2dQcBREem3GPFSfqjGLQ"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_XmRBIc5oEemcqf4p4jcudw"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_3mR0AMBREem3GPFSfqjGLQ" type="Property_ClassAttributeLabel">
-          <children xmi:type="notation:DecorationNode" xmi:id="_3mhroMBREem3GPFSfqjGLQ" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_3mhrocBREem3GPFSfqjGLQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+        <children xmi:type="notation:Shape" xmi:id="_XmRoMM5oEemcqf4p4jcudw" type="Property_ClassAttributeLabel">
+          <children xmi:type="notation:DecorationNode" xmi:id="_XmwwYM5oEemcqf4p4jcudw" visible="false" type="StereotypeLabel">
+            <styles xmi:type="notation:StringValueStyle" xmi:id="_XmwwYc5oEemcqf4p4jcudw" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3mhrosBREem3GPFSfqjGLQ"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XmwwYs5oEemcqf4p4jcudw"/>
           </children>
           <element xmi:type="uml:Property" href="Common.uml#_3ciCIMBREem3GPFSfqjGLQ"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_3mR0AcBREem3GPFSfqjGLQ"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_XmRoMc5oEemcqf4p4jcudw"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_dvseoMpkEemxyP_sJGfnPA" type="Property_ClassAttributeLabel">
-          <children xmi:type="notation:DecorationNode" xmi:id="_dv-ygMpkEemxyP_sJGfnPA" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_dv-ygcpkEemxyP_sJGfnPA" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+        <children xmi:type="notation:Shape" xmi:id="_XmRoMs5oEemcqf4p4jcudw" type="Property_ClassAttributeLabel">
+          <children xmi:type="notation:DecorationNode" xmi:id="_Xm1B0M5oEemcqf4p4jcudw" visible="false" type="StereotypeLabel">
+            <styles xmi:type="notation:StringValueStyle" xmi:id="_Xm1B0c5oEemcqf4p4jcudw" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dv-ygspkEemxyP_sJGfnPA"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Xm1B0s5oEemcqf4p4jcudw"/>
           </children>
           <element xmi:type="uml:Property" href="Common.uml#_mbLdgMpjEemxyP_sJGfnPA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_dvseocpkEemxyP_sJGfnPA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_XmRoM85oEemcqf4p4jcudw"/>
         </children>
         <styles xmi:type="notation:TitleStyle" xmi:id="_ZqxVYb6XEem4xcGs3yJOww"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_ZqxVYr6XEem4xcGs3yJOww"/>
@@ -9052,7 +9078,7 @@
       <styles xmi:type="notation:FontStyle" xmi:id="_OYVowb6gEem4xcGs3yJOww"/>
       <element xmi:type="uml:Association" href="Common.uml#_OYD78L6gEem4xcGs3yJOww"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_OYVowr6gEem4xcGs3yJOww" points="[220, 541, -643984, -643984]$[220, 600, -643984, -643984]$[1100, 600, -643984, -643984]$[1100, 501, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OY8FsL6gEem4xcGs3yJOww" id="(0.4979253112033195,1.0)"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OY8FsL6gEem4xcGs3yJOww" id="(0.5693950177935944,1.0)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OY8Fsb6gEem4xcGs3yJOww" id="(0.4979253112033195,1.0)"/>
     </edges>
   </notation:Diagram>
-- 
cgit 1.2.3-korg