From 7be93eb7f483bcdd557b22ea202e6cd1e6bb297a Mon Sep 17 00:00:00 2001
From: Kevin Scaggs <ks0567@att.com>
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 <ks0567@att.com>
---
 ONAP Information Model/Common.notation | 258 +++++++++++++++++++++++++++------
 ONAP Information Model/Common.uml      |  75 ++++++----
 2 files changed, 255 insertions(+), 78 deletions(-)

(limited to 'ONAP Information Model')

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 @@
       </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="_zwB5YM8yEemfevCNCQbkKw" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_zwB5Yc8yEemfevCNCQbkKw" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+          <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="_zwB5Ys8yEemfevCNCQbkKw"/>
+            <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"/>
@@ -8142,14 +8142,6 @@
       <element xmi:type="uml:Enumeration" href="Common.uml#_rMIDEILdEemyVus8T4NvCQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="__kufEYncEemVXsYTZj8frQ" x="200" y="500"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="__k2a4IncEemVXsYTZj8frQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="__k2a4YncEemVXsYTZj8frQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="__k2a44ncEemVXsYTZj8frQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Enumeration" href="Common.uml#_rMIDEILdEemyVus8T4NvCQ"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="__k2a4oncEemVXsYTZj8frQ" x="200"/>
-    </children>
     <children xmi:type="notation:Shape" xmi:id="_NdSKUIndEemVXsYTZj8frQ" type="Enumeration_Shape">
       <children xmi:type="notation:DecorationNode" xmi:id="_NdSxYIndEemVXsYTZj8frQ" type="Enumeration_NameLabel"/>
       <children xmi:type="notation:DecorationNode" xmi:id="_NdSxYYndEemVXsYTZj8frQ" type="Enumeration_FloatingNameLabel">
@@ -8176,13 +8168,53 @@
       <element xmi:type="uml:Enumeration" href="Common.uml#_1kyswILtEemyVus8T4NvCQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NdSKUYndEemVXsYTZj8frQ" x="400" y="500"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_NdZfEIndEemVXsYTZj8frQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_NdZfEYndEemVXsYTZj8frQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_NdZfE4ndEemVXsYTZj8frQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_6YkgYOU7Eem4RuIQi6fMsw" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_6YkgYeU7Eem4RuIQi6fMsw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_6YoKwOU7Eem4RuIQi6fMsw" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="Common.uml#_uTRv8IndEemVXsYTZj8frQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6YkgYuU7Eem4RuIQi6fMsw" x="440" y="240"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_-e4OcOU7Eem4RuIQi6fMsw" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_-e4OceU7Eem4RuIQi6fMsw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_-e41gOU7Eem4RuIQi6fMsw" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="Common.uml#_PrdukIncEemVXsYTZj8frQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-e4OcuU7Eem4RuIQi6fMsw" x="640" y="80"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_CAeF4OU8Eem4RuIQi6fMsw" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_CAeF4eU8Eem4RuIQi6fMsw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_CAeF4-U8Eem4RuIQi6fMsw" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Generalization" href="Common.uml#_qQWgYF0XEemiOP02o5T8tA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CAeF4uU8Eem4RuIQi6fMsw" x="440" y="240"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_EXFX8OU8Eem4RuIQi6fMsw" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_EXFX8eU8Eem4RuIQi6fMsw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_EXFX8-U8Eem4RuIQi6fMsw" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Generalization" href="Common.uml#_6LSTEF0XEemiOP02o5T8tA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EXFX8uU8Eem4RuIQi6fMsw" x="840" y="240"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_uppzcOVBEem4RuIQi6fMsw" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_uppzceVBEem4RuIQi6fMsw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_uppzc-VBEem4RuIQi6fMsw" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Enumeration" href="Common.uml#_rMIDEILdEemyVus8T4NvCQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uppzcuVBEem4RuIQi6fMsw" x="400" y="500"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_wPRGZ-VBEem4RuIQi6fMsw" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_wPRGaOVBEem4RuIQi6fMsw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wPRGauVBEem4RuIQi6fMsw" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Enumeration" href="Common.uml#_1kyswILtEemyVus8T4NvCQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NdZfEondEemVXsYTZj8frQ" x="200"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wPRGaeVBEem4RuIQi6fMsw" x="600" y="500"/>
     </children>
     <styles xmi:type="notation:StringValueStyle" xmi:id="_KhfZgYnbEemVXsYTZj8frQ" name="diagram_compatibility_version" stringValue="1.4.0"/>
     <styles xmi:type="notation:DiagramStyle" xmi:id="_KhfZgonbEemVXsYTZj8frQ"/>
@@ -8213,7 +8245,7 @@
     <edges xmi:type="notation:Connector" xmi:id="_SOsVwInbEemVXsYTZj8frQ" type="Generalization_Edge" source="_SM8pUInbEemVXsYTZj8frQ" target="_SN5EgInbEemVXsYTZj8frQ">
       <children xmi:type="notation:DecorationNode" xmi:id="_SOsVw4nbEemVXsYTZj8frQ" type="Generalization_StereotypeLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_SknicInbEemVXsYTZj8frQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_SOsVxInbEemVXsYTZj8frQ" y="40"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_SOsVxInbEemVXsYTZj8frQ" x="4" y="13"/>
       </children>
       <styles xmi:type="notation:FontStyle" xmi:id="_SOsVwYnbEemVXsYTZj8frQ"/>
       <element xmi:type="uml:Generalization" href="Common.uml#_6LSTEF0XEemiOP02o5T8tA"/>
@@ -8234,7 +8266,7 @@
     <edges xmi:type="notation:Connector" xmi:id="_U25uIInbEemVXsYTZj8frQ" type="Generalization_Edge" source="_U2Q08InbEemVXsYTZj8frQ" target="_SN5EgInbEemVXsYTZj8frQ">
       <children xmi:type="notation:DecorationNode" xmi:id="_U25uI4nbEemVXsYTZj8frQ" type="Generalization_StereotypeLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_VfQHkInbEemVXsYTZj8frQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_U25uJInbEemVXsYTZj8frQ" y="39"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_U25uJInbEemVXsYTZj8frQ" x="-4" y="-13"/>
       </children>
       <styles xmi:type="notation:FontStyle" xmi:id="_U25uIYnbEemVXsYTZj8frQ"/>
       <element xmi:type="uml:Generalization" href="Common.uml#_qQWgYF0XEemiOP02o5T8tA"/>
@@ -8255,7 +8287,7 @@
     <edges xmi:type="notation:Connector" xmi:id="_Py060IncEemVXsYTZj8frQ" type="Association_Edge" source="_SN5EgInbEemVXsYTZj8frQ" target="_7ojZ4InbEemVXsYTZj8frQ">
       <children xmi:type="notation:DecorationNode" xmi:id="_Py1h4IncEemVXsYTZj8frQ" type="Association_StereotypeLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_YryfkIncEemVXsYTZj8frQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Py1h4YncEemVXsYTZj8frQ" y="-20"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Py1h4YncEemVXsYTZj8frQ" x="-4" y="7"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_Py1h4oncEemVXsYTZj8frQ" type="Association_NameLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_YsGooIncEemVXsYTZj8frQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -8283,34 +8315,14 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PzPxkIncEemVXsYTZj8frQ" id="(0.4984423676012461,0.0)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PzPxkYncEemVXsYTZj8frQ" id="(0.0,0.46511627906976744)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="__k2a5IncEemVXsYTZj8frQ" type="StereotypeCommentLink" source="__kufEIncEemVXsYTZj8frQ" target="__k2a4IncEemVXsYTZj8frQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="__k2a5YncEemVXsYTZj8frQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="__k2a6YncEemVXsYTZj8frQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Enumeration" href="Common.uml#_rMIDEILdEemyVus8T4NvCQ"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="__k2a5oncEemVXsYTZj8frQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="__k2a54ncEemVXsYTZj8frQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="__k2a6IncEemVXsYTZj8frQ"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_NdZfFIndEemVXsYTZj8frQ" type="StereotypeCommentLink" source="_NdSKUIndEemVXsYTZj8frQ" target="_NdZfEIndEemVXsYTZj8frQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_NdZfFYndEemVXsYTZj8frQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_NdZfGYndEemVXsYTZj8frQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Enumeration" href="Common.uml#_1kyswILtEemyVus8T4NvCQ"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_NdZfFondEemVXsYTZj8frQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NdZfF4ndEemVXsYTZj8frQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NdZfGIndEemVXsYTZj8frQ"/>
-    </edges>
     <edges xmi:type="notation:Connector" xmi:id="_uUNkEIndEemVXsYTZj8frQ" type="Association_Edge" source="_U2Q08InbEemVXsYTZj8frQ" target="_SN5EgInbEemVXsYTZj8frQ">
       <children xmi:type="notation:DecorationNode" xmi:id="_uUNkE4ndEemVXsYTZj8frQ" type="Association_StereotypeLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_vbSg4IndEemVXsYTZj8frQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_uUNkFIndEemVXsYTZj8frQ" x="-2" y="-17"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_uUNkFIndEemVXsYTZj8frQ" x="46" y="7"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_uUNkFYndEemVXsYTZj8frQ" type="Association_NameLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_vbfVMIndEemVXsYTZj8frQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_uUNkFondEemVXsYTZj8frQ" x="83" y="-13"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_uUNkFondEemVXsYTZj8frQ" x="81" y="-13"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_uUNkF4ndEemVXsYTZj8frQ" visible="false" type="Association_TargetRoleLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_vbricIndEemVXsYTZj8frQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -8334,6 +8346,66 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uUw9sIndEemVXsYTZj8frQ" id="(0.0,0.49586776859504134)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uUw9sYndEemVXsYTZj8frQ" id="(0.0,0.4)"/>
     </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_6Yox0OU7Eem4RuIQi6fMsw" type="StereotypeCommentLink" source="_uUNkEIndEemVXsYTZj8frQ" target="_6YkgYOU7Eem4RuIQi6fMsw">
+      <styles xmi:type="notation:FontStyle" xmi:id="_6Yox0eU7Eem4RuIQi6fMsw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_6YpY4eU7Eem4RuIQi6fMsw" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="Common.uml#_uTRv8IndEemVXsYTZj8frQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_6Yox0uU7Eem4RuIQi6fMsw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6Yox0-U7Eem4RuIQi6fMsw"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6YpY4OU7Eem4RuIQi6fMsw"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_-e41geU7Eem4RuIQi6fMsw" type="StereotypeCommentLink" source="_Py060IncEemVXsYTZj8frQ" target="_-e4OcOU7Eem4RuIQi6fMsw">
+      <styles xmi:type="notation:FontStyle" xmi:id="_-e41guU7Eem4RuIQi6fMsw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_-e41huU7Eem4RuIQi6fMsw" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="Common.uml#_PrdukIncEemVXsYTZj8frQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_-e41g-U7Eem4RuIQi6fMsw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-e41hOU7Eem4RuIQi6fMsw"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-e41heU7Eem4RuIQi6fMsw"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_CAeF5OU8Eem4RuIQi6fMsw" type="StereotypeCommentLink" source="_U25uIInbEemVXsYTZj8frQ" target="_CAeF4OU8Eem4RuIQi6fMsw">
+      <styles xmi:type="notation:FontStyle" xmi:id="_CAeF5eU8Eem4RuIQi6fMsw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_CAes8eU8Eem4RuIQi6fMsw" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Generalization" href="Common.uml#_qQWgYF0XEemiOP02o5T8tA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_CAeF5uU8Eem4RuIQi6fMsw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_CAeF5-U8Eem4RuIQi6fMsw"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_CAes8OU8Eem4RuIQi6fMsw"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_EXFX9OU8Eem4RuIQi6fMsw" type="StereotypeCommentLink" source="_SOsVwInbEemVXsYTZj8frQ" target="_EXFX8OU8Eem4RuIQi6fMsw">
+      <styles xmi:type="notation:FontStyle" xmi:id="_EXFX9eU8Eem4RuIQi6fMsw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_EXFX-eU8Eem4RuIQi6fMsw" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Generalization" href="Common.uml#_6LSTEF0XEemiOP02o5T8tA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EXFX9uU8Eem4RuIQi6fMsw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EXFX9-U8Eem4RuIQi6fMsw"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EXFX-OU8Eem4RuIQi6fMsw"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_uppzdOVBEem4RuIQi6fMsw" type="StereotypeCommentLink" source="__kufEIncEemVXsYTZj8frQ" target="_uppzcOVBEem4RuIQi6fMsw">
+      <styles xmi:type="notation:FontStyle" xmi:id="_uppzdeVBEem4RuIQi6fMsw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_uppzeeVBEem4RuIQi6fMsw" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Enumeration" href="Common.uml#_rMIDEILdEemyVus8T4NvCQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_uppzduVBEem4RuIQi6fMsw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uppzd-VBEem4RuIQi6fMsw"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uppzeOVBEem4RuIQi6fMsw"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_wPRGa-VBEem4RuIQi6fMsw" type="StereotypeCommentLink" source="_NdSKUIndEemVXsYTZj8frQ" target="_wPRGZ-VBEem4RuIQi6fMsw">
+      <styles xmi:type="notation:FontStyle" xmi:id="_wPRGbOVBEem4RuIQi6fMsw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wPRtcuVBEem4RuIQi6fMsw" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Enumeration" href="Common.uml#_1kyswILtEemyVus8T4NvCQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wPRGbeVBEem4RuIQi6fMsw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wPRtcOVBEem4RuIQi6fMsw"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wPRtceVBEem4RuIQi6fMsw"/>
+    </edges>
   </notation:Diagram>
   <notation:Diagram xmi:id="_diV8QJ0LEem7-cWktwUxRA" type="PapyrusUMLClassDiagram" name="Dynamic Parameters" measurementUnit="Pixel">
     <children xmi:type="notation:Shape" xmi:id="_n6olwJ0LEem7-cWktwUxRA" type="Class_Shape">
@@ -8608,7 +8680,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="60" y="420" width="281" height="121"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J6nIcZ2fEemXg71wwI_kPA" x="40" 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"/>
@@ -8774,6 +8846,46 @@
       <element xmi:type="uml:Comment" href="Common.uml#_Gkh7YMprEemxyP_sJGfnPA"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GkllwcprEemxyP_sJGfnPA" x="120" y="120" width="161" height="81"/>
     </children>
+    <children xmi:type="notation:Shape" xmi:id="_y1TGw-U8Eem4RuIQi6fMsw" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_y1TGxOU8Eem4RuIQi6fMsw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_y1Tt0OU8Eem4RuIQi6fMsw" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="Common.uml#_zkmnYJ2sEemXg71wwI_kPA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_y1TGxeU8Eem4RuIQi6fMsw" x="580" y="20"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_2vo1YOU8Eem4RuIQi6fMsw" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_2vo1YeU8Eem4RuIQi6fMsw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_2vo1Y-U8Eem4RuIQi6fMsw" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="Common.uml#_WwqCwL6ZEem4xcGs3yJOww"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2vo1YuU8Eem4RuIQi6fMsw" x="680" y="140"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_P4fwMOU9Eem4RuIQi6fMsw" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_P4fwMeU9Eem4RuIQi6fMsw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_P4fwM-U9Eem4RuIQi6fMsw" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="Common.uml#_ucwrsL6ZEem4xcGs3yJOww"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_P4fwMuU9Eem4RuIQi6fMsw" x="720" y="320"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_aGjDI-U-Eem4RuIQi6fMsw" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_aGjDJOU-Eem4RuIQi6fMsw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_aGjDJuU-Eem4RuIQi6fMsw" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="Common.uml#_OYD78L6gEem4xcGs3yJOww"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aGjDJeU-Eem4RuIQi6fMsw" x="240" y="320"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_iu1uo-U-Eem4RuIQi6fMsw" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_iu1upOU-Eem4RuIQi6fMsw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_iu28wOU-Eem4RuIQi6fMsw" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="Common.uml#_biUdMKMJEemYd6Tamcc5WQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iu1upeU-Eem4RuIQi6fMsw" x="1020" y="20"/>
+    </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">
@@ -8885,7 +8997,7 @@
     <edges xmi:type="notation:Connector" xmi:id="_ztePgJ2sEemXg71wwI_kPA" type="Association_Edge" source="_IQUmUJ2eEemXg71wwI_kPA" target="_fdcTYJ2BEemXg71wwI_kPA">
       <children xmi:type="notation:DecorationNode" xmi:id="_ztePg52sEemXg71wwI_kPA" type="Association_StereotypeLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_0-6pQJ2sEemXg71wwI_kPA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ztePhJ2sEemXg71wwI_kPA" x="-1" y="-18"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ztePhJ2sEemXg71wwI_kPA" x="-25" y="7"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_ztePhZ2sEemXg71wwI_kPA" type="Association_NameLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_0_FoYJ2sEemXg71wwI_kPA" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -8919,7 +9031,7 @@
       </eAnnotations>
       <children xmi:type="notation:DecorationNode" xmi:id="_bjwAkKMJEemYd6Tamcc5WQ" type="Association_StereotypeLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_cRIrAKMJEemYd6Tamcc5WQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_bjwAkaMJEemYd6Tamcc5WQ" y="-20"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_bjwAkaMJEemYd6Tamcc5WQ" x="124" y="4"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_bjwnoKMJEemYd6Tamcc5WQ" type="Association_NameLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_cRaX0KMJEemYd6Tamcc5WQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -8960,11 +9072,11 @@
     <edges xmi:type="notation:Connector" xmi:id="_Ww89sL6ZEem4xcGs3yJOww" type="Association_Edge" source="_fdcTYJ2BEemXg71wwI_kPA" target="_ZqwuUL6XEem4xcGs3yJOww">
       <children xmi:type="notation:DecorationNode" xmi:id="_Ww89s76ZEem4xcGs3yJOww" type="Association_StereotypeLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_XObj4L6ZEem4xcGs3yJOww" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Ww89tL6ZEem4xcGs3yJOww" y="-19"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Ww89tL6ZEem4xcGs3yJOww" x="2" y="4"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_Ww9kwL6ZEem4xcGs3yJOww" type="Association_NameLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_XO1MgL6ZEem4xcGs3yJOww" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Ww9kwb6ZEem4xcGs3yJOww" x="2" y="-1"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Ww9kwb6ZEem4xcGs3yJOww" x="-18" y="-1"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_Ww9kwr6ZEem4xcGs3yJOww" visible="false" type="Association_TargetRoleLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_XPPcML6ZEem4xcGs3yJOww" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -9053,11 +9165,11 @@
     <edges xmi:type="notation:Connector" xmi:id="_OYVowL6gEem4xcGs3yJOww" type="Association_Edge" source="_J6nIcJ2fEemXg71wwI_kPA" target="_kxY8oJ2qEemXg71wwI_kPA">
       <children xmi:type="notation:DecorationNode" xmi:id="_OYWP0L6gEem4xcGs3yJOww" type="Association_StereotypeLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_PbmckL6gEem4xcGs3yJOww" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_OYWP0b6gEem4xcGs3yJOww" x="1" y="-18"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_OYWP0b6gEem4xcGs3yJOww" x="-34" y="7"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_OYWP0r6gEem4xcGs3yJOww" type="Association_NameLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_PbyCwL6gEem4xcGs3yJOww" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_OYWP076gEem4xcGs3yJOww" x="4" y="-13"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_OYWP076gEem4xcGs3yJOww" x="3" y="-13"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_OYWP1L6gEem4xcGs3yJOww" visible="false" type="Association_TargetRoleLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_PcBTUL6gEem4xcGs3yJOww" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -9077,9 +9189,59 @@
       </children>
       <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]"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_OYVowr6gEem4xcGs3yJOww" points="[200, 541, -643984, -643984]$[200, 600, -643984, -643984]$[1100, 600, -643984, -643984]$[1100, 501, -643984, -643984]"/>
       <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>
+    <edges xmi:type="notation:Connector" xmi:id="_y1Tt0eU8Eem4RuIQi6fMsw" type="StereotypeCommentLink" source="_ztePgJ2sEemXg71wwI_kPA" target="_y1TGw-U8Eem4RuIQi6fMsw">
+      <styles xmi:type="notation:FontStyle" xmi:id="_y1Tt0uU8Eem4RuIQi6fMsw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_y1Tt1uU8Eem4RuIQi6fMsw" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="Common.uml#_zkmnYJ2sEemXg71wwI_kPA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_y1Tt0-U8Eem4RuIQi6fMsw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_y1Tt1OU8Eem4RuIQi6fMsw"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_y1Tt1eU8Eem4RuIQi6fMsw"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_2vo1ZOU8Eem4RuIQi6fMsw" type="StereotypeCommentLink" source="_Ww89sL6ZEem4xcGs3yJOww" target="_2vo1YOU8Eem4RuIQi6fMsw">
+      <styles xmi:type="notation:FontStyle" xmi:id="_2vo1ZeU8Eem4RuIQi6fMsw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_2vo1aeU8Eem4RuIQi6fMsw" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="Common.uml#_WwqCwL6ZEem4xcGs3yJOww"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_2vo1ZuU8Eem4RuIQi6fMsw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2vo1Z-U8Eem4RuIQi6fMsw"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2vo1aOU8Eem4RuIQi6fMsw"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_P4fwNOU9Eem4RuIQi6fMsw" type="StereotypeCommentLink" source="_udCYgL6ZEem4xcGs3yJOww" target="_P4fwMOU9Eem4RuIQi6fMsw">
+      <styles xmi:type="notation:FontStyle" xmi:id="_P4fwNeU9Eem4RuIQi6fMsw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_P4fwOeU9Eem4RuIQi6fMsw" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="Common.uml#_ucwrsL6ZEem4xcGs3yJOww"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_P4fwNuU9Eem4RuIQi6fMsw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_P4fwN-U9Eem4RuIQi6fMsw"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_P4fwOOU9Eem4RuIQi6fMsw"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_aGjqMOU-Eem4RuIQi6fMsw" type="StereotypeCommentLink" source="_OYVowL6gEem4xcGs3yJOww" target="_aGjDI-U-Eem4RuIQi6fMsw">
+      <styles xmi:type="notation:FontStyle" xmi:id="_aGjqMeU-Eem4RuIQi6fMsw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_aGjqNeU-Eem4RuIQi6fMsw" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="Common.uml#_OYD78L6gEem4xcGs3yJOww"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_aGjqMuU-Eem4RuIQi6fMsw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aGjqM-U-Eem4RuIQi6fMsw"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aGjqNOU-Eem4RuIQi6fMsw"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_iu28weU-Eem4RuIQi6fMsw" type="StereotypeCommentLink" source="_bjoEwKMJEemYd6Tamcc5WQ" target="_iu1uo-U-Eem4RuIQi6fMsw">
+      <styles xmi:type="notation:FontStyle" xmi:id="_iu28wuU-Eem4RuIQi6fMsw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_iu28xuU-Eem4RuIQi6fMsw" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="Common.uml#_biUdMKMJEemYd6Tamcc5WQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_iu28w-U-Eem4RuIQi6fMsw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_iu28xOU-Eem4RuIQi6fMsw"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_iu28xeU-Eem4RuIQi6fMsw"/>
+    </edges>
   </notation:Diagram>
 </xmi:XMI>
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
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_fkyXsIncEemVXsYTZj8frQ" value="*"/>
           </ownedEnd>
         </packagedElement>
-        <packagedElement xmi:type="uml:Association" xmi:id="_uTRv8IndEemVXsYTZj8frQ" name="SelectionCriteriaCompositeComprosedOfSelectionCriteria" memberEnd="_uTS-EondEemVXsYTZj8frQ _uTTlIIndEemVXsYTZj8frQ">
+        <packagedElement xmi:type="uml:Association" xmi:id="_uTRv8IndEemVXsYTZj8frQ" name="SelectionCriteriaCompositeComprisedOfSelectionCriteria" memberEnd="_uTS-EondEemVXsYTZj8frQ _uTTlIIndEemVXsYTZj8frQ">
           <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uTS-EIndEemVXsYTZj8frQ" source="org.eclipse.papyrus">
             <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uTS-EYndEemVXsYTZj8frQ" key="nature" value="UML_Nature"/>
           </eAnnotations>
@@ -1766,10 +1766,7 @@ Permitted Values:&#xD;
           <generalization xmi:type="uml:Generalization" xmi:id="_qQWgYF0XEemiOP02o5T8tA" general="_AkO5gF0VEemiOP02o5T8tA"/>
           <ownedAttribute xmi:type="uml:Property" xmi:id="_lo6SIILdEemyVus8T4NvCQ" name="compositeOperator" type="_rMIDEILdEemyVus8T4NvCQ">
             <ownedComment xmi:type="uml:Comment" xmi:id="_LtI2MILpEemyVus8T4NvCQ" annotatedElement="_lo6SIILdEemyVus8T4NvCQ">
-              <body>Logical operation for filters composition,  e.g. logical AND or OR.</body>
-            </ownedComment>
-            <ownedComment xmi:type="uml:Comment" xmi:id="_09MBkILqEemyVus8T4NvCQ">
-              <body>Logical operation for filters composition,  e.g. logical AND or OR.</body>
+              <body>Logical operation for filters composition,  e.g. logical AND, OR, XOR.</body>
             </ownedComment>
           </ownedAttribute>
         </packagedElement>
@@ -1778,9 +1775,13 @@ Permitted Values:&#xD;
             <body>A simple (atomic) selection criteria that holds a specific attribute comparision expression.</body>
           </ownedComment>
           <generalization xmi:type="uml:Generalization" xmi:id="_6LSTEF0XEemiOP02o5T8tA" general="_AkO5gF0VEemiOP02o5T8tA"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_U92FMILsEemyVus8T4NvCQ" name="metricNamea">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_U92FMILsEemyVus8T4NvCQ" name="metricName">
             <ownedComment xmi:type="uml:Comment" xmi:id="_pcSX8ILvEemyVus8T4NvCQ" annotatedElement="_U92FMILsEemyVus8T4NvCQ">
               <body>Name of compared parameter or attribute.&#xD;
+</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_tS31cOU7Eem4RuIQi6fMsw">
+              <body>Name of compared parameter or attribute.&#xD;
 </body>
             </ownedComment>
             <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
@@ -4981,17 +4982,11 @@ Permitted Values:&#xD;
   <OpenModel_Profile:Preliminary xmi:id="_hp5QcIGAEemr-LDp1evzdw" base_Element="_8fYhoDqyEemOl5OHBoqS_w"/>
   <OpenModel_Profile:Preliminary xmi:id="_Bz2aAIGCEemr-LDp1evzdw" base_Element="_utCzUDX1EemvTc8tEY2xig"/>
   <OpenModel_Profile:OpenModelClass xmi:id="_AkO5gV0VEemiOP02o5T8tA" base_Class="_AkO5gF0VEemiOP02o5T8tA"/>
-  <OpenModel_Profile:Experimental xmi:id="_8GRFcILcEemyVus8T4NvCQ" base_Element="_AkO5gF0VEemiOP02o5T8tA"/>
   <OpenModel_Profile:OpenModelClass xmi:id="_A_9MMV0VEemiOP02o5T8tA" base_Class="_A_9MMF0VEemiOP02o5T8tA"/>
-  <OpenModel_Profile:Experimental xmi:id="_0kL0EILcEemyVus8T4NvCQ" base_Element="_A_9MMF0VEemiOP02o5T8tA"/>
   <OpenModel_Profile:OpenModelClass xmi:id="_BZSSMV0VEemiOP02o5T8tA" base_Class="_BZSSMF0VEemiOP02o5T8tA"/>
-  <OpenModel_Profile:Experimental xmi:id="_1kpykILcEemyVus8T4NvCQ" base_Element="_BZSSMF0VEemiOP02o5T8tA"/>
-  <OpenModel_Profile:Experimental xmi:id="_5XA0cILdEemyVus8T4NvCQ" base_Element="_rMIDEILdEemyVus8T4NvCQ"/>
-  <OpenModel_Profile:Experimental xmi:id="_AFDmgILuEemyVus8T4NvCQ" base_Element="_1kyswILtEemyVus8T4NvCQ"/>
   <OpenModel_Profile:Experimental xmi:id="_ipP74IMFEemyVus8T4NvCQ" base_Element="_e6hnYIMFEemyVus8T4NvCQ"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_1pWvwIMFEemyVus8T4NvCQ" base_StructuralFeature="_1pWIsIMFEemyVus8T4NvCQ"/>
   <OpenModel_Profile:Experimental xmi:id="__5dtoIMFEemyVus8T4NvCQ" base_Element="_1pWIsIMFEemyVus8T4NvCQ"/>
-  <OpenModel_Profile:Experimental xmi:id="_1DtM0InbEemVXsYTZj8frQ" base_Element="_lo6SIILdEemyVus8T4NvCQ"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_PriAAYncEemVXsYTZj8frQ" base_StructuralFeature="_PriAAIncEemVXsYTZj8frQ"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_PrjOIYncEemVXsYTZj8frQ" base_StructuralFeature="_PrjOIIncEemVXsYTZj8frQ"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_uTS-E4ndEemVXsYTZj8frQ" base_StructuralFeature="_uTS-EondEemVXsYTZj8frQ"/>
@@ -5008,10 +5003,7 @@ Permitted Values:&#xD;
   <OpenModel_Profile:OpenModelAttribute xmi:id="_oy4_0J2BEemXg71wwI_kPA" base_StructuralFeature="_oy4YwJ2BEemXg71wwI_kPA"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_xfVLgZ2BEemXg71wwI_kPA" base_StructuralFeature="_xfVLgJ2BEemXg71wwI_kPA"/>
   <OpenModel_Profile:OpenModelClass xmi:id="_J6i3AJ2fEemXg71wwI_kPA" base_Class="_J6iP8J2fEemXg71wwI_kPA"/>
-  <OpenModel_Profile:Experimental xmi:id="_apuKEJ2fEemXg71wwI_kPA" base_Element="_fcsFcJ2BEemXg71wwI_kPA"/>
-  <OpenModel_Profile:Experimental xmi:id="_bwXCAJ2fEemXg71wwI_kPA" base_Element="_J6iP8J2fEemXg71wwI_kPA"/>
   <OpenModel_Profile:OpenModelClass xmi:id="_kxXHcJ2qEemXg71wwI_kPA" base_Class="_kxWgYJ2qEemXg71wwI_kPA"/>
-  <OpenModel_Profile:Experimental xmi:id="_Gt7TkJ2rEemXg71wwI_kPA" base_Element="_kxWgYJ2qEemXg71wwI_kPA"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_2MzOIJ2rEemXg71wwI_kPA" base_StructuralFeature="_2MynEJ2rEemXg71wwI_kPA"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_zknOc52sEemXg71wwI_kPA" base_StructuralFeature="_zknOcp2sEemXg71wwI_kPA"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_zkq40J2sEemXg71wwI_kPA" base_StructuralFeature="_zkqRwJ2sEemXg71wwI_kPA"/>
@@ -5030,29 +5022,52 @@ Permitted Values:&#xD;
   <OpenModel_Profile:OpenModelAttribute xmi:id="_OYFKEb6gEem4xcGs3yJOww" base_StructuralFeature="_OYFKEL6gEem4xcGs3yJOww"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_q2DKEb6hEem4xcGs3yJOww" base_StructuralFeature="_q2DKEL6hEem4xcGs3yJOww"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_Fpm2sb6jEem4xcGs3yJOww" base_StructuralFeature="_Fpm2sL6jEem4xcGs3yJOww"/>
-  <OpenModel_Profile:Experimental xmi:id="_GvhRsL6qEem4xcGs3yJOww" base_Element="_Zqsc4L6XEem4xcGs3yJOww"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_FVS-MMBREem3GPFSfqjGLQ" base_StructuralFeature="_FVSXIMBREem3GPFSfqjGLQ"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_3ciCIcBREem3GPFSfqjGLQ" base_StructuralFeature="_3ciCIMBREem3GPFSfqjGLQ"/>
-  <OpenModel_Profile:Experimental xmi:id="_Jimn8MBYEem3GPFSfqjGLQ" base_Element="_oy4YwJ2BEemXg71wwI_kPA"/>
-  <OpenModel_Profile:Experimental xmi:id="_K74IAMBYEem3GPFSfqjGLQ" base_Element="_xfVLgJ2BEemXg71wwI_kPA"/>
-  <OpenModel_Profile:Experimental xmi:id="_MIpdIMBYEem3GPFSfqjGLQ" base_Element="_2MynEJ2rEemXg71wwI_kPA"/>
-  <OpenModel_Profile:Experimental xmi:id="_RKzvcMBYEem3GPFSfqjGLQ" base_Element="_q2DKEL6hEem4xcGs3yJOww"/>
-  <OpenModel_Profile:Experimental xmi:id="_T5KzIMBYEem3GPFSfqjGLQ" base_Element="_NiuwEL6YEem4xcGs3yJOww"/>
-  <OpenModel_Profile:Experimental xmi:id="_VG9b8MBYEem3GPFSfqjGLQ" base_Element="_P-fn4L6YEem4xcGs3yJOww"/>
-  <OpenModel_Profile:Experimental xmi:id="_WW_gcMBYEem3GPFSfqjGLQ" base_Element="_FVSXIMBREem3GPFSfqjGLQ"/>
-  <OpenModel_Profile:Experimental xmi:id="_Xsq58MBYEem3GPFSfqjGLQ" base_Element="_3ciCIMBREem3GPFSfqjGLQ"/>
-  <OpenModel_Profile:Experimental xmi:id="_1zN2wMBYEem3GPFSfqjGLQ" base_Element="_Fpm2sL6jEem4xcGs3yJOww"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_mbMEkMpjEemxyP_sJGfnPA" base_StructuralFeature="_mbLdgMpjEemxyP_sJGfnPA"/>
   <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:Experimental xmi:id="_1hIBkMpmEemxyP_sJGfnPA" base_Element="_mbLdgMpjEemxyP_sJGfnPA"/>
-  <OpenModel_Profile:Experimental xmi:id="_3HF50MpmEemxyP_sJGfnPA" base_Element="_6P1TwMpjEemxyP_sJGfnPA"/>
-  <OpenModel_Profile:Experimental xmi:id="_4qhbcMpmEemxyP_sJGfnPA" base_Element="_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:Experimental xmi:id="_A2JxQM5mEemcqf4p4jcudw" base_Element="_yI8V8M5lEemcqf4p4jcudw"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_XJtjwM8zEemfevCNCQbkKw" base_StructuralFeature="_XJrHgM8zEemfevCNCQbkKw"/>
   <OpenModel_Profile:Experimental xmi:id="_yV7dcM8zEemfevCNCQbkKw" base_Element="_T7JtYM6AEemcqf4p4jcudw"/>
-  <OpenModel_Profile:Experimental xmi:id="_dHjlwM80EemfevCNCQbkKw" base_Element="_XJrHgM8zEemfevCNCQbkKw"/>
+  <OpenModel_Profile:Preliminary xmi:id="_dYBiUOU7Eem4RuIQi6fMsw" base_Element="_AkO5gF0VEemiOP02o5T8tA"/>
+  <OpenModel_Profile:Preliminary xmi:id="_e7jxoOU7Eem4RuIQi6fMsw" base_Element="_h8AhkILoEemyVus8T4NvCQ"/>
+  <OpenModel_Profile:Preliminary xmi:id="_hxhSIOU7Eem4RuIQi6fMsw" base_Element="_A_9MMF0VEemiOP02o5T8tA"/>
+  <OpenModel_Profile:Preliminary xmi:id="_i-whUOU7Eem4RuIQi6fMsw" base_Element="_lo6SIILdEemyVus8T4NvCQ"/>
+  <OpenModel_Profile:Preliminary xmi:id="_sWS4cOU7Eem4RuIQi6fMsw" base_Element="_U92FMILsEemyVus8T4NvCQ"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_tS-jIOU7Eem4RuIQi6fMsw" base_Comment="_tS31cOU7Eem4RuIQi6fMsw" language="org.eclipse.papyrus.uml.textedit.property.xtext.UmlProperty"/>
+  <OpenModel_Profile:Preliminary xmi:id="_w2ZmkOU7Eem4RuIQi6fMsw" base_Element="_VorK4ILsEemyVus8T4NvCQ"/>
+  <OpenModel_Profile:Preliminary xmi:id="_yADWQOU7Eem4RuIQi6fMsw" base_Element="_W1j0wILsEemyVus8T4NvCQ"/>
+  <OpenModel_Profile:Preliminary xmi:id="_zHL9cOU7Eem4RuIQi6fMsw" base_Element="_XJrHgM8zEemfevCNCQbkKw"/>
+  <OpenModel_Profile:Preliminary xmi:id="_0vQugOU7Eem4RuIQi6fMsw" base_Element="_BZSSMF0VEemiOP02o5T8tA"/>
+  <OpenModel_Profile:Preliminary xmi:id="_6X81UOU7Eem4RuIQi6fMsw" base_Element="_uTRv8IndEemVXsYTZj8frQ"/>
+  <OpenModel_Profile:Preliminary xmi:id="_-eEWIOU7Eem4RuIQi6fMsw" base_Element="_PrdukIncEemVXsYTZj8frQ"/>
+  <OpenModel_Profile:Preliminary xmi:id="_B_-9sOU8Eem4RuIQi6fMsw" base_Element="_qQWgYF0XEemiOP02o5T8tA"/>
+  <OpenModel_Profile:Preliminary xmi:id="_EWlBoOU8Eem4RuIQi6fMsw" base_Element="_6LSTEF0XEemiOP02o5T8tA"/>
+  <OpenModel_Profile:Preliminary xmi:id="_YupG8OU8Eem4RuIQi6fMsw" base_Element="_fcsFcJ2BEemXg71wwI_kPA"/>
+  <OpenModel_Profile:Preliminary xmi:id="_bZxQcOU8Eem4RuIQi6fMsw" base_Element="_oy4YwJ2BEemXg71wwI_kPA"/>
+  <OpenModel_Profile:Preliminary xmi:id="_dy65IOU8Eem4RuIQi6fMsw" base_Element="_xfVLgJ2BEemXg71wwI_kPA"/>
+  <OpenModel_Profile:Preliminary xmi:id="_gTCFcOU8Eem4RuIQi6fMsw" base_Element="_2MynEJ2rEemXg71wwI_kPA"/>
+  <OpenModel_Profile:Preliminary xmi:id="_ykLhkOU8Eem4RuIQi6fMsw" base_Element="_zkmnYJ2sEemXg71wwI_kPA"/>
+  <OpenModel_Profile:Preliminary xmi:id="_2dwbMOU8Eem4RuIQi6fMsw" base_Element="_WwqCwL6ZEem4xcGs3yJOww"/>
+  <OpenModel_Profile:Preliminary xmi:id="_8RyPUOU8Eem4RuIQi6fMsw" base_Element="_Zqsc4L6XEem4xcGs3yJOww"/>
+  <OpenModel_Profile:Preliminary xmi:id="_-ZsXAOU8Eem4RuIQi6fMsw" base_Element="_NiuwEL6YEem4xcGs3yJOww"/>
+  <OpenModel_Profile:Preliminary xmi:id="_Ag7wUOU9Eem4RuIQi6fMsw" base_Element="_yI8V8M5lEemcqf4p4jcudw"/>
+  <OpenModel_Profile:Preliminary xmi:id="_Cdx3gOU9Eem4RuIQi6fMsw" base_Element="_P-fn4L6YEem4xcGs3yJOww"/>
+  <OpenModel_Profile:Preliminary xmi:id="_EgPegOU9Eem4RuIQi6fMsw" base_Element="_FVSXIMBREem3GPFSfqjGLQ"/>
+  <OpenModel_Profile:Preliminary xmi:id="_HiDCoOU9Eem4RuIQi6fMsw" base_Element="_3ciCIMBREem3GPFSfqjGLQ"/>
+  <OpenModel_Profile:Preliminary xmi:id="_J0zIYOU9Eem4RuIQi6fMsw" base_Element="_mbLdgMpjEemxyP_sJGfnPA"/>
+  <OpenModel_Profile:Preliminary xmi:id="_PnxMkOU9Eem4RuIQi6fMsw" base_Element="_ucwrsL6ZEem4xcGs3yJOww"/>
+  <OpenModel_Profile:Preliminary xmi:id="_R1u48OU9Eem4RuIQi6fMsw" base_Element="_J6iP8J2fEemXg71wwI_kPA"/>
+  <OpenModel_Profile:Preliminary xmi:id="_g3ExMOU9Eem4RuIQi6fMsw" base_Element="_q2DKEL6hEem4xcGs3yJOww"/>
+  <OpenModel_Profile:Preliminary xmi:id="_i-nFcOU9Eem4RuIQi6fMsw" base_Element="_6P1TwMpjEemxyP_sJGfnPA"/>
+  <OpenModel_Profile:Preliminary xmi:id="_k_VAAOU9Eem4RuIQi6fMsw" base_Element="_9_8vYMpjEemxyP_sJGfnPA"/>
+  <OpenModel_Profile:Preliminary xmi:id="_Zz5M4OU-Eem4RuIQi6fMsw" base_Element="_OYD78L6gEem4xcGs3yJOww"/>
+  <OpenModel_Profile:Preliminary xmi:id="_d643cOU-Eem4RuIQi6fMsw" base_Element="_kxWgYJ2qEemXg71wwI_kPA"/>
+  <OpenModel_Profile:Preliminary xmi:id="_gJk8kOU-Eem4RuIQi6fMsw" base_Element="_Fpm2sL6jEem4xcGs3yJOww"/>
+  <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"/>
 </xmi:XMI>
-- 
cgit 1.2.3-korg