VNF changes from the ETSI IFA011 4.2.1 relative to 4.1.1

	- several VipCP changes that are mirrors from 3.X
	- Addition of vnfdExtInvariantId to VNF
	- Addition of logicalNode, requestedAdditionalCapabilities and mcioConstraintsParams to VDU
Patch 2: Fixed the dos mode so that no insertion of \r.
Patch 4: Added new types to VNF types disgram

Issue-ID: ONAPMODEL-39
Signed-off-by: Fernando Oliveira <fernando.oliveira@verizon.com>
Change-Id: I6e67d72e3f18ac20aa978f7ba2b16f8d2c23f162

1 files changed, 127 insertions, 127 deletions

diff --git a/ONAP_Information_Model/Service.notation b/ONAP_Information_Model/Service.notation
index 215f3ee..b726969 100644
--- a/ONAP_Information_Model/Service.notation
+++ b/ONAP_Information_Model/Service.notation
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/gmfdiag/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.3/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/gmfdiag/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">
   <notation:Diagram xmi:id="_kngqQIn9EeiOe-BKGdv_Yg" type="PapyrusUMLClassDiagram" name="Service Order" measurementUnit="Pixel">
     <children xmi:type="notation:Shape" xmi:id="_mrNAUIn9EeiOe-BKGdv_Yg" type="Class_Shape">
       <children xmi:type="notation:DecorationNode" xmi:id="_mrNnYIn9EeiOe-BKGdv_Yg" type="Class_NameLabel"/>
@@ -5340,14 +5340,6 @@
       <element xmi:type="uml:Class" href="Service.uml#_Jvy-QD0MEeiWMf5FLWfdLA"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_N1jugdq9Eem0xcTSrumUPA" x="20" y="140" width="381"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_N6B-0Nq9Eem0xcTSrumUPA" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_N6Cl4Nq9Eem0xcTSrumUPA"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_N6Cl4tq9Eem0xcTSrumUPA" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="Service.uml#_Jvy-QD0MEeiWMf5FLWfdLA"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_N6Cl4dq9Eem0xcTSrumUPA" x="200"/>
-    </children>
     <children xmi:type="notation:Shape" xmi:id="_obo1QNq9Eem0xcTSrumUPA" type="Class_Shape">
       <children xmi:type="notation:DecorationNode" xmi:id="_obo1Qtq9Eem0xcTSrumUPA" type="Class_NameLabel"/>
       <children xmi:type="notation:DecorationNode" xmi:id="_obo1Q9q9Eem0xcTSrumUPA" type="Class_FloatingNameLabel">
@@ -5397,14 +5389,6 @@
       <element xmi:type="uml:Class" href="Service.uml#_obdPENq9Eem0xcTSrumUPA"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_obo1Qdq9Eem0xcTSrumUPA" x="460" y="20" height="85"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_ob2QoNq9Eem0xcTSrumUPA" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_ob2Qodq9Eem0xcTSrumUPA"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_ob2Qo9q9Eem0xcTSrumUPA" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="Service.uml#_obdPENq9Eem0xcTSrumUPA"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ob2Qotq9Eem0xcTSrumUPA" x="200"/>
-    </children>
     <children xmi:type="notation:Shape" xmi:id="_yVmf0NrEEem0xcTSrumUPA" type="DataType_Shape">
       <children xmi:type="notation:DecorationNode" xmi:id="_yVnG4NrEEem0xcTSrumUPA" type="DataType_NameLabel"/>
       <children xmi:type="notation:DecorationNode" xmi:id="_yVnG4drEEem0xcTSrumUPA" type="DataType_FloatingNameLabel">
@@ -5490,22 +5474,6 @@
       <element xmi:type="uml:DataType" href="Service.uml#_yzcSYNrEEem0xcTSrumUPA"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yzdggdrEEem0xcTSrumUPA" x="220" y="-500"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_VqYoYOAxEemahsJzCafKGQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_VqZPcOAxEemahsJzCafKGQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Vqdg4OAxEemahsJzCafKGQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:DataType" href="Service.uml#_yzcSYNrEEem0xcTSrumUPA"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VqZPceAxEemahsJzCafKGQ" x="420" y="300"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_WbCCMOAxEemahsJzCafKGQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_WbCCMeAxEemahsJzCafKGQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_WbCCM-AxEemahsJzCafKGQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:DataType" href="Service.uml#_yVlRsNrEEem0xcTSrumUPA"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WbCCMuAxEemahsJzCafKGQ" x="280" y="300"/>
-    </children>
     <children xmi:type="notation:Shape" xmi:id="_iregIOAxEemahsJzCafKGQ" type="Class_Shape">
       <children xmi:type="notation:DecorationNode" xmi:id="_irj_sOAxEemahsJzCafKGQ" type="Class_NameLabel"/>
       <children xmi:type="notation:DecorationNode" xmi:id="_irj_seAxEemahsJzCafKGQ" type="Class_FloatingNameLabel">
@@ -5568,14 +5536,6 @@
       <element xmi:type="uml:Class" href="Service.uml#_irOBcOAxEemahsJzCafKGQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iregIeAxEemahsJzCafKGQ" x="680" y="-220"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_ir5W4OAxEemahsJzCafKGQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_ir5W4eAxEemahsJzCafKGQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_ir5W4-AxEemahsJzCafKGQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="Service.uml#_irOBcOAxEemahsJzCafKGQ"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ir5W4uAxEemahsJzCafKGQ" x="200"/>
-    </children>
     <children xmi:type="notation:Shape" xmi:id="_jC9zEOAxEemahsJzCafKGQ" type="Class_Shape">
       <children xmi:type="notation:DecorationNode" xmi:id="_jC-aIOAxEemahsJzCafKGQ" type="Class_NameLabel"/>
       <children xmi:type="notation:DecorationNode" xmi:id="_jC-aIeAxEemahsJzCafKGQ" type="Class_FloatingNameLabel">
@@ -5638,14 +5598,6 @@
       <element xmi:type="uml:Class" href="Service.uml#_jC46kOAxEemahsJzCafKGQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jC9zEeAxEemahsJzCafKGQ" x="460" y="-220"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_jDSjM-AxEemahsJzCafKGQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_jDSjNOAxEemahsJzCafKGQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jDTKQOAxEemahsJzCafKGQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="Service.uml#_jC46kOAxEemahsJzCafKGQ"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jDSjNeAxEemahsJzCafKGQ" x="200"/>
-    </children>
     <children xmi:type="notation:Shape" xmi:id="_jZ4eQOAxEemahsJzCafKGQ" type="Class_Shape">
       <children xmi:type="notation:DecorationNode" xmi:id="_jZ5FUOAxEemahsJzCafKGQ" type="Class_NameLabel"/>
       <children xmi:type="notation:DecorationNode" xmi:id="_jZ5FUeAxEemahsJzCafKGQ" type="Class_FloatingNameLabel">
@@ -5708,14 +5660,6 @@
       <element xmi:type="uml:Class" href="Service.uml#_jZ0M0OAxEemahsJzCafKGQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jZ4eQeAxEemahsJzCafKGQ" x="220" y="-220"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_jaEEcOAxEemahsJzCafKGQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_jaEEceAxEemahsJzCafKGQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jaEEc-AxEemahsJzCafKGQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="Service.uml#_jZ0M0OAxEemahsJzCafKGQ"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jaEEcuAxEemahsJzCafKGQ" x="200"/>
-    </children>
     <children xmi:type="notation:Shape" xmi:id="_UEK-4OA5EemahsJzCafKGQ" type="Enumeration_Shape">
       <children xmi:type="notation:DecorationNode" xmi:id="_UELl8OA5EemahsJzCafKGQ" type="Enumeration_NameLabel"/>
       <children xmi:type="notation:DecorationNode" xmi:id="_UELl8eA5EemahsJzCafKGQ" type="Enumeration_FloatingNameLabel">
@@ -5898,32 +5842,68 @@
       <element xmi:type="uml:DataType" href="Service.uml#_w6aiQOp9EemgRvD45n6cUQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w6cXcOp9EemgRvD45n6cUQ" x="680" y="-500"/>
     </children>
-    <styles xmi:type="notation:StringValueStyle" xmi:id="__eQ40dq8Eem0xcTSrumUPA" name="diagram_compatibility_version" stringValue="1.4.0"/>
-    <styles xmi:type="notation:DiagramStyle" xmi:id="__eQ40tq8Eem0xcTSrumUPA"/>
-    <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="__eQ409q8Eem0xcTSrumUPA" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
-      <owner xmi:type="uml:Package" href="Service.uml#_fXNM8DOHEei5Af8DcjrhIQ"/>
-    </styles>
-    <element xmi:type="uml:Package" href="Service.uml#_Z4LYcDOHEei5Af8DcjrhIQ"/>
-    <edges xmi:type="notation:Connector" xmi:id="_N6DM8Nq9Eem0xcTSrumUPA" type="StereotypeCommentLink" source="_N1jugNq9Eem0xcTSrumUPA" target="_N6B-0Nq9Eem0xcTSrumUPA">
-      <styles xmi:type="notation:FontStyle" xmi:id="_N6DM8dq9Eem0xcTSrumUPA"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_N6D0Adq9Eem0xcTSrumUPA" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_yGYCcLMxEeuESI9ALoMYpQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_yGYCcbMxEeuESI9ALoMYpQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_yGYCc7MxEeuESI9ALoMYpQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="Service.uml#_Jvy-QD0MEeiWMf5FLWfdLA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_N6DM8tq9Eem0xcTSrumUPA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_N6DM89q9Eem0xcTSrumUPA"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_N6D0ANq9Eem0xcTSrumUPA"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_ob2QpNq9Eem0xcTSrumUPA" type="StereotypeCommentLink" source="_obo1QNq9Eem0xcTSrumUPA" target="_ob2QoNq9Eem0xcTSrumUPA">
-      <styles xmi:type="notation:FontStyle" xmi:id="_ob2Qpdq9Eem0xcTSrumUPA"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_ob23sdq9Eem0xcTSrumUPA" name="BASE_ELEMENT">
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yGYCcrMxEeuESI9ALoMYpQ" x="220" y="140"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_yG1VcLMxEeuESI9ALoMYpQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_yG1VcbMxEeuESI9ALoMYpQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_yG1Vc7MxEeuESI9ALoMYpQ" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="Service.uml#_obdPENq9Eem0xcTSrumUPA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ob2Qptq9Eem0xcTSrumUPA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ob2Qp9q9Eem0xcTSrumUPA"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ob23sNq9Eem0xcTSrumUPA"/>
-    </edges>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yG1VcrMxEeuESI9ALoMYpQ" x="660" y="20"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_yHFNE7MxEeuESI9ALoMYpQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_yHFNFLMxEeuESI9ALoMYpQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_yHFNFrMxEeuESI9ALoMYpQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:DataType" href="Service.uml#_yVlRsNrEEem0xcTSrumUPA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yHFNFbMxEeuESI9ALoMYpQ" x="260" y="-500"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_yHMh07MxEeuESI9ALoMYpQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_yHMh1LMxEeuESI9ALoMYpQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_yHNI4LMxEeuESI9ALoMYpQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:DataType" href="Service.uml#_yzcSYNrEEem0xcTSrumUPA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yHMh1bMxEeuESI9ALoMYpQ" x="420" y="-500"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_yHVrwLMxEeuESI9ALoMYpQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_yHVrwbMxEeuESI9ALoMYpQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_yHVrw7MxEeuESI9ALoMYpQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="Service.uml#_irOBcOAxEemahsJzCafKGQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yHVrwrMxEeuESI9ALoMYpQ" x="880" y="-220"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_yHhR8LMxEeuESI9ALoMYpQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_yHhR8bMxEeuESI9ALoMYpQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_yHhR87MxEeuESI9ALoMYpQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="Service.uml#_jC46kOAxEemahsJzCafKGQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yHhR8rMxEeuESI9ALoMYpQ" x="660" y="-220"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_yHzl07MxEeuESI9ALoMYpQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_yHzl1LMxEeuESI9ALoMYpQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_yHzl1rMxEeuESI9ALoMYpQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="Service.uml#_jZ0M0OAxEemahsJzCafKGQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yHzl1bMxEeuESI9ALoMYpQ" x="420" y="-220"/>
+    </children>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="__eQ40dq8Eem0xcTSrumUPA" name="diagram_compatibility_version" stringValue="1.4.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="__eQ40tq8Eem0xcTSrumUPA"/>
+    <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="__eQ409q8Eem0xcTSrumUPA" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
+      <owner xmi:type="uml:Package" href="Service.uml#_fXNM8DOHEei5Af8DcjrhIQ"/>
+    </styles>
+    <element xmi:type="uml:Package" href="Service.uml#_Z4LYcDOHEei5Af8DcjrhIQ"/>
     <edges xmi:type="notation:Connector" xmi:id="_pnEGkNq9Eem0xcTSrumUPA" type="Association_Edge" source="_N1jugNq9Eem0xcTSrumUPA" target="_obo1QNq9Eem0xcTSrumUPA">
       <children xmi:type="notation:DecorationNode" xmi:id="_pnEtoNq9Eem0xcTSrumUPA" type="Association_StereotypeLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_B2NLINq-Eem0xcTSrumUPA" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -5986,56 +5966,6 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="__TQ30Nq-Eem0xcTSrumUPA" id="(0.5128205128205128,0.0)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="__TQ30dq-Eem0xcTSrumUPA" id="(0.5,1.0)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_VqeH8OAxEemahsJzCafKGQ" type="StereotypeCommentLink" source="_yzdggNrEEem0xcTSrumUPA" target="_VqYoYOAxEemahsJzCafKGQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_VqeH8eAxEemahsJzCafKGQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_VqevAuAxEemahsJzCafKGQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:DataType" href="Service.uml#_yzcSYNrEEem0xcTSrumUPA"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_VqeH8uAxEemahsJzCafKGQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_VqevAOAxEemahsJzCafKGQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_VqevAeAxEemahsJzCafKGQ"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_WbCpQOAxEemahsJzCafKGQ" type="StereotypeCommentLink" source="_yVmf0NrEEem0xcTSrumUPA" target="_WbCCMOAxEemahsJzCafKGQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_WbCpQeAxEemahsJzCafKGQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_WbCpReAxEemahsJzCafKGQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:DataType" href="Service.uml#_yVlRsNrEEem0xcTSrumUPA"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_WbCpQuAxEemahsJzCafKGQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_WbCpQ-AxEemahsJzCafKGQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_WbCpROAxEemahsJzCafKGQ"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_ir5W5OAxEemahsJzCafKGQ" type="StereotypeCommentLink" source="_iregIOAxEemahsJzCafKGQ" target="_ir5W4OAxEemahsJzCafKGQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_ir5W5eAxEemahsJzCafKGQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_ir598uAxEemahsJzCafKGQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="Service.uml#_irOBcOAxEemahsJzCafKGQ"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ir5W5uAxEemahsJzCafKGQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ir598OAxEemahsJzCafKGQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ir598eAxEemahsJzCafKGQ"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_jDTKQeAxEemahsJzCafKGQ" type="StereotypeCommentLink" source="_jC9zEOAxEemahsJzCafKGQ" target="_jDSjM-AxEemahsJzCafKGQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_jDTKQuAxEemahsJzCafKGQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jDTKRuAxEemahsJzCafKGQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="Service.uml#_jC46kOAxEemahsJzCafKGQ"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jDTKQ-AxEemahsJzCafKGQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jDTKROAxEemahsJzCafKGQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jDTKReAxEemahsJzCafKGQ"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_jaEEdOAxEemahsJzCafKGQ" type="StereotypeCommentLink" source="_jZ4eQOAxEemahsJzCafKGQ" target="_jaEEcOAxEemahsJzCafKGQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_jaEEdeAxEemahsJzCafKGQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jaEEeeAxEemahsJzCafKGQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="Service.uml#_jZ0M0OAxEemahsJzCafKGQ"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jaEEduAxEemahsJzCafKGQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jaEEd-AxEemahsJzCafKGQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jaEEeOAxEemahsJzCafKGQ"/>
-    </edges>
     <edges xmi:type="notation:Connector" xmi:id="_osYjkOA6EemahsJzCafKGQ" type="Association_Edge" source="_obo1QNq9Eem0xcTSrumUPA" target="_jC9zEOAxEemahsJzCafKGQ">
       <children xmi:type="notation:DecorationNode" xmi:id="_osYjk-A6EemahsJzCafKGQ" type="Association_StereotypeLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_s6TVgOA6EemahsJzCafKGQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -6098,5 +6028,75 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zWbrcOA6EemahsJzCafKGQ" id="(0.5128205128205128,0.0)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zWbrceA6EemahsJzCafKGQ" id="(0.425531914893617,1.0)"/>
     </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_yGYCdLMxEeuESI9ALoMYpQ" type="StereotypeCommentLink" source="_N1jugNq9Eem0xcTSrumUPA" target="_yGYCcLMxEeuESI9ALoMYpQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_yGYCdbMxEeuESI9ALoMYpQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_yGYpgLMxEeuESI9ALoMYpQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="Service.uml#_Jvy-QD0MEeiWMf5FLWfdLA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_yGYCdrMxEeuESI9ALoMYpQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_yGYCd7MxEeuESI9ALoMYpQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_yGYCeLMxEeuESI9ALoMYpQ"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_yG1VdLMxEeuESI9ALoMYpQ" type="StereotypeCommentLink" source="_obo1QNq9Eem0xcTSrumUPA" target="_yG1VcLMxEeuESI9ALoMYpQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_yG1VdbMxEeuESI9ALoMYpQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_yG1VebMxEeuESI9ALoMYpQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="Service.uml#_obdPENq9Eem0xcTSrumUPA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_yG1VdrMxEeuESI9ALoMYpQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_yG1Vd7MxEeuESI9ALoMYpQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_yG1VeLMxEeuESI9ALoMYpQ"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_yHF0ILMxEeuESI9ALoMYpQ" type="StereotypeCommentLink" source="_yVmf0NrEEem0xcTSrumUPA" target="_yHFNE7MxEeuESI9ALoMYpQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_yHF0IbMxEeuESI9ALoMYpQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_yHF0JbMxEeuESI9ALoMYpQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:DataType" href="Service.uml#_yVlRsNrEEem0xcTSrumUPA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_yHF0IrMxEeuESI9ALoMYpQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_yHF0I7MxEeuESI9ALoMYpQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_yHF0JLMxEeuESI9ALoMYpQ"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_yHNI4bMxEeuESI9ALoMYpQ" type="StereotypeCommentLink" source="_yzdggNrEEem0xcTSrumUPA" target="_yHMh07MxEeuESI9ALoMYpQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_yHNI4rMxEeuESI9ALoMYpQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_yHNI5rMxEeuESI9ALoMYpQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:DataType" href="Service.uml#_yzcSYNrEEem0xcTSrumUPA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_yHNI47MxEeuESI9ALoMYpQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_yHNI5LMxEeuESI9ALoMYpQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_yHNI5bMxEeuESI9ALoMYpQ"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_yHVrxLMxEeuESI9ALoMYpQ" type="StereotypeCommentLink" source="_iregIOAxEemahsJzCafKGQ" target="_yHVrwLMxEeuESI9ALoMYpQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_yHVrxbMxEeuESI9ALoMYpQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_yHVrybMxEeuESI9ALoMYpQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="Service.uml#_irOBcOAxEemahsJzCafKGQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_yHVrxrMxEeuESI9ALoMYpQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_yHVrx7MxEeuESI9ALoMYpQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_yHVryLMxEeuESI9ALoMYpQ"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_yHhR9LMxEeuESI9ALoMYpQ" type="StereotypeCommentLink" source="_jC9zEOAxEemahsJzCafKGQ" target="_yHhR8LMxEeuESI9ALoMYpQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_yHhR9bMxEeuESI9ALoMYpQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_yHhR-bMxEeuESI9ALoMYpQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="Service.uml#_jC46kOAxEemahsJzCafKGQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_yHhR9rMxEeuESI9ALoMYpQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_yHhR97MxEeuESI9ALoMYpQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_yHhR-LMxEeuESI9ALoMYpQ"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_yHzl17MxEeuESI9ALoMYpQ" type="StereotypeCommentLink" source="_jZ4eQOAxEemahsJzCafKGQ" target="_yHzl07MxEeuESI9ALoMYpQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_yHzl2LMxEeuESI9ALoMYpQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_yHzl3LMxEeuESI9ALoMYpQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="Service.uml#_jZ0M0OAxEemahsJzCafKGQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_yHzl2bMxEeuESI9ALoMYpQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_yHzl2rMxEeuESI9ALoMYpQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_yHzl27MxEeuESI9ALoMYpQ"/>
+    </edges>
   </notation:Diagram>
 </xmi:XMI>