Fix sub-models in Nf, Ns, Pnf

Issue-ID: MODELING-104

Change-Id: I5bea484c891970e34026a5ade279808dae688a72
Signed-off-by: jjewitt58 <jessie.jewitt@oamtechnologies.com>

1 files changed, 62 insertions, 62 deletions

diff --git a/papyrus/ONAP Information Model/Pnf.notation b/papyrus/ONAP Information Model/Pnf.notation
index 4d23459..060d0df 100644
--- a/papyrus/ONAP Information Model/Pnf.notation
+++ b/papyrus/ONAP Information Model/Pnf.notation
@@ -447,37 +447,6 @@
     <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PJMh5ew0EeiDiIttoROOIw"/>

     <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PJMh5uw0EeiDiIttoROOIw"/>

   </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_PJMh5-w0EeiDiIttoROOIw" type="Association_Edge" source="_PJLTcew0EeiDiIttoROOIw" target="_PJL7Kuw0EeiDiIttoROOIw" routing="Rectilinear">

-    <children xmi:type="notation:DecorationNode" xmi:id="_PJMh6Ow0EeiDiIttoROOIw" type="Association_StereotypeLabel">

-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_PJMh6ew0EeiDiIttoROOIw" name="IS_UPDATED_POSITION" booleanValue="true"/>

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_PJMh6uw0EeiDiIttoROOIw" y="-20"/>

-    </children>

-    <children xmi:type="notation:DecorationNode" xmi:id="_PJMh6-w0EeiDiIttoROOIw" type="Association_NameLabel">

-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_PJMh7Ow0EeiDiIttoROOIw" name="IS_UPDATED_POSITION" booleanValue="true"/>

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_PJMh7ew0EeiDiIttoROOIw" x="-14" y="-72"/>

-    </children>

-    <children xmi:type="notation:DecorationNode" xmi:id="_PJMh7uw0EeiDiIttoROOIw" visible="false" type="Association_TargetRoleLabel">

-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_PJMh7-w0EeiDiIttoROOIw" name="IS_UPDATED_POSITION" booleanValue="true"/>

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_PJMh8Ow0EeiDiIttoROOIw" x="19" y="-79"/>

-    </children>

-    <children xmi:type="notation:DecorationNode" xmi:id="_PJMh8ew0EeiDiIttoROOIw" visible="false" type="Association_SourceRoleLabel">

-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_PJMh8uw0EeiDiIttoROOIw" name="IS_UPDATED_POSITION" booleanValue="true"/>

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_PJMh8-w0EeiDiIttoROOIw" x="-78" y="20"/>

-    </children>

-    <children xmi:type="notation:DecorationNode" xmi:id="_PJMh9Ow0EeiDiIttoROOIw" type="Association_SourceMultiplicityLabel">

-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_PJMh9ew0EeiDiIttoROOIw" name="IS_UPDATED_POSITION" booleanValue="true"/>

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_PJMh9uw0EeiDiIttoROOIw" x="23" y="-33"/>

-    </children>

-    <children xmi:type="notation:DecorationNode" xmi:id="_PJMh9-w0EeiDiIttoROOIw" type="Association_TargetMultiplicityLabel">

-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_PJMh-Ow0EeiDiIttoROOIw" name="IS_UPDATED_POSITION" booleanValue="true"/>

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_PJMh-ew0EeiDiIttoROOIw" x="-33" y="-24"/>

-    </children>

-    <styles xmi:type="notation:FontStyle" xmi:id="_PJMh-uw0EeiDiIttoROOIw"/>

-    <element xmi:type="uml:Association" href="Resource.uml#_wc9LUD2rEeiu6I5JfRTxxQ"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_PJMh--w0EeiDiIttoROOIw" points="[680, 181, -643984, -643984]$[680, 340, -643984, -643984]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PJMh_Ow0EeiDiIttoROOIw" id="(0.42704626334519574,1.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PJMh_ew0EeiDiIttoROOIw" id="(0.31347962382445144,0.0)"/>

-  </edges>

   <edges xmi:type="notation:Connector" xmi:id="_5mcVUew0EeiDiIttoROOIw" type="StereotypeCommentLink" source="_5l-bQOw0EeiDiIttoROOIw" target="_5mbuQOw0EeiDiIttoROOIw">

     <styles xmi:type="notation:FontStyle" xmi:id="_5mcVUuw0EeiDiIttoROOIw"/>

     <styles xmi:type="notation:EObjectValueStyle" xmi:id="_5mc8Yew0EeiDiIttoROOIw" name="BASE_ELEMENT">

@@ -488,37 +457,6 @@
     <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_5mcVVOw0EeiDiIttoROOIw"/>

     <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_5mc8YOw0EeiDiIttoROOIw"/>

   </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_kix68P4fEeirJOiRiTRpBw" type="Association_Edge" source="_PJL7Kuw0EeiDiIttoROOIw" target="_5l-bQOw0EeiDiIttoROOIw" routing="Rectilinear">

-    <children xmi:type="notation:DecorationNode" xmi:id="_ki0XMP4fEeirJOiRiTRpBw" type="Association_StereotypeLabel">

-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_USuXYP4gEeirJOiRiTRpBw" name="IS_UPDATED_POSITION" booleanValue="true"/>

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_ki0XMf4fEeirJOiRiTRpBw" x="-1" y="-19"/>

-    </children>

-    <children xmi:type="notation:DecorationNode" xmi:id="_ki0-QP4fEeirJOiRiTRpBw" type="Association_NameLabel">

-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UTMRcP4gEeirJOiRiTRpBw" name="IS_UPDATED_POSITION" booleanValue="true"/>

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_ki0-Qf4fEeirJOiRiTRpBw" x="4" y="70"/>

-    </children>

-    <children xmi:type="notation:DecorationNode" xmi:id="_ki0-Qv4fEeirJOiRiTRpBw" visible="false" type="Association_TargetRoleLabel">

-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UTt14P4gEeirJOiRiTRpBw" name="IS_UPDATED_POSITION" booleanValue="true"/>

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_ki0-Q_4fEeirJOiRiTRpBw" x="15" y="-19"/>

-    </children>

-    <children xmi:type="notation:DecorationNode" xmi:id="_ki1lUP4fEeirJOiRiTRpBw" visible="false" type="Association_SourceRoleLabel">

-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UUZyYP4gEeirJOiRiTRpBw" name="IS_UPDATED_POSITION" booleanValue="true"/>

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_ki1lUf4fEeirJOiRiTRpBw" x="-15" y="18"/>

-    </children>

-    <children xmi:type="notation:DecorationNode" xmi:id="_ki2MYP4fEeirJOiRiTRpBw" type="Association_SourceMultiplicityLabel">

-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UVAPUP4gEeirJOiRiTRpBw" name="IS_UPDATED_POSITION" booleanValue="true"/>

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_ki2MYf4fEeirJOiRiTRpBw" x="16" y="16"/>

-    </children>

-    <children xmi:type="notation:DecorationNode" xmi:id="_ki2MYv4fEeirJOiRiTRpBw" type="Association_TargetMultiplicityLabel">

-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UVkQAP4gEeirJOiRiTRpBw" name="IS_UPDATED_POSITION" booleanValue="true"/>

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_ki2zcP4fEeirJOiRiTRpBw" x="-16" y="-17"/>

-    </children>

-    <styles xmi:type="notation:FontStyle" xmi:id="_kix68f4fEeirJOiRiTRpBw"/>

-    <element xmi:type="uml:Association" href="Resource.uml#_kf17sP4fEeirJOiRiTRpBw"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_kix68v4fEeirJOiRiTRpBw" points="[720, 565, -643984, -643984]$[720, 660, -643984, -643984]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_kmbE0P4fEeirJOiRiTRpBw" id="(0.438871473354232,1.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_kmbr4P4fEeirJOiRiTRpBw" id="(0.5111821086261981,0.0)"/>

-  </edges>

   <edges xmi:type="notation:Connector" xmi:id="_9qIccA-PEemEj74AZiZr9A" type="StereotypeCommentLink" source="_9oQ0MA-PEemEj74AZiZr9A" target="_9qGAMA-PEemEj74AZiZr9A">

     <styles xmi:type="notation:FontStyle" xmi:id="_9qIccQ-PEemEj74AZiZr9A"/>

     <styles xmi:type="notation:EObjectValueStyle" xmi:id="_9qKRoA-PEemEj74AZiZr9A" name="BASE_ELEMENT">

@@ -603,4 +541,66 @@
     <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HcMW8A-REemEj74AZiZr9A" id="(1.0,0.5096153846153846)"/>

     <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HcM-AA-REemEj74AZiZr9A" id="(0.0,0.5769230769230769)"/>

   </edges>

+  <edges xmi:type="notation:Connector" xmi:id="_fjuyoBqdEemgL8iMmM-qfg" type="Association_Edge" source="_PJL7Kuw0EeiDiIttoROOIw" target="_5l-bQOw0EeiDiIttoROOIw" routing="Rectilinear">

+    <children xmi:type="notation:DecorationNode" xmi:id="_fjx18BqdEemgL8iMmM-qfg" type="Association_StereotypeLabel">

+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_lgdPwBqdEemgL8iMmM-qfg" name="IS_UPDATED_POSITION" booleanValue="true"/>

+      <layoutConstraint xmi:type="notation:Location" xmi:id="_fjx18RqdEemgL8iMmM-qfg" y="-20"/>

+    </children>

+    <children xmi:type="notation:DecorationNode" xmi:id="_fjx18hqdEemgL8iMmM-qfg" type="Association_NameLabel">

+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_lhtM8BqdEemgL8iMmM-qfg" name="IS_UPDATED_POSITION" booleanValue="true"/>

+      <layoutConstraint xmi:type="notation:Location" xmi:id="_fjx18xqdEemgL8iMmM-qfg" x="-6" y="-70"/>

+    </children>

+    <children xmi:type="notation:DecorationNode" xmi:id="_fjydABqdEemgL8iMmM-qfg" visible="false" type="Association_TargetRoleLabel">

+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_liyLABqdEemgL8iMmM-qfg" name="IS_UPDATED_POSITION" booleanValue="true"/>

+      <layoutConstraint xmi:type="notation:Location" xmi:id="_fjydARqdEemgL8iMmM-qfg" x="19" y="-3"/>

+    </children>

+    <children xmi:type="notation:DecorationNode" xmi:id="_fjydAhqdEemgL8iMmM-qfg" visible="false" type="Association_SourceRoleLabel">

+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_lj2iABqdEemgL8iMmM-qfg" name="IS_UPDATED_POSITION" booleanValue="true"/>

+      <layoutConstraint xmi:type="notation:Location" xmi:id="_fjydAxqdEemgL8iMmM-qfg" x="-15" y="20"/>

+    </children>

+    <children xmi:type="notation:DecorationNode" xmi:id="_fjydBBqdEemgL8iMmM-qfg" type="Association_SourceMultiplicityLabel">

+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_llQQMBqdEemgL8iMmM-qfg" name="IS_UPDATED_POSITION" booleanValue="true"/>

+      <layoutConstraint xmi:type="notation:Location" xmi:id="_fjydBRqdEemgL8iMmM-qfg" x="15" y="20"/>

+    </children>

+    <children xmi:type="notation:DecorationNode" xmi:id="_fjydBhqdEemgL8iMmM-qfg" type="Association_TargetMultiplicityLabel">

+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_lm4n4BqdEemgL8iMmM-qfg" name="IS_UPDATED_POSITION" booleanValue="true"/>

+      <layoutConstraint xmi:type="notation:Location" xmi:id="_fjydBxqdEemgL8iMmM-qfg" x="-15" y="-20"/>

+    </children>

+    <styles xmi:type="notation:FontStyle" xmi:id="_fjuyoRqdEemgL8iMmM-qfg"/>

+    <element xmi:type="uml:Association" href="Pnf.uml#_kf17sP4fEeirJOiRiTRpBw"/>

+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_fjuyohqdEemgL8iMmM-qfg" points="[720, 565, -643984, -643984]$[720, 600, -643984, -643984]$[716, 600, -643984, -643984]$[716, 660, -643984, -643984]"/>

+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_le7lwBqdEemgL8iMmM-qfg" id="(0.438871473354232,1.0)"/>

+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_le8M0BqdEemgL8iMmM-qfg" id="(0.5111821086261981,0.0)"/>

+  </edges>

+  <edges xmi:type="notation:Connector" xmi:id="_0br48BqdEemgL8iMmM-qfg" type="Association_Edge" source="_PJLTcew0EeiDiIttoROOIw" target="_PJL7Kuw0EeiDiIttoROOIw" routing="Rectilinear">

+    <children xmi:type="notation:DecorationNode" xmi:id="_0bsgABqdEemgL8iMmM-qfg" type="Association_StereotypeLabel">

+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_4pOQYBqdEemgL8iMmM-qfg" name="IS_UPDATED_POSITION" booleanValue="true"/>

+      <layoutConstraint xmi:type="notation:Location" xmi:id="_0btHEBqdEemgL8iMmM-qfg" y="-20"/>

+    </children>

+    <children xmi:type="notation:DecorationNode" xmi:id="_0btHERqdEemgL8iMmM-qfg" type="Association_NameLabel">

+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_4qBhoBqdEemgL8iMmM-qfg" name="IS_UPDATED_POSITION" booleanValue="true"/>

+      <layoutConstraint xmi:type="notation:Location" xmi:id="_0btHEhqdEemgL8iMmM-qfg" x="-14" y="-72"/>

+    </children>

+    <children xmi:type="notation:DecorationNode" xmi:id="_0btHExqdEemgL8iMmM-qfg" visible="false" type="Association_TargetRoleLabel">

+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_4q6ScBqdEemgL8iMmM-qfg" name="IS_UPDATED_POSITION" booleanValue="true"/>

+      <layoutConstraint xmi:type="notation:Location" xmi:id="_0btHFBqdEemgL8iMmM-qfg" x="24" y="-20"/>

+    </children>

+    <children xmi:type="notation:DecorationNode" xmi:id="_0btHFRqdEemgL8iMmM-qfg" visible="false" type="Association_SourceRoleLabel">

+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_4sEwEBqdEemgL8iMmM-qfg" name="IS_UPDATED_POSITION" booleanValue="true"/>

+      <layoutConstraint xmi:type="notation:Location" xmi:id="_0btHFhqdEemgL8iMmM-qfg" x="-24" y="20"/>

+    </children>

+    <children xmi:type="notation:DecorationNode" xmi:id="_0btHFxqdEemgL8iMmM-qfg" type="Association_SourceMultiplicityLabel">

+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_4tH48BqdEemgL8iMmM-qfg" name="IS_UPDATED_POSITION" booleanValue="true"/>

+      <layoutConstraint xmi:type="notation:Location" xmi:id="_0btHGBqdEemgL8iMmM-qfg" x="24" y="20"/>

+    </children>

+    <children xmi:type="notation:DecorationNode" xmi:id="_0btHGRqdEemgL8iMmM-qfg" type="Association_TargetMultiplicityLabel">

+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_4uS9oBqdEemgL8iMmM-qfg" name="IS_UPDATED_POSITION" booleanValue="true"/>

+      <layoutConstraint xmi:type="notation:Location" xmi:id="_0btHGhqdEemgL8iMmM-qfg" x="-24" y="-20"/>

+    </children>

+    <styles xmi:type="notation:FontStyle" xmi:id="_0br48RqdEemgL8iMmM-qfg"/>

+    <element xmi:type="uml:Association" href="Ns.uml#_wc9LUD2rEeiu6I5JfRTxxQ"/>

+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0br48hqdEemgL8iMmM-qfg" points="[700, 181, -643984, -643984]$[700, 340, -643984, -643984]"/>

+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4obmMBqdEemgL8iMmM-qfg" id="(0.498220640569395,1.0)"/>

+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4obmMRqdEemgL8iMmM-qfg" id="(0.3761755485893417,0.0)"/>

+  </edges>

 </notation:Diagram>