Updates to the Vnf, Service and common models

Vnf model changes includes removal of a duplicate Vnf object, deleting
several data types object 'shells' on the Vnf datatypes diagram
(objects moved to common)and slight updates to allotted resource.
Service model updates included further updates to the Service Order
diagram.  Common changes include further refinements to the VES model.

Issue-ID: MODELING-104

Change-Id: If032cfa61de6383c56eb27ecfcffd41ece1fdd9d
Signed-off-by: Kevin Scaggs <ks0567@att.com>

1 files changed, 10 insertions, 244 deletions

diff --git a/papyrus/ONAP Information Model/Vnf.notation b/papyrus/ONAP Information Model/Vnf.notation
index e2d8a1c..05865e4 100644
--- a/papyrus/ONAP Information Model/Vnf.notation
+++ b/papyrus/ONAP Information Model/Vnf.notation
@@ -4562,45 +4562,6 @@
       <element xsi:nil="true"/>

       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NGxz1UKAEeiwbqJBYHKltg" x="200"/>

     </children>

-    <children xmi:type="notation:Shape" xmi:id="_uncuIEKAEeiwbqJBYHKltg" type="Class_Shape">

-      <children xmi:type="notation:DecorationNode" xmi:id="_uncuIkKAEeiwbqJBYHKltg" type="Class_NameLabel"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_uncuI0KAEeiwbqJBYHKltg" type="Class_FloatingNameLabel">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_uncuJEKAEeiwbqJBYHKltg" y="15"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_uncuJUKAEeiwbqJBYHKltg" visible="false" type="Class_AttributeCompartment">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_uncuJkKAEeiwbqJBYHKltg"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_uncuJ0KAEeiwbqJBYHKltg"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_uncuKEKAEeiwbqJBYHKltg"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uncuKUKAEeiwbqJBYHKltg"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_uncuKkKAEeiwbqJBYHKltg" visible="false" type="Class_OperationCompartment">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_uncuK0KAEeiwbqJBYHKltg"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_uncuLEKAEeiwbqJBYHKltg"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_uncuLUKAEeiwbqJBYHKltg"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uncuLkKAEeiwbqJBYHKltg"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_uncuL0KAEeiwbqJBYHKltg" visible="false" type="Class_NestedClassifierCompartment">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_uncuMEKAEeiwbqJBYHKltg"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_uncuMUKAEeiwbqJBYHKltg"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_uncuMkKAEeiwbqJBYHKltg"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uncuM0KAEeiwbqJBYHKltg"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_unkp8EKAEeiwbqJBYHKltg" visible="false" type="StereotypeLabel">

-        <styles xmi:type="notation:StringValueStyle" xmi:id="_unkp8UKAEeiwbqJBYHKltg" name="stereotype" stringValue="OpenModel_Profile::OpenModelClass"/>

-        <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_unkp8kKAEeiwbqJBYHKltg"/>

-      </children>

-      <element xmi:type="uml:Class" href="Vnf.uml#_e5WnwDOREeiHat9KcP8uWA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uncuIUKAEeiwbqJBYHKltg" x="1080" y="800" height="73"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_unntQ0KAEeiwbqJBYHKltg" type="StereotypeComment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_unntREKAEeiwbqJBYHKltg"/>

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

-        <eObjectValue xmi:type="uml:Class" href="Vnf.uml#_e5WnwDOREeiHat9KcP8uWA"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_unntRUKAEeiwbqJBYHKltg" x="200"/>

-    </children>

     <styles xmi:type="notation:StringValueStyle" xmi:id="_ojifoT0JEeiuk5pWzMOpfA" name="diagram_compatibility_version" stringValue="1.4.0"/>

     <styles xmi:type="notation:DiagramStyle" xmi:id="_ojifoj0JEeiuk5pWzMOpfA"/>

     <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_ojifoz0JEeiuk5pWzMOpfA" diagramKindId="org.eclipse.papyrus.uml.diagram.class">

@@ -4754,7 +4715,7 @@
       <styles xmi:type="notation:FontStyle" xmi:id="_KOp3gUJ9EeiwbqJBYHKltg"/>

       <element xmi:type="uml:Association" href="Vnf.uml#_KOPAwEJ9EeiwbqJBYHKltg"/>

       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_KOp3gkJ9EeiwbqJBYHKltg" points="[660, 860, -643984, -643984]$[660, 680, -643984, -643984]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_KPVM8EJ9EeiwbqJBYHKltg" id="(0.4838709677419355,0.0)"/>

+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_KPVM8EJ9EeiwbqJBYHKltg" id="(0.6,0.0)"/>

       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_KPVM8UJ9EeiwbqJBYHKltg" id="(0.45977011494252873,1.0)"/>

     </edges>

     <edges xmi:type="notation:Connector" xmi:id="_YdHhV0J9EeiwbqJBYHKltg" type="StereotypeCommentLink" source="_Yc77IEJ9EeiwbqJBYHKltg" target="_YdHhU0J9EeiwbqJBYHKltg">

@@ -4879,7 +4840,7 @@
       <styles xmi:type="notation:FontStyle" xmi:id="_K8vlMUKAEeiwbqJBYHKltg"/>

       <element xsi:nil="true"/>

       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_K8vlMkKAEeiwbqJBYHKltg" points="[1260, -20, -643984, -643984]$[1260, 80, -643984, -643984]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_K9S-0EKAEeiwbqJBYHKltg" id="(0.7272727272727273,1.0)"/>

+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_K9S-0EKAEeiwbqJBYHKltg" id="(0.36363636363636365,1.0)"/>

       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_K9S-0UKAEeiwbqJBYHKltg" id="(0.42105263157894735,0.0)"/>

     </edges>

     <edges xmi:type="notation:Connector" xmi:id="_NGya4UKAEeiwbqJBYHKltg" type="StereotypeCommentLink" source="_NGlmkEKAEeiwbqJBYHKltg" target="_NGxz00KAEeiwbqJBYHKltg">

@@ -5010,16 +4971,6 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_h8VGYEKAEeiwbqJBYHKltg" id="(0.6,1.0)"/>

       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_h8VGYUKAEeiwbqJBYHKltg" id="(1.0,0.6)"/>

     </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_unntR0KAEeiwbqJBYHKltg" type="StereotypeCommentLink" source="_uncuIEKAEeiwbqJBYHKltg" target="_unntQ0KAEeiwbqJBYHKltg">

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

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

-        <eObjectValue xmi:type="uml:Class" href="Vnf.uml#_e5WnwDOREeiHat9KcP8uWA"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_unntSUKAEeiwbqJBYHKltg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_unntSkKAEeiwbqJBYHKltg"/>

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

-    </edges>

   </notation:Diagram>

   <notation:Diagram xmi:id="_iHSngF3PEeiwL5tPgFMcjQ" type="PapyrusUMLClassDiagram" name="VNF Instance" measurementUnit="Pixel">

     <children xmi:type="notation:Shape" xmi:id="_jLU3YF3PEeiwL5tPgFMcjQ" type="Class_Shape">

@@ -6167,104 +6118,6 @@
       <element xmi:type="uml:Enumeration" href="Vnf.uml#_c8RX8D3BEeiFiY3bcpqGkg"/>

       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3y2zsXPWEeiuFfjlON-CuQ" x="400" y="160"/>

     </children>

-    <children xmi:type="notation:Shape" xmi:id="_4baBcHPWEeiuFfjlON-CuQ" type="DataType_Shape">

-      <children xmi:type="notation:DecorationNode" xmi:id="_4baBcnPWEeiuFfjlON-CuQ" type="DataType_NameLabel"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_4baBc3PWEeiuFfjlON-CuQ" type="DataType_FloatingNameLabel">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_4baBdHPWEeiuFfjlON-CuQ" y="15"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_4baBdXPWEeiuFfjlON-CuQ" type="DataType_AttributeCompartment">

-        <children xmi:type="notation:Shape" xmi:id="_JxduUHPXEeiuFfjlON-CuQ" type="Property_DataTypeAttributeLabel">

-          <element xmi:type="uml:Property" href="Vnf.uml#_ifaxMDdPEeiIfPeSAqyGdQ"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_JxduUXPXEeiuFfjlON-CuQ"/>

-        </children>

-        <styles xmi:type="notation:TitleStyle" xmi:id="_4baBdnPWEeiuFfjlON-CuQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_4baBd3PWEeiuFfjlON-CuQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_4baBeHPWEeiuFfjlON-CuQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4baBeXPWEeiuFfjlON-CuQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_4baBenPWEeiuFfjlON-CuQ" visible="false" type="DataType_OperationCompartment">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_4baBe3PWEeiuFfjlON-CuQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_4baBfHPWEeiuFfjlON-CuQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_4baBfXPWEeiuFfjlON-CuQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4baBfnPWEeiuFfjlON-CuQ"/>

-      </children>

-      <element xmi:type="uml:DataType" href="Vnf.uml#_X9TdUDdPEeiIfPeSAqyGdQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4baBcXPWEeiuFfjlON-CuQ" x="580" y="160"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_47yxsHPWEeiuFfjlON-CuQ" type="DataType_Shape">

-      <children xmi:type="notation:DecorationNode" xmi:id="_47yxsnPWEeiuFfjlON-CuQ" type="DataType_NameLabel"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_47yxs3PWEeiuFfjlON-CuQ" type="DataType_FloatingNameLabel">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_47yxtHPWEeiuFfjlON-CuQ" y="15"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_47yxtXPWEeiuFfjlON-CuQ" type="DataType_AttributeCompartment">

-        <children xmi:type="notation:Shape" xmi:id="_LK9Q0HPXEeiuFfjlON-CuQ" type="Property_DataTypeAttributeLabel">

-          <element xmi:type="uml:Property" href="Vnf.uml#_-b8GcDdPEeiIfPeSAqyGdQ"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_LK9Q0XPXEeiuFfjlON-CuQ"/>

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_LK934HPXEeiuFfjlON-CuQ" type="Property_DataTypeAttributeLabel">

-          <element xmi:type="uml:Property" href="Vnf.uml#__BqCoDdPEeiIfPeSAqyGdQ"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_LK934XPXEeiuFfjlON-CuQ"/>

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_LK934nPXEeiuFfjlON-CuQ" type="Property_DataTypeAttributeLabel">

-          <element xmi:type="uml:Property" href="Vnf.uml#__o0JQDdPEeiIfPeSAqyGdQ"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_LK9343PXEeiuFfjlON-CuQ"/>

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_LK935HPXEeiuFfjlON-CuQ" type="Property_DataTypeAttributeLabel">

-          <element xmi:type="uml:Property" href="Vnf.uml#_Ag8rIDdQEeiIfPeSAqyGdQ"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_LK935XPXEeiuFfjlON-CuQ"/>

-        </children>

-        <styles xmi:type="notation:TitleStyle" xmi:id="_47yxtnPWEeiuFfjlON-CuQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_47yxt3PWEeiuFfjlON-CuQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_47yxuHPWEeiuFfjlON-CuQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_47yxuXPWEeiuFfjlON-CuQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_47yxunPWEeiuFfjlON-CuQ" visible="false" type="DataType_OperationCompartment">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_47yxu3PWEeiuFfjlON-CuQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_47yxvHPWEeiuFfjlON-CuQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_47yxvXPWEeiuFfjlON-CuQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_47yxvnPWEeiuFfjlON-CuQ"/>

-      </children>

-      <element xmi:type="uml:DataType" href="Vnf.uml#_4oResDdPEeiIfPeSAqyGdQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_47yxsXPWEeiuFfjlON-CuQ" x="40" y="280" height="101"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_5iMDUHPWEeiuFfjlON-CuQ" type="Enumeration_Shape">

-      <children xmi:type="notation:DecorationNode" xmi:id="_5iMqYHPWEeiuFfjlON-CuQ" type="Enumeration_NameLabel"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_5iMqYXPWEeiuFfjlON-CuQ" type="Enumeration_FloatingNameLabel">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_5iMqYnPWEeiuFfjlON-CuQ" y="15"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_5iMqY3PWEeiuFfjlON-CuQ" type="Enumeration_LiteralCompartment">

-        <children xmi:type="notation:Shape" xmi:id="_fnu3AHPXEeiuFfjlON-CuQ" type="EnumerationLiteral_LiteralLabel">

-          <element xmi:type="uml:EnumerationLiteral" href="Vnf.uml#_0VFxQDnLEeiWMf5FLWfdLA"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_fnu3AXPXEeiuFfjlON-CuQ"/>

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_fnveEHPXEeiuFfjlON-CuQ" type="EnumerationLiteral_LiteralLabel">

-          <element xmi:type="uml:EnumerationLiteral" href="Vnf.uml#_2M_uEDnLEeiWMf5FLWfdLA"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_fnveEXPXEeiuFfjlON-CuQ"/>

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_fnveEnPXEeiuFfjlON-CuQ" type="EnumerationLiteral_LiteralLabel">

-          <element xmi:type="uml:EnumerationLiteral" href="Vnf.uml#_46OwYDnLEeiWMf5FLWfdLA"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_fnveE3PXEeiuFfjlON-CuQ"/>

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_fnveFHPXEeiuFfjlON-CuQ" type="EnumerationLiteral_LiteralLabel">

-          <element xmi:type="uml:EnumerationLiteral" href="Vnf.uml#_6gEFwDnLEeiWMf5FLWfdLA"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_fnveFXPXEeiuFfjlON-CuQ"/>

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_fnveFnPXEeiuFfjlON-CuQ" type="EnumerationLiteral_LiteralLabel">

-          <element xmi:type="uml:EnumerationLiteral" href="Vnf.uml#_95b1UDnLEeiWMf5FLWfdLA"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_fnveF3PXEeiuFfjlON-CuQ"/>

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_fnveGHPXEeiuFfjlON-CuQ" type="EnumerationLiteral_LiteralLabel">

-          <element xmi:type="uml:EnumerationLiteral" href="Vnf.uml#__bv8oDnLEeiWMf5FLWfdLA"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_fnveGXPXEeiuFfjlON-CuQ"/>

-        </children>

-        <styles xmi:type="notation:TitleStyle" xmi:id="_5iMqZHPWEeiuFfjlON-CuQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_5iMqZXPWEeiuFfjlON-CuQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_5iMqZnPWEeiuFfjlON-CuQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5iMqZ3PWEeiuFfjlON-CuQ"/>

-      </children>

-      <element xmi:type="uml:Enumeration" href="Vnf.uml#_tFQGcDnLEeiWMf5FLWfdLA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5iMDUXPWEeiuFfjlON-CuQ" x="420" y="280"/>

-    </children>

     <children xmi:type="notation:Shape" xmi:id="_58Ei8HPWEeiuFfjlON-CuQ" type="Enumeration_Shape">

       <children xmi:type="notation:DecorationNode" xmi:id="_58Ei8nPWEeiuFfjlON-CuQ" type="Enumeration_NameLabel"/>

       <children xmi:type="notation:DecorationNode" xmi:id="_58FKAHPWEeiuFfjlON-CuQ" type="Enumeration_FloatingNameLabel">

@@ -7669,16 +7522,6 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_llOLC5UGEeiYXO5wr78TUw"/>

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

     </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_yR0ZcJUGEeiYXO5wr78TUw" type="StereotypeCommentLink" source="_4baBcHPWEeiuFfjlON-CuQ" target="_yRzyZ5UGEeiYXO5wr78TUw">

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

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

-        <eObjectValue xmi:type="uml:DataType" href="Vnf.uml#_X9TdUDdPEeiIfPeSAqyGdQ"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_yR0ZcpUGEeiYXO5wr78TUw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_yR0Zc5UGEeiYXO5wr78TUw"/>

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

-    </edges>

     <edges xmi:type="notation:Connector" xmi:id="_26M525UGEeiYXO5wr78TUw" type="StereotypeCommentLink" source="_3y2zsHPWEeiuFfjlON-CuQ" target="_26M515UGEeiYXO5wr78TUw">

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

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

@@ -7689,26 +7532,6 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_26M53pUGEeiYXO5wr78TUw"/>

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

     </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_4axUtJUGEeiYXO5wr78TUw" type="StereotypeCommentLink" source="_47yxsHPWEeiuFfjlON-CuQ" target="_4axUsJUGEeiYXO5wr78TUw">

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

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

-        <eObjectValue xmi:type="uml:DataType" href="Vnf.uml#_4oResDdPEeiIfPeSAqyGdQ"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_4axUtpUGEeiYXO5wr78TUw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4axUt5UGEeiYXO5wr78TUw"/>

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

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_6Z9lSJUGEeiYXO5wr78TUw" type="StereotypeCommentLink" source="_5iMDUHPWEeiuFfjlON-CuQ" target="_6Z9lRJUGEeiYXO5wr78TUw">

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

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

-        <eObjectValue xmi:type="uml:Enumeration" href="Vnf.uml#_tFQGcDnLEeiWMf5FLWfdLA"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_6Z9lSpUGEeiYXO5wr78TUw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6Z9lS5UGEeiYXO5wr78TUw"/>

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

-    </edges>

     <edges xmi:type="notation:Connector" xmi:id="_AQnPmJUHEeiYXO5wr78TUw" type="StereotypeCommentLink" source="_58Ei8HPWEeiuFfjlON-CuQ" target="_AQnPlJUHEeiYXO5wr78TUw">

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

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

@@ -8090,17 +7913,12 @@
     <children xmi:type="notation:Shape" xmi:id="_ZbKxEJWXEeiBQt0DCQoFTw" type="Comment_Shape">

       <children xmi:type="notation:DecorationNode" xmi:id="_ZbjLkJWXEeiBQt0DCQoFTw" type="Comment_BodyLabel"/>

       <element xmi:type="uml:Comment" href="Vnf.uml#_ZbAZAJWXEeiBQt0DCQoFTw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZbKxEZWXEeiBQt0DCQoFTw" x="900" y="480"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_QKZXEJdJEei-sOl6ywWHlg" type="Comment_Shape">

-      <children xmi:type="notation:DecorationNode" xmi:id="_QKalMJdJEei-sOl6ywWHlg" type="Comment_BodyLabel"/>

-      <element xmi:type="uml:Comment" href="Vnf.uml#_QKT3gJdJEei-sOl6ywWHlg"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QKZXEZdJEei-sOl6ywWHlg" x="200" y="620"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZbKxEZWXEeiBQt0DCQoFTw" x="940" y="260"/>

     </children>

     <children xmi:type="notation:Shape" xmi:id="_YxE5AJdJEei-sOl6ywWHlg" type="Comment_Shape">

       <children xmi:type="notation:DecorationNode" xmi:id="_YxFgEJdJEei-sOl6ywWHlg" type="Comment_BodyLabel"/>

       <element xmi:type="uml:Comment" href="Vnf.uml#_YxDD0JdJEei-sOl6ywWHlg"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YxE5AZdJEei-sOl6ywWHlg" x="680" y="640"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YxE5AZdJEei-sOl6ywWHlg" x="940" y="380"/>

     </children>

     <children xmi:type="notation:Shape" xmi:id="_MewbsJddEei-sOl6ywWHlg" type="Enumeration_Shape">

       <children xmi:type="notation:DecorationNode" xmi:id="_MewbspddEei-sOl6ywWHlg" type="Enumeration_NameLabel"/>

@@ -8122,7 +7940,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MexCxZddEei-sOl6ywWHlg"/>

       </children>

       <element xmi:type="uml:Enumeration" href="Vnf.uml#_MevNkJddEei-sOl6ywWHlg"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MewbsZddEei-sOl6ywWHlg" x="1140" y="260"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MewbsZddEei-sOl6ywWHlg" x="940" y="120"/>

     </children>

     <children xmi:type="notation:Shape" xmi:id="_2JIypJdeEei-sOl6ywWHlg" type="StereotypeComment">

       <styles xmi:type="notation:TitleStyle" xmi:id="_2JIypZdeEei-sOl6ywWHlg"/>

@@ -8282,63 +8100,6 @@
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2JIyrJdeEei-sOl6ywWHlg"/>

     </edges>

   </notation:Diagram>

-  <notation:Diagram xmi:id="_O6Y9UJXAEeitEu5uB9R53Q" type="PapyrusUMLClassDiagram" name="Network Function" measurementUnit="Pixel">

-    <children xmi:type="notation:Shape" xmi:id="_TEg0YJXAEeitEu5uB9R53Q" type="Class_Shape">

-      <children xmi:type="notation:DecorationNode" xmi:id="_TEkewJXAEeitEu5uB9R53Q" type="Class_NameLabel"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_TElF0JXAEeitEu5uB9R53Q" type="Class_FloatingNameLabel">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_TElF0ZXAEeitEu5uB9R53Q" y="15"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_TElF0pXAEeitEu5uB9R53Q" type="Class_AttributeCompartment">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_TElF05XAEeitEu5uB9R53Q"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_TElF1JXAEeitEu5uB9R53Q"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_TElF1ZXAEeitEu5uB9R53Q"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TElF1pXAEeitEu5uB9R53Q"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_TElF15XAEeitEu5uB9R53Q" visible="false" type="Class_OperationCompartment">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_TElF2JXAEeitEu5uB9R53Q"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_TElF2ZXAEeitEu5uB9R53Q"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_TElF2pXAEeitEu5uB9R53Q"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TElF25XAEeitEu5uB9R53Q"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_TElF3JXAEeitEu5uB9R53Q" visible="false" type="Class_NestedClassifierCompartment">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_TElF3ZXAEeitEu5uB9R53Q"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_TElF3pXAEeitEu5uB9R53Q"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_TElF35XAEeitEu5uB9R53Q"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TElF4JXAEeitEu5uB9R53Q"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_TEsakJXAEeitEu5uB9R53Q" visible="false" type="StereotypeLabel">

-        <styles xmi:type="notation:StringValueStyle" xmi:id="_TEsakZXAEeitEu5uB9R53Q" name="stereotype" stringValue="OpenModel_Profile::OpenModelClass"/>

-        <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TEsakpXAEeitEu5uB9R53Q"/>

-      </children>

-      <element xmi:type="uml:Class" href="Common.uml#_VtzSoESyEeiVGPeZpaYNtQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TEg0YZXAEeitEu5uB9R53Q" x="400" y="160"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_TEx6IJXAEeitEu5uB9R53Q" type="StereotypeComment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_TEx6IZXAEeitEu5uB9R53Q"/>

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

-        <eObjectValue xmi:type="uml:Class" href="Common.uml#_VtzSoESyEeiVGPeZpaYNtQ"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TEx6IpXAEeitEu5uB9R53Q" x="200"/>

-    </children>

-    <styles xmi:type="notation:StringValueStyle" xmi:id="_O6Y9UZXAEeitEu5uB9R53Q" name="diagram_compatibility_version" stringValue="1.4.0"/>

-    <styles xmi:type="notation:DiagramStyle" xmi:id="_O6Y9UpXAEeitEu5uB9R53Q"/>

-    <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_O6Y9U5XAEeitEu5uB9R53Q" diagramKindId="org.eclipse.papyrus.uml.diagram.class">

-      <owner xmi:type="uml:Package" href="Vnf.uml#_zPN5MDOHEei5Af8DcjrhIQ"/>

-    </styles>

-    <element xmi:type="uml:Package" href="Vnf.uml#_zPN5MDOHEei5Af8DcjrhIQ"/>

-    <edges xmi:type="notation:Connector" xmi:id="_TEyhMJXAEeitEu5uB9R53Q" type="StereotypeCommentLink" source="_TEg0YJXAEeitEu5uB9R53Q" target="_TEx6IJXAEeitEu5uB9R53Q">

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

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

-        <eObjectValue xmi:type="uml:Class" href="Common.uml#_VtzSoESyEeiVGPeZpaYNtQ"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_TEyhMpXAEeitEu5uB9R53Q" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_TEyhM5XAEeitEu5uB9R53Q"/>

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

-    </edges>

-  </notation:Diagram>

   <notation:Diagram xmi:id="_9U7NAJpVEeidy9iGT_F5-w" type="PapyrusUMLClassDiagram" name="Allotted Resource" measurementUnit="Pixel">

     <children xmi:type="notation:Shape" xmi:id="_HMZzAJpXEeidy9iGT_F5-w" type="Class_Shape">

       <children xmi:type="notation:DecorationNode" xmi:id="_HMaaEJpXEeidy9iGT_F5-w" type="Class_NameLabel"/>

@@ -8725,6 +8486,11 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_mcamgrIKEeid-vjMcczUWA"/>

         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mcamg7IKEeid-vjMcczUWA"/>

       </children>

+      <children xmi:type="notation:DecorationNode" xmi:id="_oLvNIMGvEeiS695oPTRE1Q" visible="false" type="StereotypeLabel">

+        <styles xmi:type="notation:StringValueStyle" xmi:id="_oLvNIcGvEeiS695oPTRE1Q" name="stereotype" stringValue="OpenModel_Profile::OpenModelClass"/>

+        <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oLvNIsGvEeiS695oPTRE1Q"/>

+      </children>

       <element xmi:type="uml:Class" href="Vnf.uml#_mcXjILIKEeid-vjMcczUWA"/>

       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mcamcbIKEeid-vjMcczUWA" x="600" y="660" width="121" height="81"/>

     </children>