1 files changed, 102 insertions, 81 deletions
diff --git a/papyrus/ONAP Information Model/Vnf.notation b/papyrus/ONAP Information Model/Vnf.notation
index eb5603e..c1815ad 100644
--- a/papyrus/ONAP Information Model/Vnf.notation
+++ b/papyrus/ONAP Information Model/Vnf.notation
@@ -9760,7 +9760,10 @@
       <element xsi:nil="true"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-uGUhZpXEeidy9iGT_F5-w" x="200"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_mkZUIJpYEeidy9iGT_F5-w" type="Class_Shape" fillColor="8047085">
+    <children xmi:type="notation:Shape" xmi:id="_mkZUIJpYEeidy9iGT_F5-w" type="Class_Shape" fillColor="13420443">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_U4qJIKLSEeiz_K9hWIugxQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_U4qJIaLSEeiz_K9hWIugxQ" key="fillColor" value="true"/>
+      </eAnnotations>
       <children xmi:type="notation:DecorationNode" xmi:id="_mkZ7MJpYEeidy9iGT_F5-w" type="Class_NameLabel"/>
       <children xmi:type="notation:DecorationNode" xmi:id="_mkZ7MZpYEeidy9iGT_F5-w" type="Class_FloatingNameLabel">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_mkZ7MppYEeidy9iGT_F5-w" y="15"/>
@@ -9793,18 +9796,21 @@
         <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mkh3BJpYEeidy9iGT_F5-w"/>
       </children>
-      <element xmi:type="uml:Class" href="Vnf.uml#_iQkugJpYEeidy9iGT_F5-w"/>
+      <element xmi:type="uml:Class" href="Service.uml#_iQkugJpYEeidy9iGT_F5-w"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mkZUIZpYEeidy9iGT_F5-w" x="440" y="220" width="162" height="80"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_mkkTQ5pYEeidy9iGT_F5-w" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_mkkTRJpYEeidy9iGT_F5-w"/>
       <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mkkTRppYEeidy9iGT_F5-w" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="Vnf.uml#_iQkugJpYEeidy9iGT_F5-w"/>
+        <eObjectValue xmi:type="uml:Class" href="Service.uml#_iQkugJpYEeidy9iGT_F5-w"/>
       </styles>
       <element xsi:nil="true"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mkkTRZpYEeidy9iGT_F5-w" x="200"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_EMFKsJpZEeidy9iGT_F5-w" type="Class_Shape" fillColor="8047085">
+    <children xmi:type="notation:Shape" xmi:id="_EMFKsJpZEeidy9iGT_F5-w" type="Class_Shape" fillColor="13420443">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YH3QEKLSEeiz_K9hWIugxQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YH3QEaLSEeiz_K9hWIugxQ" key="fillColor" value="true"/>
+      </eAnnotations>
       <children xmi:type="notation:DecorationNode" xmi:id="_EMFxwJpZEeidy9iGT_F5-w" type="Class_NameLabel"/>
       <children xmi:type="notation:DecorationNode" xmi:id="_EMFxwZpZEeidy9iGT_F5-w" type="Class_FloatingNameLabel">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_EMFxwppZEeidy9iGT_F5-w" y="15"/>
@@ -9837,22 +9843,17 @@
         <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EMO7tppZEeidy9iGT_F5-w"/>
       </children>
-      <element xmi:type="uml:Class" href="Vnf.uml#_BQaDwJpZEeidy9iGT_F5-w"/>
+      <element xmi:type="uml:Class" href="Service.uml#_BQaDwJpZEeidy9iGT_F5-w"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EMFKsZpZEeidy9iGT_F5-w" x="720" y="220" width="161" height="81"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_EMRX85pZEeidy9iGT_F5-w" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_EMRX9JpZEeidy9iGT_F5-w"/>
       <styles xmi:type="notation:EObjectValueStyle" xmi:id="_EMR_AJpZEeidy9iGT_F5-w" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="Vnf.uml#_BQaDwJpZEeidy9iGT_F5-w"/>
+        <eObjectValue xmi:type="uml:Class" href="Service.uml#_BQaDwJpZEeidy9iGT_F5-w"/>
       </styles>
       <element xsi:nil="true"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EMRX9ZpZEeidy9iGT_F5-w" x="200"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_Hwl90JpaEeidy9iGT_F5-w" type="Comment_Shape">
-      <children xmi:type="notation:DecorationNode" xmi:id="_Hwmk4JpaEeidy9iGT_F5-w" type="Comment_BodyLabel"/>
-      <element xmi:type="uml:Comment" href="Vnf.uml#_HwkIoJpaEeidy9iGT_F5-w"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Hwl90ZpaEeidy9iGT_F5-w" x="260" y="60" width="141"/>
-    </children>
     <children xmi:type="notation:Shape" xmi:id="_O4DnUJssEeiPBvbfaqSLYg" type="Class_Shape">
       <children xmi:type="notation:DecorationNode" xmi:id="_O4DnUpssEeiPBvbfaqSLYg" type="Class_NameLabel"/>
       <children xmi:type="notation:DecorationNode" xmi:id="_O4EOYJssEeiPBvbfaqSLYg" type="Class_FloatingNameLabel">
@@ -10024,49 +10025,49 @@
       <element xmi:type="uml:Comment" href="Vnf.uml#_V35l8Js6EeiPBvbfaqSLYg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_V37bIZs6EeiPBvbfaqSLYg" x="980" y="420" width="239"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_t9_9kKFsEeinsNXClcPPiQ" type="Class_Shape">
-      <children xmi:type="notation:DecorationNode" xmi:id="_t9_9kqFsEeinsNXClcPPiQ" type="Class_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_t-AkoKFsEeinsNXClcPPiQ" type="Class_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_t-AkoaFsEeinsNXClcPPiQ" y="15"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_t-AkoqFsEeinsNXClcPPiQ" type="Class_AttributeCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_t-Ako6FsEeinsNXClcPPiQ"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_t-AkpKFsEeinsNXClcPPiQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_t-AkpaFsEeinsNXClcPPiQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_t-AkpqFsEeinsNXClcPPiQ"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_t-Akp6FsEeinsNXClcPPiQ" visible="false" type="Class_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_t-AkqKFsEeinsNXClcPPiQ"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_t-AkqaFsEeinsNXClcPPiQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_t-AkqqFsEeinsNXClcPPiQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_t-Akq6FsEeinsNXClcPPiQ"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_t-AkrKFsEeinsNXClcPPiQ" visible="false" type="Class_NestedClassifierCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_t-AkraFsEeinsNXClcPPiQ"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_t-AkrqFsEeinsNXClcPPiQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_t-Akr6FsEeinsNXClcPPiQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_t-AksKFsEeinsNXClcPPiQ"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_t-IgcKFsEeinsNXClcPPiQ" visible="false" type="StereotypeLabel">
-        <styles xmi:type="notation:StringValueStyle" xmi:id="_t-IgcaFsEeinsNXClcPPiQ" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-        <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_t-IgcqFsEeinsNXClcPPiQ"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_t-JHgKFsEeinsNXClcPPiQ" visible="false" type="StereotypeLabel">
-        <styles xmi:type="notation:StringValueStyle" xmi:id="_t-JHgaFsEeinsNXClcPPiQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelClass"/>
+    <children xmi:type="notation:Shape" xmi:id="_r77iYKLQEeiz_K9hWIugxQ" type="Class_Shape" fillColor="14538691">
+      <children xmi:type="notation:DecorationNode" xmi:id="_r7_z0KLQEeiz_K9hWIugxQ" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_r7_z0aLQEeiz_K9hWIugxQ" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_r7_z0qLQEeiz_K9hWIugxQ" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_r8Aa4KLQEeiz_K9hWIugxQ" type="Class_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_r8Aa4aLQEeiz_K9hWIugxQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_r8Aa4qLQEeiz_K9hWIugxQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_r8Aa46LQEeiz_K9hWIugxQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_r8Aa5KLQEeiz_K9hWIugxQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_r8Aa5aLQEeiz_K9hWIugxQ" visible="false" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_r8Aa5qLQEeiz_K9hWIugxQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_r8Aa56LQEeiz_K9hWIugxQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_r8Aa6KLQEeiz_K9hWIugxQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_r8Aa6aLQEeiz_K9hWIugxQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_r8Aa6qLQEeiz_K9hWIugxQ" visible="false" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_r8Aa66LQEeiz_K9hWIugxQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_r8Aa7KLQEeiz_K9hWIugxQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_r8Aa7aLQEeiz_K9hWIugxQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_r8Aa7qLQEeiz_K9hWIugxQ"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_r8NPMKLQEeiz_K9hWIugxQ" visible="false" type="StereotypeLabel">
+        <styles xmi:type="notation:StringValueStyle" xmi:id="_r8NPMaLQEeiz_K9hWIugxQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelClass"/>
         <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_t-JHgqFsEeinsNXClcPPiQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_r8NPMqLQEeiz_K9hWIugxQ"/>
       </children>
-      <element xmi:type="uml:Class" href="Vnf.uml#_t91lgKFsEeinsNXClcPPiQ"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_t9_9kaFsEeinsNXClcPPiQ" x="560" y="60" width="201" height="81"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_r8N2RKLQEeiz_K9hWIugxQ" visible="false" type="StereotypeLabel">
+        <styles xmi:type="notation:StringValueStyle" xmi:id="_r8N2RaLQEeiz_K9hWIugxQ" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
+        <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_r8N2RqLQEeiz_K9hWIugxQ"/>
+      </children>
+      <element xmi:type="uml:Class" href="Service.uml#_Jvy-QD0MEeiWMf5FLWfdLA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_r77iYaLQEeiz_K9hWIugxQ" x="580" y="60" width="161" height="80"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_t-KVoKFsEeinsNXClcPPiQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_t-KVoaFsEeinsNXClcPPiQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_t-KVo6FsEeinsNXClcPPiQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="Vnf.uml#_t91lgKFsEeinsNXClcPPiQ"/>
+    <children xmi:type="notation:Shape" xmi:id="_r8SuwKLQEeiz_K9hWIugxQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_r8SuwaLQEeiz_K9hWIugxQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_r8Suw6LQEeiz_K9hWIugxQ" 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="_t-KVoqFsEeinsNXClcPPiQ" x="200"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_r8SuwqLQEeiz_K9hWIugxQ" x="200"/>
     </children>
     <styles xmi:type="notation:StringValueStyle" xmi:id="_9U7NAZpVEeidy9iGT_F5-w" name="diagram_compatibility_version" stringValue="1.4.0"/>
     <styles xmi:type="notation:DiagramStyle" xmi:id="_9U7NAppVEeidy9iGT_F5-w"/>
@@ -10132,35 +10133,38 @@
     <edges xmi:type="notation:Connector" xmi:id="_mkkTR5pYEeidy9iGT_F5-w" type="StereotypeCommentLink" source="_mkZUIJpYEeidy9iGT_F5-w" target="_mkkTQ5pYEeidy9iGT_F5-w">
       <styles xmi:type="notation:FontStyle" xmi:id="_mkkTSJpYEeidy9iGT_F5-w"/>
       <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mkkTTJpYEeidy9iGT_F5-w" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="Vnf.uml#_iQkugJpYEeidy9iGT_F5-w"/>
+        <eObjectValue xmi:type="uml:Class" href="Service.uml#_iQkugJpYEeidy9iGT_F5-w"/>
       </styles>
       <element xsi:nil="true"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_mkkTSZpYEeidy9iGT_F5-w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mkkTSppYEeidy9iGT_F5-w"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mkkTS5pYEeidy9iGT_F5-w"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_5lwsQJpYEeidy9iGT_F5-w" type="Generalization_Edge" source="_mkZUIJpYEeidy9iGT_F5-w" target="_t9_9kKFsEeinsNXClcPPiQ" routing="Tree">
+    <edges xmi:type="notation:Connector" xmi:id="_5lwsQJpYEeidy9iGT_F5-w" type="Generalization_Edge" source="_mkZUIJpYEeidy9iGT_F5-w" target="_r77iYKLQEeiz_K9hWIugxQ" routing="Tree">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xyshcKLQEeiz_K9hWIugxQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xytIgKLQEeiz_K9hWIugxQ" key="routing" value="true"/>
+      </eAnnotations>
       <children xmi:type="notation:DecorationNode" xmi:id="_5lwsQ5pYEeidy9iGT_F5-w" type="Generalization_StereotypeLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_NQDFkJpZEeidy9iGT_F5-w" name="IS_UPDATED_POSITION" booleanValue="true"/>
         <layoutConstraint xmi:type="notation:Location" xmi:id="_5lwsRJpYEeidy9iGT_F5-w" x="-1" y="39"/>
       </children>
       <styles xmi:type="notation:FontStyle" xmi:id="_5lwsQZpYEeidy9iGT_F5-w"/>
-      <element xmi:type="uml:Generalization" href="Vnf.uml#_5lowcJpYEeidy9iGT_F5-w"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_5lwsQppYEeidy9iGT_F5-w" points="[520, 220, -643984, -643984]$[520, 180, -643984, -643984]$[660, 180, -643984, -643984]$[660, 141, -643984, -643984]"/>
+      <element xmi:type="uml:Generalization" href="Service.uml#_5lowcJpYEeidy9iGT_F5-w"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_5lwsQppYEeidy9iGT_F5-w" points="[520, 220, -643984, -643984]$[520, 180, -643984, -643984]$[660, 180, -643984, -643984]$[660, 140, -643984, -643984]"/>
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_5mAj4JpYEeidy9iGT_F5-w" id="(0.49382716049382713,0.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_5mAj4ZpYEeidy9iGT_F5-w" id="(0.4975124378109453,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_5mAj4ZpYEeidy9iGT_F5-w" id="(0.4968944099378882,1.0)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_EMR_AZpZEeidy9iGT_F5-w" type="StereotypeCommentLink" source="_EMFKsJpZEeidy9iGT_F5-w" target="_EMRX85pZEeidy9iGT_F5-w">
       <styles xmi:type="notation:FontStyle" xmi:id="_EMR_AppZEeidy9iGT_F5-w"/>
       <styles xmi:type="notation:EObjectValueStyle" xmi:id="_EMR_BppZEeidy9iGT_F5-w" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="Vnf.uml#_BQaDwJpZEeidy9iGT_F5-w"/>
+        <eObjectValue xmi:type="uml:Class" href="Service.uml#_BQaDwJpZEeidy9iGT_F5-w"/>
       </styles>
       <element xsi:nil="true"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EMR_A5pZEeidy9iGT_F5-w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EMR_BJpZEeidy9iGT_F5-w"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EMR_BZpZEeidy9iGT_F5-w"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_Lfef0JpZEeidy9iGT_F5-w" type="Generalization_Edge" source="_EMFKsJpZEeidy9iGT_F5-w" target="_t9_9kKFsEeinsNXClcPPiQ">
+    <edges xmi:type="notation:Connector" xmi:id="_Lfef0JpZEeidy9iGT_F5-w" type="Generalization_Edge" source="_EMFKsJpZEeidy9iGT_F5-w" target="_r77iYKLQEeiz_K9hWIugxQ">
       <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_mpNNYKGEEeinsNXClcPPiQ" source="PapyrusCSSForceValue">
         <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_mpN0cKGEEeinsNXClcPPiQ" key="routing" value="true"/>
       </eAnnotations>
@@ -10169,10 +10173,10 @@
         <layoutConstraint xmi:type="notation:Location" xmi:id="_Lfef1JpZEeidy9iGT_F5-w" x="-1" y="38"/>
       </children>
       <styles xmi:type="notation:FontStyle" xmi:id="_Lfef0ZpZEeidy9iGT_F5-w"/>
-      <element xmi:type="uml:Generalization" href="Vnf.uml#_LfWkAJpZEeidy9iGT_F5-w"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Lfef0ppZEeidy9iGT_F5-w" points="[800, 220, -643984, -643984]$[800, 180, -643984, -643984]$[660, 180, -643984, -643984]$[660, 160, -643984, -643984]"/>
+      <element xmi:type="uml:Generalization" href="Service.uml#_LfWkAJpZEeidy9iGT_F5-w"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Lfef0ppZEeidy9iGT_F5-w" points="[800, 220, -643984, -643984]$[800, 180, -643984, -643984]$[680, 180, -643984, -643984]$[660, 180, -643984, -643984]$[660, 160, -643984, -643984]$[660, 140, -643984, -643984]"/>
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LfvlkJpZEeidy9iGT_F5-w" id="(0.4968944099378882,0.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LfvlkZpZEeidy9iGT_F5-w" id="(0.4975124378109453,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LfvlkZpZEeidy9iGT_F5-w" id="(0.4968944099378882,1.0)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_UusocJpZEeidy9iGT_F5-w" type="Association_Edge" source="_mkZUIJpYEeidy9iGT_F5-w" target="_HMZzAJpXEeidy9iGT_F5-w">
       <children xmi:type="notation:DecorationNode" xmi:id="_UutPgJpZEeidy9iGT_F5-w" type="Association_StereotypeLabel">
@@ -10236,20 +10240,6 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_oi-rQJpZEeidy9iGT_F5-w" id="(0.0,0.49382716049382713)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_oi-rQZpZEeidy9iGT_F5-w" id="(0.0,0.75)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_PaE3sJpaEeidy9iGT_F5-w" type="Comment_AnnotatedElementEdge" source="_Hwl90JpaEeidy9iGT_F5-w" target="_EMFKsJpZEeidy9iGT_F5-w">
-      <styles xmi:type="notation:FontStyle" xmi:id="_PaE3sZpaEeidy9iGT_F5-w"/>
-      <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_PaE3sppaEeidy9iGT_F5-w" points="[840, 360, -643984, -643984]$[840, 301, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PiEWEJpaEeidy9iGT_F5-w" id="(0.425531914893617,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PiEWEZpaEeidy9iGT_F5-w" id="(0.0,0.49382716049382713)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_QfzwsJpaEeidy9iGT_F5-w" type="Comment_AnnotatedElementEdge" source="_Hwl90JpaEeidy9iGT_F5-w" target="_mkZUIJpYEeidy9iGT_F5-w">
-      <styles xmi:type="notation:FontStyle" xmi:id="_QfzwsZpaEeidy9iGT_F5-w"/>
-      <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_QfzwsppaEeidy9iGT_F5-w" points="[800, 400, -643984, -643984]$[602, 280, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QoAqcJpaEeidy9iGT_F5-w" id="(0.425531914893617,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QoAqcZpaEeidy9iGT_F5-w" id="(0.24691358024691357,0.0)"/>
-    </edges>
     <edges xmi:type="notation:Connector" xmi:id="_NGSkMJsrEeiPBvbfaqSLYg" type="Association_Edge" source="_EMFKsJpZEeidy9iGT_F5-w" target="_HMZzAJpXEeidy9iGT_F5-w">
       <children xmi:type="notation:DecorationNode" xmi:id="_NGTLQJsrEeiPBvbfaqSLYg" type="Association_StereotypeLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Vbc4UJsrEeiPBvbfaqSLYg" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -10276,7 +10266,7 @@
         <layoutConstraint xmi:type="notation:Location" xmi:id="_NGTLS5srEeiPBvbfaqSLYg" x="-45" y="-20"/>
       </children>
       <styles xmi:type="notation:FontStyle" xmi:id="_NGSkMZsrEeiPBvbfaqSLYg"/>
-      <element xmi:type="uml:Association" href="Vnf.uml#_NBgx4JsrEeiPBvbfaqSLYg"/>
+      <element xmi:type="uml:Association" href="Service.uml#_NBgx4JsrEeiPBvbfaqSLYg"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_NGSkMpsrEeiPBvbfaqSLYg" points="[800, 301, -643984, -643984]$[800, 420, -643984, -643984]$[641, 420, -643984, -643984]"/>
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NP0ToJsrEeiPBvbfaqSLYg" id="(0.4968944099378882,1.0)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NP0ToZsrEeiPBvbfaqSLYg" id="(1.0,0.5)"/>
@@ -10399,15 +10389,46 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fLVyIJs4EeiPBvbfaqSLYg" id="(0.0,0.25)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fLVyIZs4EeiPBvbfaqSLYg" id="(0.0,0.24691358024691357)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_t-K8sKFsEeinsNXClcPPiQ" type="StereotypeCommentLink" source="_t9_9kKFsEeinsNXClcPPiQ" target="_t-KVoKFsEeinsNXClcPPiQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_t-K8saFsEeinsNXClcPPiQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_t-K8taFsEeinsNXClcPPiQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="Vnf.uml#_t91lgKFsEeinsNXClcPPiQ"/>
+    <edges xmi:type="notation:Connector" xmi:id="_r8TV0KLQEeiz_K9hWIugxQ" type="StereotypeCommentLink" source="_r77iYKLQEeiz_K9hWIugxQ" target="_r8SuwKLQEeiz_K9hWIugxQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_r8TV0aLQEeiz_K9hWIugxQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_r8TV1aLQEeiz_K9hWIugxQ" 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="_t-K8sqFsEeinsNXClcPPiQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_t-K8s6FsEeinsNXClcPPiQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_t-K8tKFsEeinsNXClcPPiQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_r8TV0qLQEeiz_K9hWIugxQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_r8TV06LQEeiz_K9hWIugxQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_r8TV1KLQEeiz_K9hWIugxQ"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_zF_f4KLREeiz_K9hWIugxQ" type="Association_Edge" source="_EMFKsJpZEeidy9iGT_F5-w" target="_r77iYKLQEeiz_K9hWIugxQ">
+      <children xmi:type="notation:DecorationNode" xmi:id="_zF_f46LREeiz_K9hWIugxQ" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_0jAQcKLREeiz_K9hWIugxQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_zF_f5KLREeiz_K9hWIugxQ" y="-19"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_zF_f5aLREeiz_K9hWIugxQ" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_0unDgKLREeiz_K9hWIugxQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_zF_f5qLREeiz_K9hWIugxQ" x="23" y="1"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_zF_f56LREeiz_K9hWIugxQ" visible="false" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_06F6wKLREeiz_K9hWIugxQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_zF_f6KLREeiz_K9hWIugxQ" x="45" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_zF_f6aLREeiz_K9hWIugxQ" visible="false" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_1FrfsKLREeiz_K9hWIugxQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_zF_f6qLREeiz_K9hWIugxQ" x="-44" y="18"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_zF_f66LREeiz_K9hWIugxQ" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_1RZngKLREeiz_K9hWIugxQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_zF_f7KLREeiz_K9hWIugxQ" x="23" y="7"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_zF_f7aLREeiz_K9hWIugxQ" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_1ddGgKLREeiz_K9hWIugxQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_zF_f7qLREeiz_K9hWIugxQ" x="-3" y="-7"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_zF_f4aLREeiz_K9hWIugxQ"/>
+      <element xmi:type="uml:Association" href="Service.uml#_y6W3oKLREeiz_K9hWIugxQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_zF_f4qLREeiz_K9hWIugxQ" points="[881, 260, -643984, -643984]$[920, 260, -643984, -643984]$[920, 100, -643984, -643984]$[741, 100, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zdG_YKLREeiz_K9hWIugxQ" id="(1.0,0.49382716049382713)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zdHmcKLREeiz_K9hWIugxQ" id="(1.0,0.5)"/>
     </edges>
   </notation:Diagram>
 </xmi:XMI>