1 files changed, 45 insertions, 36 deletions
diff --git a/ONAP Information Model/Common.notation b/ONAP Information Model/Common.notation
index 64c26b2..faea58b 100644
--- a/ONAP Information Model/Common.notation
+++ b/ONAP Information Model/Common.notation
@@ -4473,15 +4473,6 @@
         <layoutConstraint xmi:type="notation:Location" xmi:id="__F7zAxnKEemlxOdMFpUVvQ" y="15"/>
       </children>
       <children xmi:type="notation:BasicCompartment" xmi:id="__F7zBBnKEemlxOdMFpUVvQ" type="Class_AttributeCompartment">
-        <children xmi:type="notation:Shape" xmi:id="_mnd_IBpxEemOGejS9lsDjA" type="Property_ClassAttributeLabel">
-          <children xmi:type="notation:DecorationNode" xmi:id="_mnhCcBpxEemOGejS9lsDjA" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_mnhCcRpxEemOGejS9lsDjA" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mnhCchpxEemOGejS9lsDjA"/>
-          </children>
-          <element xmi:type="uml:Property" href="Common.uml#_mjJf0BpxEemOGejS9lsDjA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_mnd_IRpxEemOGejS9lsDjA"/>
-        </children>
         <children xmi:type="notation:Shape" xmi:id="_n_hXMBpxEemOGejS9lsDjA" type="Property_ClassAttributeLabel">
           <children xmi:type="notation:DecorationNode" xmi:id="_n_kagBpxEemOGejS9lsDjA" visible="false" type="StereotypeLabel">
             <styles xmi:type="notation:StringValueStyle" xmi:id="_n_kagRpxEemOGejS9lsDjA" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
@@ -4491,15 +4482,6 @@
           <element xmi:type="uml:Property" href="Common.uml#_n-rCoBpxEemOGejS9lsDjA"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_n_hXMRpxEemOGejS9lsDjA"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_ojIakBpxEemOGejS9lsDjA" type="Property_ClassAttributeLabel">
-          <children xmi:type="notation:DecorationNode" xmi:id="_ojK20BpxEemOGejS9lsDjA" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_ojK20RpxEemOGejS9lsDjA" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ojK20hpxEemOGejS9lsDjA"/>
-          </children>
-          <element xmi:type="uml:Property" href="Common.uml#_ofCkwBpxEemOGejS9lsDjA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_ojIakRpxEemOGejS9lsDjA"/>
-        </children>
         <children xmi:type="notation:Shape" xmi:id="_plkH8BpxEemOGejS9lsDjA" type="Property_ClassAttributeLabel">
           <children xmi:type="notation:DecorationNode" xmi:id="_plnLQBpxEemOGejS9lsDjA" visible="false" type="StereotypeLabel">
             <styles xmi:type="notation:StringValueStyle" xmi:id="_plnLQRpxEemOGejS9lsDjA" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
@@ -4518,6 +4500,33 @@
           <element xmi:type="uml:Property" href="Common.uml#_tRRrEBp5EemOGejS9lsDjA"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_tVn_kRp5EemOGejS9lsDjA"/>
         </children>
+        <children xmi:type="notation:Shape" xmi:id="_K_8XoEqDEemOLdIUx_ad5Q" type="Property_ClassAttributeLabel">
+          <children xmi:type="notation:DecorationNode" xmi:id="_LABQIEqDEemOLdIUx_ad5Q" visible="false" type="StereotypeLabel">
+            <styles xmi:type="notation:StringValueStyle" xmi:id="_LABQIUqDEemOLdIUx_ad5Q" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LABQIkqDEemOLdIUx_ad5Q"/>
+          </children>
+          <element xmi:type="uml:Property" href="Common.uml#_vi4oQOLJEeiKy5JVrA0UGA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_K_8XoUqDEemOLdIUx_ad5Q"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_K_9lwEqDEemOLdIUx_ad5Q" type="Property_ClassAttributeLabel">
+          <children xmi:type="notation:DecorationNode" xmi:id="_LAETcEqDEemOLdIUx_ad5Q" visible="false" type="StereotypeLabel">
+            <styles xmi:type="notation:StringValueStyle" xmi:id="_LAETcUqDEemOLdIUx_ad5Q" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LAETckqDEemOLdIUx_ad5Q"/>
+          </children>
+          <element xmi:type="uml:Property" href="Common.uml#_wEHtEOLJEeiKy5JVrA0UGA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_K_9lwUqDEemOLdIUx_ad5Q"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_K_9lwkqDEemOLdIUx_ad5Q" type="Property_ClassAttributeLabel">
+          <children xmi:type="notation:DecorationNode" xmi:id="_LAGvsEqDEemOLdIUx_ad5Q" visible="false" type="StereotypeLabel">
+            <styles xmi:type="notation:StringValueStyle" xmi:id="_LAGvsUqDEemOLdIUx_ad5Q" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LAGvskqDEemOLdIUx_ad5Q"/>
+          </children>
+          <element xmi:type="uml:Property" href="Common.uml#_wj9DsOLJEeiKy5JVrA0UGA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_K_9lw0qDEemOLdIUx_ad5Q"/>
+        </children>
         <styles xmi:type="notation:TitleStyle" xmi:id="__F7zBRnKEemlxOdMFpUVvQ"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="__F7zBhnKEemlxOdMFpUVvQ"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="__F7zBxnKEemlxOdMFpUVvQ"/>
@@ -4541,7 +4550,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="__GArghnKEemlxOdMFpUVvQ"/>
       </children>
       <element xmi:type="uml:Class" href="Common.uml#__F4vsBnKEemlxOdMFpUVvQ"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="__F7zABnKEemlxOdMFpUVvQ" x="520" y="80" width="161" height="121"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="__F7zABnKEemlxOdMFpUVvQ" x="500" y="20" width="201" height="181"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="__GBSkxnKEemlxOdMFpUVvQ" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="__GBSlBnKEemlxOdMFpUVvQ"/>
@@ -4981,8 +4990,8 @@
       <styles xmi:type="notation:FontStyle" xmi:id="_oc2bYRnMEemlxOdMFpUVvQ"/>
       <element xmi:type="uml:AssociationClass" href="Common.uml#_ocmjwBnMEemlxOdMFpUVvQ"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_oc2bYhnMEemlxOdMFpUVvQ" points="[681, 140, -643984, -643984]$[720, 140, -643984, -643984]$[720, 120, -643984, -643984]$[720, 100, -643984, -643984]$[681, 100, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_odrh0BnMEemlxOdMFpUVvQ" id="(1.0,0.49586776859504134)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_odrh0RnMEemlxOdMFpUVvQ" id="(1.0,0.1652892561983471)"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_odrh0BnMEemlxOdMFpUVvQ" id="(1.0,0.6629834254143646)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_odrh0RnMEemlxOdMFpUVvQ" id="(1.0,0.4419889502762431)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_oc8iBBnMEemlxOdMFpUVvQ" type="StereotypeCommentLink" source="_oc2bYBnMEemlxOdMFpUVvQ" target="_oc8iABnMEemlxOdMFpUVvQ">
       <styles xmi:type="notation:FontStyle" xmi:id="_oc8iBRnMEemlxOdMFpUVvQ"/>
@@ -5093,17 +5102,6 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_72ybJzqzEemOl5OHBoqS_w"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_72ybKDqzEemOl5OHBoqS_w"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_FUGqIDq0EemOl5OHBoqS_w" type="Generalization_Edge" source="_72oqIDqzEemOl5OHBoqS_w" target="_8fa94DqyEemOl5OHBoqS_w">
-      <children xmi:type="notation:DecorationNode" xmi:id="_FUHRMDq0EemOl5OHBoqS_w" type="Generalization_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_bx1dEEaJEemmD4xckllxww" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_FUHRMTq0EemOl5OHBoqS_w" y="40"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_FUGqITq0EemOl5OHBoqS_w"/>
-      <element xmi:type="uml:Generalization" href="Ves.uml#_FT4nsDq0EemOl5OHBoqS_w"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_FUGqIjq0EemOl5OHBoqS_w" points="[760, 440, -643984, -643984]$[760, 420, -643984, -643984]$[840, 420, -643984, -643984]$[840, 381, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FUoOkDq0EemOl5OHBoqS_w" id="(0.5,0.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FUoOkTq0EemOl5OHBoqS_w" id="(0.49586776859504134,1.0)"/>
-    </edges>
     <edges xmi:type="notation:Connector" xmi:id="_hR8aMEaKEemmD4xckllxww" type="StereotypeCommentLink" source="_hRtwsEaKEemmD4xckllxww" target="_hR7zIEaKEemmD4xckllxww">
       <styles xmi:type="notation:FontStyle" xmi:id="_hR8aMUaKEemmD4xckllxww"/>
       <styles xmi:type="notation:EObjectValueStyle" xmi:id="_hR8aNUaKEemmD4xckllxww" name="BASE_ELEMENT">
@@ -5137,7 +5135,7 @@
       <element xmi:type="uml:Generalization" href="Common.uml#_JT-7QEdFEemetJs_SolH_g"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_JUqQskdFEemetJs_SolH_g" points="[320, 300, -643984, -643984]$[320, 240, -643984, -643984]$[600, 240, -643984, -643984]$[600, 201, -643984, -643984]"/>
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JVsLcEdFEemetJs_SolH_g" id="(0.5,0.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JVsLcUdFEemetJs_SolH_g" id="(0.4968944099378882,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JVsLcUdFEemetJs_SolH_g" id="(0.4975124378109453,1.0)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_LwNtIEdFEemetJs_SolH_g" type="Generalization_Edge" source="_4v1twDqyEemOl5OHBoqS_w" target="__F7L8BnKEemlxOdMFpUVvQ">
       <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_cQ-7gEdrEem0ZK7gRvZmUw" source="PapyrusCSSForceValue">
@@ -5151,7 +5149,7 @@
       <element xmi:type="uml:Generalization" href="Common.uml#_Lv3H0EdFEemetJs_SolH_g"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_LwNtIkdFEemetJs_SolH_g" points="[520, 300, -643984, -643984]$[520, 240, -643984, -643984]$[600, 240, -643984, -643984]$[600, 201, -643984, -643984]"/>
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LxEowEdFEemetJs_SolH_g" id="(0.49586776859504134,0.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LxEowUdFEemetJs_SolH_g" id="(0.4968944099378882,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LxEowUdFEemetJs_SolH_g" id="(0.4975124378109453,1.0)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_aFGIAEdFEemTDOF2GVSrTg" type="Generalization_Edge" source="_2HxfUDqyEemOl5OHBoqS_w" target="__F7L8BnKEemlxOdMFpUVvQ">
       <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ZlUmgEdrEem0ZK7gRvZmUw" source="PapyrusCSSForceValue">
@@ -5165,7 +5163,7 @@
       <element xmi:type="uml:Generalization" href="Common.uml#_aERBkEdFEemTDOF2GVSrTg"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_aFGIAkdFEemTDOF2GVSrTg" points="[680, 300, -643984, -643984]$[680, 240, -643984, -643984]$[600, 240, -643984, -643984]$[600, 201, -643984, -643984]"/>
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aGU3EEdFEemTDOF2GVSrTg" id="(0.49586776859504134,0.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aGU3EUdFEemTDOF2GVSrTg" id="(0.4968944099378882,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aGU3EUdFEemTDOF2GVSrTg" id="(0.4975124378109453,1.0)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_DuSo0EdrEemxfq65Xb2oRg" type="Generalization_Edge" source="_8fa94DqyEemOl5OHBoqS_w" target="__F7L8BnKEemlxOdMFpUVvQ">
       <children xmi:type="notation:DecorationNode" xmi:id="_DuXhUEdrEemxfq65Xb2oRg" type="Generalization_StereotypeLabel">
@@ -5176,7 +5174,18 @@
       <element xmi:type="uml:Generalization" href="Common.uml#_DtbGIEdrEemxfq65Xb2oRg"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_DuSo0kdrEemxfq65Xb2oRg" points="[840, 300, -643984, -643984]$[840, 240, -643984, -643984]$[600, 240, -643984, -643984]$[600, 201, -643984, -643984]"/>
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_DvcfYEdrEemxfq65Xb2oRg" id="(0.49586776859504134,0.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_DvcfYUdrEemxfq65Xb2oRg" id="(0.4968944099378882,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_DvcfYUdrEemxfq65Xb2oRg" id="(0.4975124378109453,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_7teVIEzdEem-udRHGETbbw" type="Generalization_Edge" source="_72oqIDqzEemOl5OHBoqS_w" target="_8fa94DqyEemOl5OHBoqS_w">
+      <children xmi:type="notation:DecorationNode" xmi:id="_7teVI0zdEem-udRHGETbbw" type="Generalization_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__swOIEzdEem-udRHGETbbw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_7teVJEzdEem-udRHGETbbw" y="39"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_7teVIUzdEem-udRHGETbbw"/>
+      <element xmi:type="uml:Generalization" href="Ves.uml#_LJyFkEqCEemOLdIUx_ad5Q"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_7teVIkzdEem-udRHGETbbw" points="[760, 440, -643984, -643984]$[760, 420, -643984, -643984]$[840, 420, -643984, -643984]$[840, 381, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="__siywEzdEem-udRHGETbbw" id="(0.5,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="__QGHUEzdEem-udRHGETbbw" id="(0.49586776859504134,1.0)"/>
     </edges>
   </notation:Diagram>
   <notation:Diagram xmi:id="_KDSzABp8EemOGejS9lsDjA" type="PapyrusUMLClassDiagram" name="Business Interaction" measurementUnit="Pixel">