Align the VNFD model with IFA011 2.5.1

Issue-ID: MODELING-104


Change-Id: I8ccb0d2e91f02e8a7747bf6b6611ce91b4860605

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

10 files changed, 439 insertions, 686 deletions

diff --git a/ONAP Information Model/.project b/ONAP Information Model/.project
index dcd9a6c..1271b05 100644
--- a/ONAP Information Model/.project
+++ b/ONAP Information Model/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <projectDescription>

-	<name>ONAP Information Model</name>

+	<name>ONAP Information Model-2019-02-19</name>

 	<comment></comment>

 	<projects>

 	</projects>

diff --git a/ONAP Information Model/Common.notation b/ONAP Information Model/Common.notation
index 5cbf59e..ff02f7a 100644
--- a/ONAP Information Model/Common.notation
+++ b/ONAP Information Model/Common.notation
@@ -2490,82 +2490,6 @@
       <element xmi:type="uml:DataType" href="Common.uml#_W7iKYJaeEeiGg_moIHe9Sw"/>

       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7SBnUaGLEeinsNXClcPPiQ" x="620" y="20"/>

     </children>

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

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

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

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

-      </children>

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

-        <children xmi:type="notation:Shape" xmi:id="_smv-UKGOEeinsNXClcPPiQ" type="Property_DataTypeAttributeLabel">

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

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

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

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

-          </children>

-          <element xmi:type="uml:Property" href="Common.uml#_nPNHsj2-Eeiu6I5JfRTxxQ"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_smv-UaGOEeinsNXClcPPiQ"/>

-        </children>

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

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

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

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

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

-          </children>

-          <element xmi:type="uml:Property" href="Common.uml#_nPNHtD2-Eeiu6I5JfRTxxQ"/>

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

-        </children>

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

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

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

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

-      </children>

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

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

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

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

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

-      </children>

-      <element xmi:type="uml:DataType" href="Common.uml#_nPNHsD2-Eeiu6I5JfRTxxQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8AGOQaGLEeinsNXClcPPiQ" x="820" y="20"/>

-    </children>

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

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

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

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

-      </children>

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

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

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

-            <styles xmi:type="notation:StringValueStyle" xmi:id="_sm-n0aGOEeinsNXClcPPiQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>

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

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

-          </children>

-          <element xmi:type="uml:Property" href="Common.uml#_RVZi0T2-Eeiu6I5JfRTxxQ"/>

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

-        </children>

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

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

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

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

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

-          </children>

-          <element xmi:type="uml:Property" href="Common.uml#_RVZi0z2-Eeiu6I5JfRTxxQ"/>

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

-        </children>

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

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

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

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

-      </children>

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

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

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

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

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

-      </children>

-      <element xmi:type="uml:DataType" href="Common.uml#_RVZi0D2-Eeiu6I5JfRTxxQ"/>

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

-    </children>

     <children xmi:type="notation:Shape" xmi:id="_99M0IKGLEeinsNXClcPPiQ" type="DataType_Shape">

       <children xmi:type="notation:DecorationNode" xmi:id="_99M0IqGLEeinsNXClcPPiQ" type="DataType_NameLabel"/>

       <children xmi:type="notation:DecorationNode" xmi:id="_99M0I6GLEeinsNXClcPPiQ" type="DataType_FloatingNameLabel">

@@ -2944,22 +2868,6 @@
       <element xsi:nil="true"/>

       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9ONJss2JEeieTchE0MWKmw" x="820" y="20"/>

     </children>

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

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

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

-        <eObjectValue xmi:type="uml:DataType" href="Common.uml#_nPNHsD2-Eeiu6I5JfRTxxQ"/>

-      </styles>

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

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9OW6ss2JEeieTchE0MWKmw" x="1020" y="20"/>

-    </children>

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

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

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

-        <eObjectValue xmi:type="uml:DataType" href="Common.uml#_RVZi0D2-Eeiu6I5JfRTxxQ"/>

-      </styles>

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

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

-    </children>

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

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

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

@@ -3419,26 +3327,6 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9ONJt82JEeieTchE0MWKmw"/>

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

     </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_9OW6tM2JEeieTchE0MWKmw" type="StereotypeCommentLink" source="_8AGOQKGLEeinsNXClcPPiQ" target="_9OW6sM2JEeieTchE0MWKmw">

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

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

-        <eObjectValue xmi:type="uml:DataType" href="Common.uml#_nPNHsD2-Eeiu6I5JfRTxxQ"/>

-      </styles>

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

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

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

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

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_9OdoZM2JEeieTchE0MWKmw" type="StereotypeCommentLink" source="_8AX7EKGLEeinsNXClcPPiQ" target="_9OdoYM2JEeieTchE0MWKmw">

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

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

-        <eObjectValue xmi:type="uml:DataType" href="Common.uml#_RVZi0D2-Eeiu6I5JfRTxxQ"/>

-      </styles>

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

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

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

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

-    </edges>

     <edges xmi:type="notation:Connector" xmi:id="_9Ok9JM2JEeieTchE0MWKmw" type="StereotypeCommentLink" source="_99M0IKGLEeinsNXClcPPiQ" target="_9Ok9IM2JEeieTchE0MWKmw">

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

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

diff --git a/ONAP Information Model/Common.uml b/ONAP Information Model/Common.uml
index ff6927d..67a1120 100644
--- a/ONAP Information Model/Common.uml
+++ b/ONAP Information Model/Common.uml
@@ -6786,7 +6786,7 @@ NOTE: This allows to provide one or more   localization languages to support sel
             </ownedComment>

             <type xmi:type="uml:DataType" href="Ns.uml#_kEZBoTzEEeiWMf5FLWfdLA"/>

           </ownedAttribute>

-          <ownedAttribute xmi:type="uml:Property" xmi:id="_45bWVjzEEeiWMf5FLWfdLA" name="localAffinityOrAntiAffinityRule " type="_RVZi0D2-Eeiu6I5JfRTxxQ">

+          <ownedAttribute xmi:type="uml:Property" xmi:id="_45bWVjzEEeiWMf5FLWfdLA" name="localAffinityOrAntiAffinityRule ">

             <ownedComment xmi:type="uml:Comment" xmi:id="_45bWVzzEEeiWMf5FLWfdLA" annotatedElement="_45bWVjzEEeiWMf5FLWfdLA">

               <body>Specifies affinity and anti-affinity rules applicable between VLs instantiated from the referenced VLD. </body>

             </ownedComment>

@@ -6801,13 +6801,13 @@ NOTE : 	Each identifier references an affinity or anti-affinity group which expr
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_45bWXDzEEeiWMf5FLWfdLA"/>

             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_45bWXTzEEeiWMf5FLWfdLA" value="*"/>

           </ownedAttribute>

-          <ownedAttribute xmi:type="uml:Property" xmi:id="_45bWXjzEEeiWMf5FLWfdLA" name="maxBitrateRequirements" type="_nPNHsD2-Eeiu6I5JfRTxxQ">

+          <ownedAttribute xmi:type="uml:Property" xmi:id="_45bWXjzEEeiWMf5FLWfdLA" name="maxBitrateRequirements">

             <ownedComment xmi:type="uml:Comment" xmi:id="_45bWXzzEEeiWMf5FLWfdLA" annotatedElement="_45bWXjzEEeiWMf5FLWfdLA">

               <body>Specifies the maximum bitrate requirements for a VL instantiated according to this profile. &#xD;

 NOTE: 	These attributes are used to control scaling boundaries.</body>

             </ownedComment>

           </ownedAttribute>

-          <ownedAttribute xmi:type="uml:Property" xmi:id="_45bWYDzEEeiWMf5FLWfdLA" name="minBitrateRequirements" type="_nPNHsD2-Eeiu6I5JfRTxxQ">

+          <ownedAttribute xmi:type="uml:Property" xmi:id="_45bWYDzEEeiWMf5FLWfdLA" name="minBitrateRequirements">

             <ownedComment xmi:type="uml:Comment" xmi:id="_45bWYTzEEeiWMf5FLWfdLA" annotatedElement="_45bWYDzEEeiWMf5FLWfdLA">

               <body>Specifies the minimum bitrate requirements for a VL instantiated according to this profile.&#xD;

 NOTE: 	These attributes are used to control scaling boundaries.</body>

@@ -7065,6 +7065,9 @@ Shall be present when the addressType is IP address.</body>
           </ownedAttribute>

         </packagedElement>

         <packagedElement xmi:type="uml:DataType" xmi:id="_X9TdUDdPEeiIfPeSAqyGdQ" name="L2AddressData">

+          <ownedComment xmi:type="uml:Comment" xmi:id="_4Ik0gDVDEemHv-d7dSGofA" annotatedElement="_X9TdUDdPEeiIfPeSAqyGdQ">

+            <body>The L2AddressData information element supports providing information about Layer 2 level addressing applicable to a CP.</body>

+          </ownedComment>

           <ownedAttribute xmi:type="uml:Property" xmi:id="_ifaxMDdPEeiIfPeSAqyGdQ" name="macAddressAssignment">

             <ownedComment xmi:type="uml:Comment" xmi:id="_oHJ1wDdPEeiIfPeSAqyGdQ" annotatedElement="_ifaxMDdPEeiIfPeSAqyGdQ">

               <body>Specify if the MAC address assignment is the responsibility of management and orchestration function or not.&#xD;

@@ -7117,7 +7120,7 @@ NOTE: The address type should be aligned with the address type supported by the
         </packagedElement>

         <packagedElement xmi:type="uml:Enumeration" xmi:id="_tFQGcDnLEeiWMf5FLWfdLA" name="LayerProtocol">

           <ownedComment xmi:type="uml:Comment" xmi:id="_zLXwIDnLEeiWMf5FLWfdLA" annotatedElement="_tFQGcDnLEeiWMf5FLWfdLA">

-            <body>Identifies the protocol this VL gives access to </body>

+            <body>Identifies the protocol to which this VL gives access.</body>

           </ownedComment>

           <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_0VFxQDnLEeiWMf5FLWfdLA" name="ETHERNET"/>

           <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_2M_uEDnLEeiWMf5FLWfdLA" name="MPLS"/>

@@ -7126,26 +7129,6 @@ NOTE: The address type should be aligned with the address type supported by the
           <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_95b1UDnLEeiWMf5FLWfdLA" name="IPV6"/>

           <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="__bv8oDnLEeiWMf5FLWfdLA" name="PSEUDOWIRE"/>

         </packagedElement>

-        <packagedElement xmi:type="uml:DataType" xmi:id="_nPNHsD2-Eeiu6I5JfRTxxQ" name="LinkBitrateRequirements">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_nPNHsT2-Eeiu6I5JfRTxxQ" annotatedElement="_nPNHsD2-Eeiu6I5JfRTxxQ">

-            <body>The LinkBitrateRequirements datatype describes the requirements in terms of bitrate for a Virtual Link.</body>

-          </ownedComment>

-          <ownedAttribute xmi:type="uml:Property" xmi:id="_nPNHsj2-Eeiu6I5JfRTxxQ" name="root">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_nPNHsz2-Eeiu6I5JfRTxxQ" annotatedElement="_nPNHsj2-Eeiu6I5JfRTxxQ">

-              <body>Specifies the throughput requirement of the link (e.g. bitrate of E-Line, root bitrate of E-Tree, aggregate capacity of E-LAN).</body>

-            </ownedComment>

-            <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>

-          </ownedAttribute>

-          <ownedAttribute xmi:type="uml:Property" xmi:id="_nPNHtD2-Eeiu6I5JfRTxxQ" name="leaf">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_nPNHtT2-Eeiu6I5JfRTxxQ" annotatedElement="_nPNHtD2-Eeiu6I5JfRTxxQ">

-              <body>Specifies the throughput requirement of leaf connections to the link when applicable to the connectivity type (e.g. for E-Tree and E-LAN branches).&#xD;

-NOTE:	The present document does not specify the means to declare different bitrate requirements for leaf connections (e.g. E-LAN leaves).</body>

-            </ownedComment>

-            <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>

-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_nPNHtj2-Eeiu6I5JfRTxxQ"/>

-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_nPNHtz2-Eeiu6I5JfRTxxQ" value="1"/>

-          </ownedAttribute>

-        </packagedElement>

         <packagedElement xmi:type="uml:DataType" xmi:id="_LsX6UDgXEeiOYfGHew0BGg" name="LinkBitrateRequirements">

           <ownedComment xmi:type="uml:Comment" xmi:id="_TNBy4DgYEeiOYfGHew0BGg" annotatedElement="_LsX6UDgXEeiOYfGHew0BGg">

             <body>The LinkBitrateRequirements information element describes the requirements in terms of bitrate for a VL.</body>

@@ -7167,21 +7150,6 @@ NOTE: The present document does not specify the means to declare different bitra
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_GlNWwDgYEeiOYfGHew0BGg" value="1"/>

           </ownedAttribute>

         </packagedElement>

-        <packagedElement xmi:type="uml:DataType" xmi:id="_RVZi0D2-Eeiu6I5JfRTxxQ" name="LocalAffinityOrAntiAffinityRule">

-          <ownedAttribute xmi:type="uml:Property" xmi:id="_RVZi0T2-Eeiu6I5JfRTxxQ" name="type">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_RVZi0j2-Eeiu6I5JfRTxxQ" annotatedElement="_RVZi0T2-Eeiu6I5JfRTxxQ">

-              <body>Specifies whether the rule is an affinity rule or an anti-affinity rule.&#xD;

-</body>

-            </ownedComment>

-            <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>

-          </ownedAttribute>

-          <ownedAttribute xmi:type="uml:Property" xmi:id="_RVZi0z2-Eeiu6I5JfRTxxQ" name="scope">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_RVZi1D2-Eeiu6I5JfRTxxQ" annotatedElement="_RVZi0z2-Eeiu6I5JfRTxxQ">

-              <body>Specifies the scope of the rule.</body>

-            </ownedComment>

-            <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>

-          </ownedAttribute>

-        </packagedElement>

         <packagedElement xmi:type="uml:DataType" xmi:id="_7hn1IDd1EeiIfPeSAqyGdQ" name="LocalAffinityOrAntiAffinityRule">

           <ownedComment xmi:type="uml:Comment" xmi:id="_20J6EGNfEeio9amveq0yWQ" annotatedElement="_7hn1IDd1EeiIfPeSAqyGdQ">

             <body>The LocalAffinityOrAntiAffinityRule describes the affinity or anti-affinity rule applicable between the virtualization containers to be created based on a particular VDU, or between internal VLs to be created based on a particular VnfVirtualLinkDesc. &#xD;

@@ -7274,9 +7242,7 @@ transparency for this L2 protocol or not.</body>
         </packagedElement>

         <packagedElement xmi:type="uml:Enumeration" xmi:id="_6TxekB87EemJTaeYhZuDRA" name="NetworkType">

           <ownedComment xmi:type="uml:Comment" xmi:id="_Mss9sB88EemJTaeYhZuDRA" annotatedElement="_6TxekB87EemJTaeYhZuDRA">

-            <body>Specifies the network type for this L2&#xD;

-protocol. Possible values: FLAT, VLAN,&#xD;

-VXLAN, GRE.</body>

+            <body>Specifies the network type for this L2 protocol. </body>

           </ownedComment>

           <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_-HirIB87EemJTaeYhZuDRA" name="FLAT"/>

           <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="__jymsB87EemJTaeYhZuDRA" name="VLAN"/>

@@ -7418,13 +7384,9 @@ Note: The value of  ipv6RaMode and ipv6AddressMode must be same.&#xD;
         </packagedElement>

         <packagedElement xmi:type="uml:Enumeration" xmi:id="_I79lEB8-EemJTaeYhZuDRA" name="IpV6AdressMode">

           <ownedComment xmi:type="uml:Comment" xmi:id="_OQxtoB8-EemJTaeYhZuDRA" annotatedElement="_I79lEB8-EemJTaeYhZuDRA">

-            <body>Specifies IPv6 address mode. Possible&#xD;

-values:&#xD;

-• SLAAC.&#xD;

-• DHCPV6-STATEFUL.&#xD;

-• DHCPV6-STATELESS.&#xD;

+            <body>Specifies IPv6 address mode.  &#xD;

 May be present when the value of the&#xD;

-ipVersion attribute is &quot;IPV6&quot; and shall be&#xD;

+ipVersion attribute is IPV6 and shall be&#xD;

 absent otherwise.</body>

           </ownedComment>

           <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_QWVE4B8-EemJTaeYhZuDRA" name="SLAAC"/>

@@ -7959,10 +7921,6 @@ It is the asbstract parent of the NsQos and VnfQos datatypes, as the NsQoS (QoS
   <OpenModel_Profile:OpenModelAttribute xmi:id="_P-rlUD2vEeiu6I5JfRTxxQ" base_StructuralFeature="_P-qXMj2vEeiu6I5JfRTxxQ"/>

   <OpenModel_Profile:OpenModelAttribute xmi:id="_P-szcD2vEeiu6I5JfRTxxQ" base_StructuralFeature="_P-qXND2vEeiu6I5JfRTxxQ"/>

   <OpenModel_Profile:OpenModelAttribute xmi:id="_P-tagD2vEeiu6I5JfRTxxQ" base_StructuralFeature="_P-qXNj2vEeiu6I5JfRTxxQ"/>

-  <OpenModel_Profile:OpenModelAttribute xmi:id="_RVZi1T2-Eeiu6I5JfRTxxQ" base_StructuralFeature="_RVZi0T2-Eeiu6I5JfRTxxQ"/>

-  <OpenModel_Profile:OpenModelAttribute xmi:id="_RVaJ4D2-Eeiu6I5JfRTxxQ" base_StructuralFeature="_RVZi0z2-Eeiu6I5JfRTxxQ"/>

-  <OpenModel_Profile:OpenModelAttribute xmi:id="_nPNHuD2-Eeiu6I5JfRTxxQ" base_StructuralFeature="_nPNHsj2-Eeiu6I5JfRTxxQ"/>

-  <OpenModel_Profile:OpenModelAttribute xmi:id="_nPNuwD2-Eeiu6I5JfRTxxQ" base_StructuralFeature="_nPNHtD2-Eeiu6I5JfRTxxQ"/>

   <OpenModel_Profile:OpenModelClass xmi:id="_Tw52MES0EeiVGPeZpaYNtQ" base_Class="_Tw5PIES0EeiVGPeZpaYNtQ"/>

   <OpenModel_Profile:OpenModelClass xmi:id="_il0cAUS0EeiVGPeZpaYNtQ" base_Class="_il0cAES0EeiVGPeZpaYNtQ"/>

   <OpenModel_Profile:OpenModelAttribute xmi:id="_vV3AAES0EeiVGPeZpaYNtQ" base_StructuralFeature="_vV1x4kS0EeiVGPeZpaYNtQ"/>

@@ -8284,8 +8242,6 @@ It is the asbstract parent of the NsQos and VnfQos datatypes, as the NsQoS (QoS
   <OpenModel_Profile:Preliminary xmi:id="__h6bwKe4Eeixw5Ke5QD1pQ" base_Element="_AuYtcDkBEeiWMf5FLWfdLA"/>

   <OpenModel_Profile:Preliminary xmi:id="_BU2ZAKe5Eeixw5Ke5QD1pQ" base_Element="_vxJ9ADafEei23_xWdimG9w"/>

   <OpenModel_Profile:Preliminary xmi:id="_Gv66kKe5Eeixw5Ke5QD1pQ" base_Element="_P-qXMD2vEeiu6I5JfRTxxQ"/>

-  <OpenModel_Profile:Preliminary xmi:id="_IbgSoKe5Eeixw5Ke5QD1pQ" base_Element="_RVZi0D2-Eeiu6I5JfRTxxQ"/>

-  <OpenModel_Profile:Preliminary xmi:id="_KERAMKe5Eeixw5Ke5QD1pQ" base_Element="_nPNHsD2-Eeiu6I5JfRTxxQ"/>

   <OpenModel_Profile:Preliminary xmi:id="_LkXhAKe5Eeixw5Ke5QD1pQ" base_Element="_oXexoD2uEeiu6I5JfRTxxQ"/>

   <OpenModel_Profile:Preliminary xmi:id="_NfABsKe5Eeixw5Ke5QD1pQ" base_Element="_YQwQ0D0NEeiWMf5FLWfdLA"/>

   <OpenModel_Profile:Preliminary xmi:id="_Pib5EKe5Eeixw5Ke5QD1pQ" base_Element="_8dlAoD0TEeiWMf5FLWfdLA"/>

@@ -9214,4 +9170,40 @@ It is the asbstract parent of the NsQos and VnfQos datatypes, as the NsQoS (QoS
   <OpenModel_Profile:OpenModelClass xmi:id="_srGdATFQEemw1_Ys6rcLWw" base_Class="_srGdADFQEemw1_Ys6rcLWw"/>

   <OpenModel_Profile:OpenModelAttribute xmi:id="_tw4IkTFsEemw1_Ys6rcLWw" base_StructuralFeature="_tw4IkDFsEemw1_Ys6rcLWw"/>

   <OpenModel_Profile:OpenModelAttribute xmi:id="_tw5WsTFsEemw1_Ys6rcLWw" base_StructuralFeature="_tw5WsDFsEemw1_Ys6rcLWw"/>

+  <OpenModel_Profile:Reference xmi:id="_FLCc0DOlEemzC6274d_Yog" base_Element="_8naVoES0EeiVGPeZpaYNtQ" reference="IFA011 v2.5.1"/>

+  <OpenModel_Profile:Experimental xmi:id="_dyf6wDOlEemzC6274d_Yog" base_Element="_PJJAYB87EemJTaeYhZuDRA"/>

+  <OpenModel_Profile:Experimental xmi:id="_fTDHgDOlEemzC6274d_Yog" base_Element="_PuRtwB87EemJTaeYhZuDRA"/>

+  <OpenModel_Profile:Experimental xmi:id="_gyrHMDOlEemzC6274d_Yog" base_Element="_Qe_ZAB87EemJTaeYhZuDRA"/>

+  <OpenModel_Profile:Experimental xmi:id="_ieGuQDOlEemzC6274d_Yog" base_Element="_ej13AB8_EemJTaeYhZuDRA"/>

+  <OpenModel_Profile:Future xmi:id="_kz4S0DOlEemzC6274d_Yog" base_Element="_EXheUCCjEemw1L3J4dNy4w"/>

+  <OpenModel_Profile:Future xmi:id="_mPacsDOlEemzC6274d_Yog" base_Element="_FUxJsCCjEemw1L3J4dNy4w"/>

+  <OpenModel_Profile:Future xmi:id="_oMWDcDOlEemzC6274d_Yog" base_Element="_GEsKwCCjEemw1L3J4dNy4w"/>

+  <OpenModel_Profile:Preliminary xmi:id="__2gysDOlEemzC6274d_Yog" base_Element="_-b8GcDdPEeiIfPeSAqyGdQ"/>

+  <OpenModel_Profile:Preliminary xmi:id="_Cn4uIDOmEemzC6274d_Yog" base_Element="__BqCoDdPEeiIfPeSAqyGdQ"/>

+  <OpenModel_Profile:Preliminary xmi:id="_ExUf0DOmEemzC6274d_Yog" base_Element="__o0JQDdPEeiIfPeSAqyGdQ"/>

+  <OpenModel_Profile:Preliminary xmi:id="_G6J0kDOmEemzC6274d_Yog" base_Element="_Ag8rIDdQEeiIfPeSAqyGdQ"/>

+  <OpenModel_Profile:Experimental xmi:id="_kukfkDOmEemzC6274d_Yog" base_Element="_Z5XzUB88EemJTaeYhZuDRA"/>

+  <OpenModel_Profile:Experimental xmi:id="_l1JtIDOmEemzC6274d_Yog" base_Element="_XWjUcB9AEemJTaeYhZuDRA"/>

+  <OpenModel_Profile:Experimental xmi:id="_nPiAcDOmEemzC6274d_Yog" base_Element="_YJLEMB9AEemJTaeYhZuDRA"/>

+  <OpenModel_Profile:Experimental xmi:id="_o75boDOmEemzC6274d_Yog" base_Element="_Y2KGAB9AEemJTaeYhZuDRA"/>

+  <OpenModel_Profile:Experimental xmi:id="_qmSg4DOmEemzC6274d_Yog" base_Element="_ZdOtEB9AEemJTaeYhZuDRA"/>

+  <OpenModel_Profile:Experimental xmi:id="_sM1A4DOmEemzC6274d_Yog" base_Element="_aMwFgB9AEemJTaeYhZuDRA"/>

+  <OpenModel_Profile:Experimental xmi:id="_ty4YsDOmEemzC6274d_Yog" base_Element="_a3GDAB9AEemJTaeYhZuDRA"/>

+  <OpenModel_Profile:Future xmi:id="_v7WhEDOmEemzC6274d_Yog" base_Element="_ZrpFwCCvEemw1L3J4dNy4w"/>

+  <OpenModel_Profile:Future xmi:id="_xUL8QDOmEemzC6274d_Yog" base_Element="_5LAPoCCvEemw1L3J4dNy4w"/>

+  <OpenModel_Profile:Future xmi:id="_zZbKcDOmEemzC6274d_Yog" base_Element="_65JzgCCvEemw1L3J4dNy4w"/>

+  <OpenModel_Profile:Future xmi:id="___prIDOmEemzC6274d_Yog" base_Element="_uFBX8PuHEeiYVshOvl6_ww"/>

+  <OpenModel_Profile:Future xmi:id="_BVI3YDOnEemzC6274d_Yog" base_Element="_RayLoPuIEeiYVshOvl6_ww"/>

+  <OpenModel_Profile:Future xmi:id="_DAEIIDOnEemzC6274d_Yog" base_Element="_gUB30PuIEeiYVshOvl6_ww"/>

+  <OpenModel_Profile:OpenModelAttribute xmi:id="_GA6IYTd_EeiIfPeSAqyGdQ" base_StructuralFeature="_GA6IYDd_EeiIfPeSAqyGdQ"/>

+  <OpenModel_Profile:OpenModelAttribute xmi:id="_G-M3EDd_EeiIfPeSAqyGdQ" base_StructuralFeature="_G-MQADd_EeiIfPeSAqyGdQ"/>

+  <OpenModel_Profile:OpenModelAttribute xmi:id="_Hy64kTd_EeiIfPeSAqyGdQ" base_StructuralFeature="_Hy64kDd_EeiIfPeSAqyGdQ"/>

+  <OpenModel_Profile:Preliminary xmi:id="_9Ult4JUHEeiYXO5wr78TUw" base_Element="_GA6IYDd_EeiIfPeSAqyGdQ"/>

+  <OpenModel_Profile:Preliminary xmi:id="_-NoOsJUHEeiYXO5wr78TUw" base_Element="_G-MQADd_EeiIfPeSAqyGdQ"/>

+  <OpenModel_Profile:Preliminary xmi:id="__AwUwJUHEeiYXO5wr78TUw" base_Element="_Hy64kDd_EeiIfPeSAqyGdQ"/>

+  <OpenModel_Profile:Experimental xmi:id="_3b7QMJdeEei-sOl6ywWHlg" base_Element="_TXtQgJddEei-sOl6ywWHlg"/>

+  <OpenModel_Profile:Experimental xmi:id="_41m_8JdeEei-sOl6ywWHlg" base_Element="_UVFewJddEei-sOl6ywWHlg"/>

+  <OpenModel_Profile:OpenModelAttribute xmi:id="_uFCmEPuHEeiYVshOvl6_ww" base_StructuralFeature="_uFBX8PuHEeiYVshOvl6_ww"/>

+  <OpenModel_Profile:OpenModelAttribute xmi:id="_RayLofuIEeiYVshOvl6_ww" base_StructuralFeature="_RayLoPuIEeiYVshOvl6_ww"/>

+  <OpenModel_Profile:OpenModelAttribute xmi:id="_gUB30fuIEeiYVshOvl6_ww" base_StructuralFeature="_gUB30PuIEeiYVshOvl6_ww"/>

 </xmi:XMI>

diff --git a/ONAP Information Model/GenDoc/ONAP GenDoc Template.docx b/ONAP Information Model/GenDoc/ONAP GenDoc Template.docx
index 05066f9..1040c94 100644
--- a/ONAP Information Model/GenDoc/ONAP GenDoc Template.docx
+++ b/ONAP Information Model/GenDoc/ONAP GenDoc Template.docx
diff --git a/ONAP Information Model/GenDoc/ONAP Model GenDoc Template-Landscape-v3-02.docx b/ONAP Information Model/GenDoc/ONAP Model GenDoc Template-Landscape-v3-02.docx
index 09829d5..569d66c 100644
--- a/ONAP Information Model/GenDoc/ONAP Model GenDoc Template-Landscape-v3-02.docx
+++ b/ONAP Information Model/GenDoc/ONAP Model GenDoc Template-Landscape-v3-02.docx
diff --git a/ONAP Information Model/GenDoc/ONAP Model Structure.docx b/ONAP Information Model/GenDoc/ONAP Model Structure.docx
index 93c9b20..5fac349 100644
--- a/ONAP Information Model/GenDoc/ONAP Model Structure.docx
+++ b/ONAP Information Model/GenDoc/ONAP Model Structure.docx
diff --git a/ONAP Information Model/ModelStructure/OnapModelStructure.docx b/ONAP Information Model/ModelStructure/OnapModelStructure.docx
new file mode 100644
index 0000000..999af9b
--- /dev/null
+++ b/ONAP Information Model/ModelStructure/OnapModelStructure.docx
diff --git a/ONAP Information Model/Party.uml b/ONAP Information Model/Party.uml
index 6726e2a..7e968b7 100644
--- a/ONAP Information Model/Party.uml
+++ b/ONAP Information Model/Party.uml
@@ -1,37 +1,62 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<uml:Package xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_oZz14DOHEei5Af8DcjrhIQ" name="Party">

-  <packagedElement xmi:type="uml:Package" xmi:id="_pl6coDOHEei5Af8DcjrhIQ" name="Associations"/>

-  <packagedElement xmi:type="uml:Package" xmi:id="_pl7DsDOHEei5Af8DcjrhIQ" name="Diagrams">

-    <packagedElement xmi:type="uml:Class" xmi:id="_pLrroC7mEem7DJry5UTesQ" name="Party"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_rdTI8C7mEem7DJry5UTesQ" name="Individual">

-      <generalization xmi:type="uml:Generalization" xmi:id="_3Dw1wC7mEem7DJry5UTesQ" general="_pLrroC7mEem7DJry5UTesQ"/>

+<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:OpenModel_Profile="http:///schemas/OpenModel_Profile/_zWCisKVxEeikF6xsfT18UA/26" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http:///schemas/OpenModel_Profile/_zWCisKVxEeikF6xsfT18UA/26 OpenModel_Profile.profile.uml#_zWYg8KVxEeikF6xsfT18UA">

+  <uml:Package xmi:id="_oZz14DOHEei5Af8DcjrhIQ" name="Party">

+    <packagedElement xmi:type="uml:Package" xmi:id="_pl6coDOHEei5Af8DcjrhIQ" name="Associations"/>

+    <packagedElement xmi:type="uml:Package" xmi:id="_pl7DsDOHEei5Af8DcjrhIQ" name="Diagrams">

+      <packagedElement xmi:type="uml:Class" xmi:id="_pLrroC7mEem7DJry5UTesQ" name="Party"/>

+      <packagedElement xmi:type="uml:Class" xmi:id="_rdTI8C7mEem7DJry5UTesQ" name="Individual">

+        <generalization xmi:type="uml:Generalization" xmi:id="_3Dw1wC7mEem7DJry5UTesQ" general="_pLrroC7mEem7DJry5UTesQ"/>

+      </packagedElement>

+      <packagedElement xmi:type="uml:Class" xmi:id="_shyr0C7mEem7DJry5UTesQ" name="Organization">

+        <generalization xmi:type="uml:Generalization" xmi:id="_33D68C7mEem7DJry5UTesQ" general="_pLrroC7mEem7DJry5UTesQ"/>

+      </packagedElement>

+      <packagedElement xmi:type="uml:Class" xmi:id="_yB-98C7mEem7DJry5UTesQ" name="OrganizationDecompositionComponent"/>

+      <packagedElement xmi:type="uml:Class" xmi:id="_5mFBgC7mEem7DJry5UTesQ" name="AtomicOrganization">

+        <generalization xmi:type="uml:Generalization" xmi:id="_UjGooC7nEem7DJry5UTesQ" general="_shyr0C7mEem7DJry5UTesQ"/>

+      </packagedElement>

+      <packagedElement xmi:type="uml:Class" xmi:id="_6E0zAC7mEem7DJry5UTesQ" name="CompositeOrganization">

+        <generalization xmi:type="uml:Generalization" xmi:id="_XP0tkC7nEem7DJry5UTesQ" general="_shyr0C7mEem7DJry5UTesQ"/>

+      </packagedElement>

+      <packagedElement xmi:type="uml:Association" xmi:id="_qTvDYC7nEem7DJry5UTesQ" name="CompositeOrganizationComposedOf" memberEnd="_qTw4kC7nEem7DJry5UTesQ _qTxfoC7nEem7DJry5UTesQ">

+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_qTwRgC7nEem7DJry5UTesQ" source="org.eclipse.papyrus">

+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_qTwRgS7nEem7DJry5UTesQ" key="nature" value="UML_Nature"/>

+        </eAnnotations>

+        <ownedEnd xmi:type="uml:Property" xmi:id="_qTw4kC7nEem7DJry5UTesQ" name="organizationdecompositioncomponent" type="_yB-98C7mEem7DJry5UTesQ" association="_qTvDYC7nEem7DJry5UTesQ"/>

+        <ownedEnd xmi:type="uml:Property" xmi:id="_qTxfoC7nEem7DJry5UTesQ" name="compositeorganization" type="_6E0zAC7mEem7DJry5UTesQ" association="_qTvDYC7nEem7DJry5UTesQ"/>

+      </packagedElement>

+      <packagedElement xmi:type="uml:Association" xmi:id="_q99FEC7nEem7DJry5UTesQ" memberEnd="_q99sIC7nEem7DJry5UTesQ _q99sIS7nEem7DJry5UTesQ">

+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_q99FES7nEem7DJry5UTesQ" source="org.eclipse.papyrus">

+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_q99FEi7nEem7DJry5UTesQ" key="nature" value="UML_Nature"/>

+        </eAnnotations>

+        <ownedEnd xmi:type="uml:Property" xmi:id="_q99sIC7nEem7DJry5UTesQ" name="organization" type="_shyr0C7mEem7DJry5UTesQ" association="_q99FEC7nEem7DJry5UTesQ"/>

+        <ownedEnd xmi:type="uml:Property" xmi:id="_q99sIS7nEem7DJry5UTesQ" name="organizationdecompositioncomponent" type="_yB-98C7mEem7DJry5UTesQ" association="_q99FEC7nEem7DJry5UTesQ"/>

+      </packagedElement>

     </packagedElement>

-    <packagedElement xmi:type="uml:Class" xmi:id="_shyr0C7mEem7DJry5UTesQ" name="Organization">

-      <generalization xmi:type="uml:Generalization" xmi:id="_33D68C7mEem7DJry5UTesQ" general="_pLrroC7mEem7DJry5UTesQ"/>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Class" xmi:id="_yB-98C7mEem7DJry5UTesQ" name="OrganizationDecompositionComponent"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_5mFBgC7mEem7DJry5UTesQ" name="AtomicOrganization">

-      <generalization xmi:type="uml:Generalization" xmi:id="_UjGooC7nEem7DJry5UTesQ" general="_shyr0C7mEem7DJry5UTesQ"/>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Class" xmi:id="_6E0zAC7mEem7DJry5UTesQ" name="CompositeOrganization">

-      <generalization xmi:type="uml:Generalization" xmi:id="_XP0tkC7nEem7DJry5UTesQ" general="_shyr0C7mEem7DJry5UTesQ"/>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Association" xmi:id="_qTvDYC7nEem7DJry5UTesQ" name="CompositeOrganizationComposedOf" memberEnd="_qTw4kC7nEem7DJry5UTesQ _qTxfoC7nEem7DJry5UTesQ">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_qTwRgC7nEem7DJry5UTesQ" source="org.eclipse.papyrus">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_qTwRgS7nEem7DJry5UTesQ" key="nature" value="UML_Nature"/>

+    <packagedElement xmi:type="uml:Package" xmi:id="_pl7DsTOHEei5Af8DcjrhIQ" name="Interfaces"/>

+    <packagedElement xmi:type="uml:Package" xmi:id="_pl7qwDOHEei5Af8DcjrhIQ" name="ObjectClasses"/>

+    <packagedElement xmi:type="uml:Package" xmi:id="_pl7qwTOHEei5Af8DcjrhIQ" name="TypeDefinitions"/>

+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_gXw5UDRUEemxav-w1cv0cw">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_gX0jsjRUEemxav-w1cv0cw" source="PapyrusVersion">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_gX0jszRUEemxav-w1cv0cw" key="Version" value="0.2.14"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_gX0jtDRUEemxav-w1cv0cw" key="Comment" value=""/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_gX0jtTRUEemxav-w1cv0cw" key="Copyright" value=""/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_gX0jtjRUEemxav-w1cv0cw" key="Date" value="2018-08-21"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_gX0jtzRUEemxav-w1cv0cw" key="Author" value="J. Jewitt"/>

       </eAnnotations>

-      <ownedEnd xmi:type="uml:Property" xmi:id="_qTw4kC7nEem7DJry5UTesQ" name="organizationdecompositioncomponent" type="_yB-98C7mEem7DJry5UTesQ" association="_qTvDYC7nEem7DJry5UTesQ"/>

-      <ownedEnd xmi:type="uml:Property" xmi:id="_qTxfoC7nEem7DJry5UTesQ" name="compositeorganization" type="_6E0zAC7mEem7DJry5UTesQ" association="_qTvDYC7nEem7DJry5UTesQ"/>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Association" xmi:id="_q99FEC7nEem7DJry5UTesQ" memberEnd="_q99sIC7nEem7DJry5UTesQ _q99sIS7nEem7DJry5UTesQ">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_q99FES7nEem7DJry5UTesQ" source="org.eclipse.papyrus">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_q99FEi7nEem7DJry5UTesQ" key="nature" value="UML_Nature"/>

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_gXyugDRUEemxav-w1cv0cw" source="http://www.eclipse.org/uml2/2.0.0/UML">

+        <references xmi:type="ecore:EPackage" href="OpenModel_Profile.profile.uml#_zWYg8KVxEeikF6xsfT18UA"/>

       </eAnnotations>

-      <ownedEnd xmi:type="uml:Property" xmi:id="_q99sIC7nEem7DJry5UTesQ" name="organization" type="_shyr0C7mEem7DJry5UTesQ" association="_q99FEC7nEem7DJry5UTesQ"/>

-      <ownedEnd xmi:type="uml:Property" xmi:id="_q99sIS7nEem7DJry5UTesQ" name="organizationdecompositioncomponent" type="_yB-98C7mEem7DJry5UTesQ" association="_q99FEC7nEem7DJry5UTesQ"/>

-    </packagedElement>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Package" xmi:id="_pl7DsTOHEei5Af8DcjrhIQ" name="Interfaces"/>

-  <packagedElement xmi:type="uml:Package" xmi:id="_pl7qwDOHEei5Af8DcjrhIQ" name="ObjectClasses"/>

-  <packagedElement xmi:type="uml:Package" xmi:id="_pl7qwTOHEei5Af8DcjrhIQ" name="TypeDefinitions"/>

-</uml:Package>

+      <appliedProfile xmi:type="uml:Profile" href="OpenModel_Profile.profile.uml#_m1xqsHBgEd6FKu9XX1078A"/>

+    </profileApplication>

+  </uml:Package>

+  <OpenModel_Profile:OpenModelClass xmi:id="_gXzVkDRUEemxav-w1cv0cw" base_Class="_pLrroC7mEem7DJry5UTesQ"/>

+  <OpenModel_Profile:OpenModelClass xmi:id="_gXz8oDRUEemxav-w1cv0cw" base_Class="_rdTI8C7mEem7DJry5UTesQ"/>

+  <OpenModel_Profile:OpenModelClass xmi:id="_gXz8oTRUEemxav-w1cv0cw" base_Class="_shyr0C7mEem7DJry5UTesQ"/>

+  <OpenModel_Profile:OpenModelClass xmi:id="_gXz8ojRUEemxav-w1cv0cw" base_Class="_yB-98C7mEem7DJry5UTesQ"/>

+  <OpenModel_Profile:OpenModelClass xmi:id="_gXz8ozRUEemxav-w1cv0cw" base_Class="_5mFBgC7mEem7DJry5UTesQ"/>

+  <OpenModel_Profile:OpenModelClass xmi:id="_gXz8pDRUEemxav-w1cv0cw" base_Class="_6E0zAC7mEem7DJry5UTesQ"/>

+  <OpenModel_Profile:OpenModelAttribute xmi:id="_gXz8pTRUEemxav-w1cv0cw" base_StructuralFeature="_qTw4kC7nEem7DJry5UTesQ"/>

+  <OpenModel_Profile:OpenModelAttribute xmi:id="_gXz8pjRUEemxav-w1cv0cw" base_StructuralFeature="_qTxfoC7nEem7DJry5UTesQ"/>

+  <OpenModel_Profile:OpenModelAttribute xmi:id="_gX0jsDRUEemxav-w1cv0cw" base_StructuralFeature="_q99sIC7nEem7DJry5UTesQ"/>

+  <OpenModel_Profile:OpenModelAttribute xmi:id="_gX0jsTRUEemxav-w1cv0cw" base_StructuralFeature="_q99sIS7nEem7DJry5UTesQ"/>

+</xmi:XMI>

diff --git a/ONAP Information Model/Vnf.notation b/ONAP Information Model/Vnf.notation
index 41e0e48..32edc05 100644
--- a/ONAP Information Model/Vnf.notation
+++ b/ONAP Information Model/Vnf.notation
@@ -856,76 +856,6 @@
       <element xsi:nil="true"/>

       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OQjLnTaIEei23_xWdimG9w" x="200" y="580"/>

     </children>

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

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

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

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

-      </children>

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

-        <children xmi:type="notation:Shape" xmi:id="_lyjwcDkREeiWMf5FLWfdLA" type="Property_ClassAttributeLabel">

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

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

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

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

-          </children>

-          <element xmi:type="uml:Property" href="Common.uml#_pszPADd9EeiIfPeSAqyGdQ"/>

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

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_5B8qUDm9EeiWMf5FLWfdLA" type="Property_ClassAttributeLabel">

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

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EdwvUEgBEeimoNQADLD_mg" source="PapyrusCSSForceValue">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EdwvUUgBEeimoNQADLD_mg" key="visible" value="true"/>

-            </eAnnotations>

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

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

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

-          </children>

-          <element xmi:type="uml:Property" href="Common.uml#_qgZPIDd9EeiIfPeSAqyGdQ"/>

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

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_5B94cDm9EeiWMf5FLWfdLA" type="Property_ClassAttributeLabel">

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

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

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

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

-          </children>

-          <element xmi:type="uml:Property" href="Common.uml#_rY7ZoDd9EeiIfPeSAqyGdQ"/>

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

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_5CA7wDm9EeiWMf5FLWfdLA" type="Property_ClassAttributeLabel">

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

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

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

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

-          </children>

-          <element xmi:type="uml:Property" href="Common.uml#_1X3vADd9EeiIfPeSAqyGdQ"/>

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

-        </children>

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

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

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

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

-      </children>

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

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

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

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

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

-      </children>

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

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

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

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

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

-      </children>

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

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

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

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

-      </children>

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

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gG2K0TkREeiWMf5FLWfdLA" x="500" y="60" height="121"/>

-    </children>

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

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

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

@@ -994,7 +924,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rYZ8A4UrEeiRGZJrXkgR0w"/>

       </children>

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

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XVHG0Tm-EeiWMf5FLWfdLA" x="240" y="-20" height="81"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XVHG0Tm-EeiWMf5FLWfdLA" x="620" height="81"/>

     </children>

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

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

@@ -1156,6 +1086,81 @@
       <element xsi:nil="true"/>

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

     </children>

+    <children xmi:type="notation:Shape" xmi:id="_-FD-8DRwEem2n8bBHelJyw" type="Class_Shape">

+      <children xmi:type="notation:DecorationNode" xmi:id="_-FI3cDRwEem2n8bBHelJyw" type="Class_NameLabel"/>

+      <children xmi:type="notation:DecorationNode" xmi:id="_-FJegDRwEem2n8bBHelJyw" type="Class_FloatingNameLabel">

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_-FKFkDRwEem2n8bBHelJyw" y="15"/>

+      </children>

+      <children xmi:type="notation:BasicCompartment" xmi:id="_-FKsoDRwEem2n8bBHelJyw" type="Class_AttributeCompartment">

+        <children xmi:type="notation:Shape" xmi:id="_UuH2gDRxEem2n8bBHelJyw" type="Property_ClassAttributeLabel">

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

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

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

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

+          </children>

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

+          <layoutConstraint xmi:type="notation:Location" xmi:id="_UuIdkDRxEem2n8bBHelJyw"/>

+        </children>

+        <children xmi:type="notation:Shape" xmi:id="_UuK50DRxEem2n8bBHelJyw" type="Property_ClassAttributeLabel">

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

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

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

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

+          </children>

+          <element xmi:type="uml:Property" href="Common.uml#_Tw79sj2pEeiu6I5JfRTxxQ"/>

+          <layoutConstraint xmi:type="notation:Location" xmi:id="_UuK50TRxEem2n8bBHelJyw"/>

+        </children>

+        <children xmi:type="notation:Shape" xmi:id="_UuMH8DRxEem2n8bBHelJyw" type="Property_ClassAttributeLabel">

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

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

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

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

+          </children>

+          <element xmi:type="uml:Property" href="Common.uml#_Tw79tD2pEeiu6I5JfRTxxQ"/>

+          <layoutConstraint xmi:type="notation:Location" xmi:id="_UuMH8TRxEem2n8bBHelJyw"/>

+        </children>

+        <children xmi:type="notation:Shape" xmi:id="_UuNWEDRxEem2n8bBHelJyw" type="Property_ClassAttributeLabel">

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

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

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

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

+          </children>

+          <element xmi:type="uml:Property" href="Common.uml#_Tw79uj2pEeiu6I5JfRTxxQ"/>

+          <layoutConstraint xmi:type="notation:Location" xmi:id="_UuNWETRxEem2n8bBHelJyw"/>

+        </children>

+        <styles xmi:type="notation:TitleStyle" xmi:id="_-FKsoTRwEem2n8bBHelJyw"/>

+        <styles xmi:type="notation:SortingStyle" xmi:id="_-FKsojRwEem2n8bBHelJyw"/>

+        <styles xmi:type="notation:FilteringStyle" xmi:id="_-FKsozRwEem2n8bBHelJyw"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-FKspDRwEem2n8bBHelJyw"/>

+      </children>

+      <children xmi:type="notation:BasicCompartment" xmi:id="_-FKspTRwEem2n8bBHelJyw" visible="false" type="Class_OperationCompartment">

+        <styles xmi:type="notation:TitleStyle" xmi:id="_-FKspjRwEem2n8bBHelJyw"/>

+        <styles xmi:type="notation:SortingStyle" xmi:id="_-FKspzRwEem2n8bBHelJyw"/>

+        <styles xmi:type="notation:FilteringStyle" xmi:id="_-FKsqDRwEem2n8bBHelJyw"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-FKsqTRwEem2n8bBHelJyw"/>

+      </children>

+      <children xmi:type="notation:BasicCompartment" xmi:id="_-FLTsDRwEem2n8bBHelJyw" visible="false" type="Class_NestedClassifierCompartment">

+        <styles xmi:type="notation:TitleStyle" xmi:id="_-FLTsTRwEem2n8bBHelJyw"/>

+        <styles xmi:type="notation:SortingStyle" xmi:id="_-FLTsjRwEem2n8bBHelJyw"/>

+        <styles xmi:type="notation:FilteringStyle" xmi:id="_-FLTszRwEem2n8bBHelJyw"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-FLTtDRwEem2n8bBHelJyw"/>

+      </children>

+      <children xmi:type="notation:DecorationNode" xmi:id="_-Fqb4DRwEem2n8bBHelJyw" visible="false" type="StereotypeLabel">

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

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

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-Fqb4jRwEem2n8bBHelJyw"/>

+      </children>

+      <element xmi:type="uml:Class" href="Vnf.uml#_-5-w8Cr9EemS0_wZSU3sbA"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-FEmADRwEem2n8bBHelJyw" x="200" height="121"/>

+    </children>

+    <children xmi:type="notation:Shape" xmi:id="_-GErkDRwEem2n8bBHelJyw" type="StereotypeComment">

+      <styles xmi:type="notation:TitleStyle" xmi:id="_-GErkTRwEem2n8bBHelJyw"/>

+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_-GFSoDRwEem2n8bBHelJyw" name="BASE_ELEMENT">

+        <eObjectValue xmi:type="uml:Class" href="Vnf.uml#_-5-w8Cr9EemS0_wZSU3sbA"/>

+      </styles>

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

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-GErkjRwEem2n8bBHelJyw" x="200"/>

+    </children>

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

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

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

@@ -1264,11 +1269,11 @@
     <edges xmi:type="notation:Connector" xmi:id="_EUnc8DTSEeiwQ6KPLHcy4g" type="Association_Edge" source="_YQdLMDTQEeiwQ6KPLHcy4g" target="_aaUQoDOREeiHat9KcP8uWA">

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

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

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

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_EUoEATTSEeiwQ6KPLHcy4g" x="16" y="50"/>

       </children>

       <children xmi:type="notation:DecorationNode" xmi:id="_EUoEAjTSEeiwQ6KPLHcy4g" type="Association_NameLabel">

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

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

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_EUoEAzTSEeiwQ6KPLHcy4g" x="36" y="58"/>

       </children>

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

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

@@ -1444,7 +1449,7 @@
       </children>

       <children xmi:type="notation:DecorationNode" xmi:id="_u0WodTadEei23_xWdimG9w" type="Association_NameLabel">

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

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_u0WodjadEei23_xWdimG9w" x="27" y="161"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_u0WodjadEei23_xWdimG9w" x="17" y="161"/>

       </children>

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

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

@@ -1592,16 +1597,6 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ok2ZQDkOEeiWMf5FLWfdLA" id="(1.0,0.2846975088967972)"/>

       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ok2ZQTkOEeiWMf5FLWfdLA" id="(0.33240997229916897,0.0)"/>

     </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_gKxBgDkREeiWMf5FLWfdLA" type="StereotypeCommentLink" source="_gG2K0DkREeiWMf5FLWfdLA" target="_gKvMUDkREeiWMf5FLWfdLA">

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

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

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

-      </styles>

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

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

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

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

-    </edges>

     <edges xmi:type="notation:Connector" xmi:id="_XW1lJDm-EeiWMf5FLWfdLA" type="StereotypeCommentLink" source="_XVHG0Dm-EeiWMf5FLWfdLA" target="_XW1lIDm-EeiWMf5FLWfdLA">

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

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

@@ -1612,37 +1607,6 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XW1lJzm-EeiWMf5FLWfdLA"/>

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

     </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_XycTUDnPEeiWMf5FLWfdLA" type="Association_Edge" source="_YQdLMDTQEeiwQ6KPLHcy4g" target="_gG2K0DkREeiWMf5FLWfdLA" routing="Rectilinear">

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

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

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

-      </children>

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

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

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_XyeIgznPEeiWMf5FLWfdLA" x="75" y="-13"/>

-      </children>

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

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

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

-      </children>

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

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

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

-      </children>

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

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

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

-      </children>

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

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

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

-      </children>

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

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

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_XycTUjnPEeiWMf5FLWfdLA" points="[81, 140, -643984, -643984]$[280, 140, -643984, -643984]$[280, 120, -643984, -643984]$[480, 120, -643984, -643984]"/>

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

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

-    </edges>

     <edges xmi:type="notation:Connector" xmi:id="_7Yz3IBiwEemU7tpKjNcB0w" type="Association_Edge" source="_e5ZEADOREeiHat9KcP8uWA" target="_e5ZEADOREeiHat9KcP8uWA">

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

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

@@ -1820,6 +1784,70 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lUxI4CvPEemS0_wZSU3sbA" id="(0.2127659574468085,0.0)"/>

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

     </edges>

+    <edges xmi:type="notation:Connector" xmi:id="_-GHH0DRwEem2n8bBHelJyw" type="StereotypeCommentLink" source="_-FD-8DRwEem2n8bBHelJyw" target="_-GErkDRwEem2n8bBHelJyw">

+      <styles xmi:type="notation:FontStyle" xmi:id="_-GHH0TRwEem2n8bBHelJyw"/>

+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_-GIV8TRwEem2n8bBHelJyw" name="BASE_ELEMENT">

+        <eObjectValue xmi:type="uml:Class" href="Vnf.uml#_-5-w8Cr9EemS0_wZSU3sbA"/>

+      </styles>

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

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

+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-GHu4DRwEem2n8bBHelJyw"/>

+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-GIV8DRwEem2n8bBHelJyw"/>

+    </edges>

+    <edges xmi:type="notation:Connector" xmi:id="_2I91oDRxEem2n8bBHelJyw" type="Association_Edge" source="_aaUQoDOREeiHat9KcP8uWA" target="_-FD-8DRwEem2n8bBHelJyw" routing="Rectilinear">

+      <children xmi:type="notation:DecorationNode" xmi:id="_2I-csDRxEem2n8bBHelJyw" type="Association_StereotypeLabel">

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

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

+      </children>

+      <children xmi:type="notation:DecorationNode" xmi:id="_2I-csjRxEem2n8bBHelJyw" type="Association_NameLabel">

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

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_2I-cszRxEem2n8bBHelJyw" x="95" y="6"/>

+      </children>

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

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

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

+      </children>

+      <children xmi:type="notation:DecorationNode" xmi:id="_2I_DwTRxEem2n8bBHelJyw" visible="false" type="Association_SourceRoleLabel">

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

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

+      </children>

+      <children xmi:type="notation:DecorationNode" xmi:id="_2I_DwzRxEem2n8bBHelJyw" type="Association_SourceMultiplicityLabel">

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

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_2I_DxDRxEem2n8bBHelJyw" x="16" y="20"/>

+      </children>

+      <children xmi:type="notation:DecorationNode" xmi:id="_2I_DxTRxEem2n8bBHelJyw" type="Association_TargetMultiplicityLabel">

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

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

+      </children>

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

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

+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_2I91ojRxEem2n8bBHelJyw" points="[360, 200, -643984, -643984]$[360, 161, -643984, -643984]$[388, 161, -643984, -643984]$[388, 121, -643984, -643984]"/>

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

+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_83wB0DRxEem2n8bBHelJyw" id="(0.4787234042553192,1.0)"/>

+    </edges>

+    <edges xmi:type="notation:Connector" xmi:id="_-9hbgDRxEem2n8bBHelJyw" type="Association_Edge" source="_-FD-8DRwEem2n8bBHelJyw" target="_XVHG0Dm-EeiWMf5FLWfdLA">

+      <children xmi:type="notation:DecorationNode" xmi:id="_-9iCkDRxEem2n8bBHelJyw" type="Association_StereotypeLabel">

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_-9iCkTRxEem2n8bBHelJyw" y="-20"/>

+      </children>

+      <children xmi:type="notation:DecorationNode" xmi:id="_-9ipoDRxEem2n8bBHelJyw" type="Association_NameLabel">

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_-9ipoTRxEem2n8bBHelJyw" x="59" y="58"/>

+      </children>

+      <children xmi:type="notation:DecorationNode" xmi:id="_-9ipojRxEem2n8bBHelJyw" visible="false" type="Association_TargetRoleLabel">

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_-9ipozRxEem2n8bBHelJyw" y="-20"/>

+      </children>

+      <children xmi:type="notation:DecorationNode" xmi:id="_-9ippDRxEem2n8bBHelJyw" visible="false" type="Association_SourceRoleLabel">

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_-9ippTRxEem2n8bBHelJyw" y="20"/>

+      </children>

+      <children xmi:type="notation:DecorationNode" xmi:id="_-9ippjRxEem2n8bBHelJyw" type="Association_SourceMultiplicityLabel">

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_-9ippzRxEem2n8bBHelJyw" y="20"/>

+      </children>

+      <children xmi:type="notation:DecorationNode" xmi:id="_-9ipqDRxEem2n8bBHelJyw" type="Association_TargetMultiplicityLabel">

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_-9ipqTRxEem2n8bBHelJyw" x="-3" y="-22"/>

+      </children>

+      <styles xmi:type="notation:FontStyle" xmi:id="_-9hbgTRxEem2n8bBHelJyw"/>

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

+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_-9hbgjRxEem2n8bBHelJyw" points="[576, 49, -643984, -643984]$[620, 47, -643984, -643984]"/>

+    </edges>

   </notation:Diagram>

   <notation:Diagram xmi:id="_tsOFEDQTEeixv_sLOod4lQ" type="PapyrusUMLClassDiagram" name="ONAP Vnfd - Topology View" measurementUnit="Pixel">

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

@@ -2118,7 +2146,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kvhl4jc_EeiIfPeSAqyGdQ"/>

       </children>

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

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zOg-ETQVEeixv_sLOod4lQ" x="460" y="160" height="201"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zOg-ETQVEeixv_sLOod4lQ" x="460" y="140" height="201"/>

     </children>

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

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

@@ -2381,7 +2409,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kwUQEjc_EeiIfPeSAqyGdQ"/>

       </children>

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

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7pWpUTa7EeivvI-m1BaAbA" x="460" y="-40" height="161"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7pWpUTa7EeivvI-m1BaAbA" x="460" y="-80" height="161"/>

     </children>

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

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

@@ -2392,8 +2420,8 @@
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7phBYja7EeivvI-m1BaAbA" x="200"/>

     </children>

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

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_9rkOEDd-EeiIfPeSAqyGdQ" source="ShadowFigure">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_9rlcMDd-EeiIfPeSAqyGdQ" key="ShadowFigure_Value" value="true"/>

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_42rjoDRyEem2n8bBHelJyw" source="ShadowFigure">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_42sKsDRyEem2n8bBHelJyw" key="ShadowFigure_Value" value="false"/>

       </eAnnotations>

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

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

@@ -2516,7 +2544,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SeReMjgSEeiOYfGHew0BGg"/>

       </children>

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

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SeL-oDgSEeiOYfGHew0BGg" x="140" y="360" width="441" height="201"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SeL-oDgSEeiOYfGHew0BGg" x="140" y="360" width="441" height="121"/>

     </children>

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

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

@@ -2625,41 +2653,32 @@
           <element xmi:type="uml:Property" href="Vnf.uml#_ZuR54Cr-EemS0_wZSU3sbA"/>

           <layoutConstraint xmi:type="notation:Location" xmi:id="_XcbWkSr_EemS0_wZSU3sbA"/>

         </children>

-        <children xmi:type="notation:Shape" xmi:id="_XccksCr_EemS0_wZSU3sbA" type="Property_ClassAttributeLabel">

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

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

+        <children xmi:type="notation:Shape" xmi:id="_U1cxEDRyEem2n8bBHelJyw" type="Property_ClassAttributeLabel">

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

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

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

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

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

           </children>

-          <element xmi:type="uml:Property" href="Common.uml#_pszPADd9EeiIfPeSAqyGdQ"/>

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

+          <element xmi:type="uml:Property" href="Common.uml#_Tw79sj2pEeiu6I5JfRTxxQ"/>

+          <layoutConstraint xmi:type="notation:Location" xmi:id="_U1cxETRyEem2n8bBHelJyw"/>

         </children>

-        <children xmi:type="notation:Shape" xmi:id="_Xcdy0Cr_EemS0_wZSU3sbA" type="Property_ClassAttributeLabel">

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

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

+        <children xmi:type="notation:Shape" xmi:id="_U1fNUDRyEem2n8bBHelJyw" type="Property_ClassAttributeLabel">

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

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

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

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

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

           </children>

-          <element xmi:type="uml:Property" href="Common.uml#_qgZPIDd9EeiIfPeSAqyGdQ"/>

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

+          <element xmi:type="uml:Property" href="Common.uml#_Tw79tD2pEeiu6I5JfRTxxQ"/>

+          <layoutConstraint xmi:type="notation:Location" xmi:id="_U1fNUTRyEem2n8bBHelJyw"/>

         </children>

-        <children xmi:type="notation:Shape" xmi:id="_XceZ4Cr_EemS0_wZSU3sbA" type="Property_ClassAttributeLabel">

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

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

+        <children xmi:type="notation:Shape" xmi:id="_U1hCgDRyEem2n8bBHelJyw" type="Property_ClassAttributeLabel">

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

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

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

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

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

           </children>

-          <element xmi:type="uml:Property" href="Common.uml#_rY7ZoDd9EeiIfPeSAqyGdQ"/>

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

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_XcfA8Cr_EemS0_wZSU3sbA" type="Property_ClassAttributeLabel">

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

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

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

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

-          </children>

-          <element xmi:type="uml:Property" href="Common.uml#_1X3vADd9EeiIfPeSAqyGdQ"/>

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

+          <element xmi:type="uml:Property" href="Common.uml#_Tw79uj2pEeiu6I5JfRTxxQ"/>

+          <layoutConstraint xmi:type="notation:Location" xmi:id="_U1hCgTRyEem2n8bBHelJyw"/>

         </children>

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

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

@@ -2684,7 +2703,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Hz5_Air-EemS0_wZSU3sbA"/>

       </children>

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

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HzgWYSr-EemS0_wZSU3sbA" x="300" y="580"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HzgWYSr-EemS0_wZSU3sbA" x="300" y="600"/>

     </children>

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

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

@@ -2844,7 +2863,7 @@
       </children>

       <children xmi:type="notation:DecorationNode" xmi:id="_PDFtkjWdEei9Ia34RXjpEg" type="Association_NameLabel">

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

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_PDFtkzWdEei9Ia34RXjpEg" x="-2" y="2"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_PDFtkzWdEei9Ia34RXjpEg" x="-4" y="-52"/>

       </children>

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

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

@@ -2956,9 +2975,9 @@
       </children>

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

       <element xmi:type="uml:Generalization" href="Vnf.uml#_W3y74DdREeiIfPeSAqyGdQ"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_W7gXMjdREeiIfPeSAqyGdQ" points="[620, 160, -643984, -643984]$[620, 153, -643984, -643984]$[620, 153, -643984, -643984]$[620, 121, -643984, -643984]"/>

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

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XDo_gTdREeiIfPeSAqyGdQ" id="(0.3818615751789976,1.0)"/>

+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_W7gXMjdREeiIfPeSAqyGdQ" points="[620, 140, -643984, -643984]$[620, 140, -643984, -643984]$[620, 140, -643984, -643984]$[620, 81, -643984, -643984]"/>

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

+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XDo_gTdREeiIfPeSAqyGdQ" id="(0.528052805280528,1.0)"/>

     </edges>

     <edges xmi:type="notation:Connector" xmi:id="_unBNcDdVEeiIfPeSAqyGdQ" type="Association_Edge" source="_Am1LkDQtEeixv_sLOod4lQ" target="_zOg-EDQVEeixv_sLOod4lQ" routing="Rectilinear">

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

@@ -2967,7 +2986,7 @@
       </children>

       <children xmi:type="notation:DecorationNode" xmi:id="_unB0gjdVEeiIfPeSAqyGdQ" type="Association_NameLabel">

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

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_unB0gzdVEeiIfPeSAqyGdQ" x="93" y="38"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_unB0gzdVEeiIfPeSAqyGdQ" x="103" y="89"/>

       </children>

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

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

@@ -3034,12 +3053,12 @@
       </children>

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

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

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

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_uzOFHjgTEeiOYfGHew0BGg" x="-13" y="15"/>

       </children>

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

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

       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_uzOFEjgTEeiOYfGHew0BGg" points="[581, 380, -643984, -643984]$[780, 380, -643984, -643984]$[780, 400, -643984, -643984]"/>

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

+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vJf3EDgTEeiOYfGHew0BGg" id="(1.0,0.1652892561983471)"/>

       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vJf3ETgTEeiOYfGHew0BGg" id="(0.6405693950177936,0.0)"/>

     </edges>

     <edges xmi:type="notation:Connector" xmi:id="_nNOFsDkTEeiWMf5FLWfdLA" type="Association_Edge" source="_6Mhj8DQTEeixv_sLOod4lQ" target="_zOg-EDQVEeixv_sLOod4lQ" routing="Rectilinear">

@@ -3102,7 +3121,7 @@
       </children>

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

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

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

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_hA9TVzm5EeiWMf5FLWfdLA" x="35" y="-7"/>

       </children>

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

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

@@ -3187,35 +3206,41 @@
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_H0GzVCr-EemS0_wZSU3sbA"/>

     </edges>

     <edges xmi:type="notation:Connector" xmi:id="_29-40Cr_EemS0_wZSU3sbA" type="Association_Edge" source="_6Mhj8DQTEeixv_sLOod4lQ" target="_HzgWYCr-EemS0_wZSU3sbA" routing="Rectilinear">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_9DMjkCr_EemS0_wZSU3sbA" source="displayNameLabelIcon">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_9DNKoCr_EemS0_wZSU3sbA" key="displayNameLabelIcon_value" value="true"/>

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_7s7_EDRyEem2n8bBHelJyw" source="displayNameLabelIcon">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_7s7_ETRyEem2n8bBHelJyw" key="displayNameLabelIcon_value" value="false"/>

       </eAnnotations>

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

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

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

       </children>

       <children xmi:type="notation:DecorationNode" xmi:id="_29_f4ir_EemS0_wZSU3sbA" type="Association_NameLabel">

         <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_TXSQsCsAEemS0_wZSU3sbA" source="displayNameLabelIcon">

           <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_TXSQsSsAEemS0_wZSU3sbA" key="displayNameLabelIcon_value" value="false"/>

         </eAnnotations>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_29_f4yr_EemS0_wZSU3sbA" x="-54" y="20"/>

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

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_29_f4yr_EemS0_wZSU3sbA" x="-64" y="20"/>

       </children>

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

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

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

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_29_f5Sr_EemS0_wZSU3sbA" x="49" y="-20"/>

       </children>

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

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

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

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_29_f5yr_EemS0_wZSU3sbA" x="-49" y="20"/>

       </children>

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

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_29_f6Sr_EemS0_wZSU3sbA" x="-34" y="13"/>

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

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_29_f6Sr_EemS0_wZSU3sbA" x="15" y="13"/>

       </children>

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

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

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

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_29_f6yr_EemS0_wZSU3sbA" x="-49" y="-20"/>

       </children>

       <styles xmi:type="notation:FontStyle" xmi:id="_29-40Sr_EemS0_wZSU3sbA"/>

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

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_29-40ir_EemS0_wZSU3sbA" points="[900, 540, -643984, -643984]$[676, 640, -643984, -643984]"/>

+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_29-40ir_EemS0_wZSU3sbA" points="[900, 540, -643984, -643984]$[780, 540, -643984, -643984]$[780, 640, -643984, -643984]$[676, 640, -643984, -643984]"/>

       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3DNXECr_EemS0_wZSU3sbA" id="(0.0,0.8637873754152824)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3DNXESr_EemS0_wZSU3sbA" id="(1.0,0.37267080745341613)"/>

+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3DNXESr_EemS0_wZSU3sbA" id="(1.0,0.41379310344827586)"/>

     </edges>

     <edges xmi:type="notation:Connector" xmi:id="_GY-xwCsBEemS0_wZSU3sbA" type="Association_Edge" source="_SeLXkDgSEeiOYfGHew0BGg" target="_HzgWYCr-EemS0_wZSU3sbA">

       <children xmi:type="notation:DecorationNode" xmi:id="_GY_Y0CsBEemS0_wZSU3sbA" visible="false" type="Association_StereotypeLabel">

@@ -3271,32 +3296,38 @@
       </children>

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

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

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_6t1j2ysBEemS0_wZSU3sbA" x="-129" y="-20"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_6t1j2ysBEemS0_wZSU3sbA" x="-29" y="-33"/>

       </children>

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

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

       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_6t08wisBEemS0_wZSU3sbA" points="[460, 300, -643984, -643984]$[120, 300, -643984, -643984]$[120, 660, -643984, -643984]$[300, 660, -643984, -643984]"/>

       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6zMk8CsBEemS0_wZSU3sbA" id="(0.0,0.5970149253731343)"/>

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

+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6zNMACsBEemS0_wZSU3sbA" id="(0.0,0.5517241379310345)"/>

     </edges>

     <edges xmi:type="notation:Connector" xmi:id="_qE_QUCsDEemS0_wZSU3sbA" type="Association_Edge" source="_HzgWYCr-EemS0_wZSU3sbA" target="_oFSpMDd-EeiIfPeSAqyGdQ">

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

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

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

       </children>

       <children xmi:type="notation:DecorationNode" xmi:id="_qE_3YisDEemS0_wZSU3sbA" visible="false" type="Association_NameLabel">

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

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

       </children>

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

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

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

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_qFAecSsDEemS0_wZSU3sbA" x="12" y="-20"/>

       </children>

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

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

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

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_qFAecysDEemS0_wZSU3sbA" x="-12" y="20"/>

       </children>

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

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

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

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_qFAedSsDEemS0_wZSU3sbA" x="12" y="20"/>

       </children>

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

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

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

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_qFAedysDEemS0_wZSU3sbA" x="-12" y="-20"/>

       </children>

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

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

@@ -3306,31 +3337,37 @@
     </edges>

     <edges xmi:type="notation:Connector" xmi:id="_lcctACsFEemS0_wZSU3sbA" type="Association_Edge" source="_Am1LkDQtEeixv_sLOod4lQ" target="_HzgWYCr-EemS0_wZSU3sbA" routing="Rectilinear">

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

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

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

       </children>

       <children xmi:type="notation:DecorationNode" xmi:id="_lcdUEisFEemS0_wZSU3sbA" visible="false" type="Association_NameLabel">

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

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

       </children>

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

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

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

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_lcd7ISsFEemS0_wZSU3sbA" x="30" y="-20"/>

       </children>

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

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

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

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_lcd7IysFEemS0_wZSU3sbA" x="-30" y="20"/>

       </children>

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

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

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

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_lcd7JSsFEemS0_wZSU3sbA" x="30" y="20"/>

       </children>

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

         <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_AqZsECsGEemS0_wZSU3sbA" source="PapyrusCSSForceValue">

           <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_AqaTICsGEemS0_wZSU3sbA" key="visible" value="true"/>

         </eAnnotations>

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

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

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_lcd7JysFEemS0_wZSU3sbA" x="-29" y="7"/>

       </children>

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

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

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_lcctAisFEemS0_wZSU3sbA" points="[180, 760, -643984, -643984]$[300, 700, -643984, -643984]"/>

+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_lcctAisFEemS0_wZSU3sbA" points="[180, 760, -643984, -643984]$[180, 680, -643984, -643984]$[300, 680, -643984, -643984]"/>

       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ljP4kCsFEemS0_wZSU3sbA" id="(0.46511627906976744,0.0)"/>

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

+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ljQfoCsFEemS0_wZSU3sbA" id="(0.0,0.6896551724137931)"/>

     </edges>

     <edges xmi:type="notation:Connector" xmi:id="_1pq3oSsHEemS0_wZSU3sbA" type="StereotypeCommentLink" source="_1pIFECsHEemS0_wZSU3sbA" target="_1pqQkCsHEemS0_wZSU3sbA">

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

@@ -3361,11 +3398,11 @@
       </children>

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

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

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

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_6ujGwSsHEemS0_wZSU3sbA" x="19" y="-13"/>

       </children>

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

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

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_6ujGwysHEemS0_wZSU3sbA" x="-197" y="-20"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_6ujGwysHEemS0_wZSU3sbA" x="-15" y="27"/>

       </children>

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

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

@@ -3762,7 +3799,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tqwpMjzqEeiuk5pWzMOpfA"/>

       </children>

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

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tqlqETzqEeiuk5pWzMOpfA" x="880" y="-60" height="241"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tqlqETzqEeiuk5pWzMOpfA" x="880" y="-60" height="181"/>

     </children>

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

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

@@ -4159,7 +4196,7 @@
       <element xmi:type="uml:Association" href="Vnf.uml#_KN7jQDnAEeiWMf5FLWfdLA"/>

       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_trUC0jzqEeiuk5pWzMOpfA" points="[620, 220, -643984, -643984]$[620, 60, -643984, -643984]$[880, 60, -643984, -643984]"/>

       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_yy8D8DzqEeiuk5pWzMOpfA" id="(0.5809128630705395,0.0)"/>

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

+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_yy8rADzqEeiuk5pWzMOpfA" id="(0.0,0.5524861878453039)"/>

     </edges>

     <edges xmi:type="notation:Connector" xmi:id="_PGVBFzzrEeiuk5pWzMOpfA" type="StereotypeCommentLink" source="_PGLQEDzrEeiuk5pWzMOpfA" target="_PGVBEzzrEeiuk5pWzMOpfA">

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

@@ -7871,59 +7908,6 @@
       <element xmi:type="uml:DataType" href="Vnf.uml#_BAt7gBx6Eemit6R65X1VNQ"/>

       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BA46oRx6Eemit6R65X1VNQ" x="1120" y="1400"/>

     </children>

-    <children xmi:type="notation:Shape" xmi:id="_1DJN4ByHEemVVe_wt-ZCGw" type="Enumeration_Shape" fontColor="16711680" fontName="Segoe UI">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6hqFAByHEemVVe_wt-ZCGw" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6hqFARyHEemVVe_wt-ZCGw" key="fontHeight" value="true"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6hqFAhyHEemVVe_wt-ZCGw" key="bold" value="true"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6hqFAxyHEemVVe_wt-ZCGw" key="italic" value="true"/>

-      </eAnnotations>

-      <children xmi:type="notation:DecorationNode" xmi:id="_1DJN4hyHEemVVe_wt-ZCGw" type="Enumeration_NameLabel"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_1DJN4xyHEemVVe_wt-ZCGw" type="Enumeration_FloatingNameLabel">

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

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_1DJN5RyHEemVVe_wt-ZCGw" type="Enumeration_LiteralCompartment">

-        <children xmi:type="notation:Shape" xmi:id="__ptj8ByHEemVVe_wt-ZCGw" type="EnumerationLiteral_LiteralLabel" fontColor="16711680" fontName="Segoe UI">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IpgwgByIEemVVe_wt-ZCGw" source="PapyrusCSSForceValue">

-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IpgwgRyIEemVVe_wt-ZCGw" key="fontHeight" value="true"/>

-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IpgwghyIEemVVe_wt-ZCGw" key="bold" value="true"/>

-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IpgwgxyIEemVVe_wt-ZCGw" key="italic" value="true"/>

-          </eAnnotations>

-          <children xmi:type="notation:DecorationNode" xmi:id="_zcBpoByIEemVVe_wt-ZCGw" type="StereotypeLabel">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_2vPG0ByIEemVVe_wt-ZCGw" source="PapyrusCSSForceValue">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_2vPG0RyIEemVVe_wt-ZCGw" key="visible" value="true"/>

-            </eAnnotations>

-            <styles xmi:type="notation:StringValueStyle" xmi:id="_zcBpoRyIEemVVe_wt-ZCGw" name="stereotype" stringValue="OpenModel_Profile::Preliminary"/>

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

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

-          </children>

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

-          <layoutConstraint xmi:type="notation:Location" xmi:id="__ptj8RyHEemVVe_wt-ZCGw"/>

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_CSOeUByIEemVVe_wt-ZCGw" type="EnumerationLiteral_LiteralLabel" fontColor="16711680" fontName="Segoe UI">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_KQcSEByIEemVVe_wt-ZCGw" source="PapyrusCSSForceValue">

-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_KQcSERyIEemVVe_wt-ZCGw" key="fontHeight" value="true"/>

-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_KQcSEhyIEemVVe_wt-ZCGw" key="bold" value="true"/>

-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_KQcSExyIEemVVe_wt-ZCGw" key="italic" value="true"/>

-          </eAnnotations>

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

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_CSOeURyIEemVVe_wt-ZCGw"/>

-        </children>

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

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

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

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

-      </children>

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

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1DJN4RyHEemVVe_wt-ZCGw" x="1280" y="1600"/>

-    </children>

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

-      <styles xmi:type="notation:TitleStyle" xmi:id="_1Cw9-ByIEemVVe_wt-ZCGw"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1Cw9-hyIEemVVe_wt-ZCGw" name="BASE_ELEMENT">

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

-      </styles>

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

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1Cw9-RyIEemVVe_wt-ZCGw" x="1480" y="1600"/>

-    </children>

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

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

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

@@ -8240,16 +8224,6 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HPSOdJqEEeidy9iGT_F5-w"/>

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

     </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_1Cw9-xyIEemVVe_wt-ZCGw" type="StereotypeCommentLink" source="_1DJN4ByHEemVVe_wt-ZCGw" target="_1Cw99xyIEemVVe_wt-ZCGw">

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

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1Cw-AByIEemVVe_wt-ZCGw" name="BASE_ELEMENT">

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

-      </styles>

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

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

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

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

-    </edges>

   </notation:Diagram>

   <notation:Diagram xmi:id="_4MDaUIOOEeivtfz_CvwDeA" type="PapyrusUMLClassDiagram" name="Runtime Topology" measurementUnit="Pixel">

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

@@ -9398,120 +9372,4 @@
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_29VL4bxOEeiMnLuHd6ALAg" id="(0.0,0.25)"/>

     </edges>

   </notation:Diagram>

-  <notation:Diagram xmi:id="_FcZroNxbEei0G_d67y10Rg" type="PapyrusUMLClassDiagram" name="NF and PNF" measurementUnit="Pixel">

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

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

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

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

-      </children>

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

-        <children xmi:type="notation:Shape" xmi:id="_JncIsNxbEei0G_d67y10Rg" type="Property_ClassAttributeLabel">

-          <element xmi:type="uml:Property" href="Resource.uml#_13TCEjzEEeiWMf5FLWfdLA"/>

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

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_Jnd94NxbEei0G_d67y10Rg" type="Property_ClassAttributeLabel">

-          <element xmi:type="uml:Property" href="Resource.uml#_13TCFDzEEeiWMf5FLWfdLA"/>

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

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_Jnek8NxbEei0G_d67y10Rg" type="Property_ClassAttributeLabel">

-          <element xmi:type="uml:Property" href="Resource.uml#_13TCFjzEEeiWMf5FLWfdLA"/>

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

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_Jnek8txbEei0G_d67y10Rg" type="Property_ClassAttributeLabel">

-          <element xmi:type="uml:Property" href="Resource.uml#_13TCGDzEEeiWMf5FLWfdLA"/>

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

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_JnfMANxbEei0G_d67y10Rg" type="Property_ClassAttributeLabel">

-          <element xmi:type="uml:Property" href="Resource.uml#_13TCHDzEEeiWMf5FLWfdLA"/>

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

-        </children>

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

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

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

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

-      </children>

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

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

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

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

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

-      </children>

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

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

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

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

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

-      </children>

-      <element xmi:type="uml:Class" href="Resource.uml#_13TCEDzEEeiWMf5FLWfdLA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Hhw1odxbEei0G_d67y10Rg" x="80" y="220"/>

-    </children>

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

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

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

-        <eObjectValue xmi:type="uml:Class" href="Resource.uml#_13TCEDzEEeiWMf5FLWfdLA"/>

-      </styles>

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

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

-    </children>

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

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

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

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

-      </children>

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

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

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

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

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

-      </children>

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

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

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

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

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

-      </children>

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

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

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

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

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

-      </children>

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

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

-    </children>

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

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

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

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

-      </styles>

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

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

-    </children>

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

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

-    <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_FcZro9xbEei0G_d67y10Rg" 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="_HiFlwNxbEei0G_d67y10Rg" type="StereotypeCommentLink" source="_Hhw1oNxbEei0G_d67y10Rg" target="_HiE-sNxbEei0G_d67y10Rg">

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

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

-        <eObjectValue xmi:type="uml:Class" href="Resource.uml#_13TCEDzEEeiWMf5FLWfdLA"/>

-      </styles>

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

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

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

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

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_TidnZNxbEei0G_d67y10Rg" type="StereotypeCommentLink" source="_TiNIsNxbEei0G_d67y10Rg" target="_TidnYNxbEei0G_d67y10Rg">

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

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

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

-      </styles>

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

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

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

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

-    </edges>

-  </notation:Diagram>

 </xmi:XMI>

diff --git a/ONAP Information Model/Vnf.uml b/ONAP Information Model/Vnf.uml
index 594b4e3..18f08f4 100644
--- a/ONAP Information Model/Vnf.uml
+++ b/ONAP Information Model/Vnf.uml
@@ -1382,6 +1382,11 @@ BaseConfigGroup may establish internal networks such as OAM (VNF Mgmt) or MNS (M
         </ownedAttribute>

       </packagedElement>

       <packagedElement xmi:type="uml:Class" xmi:id="_AmzWYDQtEeixv_sLOod4lQ" name="VnfExtCpd ">

+        <ownedComment xmi:type="uml:Comment" xmi:id="_096QYDR0Eem2n8bBHelJyw" annotatedElement="_AmzWYDQtEeixv_sLOod4lQ">

+          <body>A VnfExtCpd is a type of Cpd and describes an external interface, a.k.a external CP, exposed by this VNF enabling connection with a VL.&#xD;

+When the VnfExtCpd is mapped to a VduCpd, the values for the attributes type, subType and description shall be identical for both elements.&#xD;

+</body>

+        </ownedComment>

         <ownedAttribute xmi:type="uml:Property" xmi:id="_hzG3ETm7EeiWMf5FLWfdLA" name="_virtualNetworkInterfaceRequirements" type="_8BUXwDm4EeiWMf5FLWfdLA" aggregation="composite" association="_hzDMsDm7EeiWMf5FLWfdLA">

           <ownedComment xmi:type="uml:Comment" xmi:id="_Ml1voGNeEeio9amveq0yWQ" annotatedElement="_hzG3ETm7EeiWMf5FLWfdLA">

             <body>Specifies requirements on a virtual network interface realising the CPs instantiated from this CPD.&#xD;

@@ -1406,41 +1411,6 @@ When the VnfExtCpd is mapped to a VduCpd, the values for the attributes type, su
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_lZuJICsFEemS0_wZSU3sbA" value="1"/>

         </ownedAttribute>

       </packagedElement>

-      <packagedElement xmi:type="uml:Class" xmi:id="_X3eqgDTQEeiwQ6KPLHcy4g" name="VnfdElementGroup">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_uOZFUDTUEeiwQ6KPLHcy4g" annotatedElement="_X3eqgDTQEeiwQ6KPLHcy4g">

-          <body>A VNFD Element Group is a mechanism for associating elements of a VNFD (Vdus and VnfVirtualLinkDesc(s)) for a&#xD;

-certain purpose, for example, scaling aspects.&#xD;

-&#xD;

-A given element can belong to multiple groups.</body>

-        </ownedComment>

-        <ownedAttribute xmi:type="uml:Property" xmi:id="_x-RHEDkLEeiWMf5FLWfdLA" name="vnfdElementGroupId" visibility="public">

-          <ownedComment xmi:type="uml:Comment" xmi:id="__w6XkDkLEeiWMf5FLWfdLA" annotatedElement="_x-RHEDkLEeiWMf5FLWfdLA">

-            <body>Unique identifier of this group in the VNFD.</body>

-          </ownedComment>

-          <type xmi:type="uml:DataType" href="Common.uml#_AuYtcDkBEeiWMf5FLWfdLA"/>

-        </ownedAttribute>

-        <ownedAttribute xmi:type="uml:Property" xmi:id="_A4oNkDkMEeiWMf5FLWfdLA" name="description" visibility="public">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_JHFcwDkMEeiWMf5FLWfdLA" annotatedElement="_A4oNkDkMEeiWMf5FLWfdLA">

-            <body>Human readable description of the group.</body>

-          </ownedComment>

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>

-        </ownedAttribute>

-        <ownedAttribute xmi:type="uml:Property" xmi:id="__lR54DkMEeiWMf5FLWfdLA" name="_vdu" type="_e5WnwDOREeiHat9KcP8uWA" aggregation="shared" association="__knLgDkMEeiWMf5FLWfdLA">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_I0bmMJwXEeiPD5fN_oRNAg" annotatedElement="__lR54DkMEeiWMf5FLWfdLA">

-            <body>References to Vdus that are part of this group.</body>

-          </ownedComment>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="__lTvEDkMEeiWMf5FLWfdLA"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="__lTvETkMEeiWMf5FLWfdLA" value="*"/>

-        </ownedAttribute>

-        <ownedAttribute xmi:type="uml:Property" xmi:id="_Xh4HwDnPEeiWMf5FLWfdLA" name="_vnfVirtualLinkdesc " aggregation="shared" association="_Xh1EcDnPEeiWMf5FLWfdLA">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_UYe4MJwXEeiPD5fN_oRNAg" annotatedElement="_Xh4HwDnPEeiWMf5FLWfdLA">

-            <body>References to VnfVirtualLinkDesc that are part of this group.</body>

-          </ownedComment>

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

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_XiAqoDnPEeiWMf5FLWfdLA"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_XiRJUDnPEeiWMf5FLWfdLA" value="*"/>

-        </ownedAttribute>

-      </packagedElement>

       <packagedElement xmi:type="uml:Class" xmi:id="_tEnEsDTSEeiwQ6KPLHcy4g" name="VnfIndicator">

         <ownedComment xmi:type="uml:Comment" xmi:id="_2u8xIDTUEeiwQ6KPLHcy4g" annotatedElement="_tEnEsDTSEeiwQ6KPLHcy4g">

           <body>The VnfIndicator information element defines the indicator the VNF supports.</body>

@@ -1601,6 +1571,41 @@ NOTE: If not present, it is assumed that the bitrate requirements can be derived
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_lIfAYSvPEemS0_wZSU3sbA" value="1"/>

         </ownedAttribute>

       </packagedElement>

+      <packagedElement xmi:type="uml:Class" xmi:id="_X3eqgDTQEeiwQ6KPLHcy4g" name="VnfdElementGroup">

+        <ownedComment xmi:type="uml:Comment" xmi:id="_uOZFUDTUEeiwQ6KPLHcy4g" annotatedElement="_X3eqgDTQEeiwQ6KPLHcy4g">

+          <body>A VNFD Element Group is a mechanism for associating elements of a VNFD (Vdus and VnfVirtualLinkDesc(s)) for a&#xD;

+certain purpose, for example, scaling aspects.&#xD;

+&#xD;

+A given element can belong to multiple groups.</body>

+        </ownedComment>

+        <ownedAttribute xmi:type="uml:Property" xmi:id="_x-RHEDkLEeiWMf5FLWfdLA" name="vnfdElementGroupId" visibility="public">

+          <ownedComment xmi:type="uml:Comment" xmi:id="__w6XkDkLEeiWMf5FLWfdLA" annotatedElement="_x-RHEDkLEeiWMf5FLWfdLA">

+            <body>Unique identifier of this group in the VNFD.</body>

+          </ownedComment>

+          <type xmi:type="uml:DataType" href="Common.uml#_AuYtcDkBEeiWMf5FLWfdLA"/>

+        </ownedAttribute>

+        <ownedAttribute xmi:type="uml:Property" xmi:id="_A4oNkDkMEeiWMf5FLWfdLA" name="description" visibility="public">

+          <ownedComment xmi:type="uml:Comment" xmi:id="_JHFcwDkMEeiWMf5FLWfdLA" annotatedElement="_A4oNkDkMEeiWMf5FLWfdLA">

+            <body>Human readable description of the group.</body>

+          </ownedComment>

+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>

+        </ownedAttribute>

+        <ownedAttribute xmi:type="uml:Property" xmi:id="__lR54DkMEeiWMf5FLWfdLA" name="_vdu" type="_e5WnwDOREeiHat9KcP8uWA" aggregation="shared" association="__knLgDkMEeiWMf5FLWfdLA">

+          <ownedComment xmi:type="uml:Comment" xmi:id="_I0bmMJwXEeiPD5fN_oRNAg" annotatedElement="__lR54DkMEeiWMf5FLWfdLA">

+            <body>References to Vdus that are part of this group.</body>

+          </ownedComment>

+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="__lTvEDkMEeiWMf5FLWfdLA"/>

+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="__lTvETkMEeiWMf5FLWfdLA" value="*"/>

+        </ownedAttribute>

+        <ownedAttribute xmi:type="uml:Property" xmi:id="_Xh4HwDnPEeiWMf5FLWfdLA" name="_vnfVirtualLinkdesc " aggregation="shared" association="_Xh1EcDnPEeiWMf5FLWfdLA">

+          <ownedComment xmi:type="uml:Comment" xmi:id="_UYe4MJwXEeiPD5fN_oRNAg" annotatedElement="_Xh4HwDnPEeiWMf5FLWfdLA">

+            <body>References to VnfVirtualLinkDesc that are part of this group.</body>

+          </ownedComment>

+          <type xmi:type="uml:Class" href="Common.uml#_AC2eIDQUEeixv_sLOod4lQ"/>

+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_XiAqoDnPEeiWMf5FLWfdLA"/>

+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_XiRJUDnPEeiWMf5FLWfdLA" value="*"/>

+        </ownedAttribute>

+      </packagedElement>

       <packagedElement xmi:type="uml:Class" xmi:id="_IYL40D0REeiuk5pWzMOpfA" name="BaseConfigGroup">

         <ownedComment xmi:type="uml:Comment" xmi:id="_x174wD5hEeijbdkIlrq2uQ" annotatedElement="_IYL40D0REeiuk5pWzMOpfA">

           <body>Every Vnf contains a BaseConfigGroup. &#xD;

@@ -1660,9 +1665,6 @@ Diversity - Resources are geo-diverse ( cannot be co-located).&#xD;
         <generalization xmi:type="uml:Generalization" xmi:id="_3Dbg8ES6EeiVGPeZpaYNtQ">

           <general xmi:type="uml:Class" href="Common.uml#_8naVoES0EeiVGPeZpaYNtQ"/>

         </generalization>

-        <generalization xmi:type="uml:Generalization" xmi:id="_hHsFoIXlEei3S_qasA4xqA">

-          <general xmi:type="uml:Class" href="Common.uml#_8naVoES0EeiVGPeZpaYNtQ"/>

-        </generalization>

       </packagedElement>

       <packagedElement xmi:type="uml:Class" xmi:id="_jH_PgF3PEeiwL5tPgFMcjQ" name="Vnf">

         <ownedComment xmi:type="uml:Comment" xmi:id="_Qzli4F4CEei-d9bwZwcVEw" annotatedElement="_jH_PgF3PEeiwL5tPgFMcjQ">

@@ -1870,9 +1872,6 @@ Diversity - Resources are geo-diverse ( cannot be co-located).&#xD;
         <generalization xmi:type="uml:Generalization" xmi:id="_NomTQH7gEeifJIHxnlj6Cg">

           <general xmi:type="uml:Class" href="Common.uml#_8naVoES0EeiVGPeZpaYNtQ"/>

         </generalization>

-        <generalization xmi:type="uml:Generalization" xmi:id="_y4l5UIUSEeiRGZJrXkgR0w">

-          <general xmi:type="uml:Class" href="Common.uml#_8naVoES0EeiVGPeZpaYNtQ"/>

-        </generalization>

       </packagedElement>

       <packagedElement xmi:type="uml:Class" xmi:id="_OpdBwF9vEeiaLPXj8My4aQ" name="Vnfc">

         <ownedComment xmi:type="uml:Comment" xmi:id="_RCJ2AGN2Eeio9amveq0yWQ" annotatedElement="_OpdBwF9vEeiaLPXj8My4aQ">

@@ -2189,7 +2188,6 @@ If not present, the default instantiation level as declared in the VNFD shall be
           <ownedComment xmi:type="uml:Comment" xmi:id="_45XE9DzEEeiWMf5FLWfdLA" annotatedElement="_45XE8zzEEeiWMf5FLWfdLA">

             <body>Specifies affinity and anti-affinity rules applicable between VNF instances created from this profile. </body>

           </ownedComment>

-          <type xmi:type="uml:DataType" href="Common.uml#_RVZi0D2-Eeiu6I5JfRTxxQ"/>

           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_45XE9TzEEeiWMf5FLWfdLA"/>

           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_45XE9jzEEeiWMf5FLWfdLA" value="*"/>

         </ownedAttribute>

@@ -2285,8 +2283,8 @@ This could include the number of CPU cores on this logical node, a memory config
         <ownedComment xmi:type="uml:Comment" xmi:id="_g1eIkCsKEemS0_wZSU3sbA" annotatedElement="_-5-w8Cr9EemS0_wZSU3sbA">

           <body>Represents the type of network connectivity mandated by the VNF vendor between two or more Connection Points which includes at least one Internal Connection Point.</body>

         </ownedComment>

-        <generalization xmi:type="uml:Generalization" xmi:id="_LKhVgCr-EemS0_wZSU3sbA">

-          <general xmi:type="uml:Class" href="Common.uml#_AC2eIDQUEeixv_sLOod4lQ"/>

+        <generalization xmi:type="uml:Generalization" xmi:id="_LxM-0DRxEem2n8bBHelJyw">

+          <general xmi:type="uml:Class" href="Common.uml#_Tw79sD2pEeiu6I5JfRTxxQ"/>

         </generalization>

         <ownedAttribute xmi:type="uml:Property" xmi:id="_ZuR54Cr-EemS0_wZSU3sbA" name="monitoringParameter" visibility="public" type="_HlF2kDmxEeiWMf5FLWfdLA">

           <ownedComment xmi:type="uml:Comment" xmi:id="_mt7AICr-EemS0_wZSU3sbA" annotatedElement="_ZuR54Cr-EemS0_wZSU3sbA">

@@ -2373,6 +2371,9 @@ This could include the number of CPU cores on this logical node, a memory config
         </ownedAttribute>

       </packagedElement>

       <packagedElement xmi:type="uml:DataType" xmi:id="_AJK9MDa0Eei23_xWdimG9w" name="VirtualMemoryData">

+        <ownedComment xmi:type="uml:Comment" xmi:id="_A4n9sDOrEemzC6274d_Yog" annotatedElement="_AJK9MDa0Eei23_xWdimG9w">

+          <body>The VirtualMemoryData information element supports the specification of requirements related to virtual memory of a virtual compute resource.</body>

+        </ownedComment>

         <ownedAttribute xmi:type="uml:Property" xmi:id="_HJMDUDa0Eei23_xWdimG9w" name="virtualMemSize">

           <ownedComment xmi:type="uml:Comment" xmi:id="_QinQ0Da0Eei23_xWdimG9w" annotatedElement="_HJMDUDa0Eei23_xWdimG9w">

             <body>Amount of virtual Memory (e.g. in MB).</body>

@@ -2515,14 +2516,14 @@ NOTE: A cardinality of &quot;0&quot; indicates that configuring this present VNF
         </ownedComment>

         <ownedAttribute xmi:type="uml:Property" xmi:id="_vYoMcDkJEeiWMf5FLWfdLA" name="extension">

           <ownedComment xmi:type="uml:Comment" xmi:id="_vYoMcTkJEeiWMf5FLWfdLA" annotatedElement="_vYoMcDkJEeiWMf5FLWfdLA">

-            <body>&quot;Extension&quot; attributes of VnfInfo that are writeable.</body>

+            <body>&quot;Extension&quot; attributes of VnfInfo that are writeable. NOTE: The exact data structure describing the attribute is left for data model solution specification, but it should include: name, and any constraints on the values, such as ranges, predefined values, etc.</body>

           </ownedComment>

           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_vYoMcjkJEeiWMf5FLWfdLA"/>

           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_vYoMczkJEeiWMf5FLWfdLA" value="*"/>

         </ownedAttribute>

         <ownedAttribute xmi:type="uml:Property" xmi:id="_vYsd4DkJEeiWMf5FLWfdLA" name="metadata">

           <ownedComment xmi:type="uml:Comment" xmi:id="_vYsd4TkJEeiWMf5FLWfdLA" annotatedElement="_vYsd4DkJEeiWMf5FLWfdLA">

-            <body>Metadata&quot; attributes of VnfInfo that are writeable</body>

+            <body>Metadata&quot; attributes of VnfInfo that are writeable. NOTE: The exact data structure describing the attribute is left for data model solution specification, but it should include: name, and any constraints on the values, such as ranges, predefined values, etc.</body>

           </ownedComment>

           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_vYsd4jkJEeiWMf5FLWfdLA"/>

           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_vYsd4zkJEeiWMf5FLWfdLA" value="*"/>

@@ -2609,7 +2610,7 @@ NOTE: The MANO or NFVI may not support the recommended collectionPeriod based on
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ZcpG8jmxEeiWMf5FLWfdLA"/>

           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ZcpG8zmxEeiWMf5FLWfdLA" value="1"/>

         </ownedAttribute>

-        <ownedAttribute xmi:type="uml:Property" xmi:id="_zm95IvwtEeijjKJn7OxwuQ" name="localaffinityorantiaffinityrule">

+        <ownedAttribute xmi:type="uml:Property" xmi:id="_zm95IvwtEeijjKJn7OxwuQ" name="localAffinityOrAntiAffinityRule">

           <type xmi:type="uml:DataType" href="Common.uml#_7hn1IDd1EeiIfPeSAqyGdQ"/>

           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_znD_wPwtEeijjKJn7OxwuQ"/>

           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_znD_wfwtEeijjKJn7OxwuQ" value="1"/>

@@ -2695,7 +2696,7 @@ NOTE: The MANO or NFVI may not support the recommended collectionPeriod based on
       </packagedElement>

       <packagedElement xmi:type="uml:Enumeration" xmi:id="_pRh10DnOEeiWMf5FLWfdLA" name="CollectionPeriod">

         <ownedComment xmi:type="uml:Comment" xmi:id="_tFpAoDnOEeiWMf5FLWfdLA" annotatedElement="_pRh10DnOEeiWMf5FLWfdLA">

-          <body>Specifies the periodicity at which the producer will collect performance information.</body>

+          <body>Specifies the periodicity at which the producer will collect performance information. Note: at the end of each reportingPeriod, the producer will inform the consumer about availability of the performance data collected for each completed collection period during this reportingPeriod. While the exact definition of the types for collectionPeriod and reportingPeriod is left for further specification, it is recommended that the reportingPeriod be equal or a multiple of the collectionPeriod. In the latter case, the performance data for the collection periods within one reporting period would be reported together.</body>

         </ownedComment>

       </packagedElement>

       <packagedElement xmi:type="uml:Enumeration" xmi:id="_c8RX8D3BEeiFiY3bcpqGkg" name="HomingStrategy">

@@ -2711,6 +2712,17 @@ NOTE: The MANO or NFVI may not support the recommended collectionPeriod based on
         <ownedComment xmi:type="uml:Comment" xmi:id="_5UfW4EcmEei7eo5RdnNiBQ" annotatedElement="_0RG8kEcmEei7eo5RdnNiBQ">

           <body>The VirtualLinkBitRateLevel information element specifies bitrate requirements applicable to a virtual link instantiated from a particular VnfVirtualLinkDesc.</body>

         </ownedComment>

+        <ownedAttribute xmi:type="uml:Property" xmi:id="_Gn4jQDUvEem2n8bBHelJyw" name="vnfVirtualLinkDescId" visibility="public" type="_-5-w8Cr9EemS0_wZSU3sbA">

+          <ownedComment xmi:type="uml:Comment" xmi:id="_WAtHYDUvEem2n8bBHelJyw" annotatedElement="_Gn4jQDUvEem2n8bBHelJyw">

+            <body>Uniquely identifies a VnfVirtualLinkDesc</body>

+          </ownedComment>

+        </ownedAttribute>

+        <ownedAttribute xmi:type="uml:Property" xmi:id="_auXwYDUvEem2n8bBHelJyw" name="bitrateRequirements" visibility="public">

+          <ownedComment xmi:type="uml:Comment" xmi:id="_tuImADUvEem2n8bBHelJyw" annotatedElement="_auXwYDUvEem2n8bBHelJyw">

+            <body>Bitrate requirements for an instantiation level or bitrate delta for a scaling step.</body>

+          </ownedComment>

+          <type xmi:type="uml:DataType" href="Common.uml#_LsX6UDgXEeiOYfGHew0BGg"/>

+        </ownedAttribute>

       </packagedElement>

       <packagedElement xmi:type="uml:Enumeration" xmi:id="_DK1hoGjsEeip9umi7zNprw" name="ClosedLoopStatus">

         <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_J4maIGjsEeip9umi7zNprw" name="ENABLED"/>

@@ -2728,8 +2740,8 @@ NOTE: The MANO or NFVI may not support the recommended collectionPeriod based on
         <ownedComment xmi:type="uml:Comment" xmi:id="_dtARwHVuEeityfM-lkDl2Q" annotatedElement="_JqA_UHPTEeiuFfjlON-CuQ">

           <body>Indicator for whether the resource is considered operational. Valid values are in-service-path and out-of-service-path.</body>

         </ownedComment>

-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_QPdCQHPTEeiuFfjlON-CuQ" name="IN-SERVICE-PATH"/>

-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_TkXIkHPTEeiuFfjlON-CuQ" name="OUT-OF-SERVICE-PATH"/>

+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_QPdCQHPTEeiuFfjlON-CuQ" name="IN_SERVICE_PATH"/>

+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_TkXIkHPTEeiuFfjlON-CuQ" name="OUT_OF_SERVICE_PATH"/>

       </packagedElement>

       <packagedElement xmi:type="uml:Enumeration" xmi:id="_5--AQJdUEei-sOl6ywWHlg" name="OrchestrationStatus">

         <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_v6IPgJdaEei-sOl6ywWHlg" name="INVENTORIED"/>

@@ -2738,19 +2750,19 @@ NOTE: The MANO or NFVI may not support the recommended collectionPeriod based on
         <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_0SWM8JdaEei-sOl6ywWHlg" name="ACTIVE"/>

       </packagedElement>

       <packagedElement xmi:type="uml:DataType" xmi:id="_ZQtesOzlEei7-e9MrPJW7Q" name="VnfLcmOperationsConfiguration"/>

-      <packagedElement xmi:type="uml:Enumeration" xmi:id="_yPciUBDCEemFz_A_9-IJMQ" name="consumerScope">

-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yPciURDCEemFz_A_9-IJMQ" name="back-end"/>

+      <packagedElement xmi:type="uml:Enumeration" xmi:id="_yPciUBDCEemFz_A_9-IJMQ" name="ConsumerScope">

+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yPciURDCEemFz_A_9-IJMQ" name="BACK_END"/>

       </packagedElement>

       <packagedElement xmi:type="uml:DataType" xmi:id="_kEZoUjzEEeiWMf5FLWfdLA" name="VnfIndicatorData">

         <ownedComment xmi:type="uml:Comment" xmi:id="_kEZoUzzEEeiWMf5FLWfdLA" annotatedElement="_kEZoUjzEEeiWMf5FLWfdLA">

           <body>The VnfIndicatorData datatype identifies a VNF indicator in a VNFD.</body>

         </ownedComment>

-        <ownedAttribute xmi:type="uml:Property" xmi:id="_kEZoVDzEEeiWMf5FLWfdLA" name="vnfdId">

+        <ownedAttribute xmi:type="uml:Property" xmi:id="_kEZoVDzEEeiWMf5FLWfdLA" name="vnfdId" type="_aaEZADOREeiHat9KcP8uWA">

           <ownedComment xmi:type="uml:Comment" xmi:id="_kEZoVTzEEeiWMf5FLWfdLA" annotatedElement="_kEZoVDzEEeiWMf5FLWfdLA">

             <body>Identifies a VNFD.</body>

           </ownedComment>

         </ownedAttribute>

-        <ownedAttribute xmi:type="uml:Property" xmi:id="_kEZoVjzEEeiWMf5FLWfdLA" name="vnfIndicator">

+        <ownedAttribute xmi:type="uml:Property" xmi:id="_kEZoVjzEEeiWMf5FLWfdLA" name="vnfIndicator" type="_tEnEsDTSEeiwQ6KPLHcy4g">

           <ownedComment xmi:type="uml:Comment" xmi:id="_kEZoVzzEEeiWMf5FLWfdLA" annotatedElement="_kEZoVjzEEeiWMf5FLWfdLA">

             <body>Identifies a VNF indicator within the VNFD.</body>

           </ownedComment>

@@ -2840,13 +2852,12 @@ Shall be absent when used for virtual disks.&#xD;
           </ownedComment>

           <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>

         </ownedAttribute>

-        <ownedAttribute xmi:type="uml:Property" xmi:id="_pEem4CpFEemS0_wZSU3sbA" name="intVirtualLinkDesc" visibility="public">

+        <ownedAttribute xmi:type="uml:Property" xmi:id="_pEem4CpFEemS0_wZSU3sbA" name="intVirtualLinkDesc" visibility="public" type="_-5-w8Cr9EemS0_wZSU3sbA">

           <ownedComment xmi:type="uml:Comment" xmi:id="_06i18CpFEemS0_wZSU3sbA" annotatedElement="_pEem4CpFEemS0_wZSU3sbA">

             <body>Reference of the internal VLD which this file storage connects to.&#xD;

 The attached VDUs shall connect to the same internal VLD.&#xD;

 </body>

           </ownedComment>

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

         </ownedAttribute>

       </packagedElement>

       <packagedElement xmi:type="uml:DataType" xmi:id="_hzvvUPxSEeijjKJn7OxwuQ" name="StorageQos">

@@ -2867,7 +2878,7 @@ The attached VDUs shall connect to the same internal VLD.&#xD;
             <body>Consumer type.</body>

           </ownedComment>

         </ownedAttribute>

-        <ownedAttribute xmi:type="uml:Property" xmi:id="_43vsABDCEemFz_A_9-IJMQ" name="qos_specs">

+        <ownedAttribute xmi:type="uml:Property" xmi:id="_43vsABDCEemFz_A_9-IJMQ" name="qosSpecs">

           <ownedComment xmi:type="uml:Comment" xmi:id="_LFiSIBDDEemFz_A_9-IJMQ" annotatedElement="_43vsABDCEemFz_A_9-IJMQ">

             <body>Describe qualities of Qos：total_bytes_sec、total_iops_sec. </body>

           </ownedComment>

@@ -2896,12 +2907,14 @@ The attached VDUs shall connect to the same internal VLD.&#xD;
           <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>

         </ownedAttribute>

       </packagedElement>

-      <packagedElement xmi:type="uml:Enumeration" xmi:id="_1DEVYByHEemVVe_wt-ZCGw" name="NetworkType">

-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="__oFMQByHEemVVe_wt-ZCGw" name="VLAN"/>

-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_CP_psByIEemVVe_wt-ZCGw" name="VXLAN"/>

-      </packagedElement>

       <packagedElement xmi:type="uml:DataType" xmi:id="_BAt7gBx6Eemit6R65X1VNQ" name="VirtualLinkProtocolData">

+        <ownedComment xmi:type="uml:Comment" xmi:id="_2suxcDOqEemzC6274d_Yog" annotatedElement="_BAt7gBx6Eemit6R65X1VNQ">

+          <body>The VirtualLinkProtocolData describes the protocol layer and associated protocol data for a virtual link</body>

+        </ownedComment>

         <ownedAttribute xmi:type="uml:Property" xmi:id="_gKzRkBx9Eemit6R65X1VNQ" name="associatedLayerProtocol">

+          <ownedComment xmi:type="uml:Comment" xmi:id="_xhQLEDOqEemzC6274d_Yog" annotatedElement="_gKzRkBx9Eemit6R65X1VNQ">

+            <body>One of the values of the attribute layerProtocol of the ConnectivityType IE.</body>

+          </ownedComment>

           <type xmi:type="uml:Enumeration" href="Common.uml#_tFQGcDnLEeiWMf5FLWfdLA"/>

         </ownedAttribute>

         <ownedAttribute xmi:type="uml:Property" xmi:id="_geJEUBx9Eemit6R65X1VNQ" name="l2ProtocolData">

@@ -3057,18 +3070,6 @@ The attached VDUs shall connect to the same internal VLD.&#xD;
   <OpenModel_Profile:OpenModelAttribute xmi:id="_4zAhUDdKEeiIfPeSAqyGdQ" base_StructuralFeature="_4y_6QDdKEeiIfPeSAqyGdQ"/>

   <OpenModel_Profile:OpenModelAttribute xmi:id="_6sJ0QTdKEeiIfPeSAqyGdQ" base_StructuralFeature="_6sJ0QDdKEeiIfPeSAqyGdQ"/>

   <OpenModel_Profile:OpenModelAttribute xmi:id="_7J5gMDdKEeiIfPeSAqyGdQ" base_StructuralFeature="_7J45IDdKEeiIfPeSAqyGdQ"/>

-  <OpenModel_Profile:OpenModelAttribute xmi:id="_pszPATd9EeiIfPeSAqyGdQ" isInvariant="true">

-    <base_StructuralFeature xmi:type="uml:Property" href="Common.uml#_pszPADd9EeiIfPeSAqyGdQ"/>

-  </OpenModel_Profile:OpenModelAttribute>

-  <OpenModel_Profile:OpenModelAttribute xmi:id="_qgZ2MDd9EeiIfPeSAqyGdQ">

-    <base_StructuralFeature xmi:type="uml:Property" href="Common.uml#_qgZPIDd9EeiIfPeSAqyGdQ"/>

-  </OpenModel_Profile:OpenModelAttribute>

-  <OpenModel_Profile:OpenModelAttribute xmi:id="_rY7ZoTd9EeiIfPeSAqyGdQ">

-    <base_StructuralFeature xmi:type="uml:Property" href="Common.uml#_rY7ZoDd9EeiIfPeSAqyGdQ"/>

-  </OpenModel_Profile:OpenModelAttribute>

-  <OpenModel_Profile:OpenModelAttribute xmi:id="_1X3vATd9EeiIfPeSAqyGdQ">

-    <base_StructuralFeature xmi:type="uml:Property" href="Common.uml#_1X3vADd9EeiIfPeSAqyGdQ"/>

-  </OpenModel_Profile:OpenModelAttribute>

   <OpenModel_Profile:OpenModelClass xmi:id="_ONvIIDaIEei23_xWdimG9w" base_Class="_zOfv8DQVEeixv_sLOod4lQ"/>

   <OpenModel_Profile:OpenModelAttribute xmi:id="_7nJYsTdREeiIfPeSAqyGdQ" base_StructuralFeature="_7nJYsDdREeiIfPeSAqyGdQ"/>

   <OpenModel_Profile:OpenModelAttribute xmi:id="_7dX8MTdSEeiIfPeSAqyGdQ" base_StructuralFeature="_7dX8MDdSEeiIfPeSAqyGdQ"/>

@@ -3148,15 +3149,6 @@ The attached VDUs shall connect to the same internal VLD.&#xD;
   <OpenModel_Profile:OpenModelAttribute xmi:id="_3WVcUDa4EeivvI-m1BaAbA" base_StructuralFeature="_3WU1QDa4EeivvI-m1BaAbA"/>

   <OpenModel_Profile:OpenModelAttribute xmi:id="_gv2iMTa5EeivvI-m1BaAbA" base_StructuralFeature="_gv2iMDa5EeivvI-m1BaAbA"/>

   <OpenModel_Profile:OpenModelAttribute xmi:id="_heqI8Ta5EeivvI-m1BaAbA" base_StructuralFeature="_heqI8Da5EeivvI-m1BaAbA"/>

-  <OpenModel_Profile:OpenModelAttribute xmi:id="_GA6IYTd_EeiIfPeSAqyGdQ">

-    <base_StructuralFeature xmi:type="uml:Property" href="Common.uml#_GA6IYDd_EeiIfPeSAqyGdQ"/>

-  </OpenModel_Profile:OpenModelAttribute>

-  <OpenModel_Profile:OpenModelAttribute xmi:id="_G-M3EDd_EeiIfPeSAqyGdQ">

-    <base_StructuralFeature xmi:type="uml:Property" href="Common.uml#_G-MQADd_EeiIfPeSAqyGdQ"/>

-  </OpenModel_Profile:OpenModelAttribute>

-  <OpenModel_Profile:OpenModelAttribute xmi:id="_Hy64kTd_EeiIfPeSAqyGdQ">

-    <base_StructuralFeature xmi:type="uml:Property" href="Common.uml#_Hy64kDd_EeiIfPeSAqyGdQ"/>

-  </OpenModel_Profile:OpenModelAttribute>

   <OpenModel_Profile:OpenModelAttribute xmi:id="_pswrQDkIEeiWMf5FLWfdLA" base_StructuralFeature="_pslFEDkIEeiWMf5FLWfdLA"/>

   <OpenModel_Profile:OpenModelAttribute xmi:id="_pxWQUDkIEeiWMf5FLWfdLA" base_StructuralFeature="_pxVpQDkIEeiWMf5FLWfdLA"/>

   <OpenModel_Profile:OpenModelAttribute xmi:id="_pxdlEzkIEeiWMf5FLWfdLA" base_StructuralFeature="_pxdlEDkIEeiWMf5FLWfdLA"/>

@@ -3275,18 +3267,6 @@ The attached VDUs shall connect to the same internal VLD.&#xD;
   <OpenModel_Profile:Preliminary xmi:id="_4T-jcJT2EeiYXO5wr78TUw" base_Element="_s7WyQDgYEeiOYfGHew0BGg"/>

   <OpenModel_Profile:Preliminary xmi:id="_HjFx8JT3EeiYXO5wr78TUw" base_Element="_oFQM8Dd-EeiIfPeSAqyGdQ"/>

   <OpenModel_Profile:Preliminary xmi:id="_IrN3oJT3EeiYXO5wr78TUw" base_Element="_v0nsYDd-EeiIfPeSAqyGdQ"/>

-  <OpenModel_Profile:Preliminary xmi:id="_00PbQJT4EeiYXO5wr78TUw">

-    <base_Element xmi:type="uml:Property" href="Common.uml#_pszPADd9EeiIfPeSAqyGdQ"/>

-  </OpenModel_Profile:Preliminary>

-  <OpenModel_Profile:Preliminary xmi:id="_2KjG4JT4EeiYXO5wr78TUw">

-    <base_Element xmi:type="uml:Property" href="Common.uml#_qgZPIDd9EeiIfPeSAqyGdQ"/>

-  </OpenModel_Profile:Preliminary>

-  <OpenModel_Profile:Preliminary xmi:id="_3eA54JT4EeiYXO5wr78TUw">

-    <base_Element xmi:type="uml:Property" href="Common.uml#_rY7ZoDd9EeiIfPeSAqyGdQ"/>

-  </OpenModel_Profile:Preliminary>

-  <OpenModel_Profile:Preliminary xmi:id="_4brcAJT4EeiYXO5wr78TUw">

-    <base_Element xmi:type="uml:Property" href="Common.uml#_1X3vADd9EeiIfPeSAqyGdQ"/>

-  </OpenModel_Profile:Preliminary>

   <OpenModel_Profile:Preliminary xmi:id="_-2rJgJT4EeiYXO5wr78TUw" base_Element="_AmzWYDQtEeixv_sLOod4lQ"/>

   <OpenModel_Profile:Preliminary xmi:id="_DQS1IJT5EeiYXO5wr78TUw" base_Element="_e5WnwDOREeiHat9KcP8uWA"/>

   <OpenModel_Profile:Preliminary xmi:id="_ETQG8JT5EeiYXO5wr78TUw" base_Element="_l8PhgDWbEei9Ia34RXjpEg"/>

@@ -3367,13 +3347,9 @@ The attached VDUs shall connect to the same internal VLD.&#xD;
   <OpenModel_Profile:Experimental xmi:id="_0dCJQJUFEeiYXO5wr78TUw" base_Element="_2Ykn8GN4Eeio9amveq0yWQ"/>

   <OpenModel_Profile:Experimental xmi:id="_1pv0AJUFEeiYXO5wr78TUw" base_Element="_WbPTMGN5Eeio9amveq0yWQ"/>

   <OpenModel_Profile:Experimental xmi:id="_4Z5ncJUFEeiYXO5wr78TUw" base_Element="_B2hDUF-GEeiaLPXj8My4aQ"/>

-  <OpenModel_Profile:Experimental xmi:id="_6RkTsJUFEeiYXO5wr78TUw" base_Element="_aYK0IHPSEeiuFfjlON-CuQ"/>

   <OpenModel_Profile:Experimental xmi:id="_8B_IcJUFEeiYXO5wr78TUw" base_Element="_kxfYYHPSEeiuFfjlON-CuQ"/>

   <OpenModel_Profile:Experimental xmi:id="_9nSSUJUFEeiYXO5wr78TUw" base_Element="_nDl94HPSEeiuFfjlON-CuQ"/>

   <OpenModel_Profile:Experimental xmi:id="_-rp5YJUFEeiYXO5wr78TUw" base_Element="_okbegHPSEeiuFfjlON-CuQ"/>

-  <OpenModel_Profile:Experimental xmi:id="_Arg4UJUGEeiYXO5wr78TUw" base_Element="_JqA_UHPTEeiuFfjlON-CuQ"/>

-  <OpenModel_Profile:Experimental xmi:id="_CRvPQJUGEeiYXO5wr78TUw" base_Element="_QPdCQHPTEeiuFfjlON-CuQ"/>

-  <OpenModel_Profile:Experimental xmi:id="_DlFtgJUGEeiYXO5wr78TUw" base_Element="_TkXIkHPTEeiuFfjlON-CuQ"/>

   <OpenModel_Profile:Preliminary xmi:id="_cBQhcJUGEeiYXO5wr78TUw" base_Element="_DK1hoGjsEeip9umi7zNprw"/>

   <OpenModel_Profile:Preliminary xmi:id="_c7EeUJUGEeiYXO5wr78TUw" base_Element="_J4maIGjsEeip9umi7zNprw"/>

   <OpenModel_Profile:Preliminary xmi:id="_dyG0AJUGEeiYXO5wr78TUw" base_Element="_L1m5YGjsEeip9umi7zNprw"/>

@@ -3396,15 +3372,6 @@ The attached VDUs shall connect to the same internal VLD.&#xD;
   <OpenModel_Profile:Experimental xmi:id="_3mrI0JUHEeiYXO5wr78TUw" base_Element="_FCQV8D5dEeijbdkIlrq2uQ"/>

   <OpenModel_Profile:Experimental xmi:id="_4YckAJUHEeiYXO5wr78TUw" base_Element="_GY4KoD5dEeijbdkIlrq2uQ"/>

   <OpenModel_Profile:Experimental xmi:id="_5oJ4YJUHEeiYXO5wr78TUw" base_Element="_JaCOgD5dEeijbdkIlrq2uQ"/>

-  <OpenModel_Profile:Preliminary xmi:id="_9Ult4JUHEeiYXO5wr78TUw">

-    <base_Element xmi:type="uml:Property" href="Common.uml#_GA6IYDd_EeiIfPeSAqyGdQ"/>

-  </OpenModel_Profile:Preliminary>

-  <OpenModel_Profile:Preliminary xmi:id="_-NoOsJUHEeiYXO5wr78TUw">

-    <base_Element xmi:type="uml:Property" href="Common.uml#_G-MQADd_EeiIfPeSAqyGdQ"/>

-  </OpenModel_Profile:Preliminary>

-  <OpenModel_Profile:Preliminary xmi:id="__AwUwJUHEeiYXO5wr78TUw">

-    <base_Element xmi:type="uml:Property" href="Common.uml#_Hy64kDd_EeiIfPeSAqyGdQ"/>

-  </OpenModel_Profile:Preliminary>

   <OpenModel_Profile:Preliminary xmi:id="_Wp030JUIEeiYXO5wr78TUw" base_Element="_EYaAsDnIEeiWMf5FLWfdLA"/>

   <OpenModel_Profile:Preliminary xmi:id="_Xb5N8JUIEeiYXO5wr78TUw" base_Element="_KFKIIDnIEeiWMf5FLWfdLA"/>

   <OpenModel_Profile:Preliminary xmi:id="_YKO6oJUIEeiYXO5wr78TUw" base_Element="_SHb8gDnIEeiWMf5FLWfdLA"/>

@@ -3444,13 +3411,6 @@ The attached VDUs shall connect to the same internal VLD.&#xD;
   <OpenModel_Profile:Preliminary xmi:id="_rbXXoJUJEeiYXO5wr78TUw" base_Element="_bbN9YDm6EeiWMf5FLWfdLA"/>

   <OpenModel_Profile:Preliminary xmi:id="_sb5AgJUJEeiYXO5wr78TUw" base_Element="_fCLdADm6EeiWMf5FLWfdLA"/>

   <OpenModel_Profile:Preliminary xmi:id="_9VPjQJUJEeiYXO5wr78TUw" base_Element="_tIZ6oDa2Eei23_xWdimG9w"/>

-  <OpenModel_Profile:Experimental xmi:id="_GAbnAJdVEei-sOl6ywWHlg" base_Element="_5--AQJdUEei-sOl6ywWHlg"/>

-  <OpenModel_Profile:Experimental xmi:id="_3b7QMJdeEei-sOl6ywWHlg">

-    <base_Element xmi:type="uml:EnumerationLiteral" href="Common.uml#_TXtQgJddEei-sOl6ywWHlg"/>

-  </OpenModel_Profile:Experimental>

-  <OpenModel_Profile:Experimental xmi:id="_41m_8JdeEei-sOl6ywWHlg">

-    <base_Element xmi:type="uml:EnumerationLiteral" href="Common.uml#_UVFewJddEei-sOl6ywWHlg"/>

-  </OpenModel_Profile:Experimental>

   <OpenModel_Profile:OpenModelAttribute xmi:id="_psa4QZmYEeibE8EgApNciA" base_StructuralFeature="_psa4QJmYEeibE8EgApNciA"/>

   <OpenModel_Profile:Preliminary xmi:id="_76XPYJmYEeibE8EgApNciA" base_Element="_psa4QJmYEeibE8EgApNciA"/>

   <OpenModel_Profile:OpenModelAttribute xmi:id="_UugbMJpZEeidy9iGT_F5-w" base_StructuralFeature="_Uuf0IJpZEeidy9iGT_F5-w"/>

@@ -3518,15 +3478,6 @@ The attached VDUs shall connect to the same internal VLD.&#xD;
   <OpenModel_Profile:OpenModelAttribute xmi:id="_0yXWgfuDEeikN6fzJzDfWw" base_StructuralFeature="_0yXWgPuDEeikN6fzJzDfWw" support="OPTIONAL"/>

   <OpenModel_Profile:OpenModelAttribute xmi:id="_ilsVQfuEEeikN6fzJzDfWw" base_StructuralFeature="_ilsVQPuEEeikN6fzJzDfWw"/>

   <OpenModel_Profile:OpenModelAttribute xmi:id="_PyPn4fuFEeikN6fzJzDfWw" base_StructuralFeature="_PyPn4PuFEeikN6fzJzDfWw"/>

-  <OpenModel_Profile:OpenModelAttribute xmi:id="_uFCmEPuHEeiYVshOvl6_ww">

-    <base_StructuralFeature xmi:type="uml:Property" href="Common.uml#_uFBX8PuHEeiYVshOvl6_ww"/>

-  </OpenModel_Profile:OpenModelAttribute>

-  <OpenModel_Profile:OpenModelAttribute xmi:id="_RayLofuIEeiYVshOvl6_ww">

-    <base_StructuralFeature xmi:type="uml:Property" href="Common.uml#_RayLoPuIEeiYVshOvl6_ww"/>

-  </OpenModel_Profile:OpenModelAttribute>

-  <OpenModel_Profile:OpenModelAttribute xmi:id="_gUB30fuIEeiYVshOvl6_ww">

-    <base_StructuralFeature xmi:type="uml:Property" href="Common.uml#_gUB30PuIEeiYVshOvl6_ww"/>

-  </OpenModel_Profile:OpenModelAttribute>

   <OpenModel_Profile:OpenModelAttribute xmi:id="_tID8QfuOEeiYVshOvl6_ww" base_StructuralFeature="_tID8QPuOEeiYVshOvl6_ww"/>

   <OpenModel_Profile:OpenModelAttribute xmi:id="_QOpoEfwqEeijjKJn7OxwuQ" base_StructuralFeature="_QOpoEPwqEeijjKJn7OxwuQ"/>

   <OpenModel_Profile:OpenModelAttribute xmi:id="_zm95I_wtEeijjKJn7OxwuQ" base_StructuralFeature="_zm95IvwtEeijjKJn7OxwuQ"/>

@@ -3550,9 +3501,6 @@ The attached VDUs shall connect to the same internal VLD.&#xD;
   <OpenModel_Profile:OpenModelAttribute xmi:id="_gKzRkRx9Eemit6R65X1VNQ" base_StructuralFeature="_gKzRkBx9Eemit6R65X1VNQ"/>

   <OpenModel_Profile:OpenModelAttribute xmi:id="_geJEURx9Eemit6R65X1VNQ" base_StructuralFeature="_geJEUBx9Eemit6R65X1VNQ"/>

   <OpenModel_Profile:OpenModelAttribute xmi:id="_gy064Rx9Eemit6R65X1VNQ" base_StructuralFeature="_gy064Bx9Eemit6R65X1VNQ"/>

-  <OpenModel_Profile:Preliminary xmi:id="_zaVAgByIEemVVe_wt-ZCGw" base_Element="__oFMQByHEemVVe_wt-ZCGw"/>

-  <OpenModel_Profile:Preliminary xmi:id="_1AVVAByIEemVVe_wt-ZCGw" base_Element="_1DEVYByHEemVVe_wt-ZCGw"/>

-  <OpenModel_Profile:Preliminary xmi:id="_5INwYByIEemVVe_wt-ZCGw" base_Element="_CP_psByIEemVVe_wt-ZCGw"/>

   <OpenModel_Profile:OpenModelAttribute xmi:id="_kFvsADzEEeiWMf5FLWfdLA" base_StructuralFeature="_kEZoVDzEEeiWMf5FLWfdLA"/>

   <OpenModel_Profile:OpenModelAttribute xmi:id="_kFxhMDzEEeiWMf5FLWfdLA" base_StructuralFeature="_kEZoVjzEEeiWMf5FLWfdLA"/>

   <OpenModel_Profile:OpenModelAttribute xmi:id="_kGTFojzEEeiWMf5FLWfdLA" base_StructuralFeature="_kEZowzzEEeiWMf5FLWfdLA"/>

@@ -3737,4 +3685,46 @@ The attached VDUs shall connect to the same internal VLD.&#xD;
   <OpenModel_Profile:OpenModelAttribute xmi:id="_p8meQTa8EeivvI-m1BaAbA" base_StructuralFeature="_p8meQDa8EeivvI-m1BaAbA"/>

   <OpenModel_Profile:Preliminary xmi:id="_mm4FAJT1EeiYXO5wr78TUw" base_Element="_p8meQDa8EeivvI-m1BaAbA"/>

   <ActionLanguage:TextualRepresentation xmi:id="_kmLigCo4EemZ-7haRVvogQ" base_Comment="_kl9gECo4EemZ-7haRVvogQ" language="org.eclipse.papyrus.uml.textedit.property.xtext.UmlProperty"/>

+  <OpenModel_Profile:Future xmi:id="_21aNUDOfEemzC6274d_Yog" base_Element="_7OI4MBiwEemU7tpKjNcB0w"/>

+  <OpenModel_Profile:Future xmi:id="_CA6ccDOgEemzC6274d_Yog" base_Element="_tID8QPuOEeiYVshOvl6_ww"/>

+  <OpenModel_Profile:Future xmi:id="_D0G4YDOgEemzC6274d_Yog" base_Element="_4rzi8A5rEemrJqq3q9vf6g"/>

+  <OpenModel_Profile:Future xmi:id="_M5nEUDOgEemzC6274d_Yog" base_Element="_QOpoEPwqEeijjKJn7OxwuQ"/>

+  <OpenModel_Profile:Future xmi:id="_Ox3mcDOgEemzC6274d_Yog" base_Element="_u6wxQPxEEeijjKJn7OxwuQ"/>

+  <OpenModel_Profile:Future xmi:id="_QlaAoDOgEemzC6274d_Yog" base_Element="_7qyuMPxEEeijjKJn7OxwuQ"/>

+  <OpenModel_Profile:Future xmi:id="_TekmIDOgEemzC6274d_Yog" base_Element="_0yXWgPuDEeikN6fzJzDfWw"/>

+  <OpenModel_Profile:Future xmi:id="_VJR0cDOgEemzC6274d_Yog" base_Element="_ilsVQPuEEeikN6fzJzDfWw"/>

+  <OpenModel_Profile:Future xmi:id="_Ww7HsDOgEemzC6274d_Yog" base_Element="_PyPn4PuFEeikN6fzJzDfWw"/>

+  <OpenModel_Profile:Future xmi:id="_YUTmADOgEemzC6274d_Yog" base_Element="_ZhRloBlYEem_VM0Ij2_uSw"/>

+  <OpenModel_Profile:Future xmi:id="_lJ4xUDOgEemzC6274d_Yog" base_Element="_O0DAID5dEeijbdkIlrq2uQ"/>

+  <OpenModel_Profile:Future xmi:id="_n-0XEDOgEemzC6274d_Yog" base_Element="_o4b5oD5eEeijbdkIlrq2uQ"/>

+  <OpenModel_Profile:Experimental xmi:id="_8KbUwDOgEemzC6274d_Yog" base_Element="_mcXjILIKEeid-vjMcczUWA"/>

+  <OpenModel_Profile:Future xmi:id="_OOwc4DOhEemzC6274d_Yog" base_Element="_zm95IvwtEeijjKJn7OxwuQ"/>

+  <OpenModel_Profile:Future xmi:id="_ajZeUDOhEemzC6274d_Yog" base_Element="_QPdCQHPTEeiuFfjlON-CuQ"/>

+  <OpenModel_Profile:Future xmi:id="_gDozwDOhEemzC6274d_Yog" base_Element="_TkXIkHPTEeiuFfjlON-CuQ"/>

+  <OpenModel_Profile:Future xmi:id="_2hLiYDOiEemzC6274d_Yog" base_Element="_yPciURDCEemFz_A_9-IJMQ"/>

+  <OpenModel_Profile:Future xmi:id="_BwZz4DOjEemzC6274d_Yog" base_Element="_kEZowTzEEeiWMf5FLWfdLA"/>

+  <OpenModel_Profile:Future xmi:id="_Em5f4DOjEemzC6274d_Yog" base_Element="_kEZowzzEEeiWMf5FLWfdLA"/>

+  <OpenModel_Profile:Future xmi:id="_GGmYEDOjEemzC6274d_Yog" base_Element="_kEZoxTzEEeiWMf5FLWfdLA"/>

+  <OpenModel_Profile:Future xmi:id="_K4zi0DOjEemzC6274d_Yog" base_Element="_hzvvUPxSEeijjKJn7OxwuQ"/>

+  <OpenModel_Profile:Future xmi:id="_OPVZwDOjEemzC6274d_Yog" base_Element="_tMfJMPxSEeijjKJn7OxwuQ"/>

+  <OpenModel_Profile:Future xmi:id="_PsEdgDOjEemzC6274d_Yog" base_Element="_tlqeMPxSEeijjKJn7OxwuQ"/>

+  <OpenModel_Profile:Future xmi:id="_RG1yYDOjEemzC6274d_Yog" base_Element="_nUxZ8BDBEemFz_A_9-IJMQ"/>

+  <OpenModel_Profile:Future xmi:id="_UQZkUDOjEemzC6274d_Yog" base_Element="_43vsABDCEemFz_A_9-IJMQ"/>

+  <OpenModel_Profile:Future xmi:id="_WZ1WADOjEemzC6274d_Yog" base_Element="_cyGIcPxUEeijjKJn7OxwuQ"/>

+  <OpenModel_Profile:Future xmi:id="_ZS504DOjEemzC6274d_Yog" base_Element="_qvf3cPxUEeijjKJn7OxwuQ"/>

+  <OpenModel_Profile:Future xmi:id="_bF4OYDOjEemzC6274d_Yog" base_Element="_rBniMPxUEeijjKJn7OxwuQ"/>

+  <OpenModel_Profile:Future xmi:id="_cqe0sDOjEemzC6274d_Yog" base_Element="_rVW9kPxUEeijjKJn7OxwuQ"/>

+  <OpenModel_Profile:Experimental xmi:id="_q4DtsDOjEemzC6274d_Yog" base_Element="_BAt7gBx6Eemit6R65X1VNQ"/>

+  <OpenModel_Profile:Experimental xmi:id="_sR_VEDOjEemzC6274d_Yog" base_Element="_gKzRkBx9Eemit6R65X1VNQ"/>

+  <OpenModel_Profile:Experimental xmi:id="_t6MpADOjEemzC6274d_Yog" base_Element="_geJEUBx9Eemit6R65X1VNQ"/>

+  <OpenModel_Profile:Experimental xmi:id="_v0a6ADOjEemzC6274d_Yog" base_Element="_gy064Bx9Eemit6R65X1VNQ"/>

+  <OpenModel_Profile:Experimental xmi:id="_yjuY4DOjEemzC6274d_Yog" base_Element="_m4u3AC41EemS0_wZSU3sbA"/>

+  <OpenModel_Profile:OpenModelAttribute xmi:id="_Gt5rsDUvEem2n8bBHelJyw" base_StructuralFeature="_Gn4jQDUvEem2n8bBHelJyw"/>

+  <OpenModel_Profile:PassedByReference xmi:id="_X250ADUvEem2n8bBHelJyw" base_Property="_Gn4jQDUvEem2n8bBHelJyw"/>

+  <OpenModel_Profile:OpenModelAttribute xmi:id="_auYXcDUvEem2n8bBHelJyw" base_StructuralFeature="_auXwYDUvEem2n8bBHelJyw"/>

+  <OpenModel_Profile:Reference xmi:id="_7gdtcDUvEem2n8bBHelJyw" base_Element="_BAt7gBx6Eemit6R65X1VNQ" reference="IFA011 v2.5.1"/>

+  <OpenModel_Profile:Reference xmi:id="_EYSCsDUwEem2n8bBHelJyw" base_Element="_m4u3AC41EemS0_wZSU3sbA" reference="IFA011 v2.5.1"/>

+  <OpenModel_Profile:Future xmi:id="_uzbV8DU2Eem2n8bBHelJyw" base_Element="_aYK0IHPSEeiuFfjlON-CuQ"/>

+  <OpenModel_Profile:Future xmi:id="_w9fZwDU2Eem2n8bBHelJyw" base_Element="_JqA_UHPTEeiuFfjlON-CuQ"/>

+  <OpenModel_Profile:Future xmi:id="_zOyuADU2Eem2n8bBHelJyw" base_Element="_5--AQJdUEei-sOl6ywWHlg"/>

 </xmi:XMI>