1 files changed, 62 insertions, 80 deletions
diff --git a/papyrus/ONAP Information Model/Resource.notation b/papyrus/ONAP Information Model/Resource.notation
index 2260f44..f62ca7b 100644
--- a/papyrus/ONAP Information Model/Resource.notation
+++ b/papyrus/ONAP Information Model/Resource.notation
@@ -255,45 +255,6 @@
     <element xsi:nil="true"/>
     <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pRUrFT2rEeiu6I5JfRTxxQ" x="200"/>
   </children>
-  <children xmi:type="notation:Shape" xmi:id="_6JwEUKb0Eeixw5Ke5QD1pQ" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_6J84oKb0Eeixw5Ke5QD1pQ" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_6J9fsKb0Eeixw5Ke5QD1pQ" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_6J9fsab0Eeixw5Ke5QD1pQ" y="15"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_6J9fsqb0Eeixw5Ke5QD1pQ" type="Class_AttributeCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_6J9fs6b0Eeixw5Ke5QD1pQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_6J9ftKb0Eeixw5Ke5QD1pQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_6J9ftab0Eeixw5Ke5QD1pQ"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6J9ftqb0Eeixw5Ke5QD1pQ"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_6J9ft6b0Eeixw5Ke5QD1pQ" visible="false" type="Class_OperationCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_6J9fuKb0Eeixw5Ke5QD1pQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_6J9fuab0Eeixw5Ke5QD1pQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_6J9fuqb0Eeixw5Ke5QD1pQ"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6J9fu6b0Eeixw5Ke5QD1pQ"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_6J9fvKb0Eeixw5Ke5QD1pQ" visible="false" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_6J9fvab0Eeixw5Ke5QD1pQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_6J9fvqb0Eeixw5Ke5QD1pQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_6J9fv6b0Eeixw5Ke5QD1pQ"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6J9fwKb0Eeixw5Ke5QD1pQ"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_6KUsEKb0Eeixw5Ke5QD1pQ" visible="false" type="StereotypeLabel">
-      <styles xmi:type="notation:StringValueStyle" xmi:id="_6KUsEab0Eeixw5Ke5QD1pQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelClass"/>
-      <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6KUsEqb0Eeixw5Ke5QD1pQ"/>
-    </children>
-    <element xmi:type="uml:Class" href="Vnf.uml#_AmzWYDQtEeixv_sLOod4lQ"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6JwEUab0Eeixw5Ke5QD1pQ" x="180" y="640"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_6KdO8Kb0Eeixw5Ke5QD1pQ" type="StereotypeComment">
-    <styles xmi:type="notation:TitleStyle" xmi:id="_6KdO8ab0Eeixw5Ke5QD1pQ"/>
-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_6KdO86b0Eeixw5Ke5QD1pQ" name="BASE_ELEMENT">
-      <eObjectValue xmi:type="uml:Class" href="Vnf.uml#_AmzWYDQtEeixv_sLOod4lQ"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6KdO8qb0Eeixw5Ke5QD1pQ" x="200"/>
-  </children>
   <children xmi:type="notation:Shape" xmi:id="_8LGBwK0aEeirrO9guYUuGw" type="Class_Shape">
     <children xmi:type="notation:DecorationNode" xmi:id="_8LcAAK0aEeirrO9guYUuGw" type="Class_NameLabel"/>
     <children xmi:type="notation:DecorationNode" xmi:id="_8LcnEK0aEeirrO9guYUuGw" type="Class_FloatingNameLabel">
@@ -499,47 +460,6 @@
     <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wg86gD2rEeiu6I5JfRTxxQ" id="(1.0,0.5970149253731343)"/>
     <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wg86gT2rEeiu6I5JfRTxxQ" id="(1.0,0.4)"/>
   </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_6KdO9Kb0Eeixw5Ke5QD1pQ" type="StereotypeCommentLink" source="_6JwEUKb0Eeixw5Ke5QD1pQ" target="_6KdO8Kb0Eeixw5Ke5QD1pQ">
-    <styles xmi:type="notation:FontStyle" xmi:id="_6KdO9ab0Eeixw5Ke5QD1pQ"/>
-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_6KqDQqb0Eeixw5Ke5QD1pQ" name="BASE_ELEMENT">
-      <eObjectValue xmi:type="uml:Class" href="Vnf.uml#_AmzWYDQtEeixv_sLOod4lQ"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_6KdO9qb0Eeixw5Ke5QD1pQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6KqDQKb0Eeixw5Ke5QD1pQ"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6KqDQab0Eeixw5Ke5QD1pQ"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_G3dtEKb1Eeixw5Ke5QD1pQ" type="Association_Edge" source="_6JwEUKb0Eeixw5Ke5QD1pQ" target="_Bcnm4D2rEeiu6I5JfRTxxQ" routing="Rectilinear">
-    <children xmi:type="notation:DecorationNode" xmi:id="_G3eUIKb1Eeixw5Ke5QD1pQ" type="Association_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Cqo04K0XEeirrO9guYUuGw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_G3eUIab1Eeixw5Ke5QD1pQ" y="-20"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_G3eUIqb1Eeixw5Ke5QD1pQ" type="Association_NameLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_CsIpsK0XEeirrO9guYUuGw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_G3eUI6b1Eeixw5Ke5QD1pQ" x="3" y="68"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_G3eUJKb1Eeixw5Ke5QD1pQ" visible="false" type="Association_TargetRoleLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Ct3vEK0XEeirrO9guYUuGw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_G3eUJab1Eeixw5Ke5QD1pQ" x="9" y="-20"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_G3e7MKb1Eeixw5Ke5QD1pQ" visible="false" type="Association_SourceRoleLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_CvXj4K0XEeirrO9guYUuGw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_G3e7Mab1Eeixw5Ke5QD1pQ" x="-9" y="20"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_G3e7Mqb1Eeixw5Ke5QD1pQ" type="Association_SourceMultiplicityLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Cw2KkK0XEeirrO9guYUuGw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_G3e7M6b1Eeixw5Ke5QD1pQ" x="9" y="20"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_G3e7NKb1Eeixw5Ke5QD1pQ" type="Association_TargetMultiplicityLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_CylP8K0XEeirrO9guYUuGw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_G3e7Nab1Eeixw5Ke5QD1pQ" x="-9" y="-20"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_G3dtEab1Eeixw5Ke5QD1pQ"/>
-    <element xmi:type="uml:Association" href="Vnf.uml#_LOOBADQtEeixv_sLOod4lQ"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_G3dtEqb1Eeixw5Ke5QD1pQ" points="[260, 640, -643984, -643984]$[260, 580, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_C03u8K0XEeirrO9guYUuGw" id="(0.8,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_C049EK0XEeirrO9guYUuGw" id="(0.5809128630705395,1.0)"/>
-  </edges>
   <edges xmi:type="notation:Connector" xmi:id="_8P2l8K0aEeirrO9guYUuGw" type="StereotypeCommentLink" source="_8LGBwK0aEeirrO9guYUuGw" target="_8PmHQK0aEeirrO9guYUuGw">
     <styles xmi:type="notation:FontStyle" xmi:id="_8P2l8a0aEeirrO9guYUuGw"/>
     <styles xmi:type="notation:EObjectValueStyle" xmi:id="_8QEoYa0aEeirrO9guYUuGw" name="BASE_ELEMENT">
@@ -561,4 +481,66 @@
     <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JH52cK0bEeirrO9guYUuGw" id="(1.0,0.5445544554455446)"/>
     <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JH6dgK0bEeirrO9guYUuGw" id="(0.0,0.594059405940594)"/>
   </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_iQ_cgLAVEei3l9EE3oQfMw" type="Association_Edge" source="_Bcnm4D2rEeiu6I5JfRTxxQ" target="_3XpM4D2oEeiu6I5JfRTxxQ">
+    <children xmi:type="notation:DecorationNode" xmi:id="_iRB4wLAVEei3l9EE3oQfMw" type="Association_StereotypeLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_jaD9YLAVEei3l9EE3oQfMw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_iRB4wbAVEei3l9EE3oQfMw" y="-20"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_iRCf0LAVEei3l9EE3oQfMw" type="Association_NameLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_jayWILAVEei3l9EE3oQfMw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_iRCf0bAVEei3l9EE3oQfMw" y="20"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_iRCf0rAVEei3l9EE3oQfMw" visible="false" type="Association_TargetRoleLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_jbeSoLAVEei3l9EE3oQfMw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_iRCf07AVEei3l9EE3oQfMw" x="45" y="-20"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_iRCf1LAVEei3l9EE3oQfMw" visible="false" type="Association_SourceRoleLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_jcBsQLAVEei3l9EE3oQfMw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_iRCf1bAVEei3l9EE3oQfMw" x="-45" y="20"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_iRCf1rAVEei3l9EE3oQfMw" type="Association_SourceMultiplicityLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_jcu24LAVEei3l9EE3oQfMw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_iRCf17AVEei3l9EE3oQfMw" x="45" y="20"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_iRCf2LAVEei3l9EE3oQfMw" type="Association_TargetMultiplicityLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_jdTeoLAVEei3l9EE3oQfMw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_iRCf2bAVEei3l9EE3oQfMw" x="-45" y="-20"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_iQ_cgbAVEei3l9EE3oQfMw"/>
+    <element xmi:type="uml:Association" href="Service.uml#_iP0-4LAVEei3l9EE3oQfMw"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_iQ_cgrAVEei3l9EE3oQfMw" points="[361, 540, -643984, -643984]$[540, 540, -643984, -643984]$[540, 421, -643984, -643984]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_iSuh4LAVEei3l9EE3oQfMw" id="(1.0,0.6)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_iSuh4bAVEei3l9EE3oQfMw" id="(0.2631578947368421,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_i0X2YLAVEei3l9EE3oQfMw" type="Association_Edge" source="_3XpM4D2oEeiu6I5JfRTxxQ" target="_pPk-oD2rEeiu6I5JfRTxxQ">
+    <children xmi:type="notation:DecorationNode" xmi:id="_i0YdcLAVEei3l9EE3oQfMw" type="Association_StereotypeLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_8MacsLAVEei3l9EE3oQfMw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_i0YdcbAVEei3l9EE3oQfMw" x="-1" y="-18"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_i0YdcrAVEei3l9EE3oQfMw" type="Association_NameLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_8M7aELAVEei3l9EE3oQfMw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_i0Ydc7AVEei3l9EE3oQfMw" x="47" y="27"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_i0YddLAVEei3l9EE3oQfMw" visible="false" type="Association_TargetRoleLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_8NbJULAVEei3l9EE3oQfMw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_i0ZEgLAVEei3l9EE3oQfMw" x="48" y="-20"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_i0ZEgbAVEei3l9EE3oQfMw" visible="false" type="Association_SourceRoleLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_8OA_MLAVEei3l9EE3oQfMw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_i0ZEgrAVEei3l9EE3oQfMw" x="-47" y="20"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_i0ZEg7AVEei3l9EE3oQfMw" type="Association_SourceMultiplicityLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_8Olm8LAVEei3l9EE3oQfMw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_i0ZEhLAVEei3l9EE3oQfMw" x="48" y="20"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_i0ZEhbAVEei3l9EE3oQfMw" type="Association_TargetMultiplicityLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_8PLc0LAVEei3l9EE3oQfMw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_i0ZEhrAVEei3l9EE3oQfMw" x="-48" y="-17"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_i0X2YbAVEei3l9EE3oQfMw"/>
+    <element xmi:type="uml:Association" href="Service.uml#_iznocLAVEei3l9EE3oQfMw"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_i0X2YrAVEei3l9EE3oQfMw" points="[660, 421, -643984, -643984]$[660, 520, -643984, -643984]$[660, 540, -643984, -643984]$[760, 540, -643984, -643984]$[820, 540, -643984, -643984]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_i19KwLAVEei3l9EE3oQfMw" id="(0.6578947368421053,1.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_i19x0LAVEei3l9EE3oQfMw" id="(0.0,0.6)"/>
+  </edges>
 </notation:Diagram>