6 files changed, 244 insertions, 412 deletions
diff --git a/ONAP Information Model/Common.notation b/ONAP Information Model/Common.notation
index 7c98309..27013c2 100644
--- a/ONAP Information Model/Common.notation
+++ b/ONAP Information Model/Common.notation
@@ -8971,11 +8971,6 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="__e23wNxxEei0G_d67y10Rg"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="__e23wdxxEei0G_d67y10Rg"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_aq9coNxyEei0G_d67y10Rg" visible="false" type="StereotypeLabel">
-        <styles xmi:type="notation:StringValueStyle" xmi:id="_aq9codxyEei0G_d67y10Rg" name="stereotype" stringValue="OpenModel_Profile::OpenModelClass"/>
-        <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aq9cotxyEei0G_d67y10Rg"/>
-      </children>
       <element xmi:type="uml:Class" href="Common.uml#__ez0YNxxEei0G_d67y10Rg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="__e2QodxxEei0G_d67y10Rg" x="940" y="100"/>
     </children>
@@ -9038,38 +9033,18 @@
       </children>
       <children xmi:type="notation:BasicCompartment" xmi:id="_KEVK4d0dEeiRzJu73dYz2w" type="Class_AttributeCompartment">
         <children xmi:type="notation:Shape" xmi:id="_ycvRsN0gEeiRzJu73dYz2w" type="Property_ClassAttributeLabel">
-          <children xmi:type="notation:DecorationNode" xmi:id="_yhX6EN0gEeiRzJu73dYz2w" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_yhX6Ed0gEeiRzJu73dYz2w" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yhX6Et0gEeiRzJu73dYz2w"/>
-          </children>
           <element xmi:type="uml:Property" href="Common.uml#_yYBw0N0gEeiRzJu73dYz2w"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_ycvRsd0gEeiRzJu73dYz2w"/>
         </children>
         <children xmi:type="notation:Shape" xmi:id="_zEcK4N0gEeiRzJu73dYz2w" type="Property_ClassAttributeLabel">
-          <children xmi:type="notation:DecorationNode" xmi:id="_zIxRQN0gEeiRzJu73dYz2w" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_zIxRQd0gEeiRzJu73dYz2w" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zIxRQt0gEeiRzJu73dYz2w"/>
-          </children>
           <element xmi:type="uml:Property" href="Common.uml#_zAJgwN0gEeiRzJu73dYz2w"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_zEcK4d0gEeiRzJu73dYz2w"/>
         </children>
         <children xmi:type="notation:Shape" xmi:id="_FF1o4N0jEeiRzJu73dYz2w" type="Property_ClassAttributeLabel">
-          <children xmi:type="notation:DecorationNode" xmi:id="_FKXjkN0jEeiRzJu73dYz2w" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_FKXjkd0jEeiRzJu73dYz2w" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FKXjkt0jEeiRzJu73dYz2w"/>
-          </children>
           <element xmi:type="uml:Property" href="Common.uml#_FBhwoN0jEeiRzJu73dYz2w"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_FF1o4d0jEeiRzJu73dYz2w"/>
         </children>
         <children xmi:type="notation:Shape" xmi:id="_FtI5cN0jEeiRzJu73dYz2w" type="Property_ClassAttributeLabel">
-          <children xmi:type="notation:DecorationNode" xmi:id="_FxWEAN0jEeiRzJu73dYz2w" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_FxWEAd0jEeiRzJu73dYz2w" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FxWEAt0jEeiRzJu73dYz2w"/>
-          </children>
           <element xmi:type="uml:Property" href="Common.uml#_Fox94N0jEeiRzJu73dYz2w"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_FtI5cd0jEeiRzJu73dYz2w"/>
         </children>
@@ -9090,11 +9065,6 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_KEVK7t0dEeiRzJu73dYz2w"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KEVK790dEeiRzJu73dYz2w"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_KEdtwN0dEeiRzJu73dYz2w" visible="false" type="StereotypeLabel">
-        <styles xmi:type="notation:StringValueStyle" xmi:id="_KEdtwd0dEeiRzJu73dYz2w" name="stereotype" stringValue="OpenModel_Profile::OpenModelClass"/>
-        <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KEdtwt0dEeiRzJu73dYz2w"/>
-      </children>
       <element xmi:type="uml:Class" href="Common.uml#_KEN2IN0dEeiRzJu73dYz2w"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KESHkd0dEeiRzJu73dYz2w" x="740" y="480" height="121"/>
     </children>
diff --git a/ONAP Information Model/Common.uml b/ONAP Information Model/Common.uml
index 826613d..4fa1837 100644
--- a/ONAP Information Model/Common.uml
+++ b/ONAP Information Model/Common.uml
@@ -6296,9 +6296,6 @@ White - Not Ready for Review</body>
           <ownedComment xmi:type="uml:Comment" xmi:id="_Tw79sT2pEeiu6I5JfRTxxQ" annotatedElement="_Tw79sD2pEeiu6I5JfRTxxQ">
             <body>Common part of the various VLDs.</body>
           </ownedComment>
-          <generalization xmi:type="uml:Generalization" xmi:id="_tmOdULeSEeiq7vtzCAMDQQ">
-            <general xmi:type="uml:Class" href="Vnf.uml#_AC2eIDQUEeixv_sLOod4lQ"/>
-          </generalization>
           <ownedAttribute xmi:type="uml:Property" xmi:id="_Tw79sj2pEeiu6I5JfRTxxQ" name="virtualLinkDescId" type="_AuYtcDkBEeiWMf5FLWfdLA">
             <ownedComment xmi:type="uml:Comment" xmi:id="_Tw79sz2pEeiu6I5JfRTxxQ" annotatedElement="_Tw79sj2pEeiu6I5JfRTxxQ">
               <body>Uniquely identifies a VLD in the parent descriptor.&#xD;
@@ -6545,8 +6542,9 @@ Note: the description of this class are different in ETSI GS NFV IFA 011 and ETS
         </packagedElement>
         <packagedElement xmi:type="uml:Class" xmi:id="_7pUNEDa7EeivvI-m1BaAbA" name="Cpd " isAbstract="true">
           <ownedComment xmi:type="uml:Comment" xmi:id="_R0MsAEbwEei7eo5RdnNiBQ" annotatedElement="_7pUNEDa7EeivvI-m1BaAbA">
-            <body>A Cpd information element describes network connectivity to a compute resource or a VL. This is an abstract class used&#xD;
-as parent for the various Cpd classes.</body>
+            <body>The Cpd class specifies the characteristics of connection points attached to NFs and NSs. This is an abstract class used as parent for the various Cpd classes.&#xD;
+&#xD;
+Note 1: the description of this class is different in ETSI GS NFV IFA 011 and ETSI GS NFV IFA 014. The present definition uses the definition in ETSI GS NFV IFA 014 as it is the more general.</body>
           </ownedComment>
           <ownedAttribute xmi:type="uml:Property" xmi:id="_knSmcDa8EeivvI-m1BaAbA" name="cpdId" type="_AuYtcDkBEeiWMf5FLWfdLA">
             <ownedComment xmi:type="uml:Comment" xmi:id="_XFxTUEbwEei7eo5RdnNiBQ" annotatedElement="_knSmcDa8EeivvI-m1BaAbA">
@@ -6554,7 +6552,7 @@ as parent for the various Cpd classes.</body>
 </body>
             </ownedComment>
           </ownedAttribute>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_lRLQ8Da8EeivvI-m1BaAbA" name="cpRole">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_lRLQ8Da8EeivvI-m1BaAbA" name="cpdRole">
             <ownedComment xmi:type="uml:Comment" xmi:id="_Zs7i0EbwEei7eo5RdnNiBQ" annotatedElement="_lRLQ8Da8EeivvI-m1BaAbA">
               <body>Identifies the role of the port in the context of the traffic flow patterns in the VNF or parent NS.&#xD;
 &#xD;
@@ -6591,18 +6589,19 @@ Editor's note: the attribute &quot;layerProtocol&quot; still needs further discu
             </ownedComment>
             <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
           </ownedAttribute>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_p8meQDa8EeivvI-m1BaAbA" name="allowedAddressData" type="_2aIggDa9EeivvI-m1BaAbA">
-            <ownedComment xmi:type="uml:Comment" xmi:id="_kI39QEbwEei7eo5RdnNiBQ" annotatedElement="_p8meQDa8EeivvI-m1BaAbA">
-              <body>For specifying floating IP(s) to be shared among Cpds, which are reserved for vnfReservedCpd described in the VNFD.&#xD;
-</body>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_MVvycC4zEemS0_wZSU3sbA" name="layerProtocol" visibility="public" type="_tFQGcDnLEeiWMf5FLWfdLA">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_bLoooC4zEemS0_wZSU3sbA" annotatedElement="_MVvycC4zEemS0_wZSU3sbA">
+              <body>Identifies which protocol the CP uses for connectivity purposes (Ethernet, MPLS, ODU2, IPV4, IPV6, Pseudo-Wire, etc.).</body>
             </ownedComment>
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_H0-cMDa9EeivvI-m1BaAbA"/>
-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_H1CtoDa9EeivvI-m1BaAbA" value="*"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_TUOAcC4zEemS0_wZSU3sbA" value="1"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_TUg7YC4zEemS0_wZSU3sbA" value="*"/>
           </ownedAttribute>
         </packagedElement>
         <packagedElement xmi:type="uml:Class" xmi:id="_0AbUYDnBEeiWMf5FLWfdLA" name="AffinityOrAntiAffinityGroup">
           <ownedComment xmi:type="uml:Comment" xmi:id="_L_HiIDnCEeiWMf5FLWfdLA" annotatedElement="_0AbUYDnBEeiWMf5FLWfdLA">
-            <body>The AffinityOrAntiAffinityGroup class describes the affinity or anti-affinity relationship.</body>
+            <body>The AffinityOrAntiAffinityGroup class describes the affinity or anti-affinity relationship. For NSs, those rules are applicable between the VNF instances created using different VnfProfiles, the Virtual Link instances created using different VlProfiles or the nested NS instances created using different NsProfiles.&#xD;
+&#xD;
+For VNFs, those rules are applicable between the virtualization containers to be created based on different VDUs, or between internal VLs to be created based on different VnfVirtualLinkDesc(s).</body>
           </ownedComment>
           <ownedAttribute xmi:type="uml:Property" xmi:id="_6g1tYDnBEeiWMf5FLWfdLA" name="groupId" type="_AuYtcDkBEeiWMf5FLWfdLA">
             <ownedComment xmi:type="uml:Comment" xmi:id="_6g1tYTnBEeiWMf5FLWfdLA" annotatedElement="_6g1tYDnBEeiWMf5FLWfdLA">
@@ -7015,7 +7014,7 @@ NOTE: 	These attributes are used to control scaling boundaries.</body>
           <ownedComment xmi:type="uml:Comment" xmi:id="_Wv89wGNfEeio9amveq0yWQ" annotatedElement="_2aIggDa9EeivvI-m1BaAbA">
             <body>The AddressData information element supports providing information about the addressing scheme and parameters applicable to a CP. </body>
           </ownedComment>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_A8dPwDa-EeivvI-m1BaAbA" name="addressType" type="_AuYtcDkBEeiWMf5FLWfdLA">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_A8dPwDa-EeivvI-m1BaAbA" name="addressType" type="_MevNkJddEei-sOl6ywWHlg">
             <ownedComment xmi:type="uml:Comment" xmi:id="_dD2YQDa-EeivvI-m1BaAbA" annotatedElement="_A8dPwDa-EeivvI-m1BaAbA">
               <body>Describes the type of the address to be assigned to the CP instantiated from the parent CPD. The content type shall be aligned with the address type supported by the layerProtocol attribute of the parent CPD.&#xD;
 </body>
@@ -7040,11 +7039,11 @@ Shall be present when the addressType is IP address.</body>
         </packagedElement>
         <packagedElement xmi:type="uml:DataType" xmi:id="_ImxsgDeBEeiIfPeSAqyGdQ" name="ConnectivityType">
           <ownedComment xmi:type="uml:Comment" xmi:id="_8qt_MK0pEeiQr7XQ2okIrA" annotatedElement="_ImxsgDeBEeiIfPeSAqyGdQ">
-            <body>The ConnectivityType datatype specifies the protocol exposed by a VL and the flow pattern supported by the VL.</body>
+            <body>The ConnectivityType datatype specifies the protocol exposed by a VL and the flow pattern supported by the VL.The top layer protocol of the VL protocol stack shall always be provided. The lower layer protocols may be included when there are specific requirements on these layers.</body>
           </ownedComment>
           <ownedAttribute xmi:type="uml:Property" xmi:id="_N61nIDeBEeiIfPeSAqyGdQ" name="layerProtocol" type="_tFQGcDnLEeiWMf5FLWfdLA">
             <ownedComment xmi:type="uml:Comment" xmi:id="_XlK-cDeBEeiIfPeSAqyGdQ" annotatedElement="_N61nIDeBEeiIfPeSAqyGdQ">
-              <body>Identifies the protocol this VL gives access to (Ethernet, MPLS, ODU2, IPV4, IPV6, Pseudo-Wire).&#xD;
+              <body>Identifies the protocols to which this VL gives access (Ethernet, MPLS, ODU2, IPV4, IPV6, Pseudo-Wire).&#xD;
 </body>
             </ownedComment>
           </ownedAttribute>
@@ -7069,10 +7068,10 @@ Shall be present when the addressType is IP address.</body>
           </ownedAttribute>
           <ownedAttribute xmi:type="uml:Property" xmi:id="_pMKqYDa9EeivvI-m1BaAbA" name="addressData" type="_2aIggDa9EeivvI-m1BaAbA">
             <ownedComment xmi:type="uml:Comment" xmi:id="_06IGUDa9EeivvI-m1BaAbA" annotatedElement="_pMKqYDa9EeivvI-m1BaAbA">
-              <body>Provides information on the addresses to be assigned to the CP(s) instantiated from the CPD.</body>
+              <body>Provides information on the address to be assigned to the CP(s) instantiated from the CPD.</body>
             </ownedComment>
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_xOJj0Da9EeivvI-m1BaAbA"/>
-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xORfoDa9EeivvI-m1BaAbA" value="*"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_xOJj0Da9EeivvI-m1BaAbA" value="1"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xORfoDa9EeivvI-m1BaAbA" value="1"/>
           </ownedAttribute>
         </packagedElement>
         <packagedElement xmi:type="uml:DataType" xmi:id="_X9TdUDdPEeiIfPeSAqyGdQ" name="L2AddressData">
@@ -7107,7 +7106,7 @@ If it is set to True, it is the management and orchestration function responsibi
             </ownedComment>
             <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
           </ownedAttribute>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="__o0JQDdPEeiIfPeSAqyGdQ" name="ipAddressType">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="__o0JQDdPEeiIfPeSAqyGdQ" name="ipAddressType" type="_TTf2EB89EemJTaeYhZuDRA">
             <ownedComment xmi:type="uml:Comment" xmi:id="_WilWUDdQEeiIfPeSAqyGdQ" annotatedElement="__o0JQDdPEeiIfPeSAqyGdQ">
               <body>Define address type.&#xD;
 &#xD;
@@ -7211,13 +7210,6 @@ Per VNF, the affinity/anti-affinity rules defined using this information element
             </ownedComment>
           </ownedAttribute>
         </packagedElement>
-        <packagedElement xmi:type="uml:Enumeration" xmi:id="_Qmf1kDnFEeiWMf5FLWfdLA" name="NetworkType">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_VN9I4DnFEeiWMf5FLWfdLA" annotatedElement="_Qmf1kDnFEeiWMf5FLWfdLA">
-            <body>Type of network supported.</body>
-          </ownedComment>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_W5tgEDnFEeiWMf5FLWfdLA" name="VLAN"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Z6H9EDnFEeiWMf5FLWfdLA" name="VXLAN"/>
-        </packagedElement>
         <packagedElement xmi:type="uml:DataType" xmi:id="_zxlckB8-EemJTaeYhZuDRA" name="L2ProtocolData">
           <ownedComment xmi:type="uml:Comment" xmi:id="_TC2ncB88EemJTaeYhZuDRA">
             <body>The L2ProtocolData information element describes the L2 protocol related data for a virtual link.</body>
@@ -7225,7 +7217,7 @@ Per VNF, the affinity/anti-affinity rules defined using this information element
           <ownedComment xmi:type="uml:Comment" xmi:id="_MiWAcB8_EemJTaeYhZuDRA" annotatedElement="_zxlckB8-EemJTaeYhZuDRA">
             <body>The L2ProtocolData information element describes the L2 protocol related data for a virtual link.</body>
           </ownedComment>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_PJJAYB87EemJTaeYhZuDRA" name="networkName">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_PJJAYB87EemJTaeYhZuDRA" name="name">
             <ownedComment xmi:type="uml:Comment" xmi:id="_cXsFUB87EemJTaeYhZuDRA" annotatedElement="_PJJAYB87EemJTaeYhZuDRA">
               <body>Network name associated with this L2&#xD;
 protocol.</body>
@@ -7290,7 +7282,7 @@ transparency for this L2 protocol or not.</body>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_74KP4CCjEemw1L3J4dNy4w" value="1"/>
           </ownedAttribute>
         </packagedElement>
-        <packagedElement xmi:type="uml:Enumeration" xmi:id="_6TxekB87EemJTaeYhZuDRA" name="NetworkTypes">
+        <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;
@@ -7459,6 +7451,56 @@ Value:&#xD;
           <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XAJG8B89EemJTaeYhZuDRA" name="IPV4"/>
           <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_YHaRAB89EemJTaeYhZuDRA" name="IPV6"/>
         </packagedElement>
+        <packagedElement xmi:type="uml:DataType" xmi:id="_B1G2UDd_EeiIfPeSAqyGdQ" name="QoS">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_DNOvkGNgEeio9amveq0yWQ" annotatedElement="_B1G2UDd_EeiIfPeSAqyGdQ">
+            <body>The QoS datatype specifies quality of service parameters applicable to a VL.&#xD;
+It is the asbstract parent of the NsQos and VnfQos datatypes, as the NsQoS (QoS in ETSI GS NFV IFA 014) includes a priority attribute, while VnfQoS (QoS in ETSI GS NFV IFA 011) does not.&#xD;
+</body>
+          </ownedComment>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_GA6IYDd_EeiIfPeSAqyGdQ" name="latency" type="_p3EKoDm0EeiWMf5FLWfdLA">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_P3EVMDd_EeiIfPeSAqyGdQ" annotatedElement="_GA6IYDd_EeiIfPeSAqyGdQ">
+              <body>Maximum latency in ms.&#xD;
+</body>
+            </ownedComment>
+          </ownedAttribute>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_G-MQADd_EeiIfPeSAqyGdQ" name="packetDelayVariation" type="_p3EKoDm0EeiWMf5FLWfdLA">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_V5HXMDd_EeiIfPeSAqyGdQ" annotatedElement="_G-MQADd_EeiIfPeSAqyGdQ">
+              <body>Maximum jitter in ms.</body>
+            </ownedComment>
+          </ownedAttribute>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_Hy64kDd_EeiIfPeSAqyGdQ" name="packetLossRatio" type="_p3EKoDm0EeiWMf5FLWfdLA">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_bo3vUDd_EeiIfPeSAqyGdQ" annotatedElement="_Hy64kDd_EeiIfPeSAqyGdQ">
+              <body>Maximum packet loss ratio. Cardinality is 0 if no packetLossRatio requirement exists.</body>
+            </ownedComment>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Z7MFgDd_EeiIfPeSAqyGdQ"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Z7WdkDd_EeiIfPeSAqyGdQ" value="1"/>
+          </ownedAttribute>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_uFBX8PuHEeiYVshOvl6_ww" name="qosId" type="_AuYtcDkBEeiWMf5FLWfdLA">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_LF1bwPuIEeiYVshOvl6_ww" annotatedElement="_uFBX8PuHEeiYVshOvl6_ww">
+              <body>Qos ID.</body>
+            </ownedComment>
+          </ownedAttribute>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_RayLoPuIEeiYVshOvl6_ww" name="qosName">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_ZP674PuIEeiYVshOvl6_ww" annotatedElement="_RayLoPuIEeiYVshOvl6_ww">
+              <body>Human readable Qos name.</body>
+            </ownedComment>
+            <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+          </ownedAttribute>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_gUB30PuIEeiYVshOvl6_ww" name="rules" type="_vxJ9ADafEei23_xWdimG9w">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_yom7EPuLEeiYVshOvl6_ww" annotatedElement="_gUB30PuIEeiYVshOvl6_ww">
+              <body>Detailed requirements of Qos, including maximum bandwidth limitation{max_kbps}、maximum burst bandwidth limitation{max_burst_kbps} 、direction{egress|ingress}，etc.</body>
+            </ownedComment>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_kTldoPuIEeiYVshOvl6_ww"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_kUKFYPuIEeiYVshOvl6_ww" value="*"/>
+          </ownedAttribute>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Enumeration" xmi:id="_MevNkJddEei-sOl6ywWHlg" name="AddressType">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_zYqPEJdeEei-sOl6ywWHlg" annotatedElement="_MevNkJddEei-sOl6ywWHlg">
+            <body>Type of address</body>
+          </ownedComment>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_TXtQgJddEei-sOl6ywWHlg" name="MAC"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_UVFewJddEei-sOl6ywWHlg" name="IP"/>
+        </packagedElement>
       </packagedElement>
     </packagedElement>
     <packagedElement xmi:type="uml:Package" xmi:id="_BprD8OLJEeiKy5JVrA0UGA" name="Root">
@@ -8149,7 +8191,6 @@ Value:&#xD;
   <OpenModel_Profile:Preliminary xmi:id="_fl9AAKe5Eeixw5Ke5QD1pQ" base_Element="_LsX6UDgXEeiOYfGHew0BGg"/>
   <OpenModel_Profile:Preliminary xmi:id="_huR-cKe5Eeixw5Ke5QD1pQ" base_Element="_tFQGcDnLEeiWMf5FLWfdLA"/>
   <OpenModel_Profile:Preliminary xmi:id="_jLXAcKe5Eeixw5Ke5QD1pQ" base_Element="_7hn1IDd1EeiIfPeSAqyGdQ"/>
-  <OpenModel_Profile:Preliminary xmi:id="_mWkYMKe5Eeixw5Ke5QD1pQ" base_Element="_Qmf1kDnFEeiWMf5FLWfdLA"/>
   <OpenModel_Profile:Preliminary xmi:id="_n2f54Ke5Eeixw5Ke5QD1pQ" base_Element="_PjIasDa9EeivvI-m1BaAbA"/>
   <OpenModel_Profile:Preliminary xmi:id="_p4PvMKe5Eeixw5Ke5QD1pQ" base_Element="_2aIggDa9EeivvI-m1BaAbA"/>
   <OpenModel_Profile:Preliminary xmi:id="_r0DUkKe5Eeixw5Ke5QD1pQ" base_Element="_tMoywDnJEeiWMf5FLWfdLA"/>
@@ -8872,12 +8913,11 @@ Value:&#xD;
   <OpenModel_Profile:Future xmi:id="_IofU0KewEeixw5Ke5QD1pQ" base_Element="_45bWUDzEEeiWMf5FLWfdLA"/>
   <OpenModel_Profile:Future xmi:id="_NTGp0KewEeixw5Ke5QD1pQ" base_Element="_kEZB9jzEEeiWMf5FLWfdLA"/>
   <OpenModel_Profile:OpenModelClass xmi:id="_7pU0IDa7EeivvI-m1BaAbA" base_Class="_7pUNEDa7EeivvI-m1BaAbA"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_knSmcTa8EeivvI-m1BaAbA" base_StructuralFeature="_knSmcDa8EeivvI-m1BaAbA"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_knSmcTa8EeivvI-m1BaAbA" base_StructuralFeature="_knSmcDa8EeivvI-m1BaAbA" isInvariant="true"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_lRLQ8Ta8EeivvI-m1BaAbA" base_StructuralFeature="_lRLQ8Da8EeivvI-m1BaAbA"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_luv9wDa8EeivvI-m1BaAbA" base_StructuralFeature="_luvWsDa8EeivvI-m1BaAbA"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_oWHBkTa8EeivvI-m1BaAbA" base_StructuralFeature="_oWHBkDa8EeivvI-m1BaAbA"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_pJTZETa8EeivvI-m1BaAbA" base_StructuralFeature="_pJTZEDa8EeivvI-m1BaAbA"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_p8meQTa8EeivvI-m1BaAbA" base_StructuralFeature="_p8meQDa8EeivvI-m1BaAbA"/>
   <OpenModel_Profile:OpenModelClass xmi:id="_0Ab7cDnBEeiWMf5FLWfdLA" base_Class="_0AbUYDnBEeiWMf5FLWfdLA"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_6g1tYjnBEeiWMf5FLWfdLA" base_StructuralFeature="_6g1tYDnBEeiWMf5FLWfdLA"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_6g3ikjnBEeiWMf5FLWfdLA" base_StructuralFeature="_6g3ikDnBEeiWMf5FLWfdLA"/>
@@ -8895,7 +8935,6 @@ Value:&#xD;
   <OpenModel_Profile:Preliminary xmi:id="_i388MJT1EeiYXO5wr78TUw" base_Element="_luvWsDa8EeivvI-m1BaAbA"/>
   <OpenModel_Profile:Preliminary xmi:id="_kDQ4wJT1EeiYXO5wr78TUw" base_Element="_oWHBkDa8EeivvI-m1BaAbA"/>
   <OpenModel_Profile:Preliminary xmi:id="_lmmTwJT1EeiYXO5wr78TUw" base_Element="_pJTZEDa8EeivvI-m1BaAbA"/>
-  <OpenModel_Profile:Preliminary xmi:id="_mm4FAJT1EeiYXO5wr78TUw" base_Element="_p8meQDa8EeivvI-m1BaAbA"/>
   <OpenModel_Profile:Preliminary xmi:id="_XkYfwJUBEeiYXO5wr78TUw" base_Element="_0AbUYDnBEeiWMf5FLWfdLA"/>
   <OpenModel_Profile:Preliminary xmi:id="_YpUHgJUBEeiYXO5wr78TUw" base_Element="_6g1tYDnBEeiWMf5FLWfdLA"/>
   <OpenModel_Profile:Preliminary xmi:id="_ZkJ_IJUBEeiYXO5wr78TUw" base_Element="_6g3ikDnBEeiWMf5FLWfdLA"/>
@@ -8910,9 +8949,6 @@ Value:&#xD;
   <OpenModel_Profile:Preliminary xmi:id="_LCFOEJUHEeiYXO5wr78TUw" base_Element="_7hn1IDd1EeiIfPeSAqyGdQ"/>
   <OpenModel_Profile:Preliminary xmi:id="_L1qAEJUHEeiYXO5wr78TUw" base_Element="_EjJgADd2EeiIfPeSAqyGdQ"/>
   <OpenModel_Profile:Preliminary xmi:id="_Mjc6MJUHEeiYXO5wr78TUw" base_Element="_F5b9gDd2EeiIfPeSAqyGdQ"/>
-  <OpenModel_Profile:Preliminary xmi:id="_tn5ykJUHEeiYXO5wr78TUw" base_Element="_Qmf1kDnFEeiWMf5FLWfdLA"/>
-  <OpenModel_Profile:Preliminary xmi:id="_ugdLMJUHEeiYXO5wr78TUw" base_Element="_W5tgEDnFEeiWMf5FLWfdLA"/>
-  <OpenModel_Profile:Preliminary xmi:id="_vUP_oJUHEeiYXO5wr78TUw" base_Element="_Z6H9EDnFEeiWMf5FLWfdLA"/>
   <OpenModel_Profile:Preliminary xmi:id="_ONrx8JUIEeiYXO5wr78TUw" base_Element="_B3kJsDnKEeiWMf5FLWfdLA"/>
   <OpenModel_Profile:Preliminary xmi:id="_O-PFIJUIEeiYXO5wr78TUw" base_Element="_IJCHwDnKEeiWMf5FLWfdLA"/>
   <OpenModel_Profile:Preliminary xmi:id="_PrZtIJUIEeiYXO5wr78TUw" base_Element="_LgsnIDnKEeiWMf5FLWfdLA"/>
@@ -9038,4 +9074,16 @@ Value:&#xD;
   <OpenModel_Profile:OpenModelAttribute xmi:id="_FeGUYCoxEemnoK-fhDe5lw" base_StructuralFeature="_FeFtUCoxEemnoK-fhDe5lw"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_IkqcsSoxEemnoK-fhDe5lw" base_StructuralFeature="_IkqcsCoxEemnoK-fhDe5lw"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_RF49QSo5EemnoK-fhDe5lw" base_StructuralFeature="_RF49QCo5EemnoK-fhDe5lw"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_MVvycS4zEemS0_wZSU3sbA" base_StructuralFeature="_MVvycC4zEemS0_wZSU3sbA"/>
+  <OpenModel_Profile:Experimental xmi:id="_eYHLsC4zEemS0_wZSU3sbA" base_Element="_MVvycC4zEemS0_wZSU3sbA"/>
+  <OpenModel_Profile:Preliminary xmi:id="_8TIQ4JUHEeiYXO5wr78TUw" base_Element="_B1G2UDd_EeiIfPeSAqyGdQ"/>
+  <OpenModel_Profile:Reference xmi:id="_2s5kQCvNEemS0_wZSU3sbA" base_Element="_B1G2UDd_EeiIfPeSAqyGdQ" reference="IFA011 v2.5.1"/>
+  <OpenModel_Profile:Experimental xmi:id="_18lkYJdeEei-sOl6ywWHlg" base_Element="_MevNkJddEei-sOl6ywWHlg"/>
+  <OpenModel_Profile:Reference xmi:id="_WoDPEC47EemS0_wZSU3sbA" base_Element="_Tw79sD2pEeiu6I5JfRTxxQ" reference="IFA011 v2.5.1"/>
+  <OpenModel_Profile:Reference xmi:id="_abu8EC47EemS0_wZSU3sbA" base_Element="_Tw5PIES0EeiVGPeZpaYNtQ" reference="IFA011 v2.5.1"/>
+  <OpenModel_Profile:Reference xmi:id="_eCHz8C47EemS0_wZSU3sbA" base_Element="_il0cAES0EeiVGPeZpaYNtQ" reference="IFA011 v2.5.1"/>
+  <OpenModel_Profile:Reference xmi:id="_hbI-MC47EemS0_wZSU3sbA" base_Element="_7pUNEDa7EeivvI-m1BaAbA" reference="IFA011 v2.5.1"/>
+  <OpenModel_Profile:Reference xmi:id="_lR_T8C47EemS0_wZSU3sbA" base_Element="_0AbUYDnBEeiWMf5FLWfdLA" reference="IFA011 v2.5.1"/>
+  <OpenModel_Profile:Preliminary xmi:id="_qqZjEC47EemS0_wZSU3sbA" base_Element="_rmDCkNxjEei0G_d67y10Rg"/>
+  <OpenModel_Profile:Reference xmi:id="_qrVXMC47EemS0_wZSU3sbA" base_Element="_rmDCkNxjEei0G_d67y10Rg" reference="IFA011 v2.5.1"/>
 </xmi:XMI>
diff --git a/ONAP Information Model/Ns.uml b/ONAP Information Model/Ns.uml
index 5bf2392..df1dc57 100644
--- a/ONAP Information Model/Ns.uml
+++ b/ONAP Information Model/Ns.uml
@@ -119,7 +119,7 @@
     </packagedElement>
     <packagedElement xmi:type="uml:Package" xmi:id="_XHgosBg2EembeqMx64UEWQ" name="Diagrams"/>
     <packagedElement xmi:type="uml:Package" xmi:id="_XHh20Bg2EembeqMx64UEWQ" name="ObjectClasses">
-      <packagedElement xmi:type="uml:Class" xmi:id="_13KfMDzEEeiWMf5FLWfdLA" name="NetworkServiceDescriptor">
+      <packagedElement xmi:type="uml:Class" xmi:id="_13KfMDzEEeiWMf5FLWfdLA" name="NSD">
         <ownedComment xmi:type="uml:Comment" xmi:id="_13KfMTzEEeiWMf5FLWfdLA" annotatedElement="_13KfMDzEEeiWMf5FLWfdLA">
           <body>The NSD class is a deployment template whose instances are used by the NFVO for the lifecycle management of NSs.&#xD;
 For all attributes in this class, the Producer is SDC and the Consumer is SDC/UUI/VFC&#xD;
@@ -537,7 +537,7 @@ NOTE 2:	A minimum set of external stimulus includes: the receipt of request mess
           <body>The NsQoS datatype specifies quality of service parameters applicable to a NS VL.</body>
         </ownedComment>
         <generalization xmi:type="uml:Generalization" xmi:id="_nlCDoKY-Eeixw5Ke5QD1pQ">
-          <general xmi:type="uml:DataType" href="Vnf.uml#_B1G2UDd_EeiIfPeSAqyGdQ"/>
+          <general xmi:type="uml:DataType" href="Common.uml#_B1G2UDd_EeiIfPeSAqyGdQ"/>
         </generalization>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_kEZo-zzEEeiWMf5FLWfdLA" name="priority">
           <ownedComment xmi:type="uml:Comment" xmi:id="_kEZo_DzEEeiWMf5FLWfdLA" annotatedElement="_kEZo-zzEEeiWMf5FLWfdLA">
diff --git a/ONAP Information Model/Pnf.notation b/ONAP Information Model/Pnf.notation
index 4bdc646..406c1a1 100644
--- a/ONAP Information Model/Pnf.notation
+++ b/ONAP Information Model/Pnf.notation
@@ -192,15 +192,6 @@
         <element xmi:type="uml:Property" href="Common.uml#_pJTZEDa8EeivvI-m1BaAbA"/>
         <layoutConstraint xmi:type="notation:Location" xmi:id="_XYU2Yf4gEeirJOiRiTRpBw"/>
       </children>
-      <children xmi:type="notation:Shape" xmi:id="_XYVdcP4gEeirJOiRiTRpBw" type="Property_ClassAttributeLabel">
-        <children xmi:type="notation:DecorationNode" xmi:id="_XaKpcP4gEeirJOiRiTRpBw" visible="false" type="StereotypeLabel">
-          <styles xmi:type="notation:StringValueStyle" xmi:id="_XaKpcf4gEeirJOiRiTRpBw" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-          <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XaKpcv4gEeirJOiRiTRpBw"/>
-        </children>
-        <element xmi:type="uml:Property" href="Common.uml#_p8meQDa8EeivvI-m1BaAbA"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_XYVdcf4gEeirJOiRiTRpBw"/>
-      </children>
       <styles xmi:type="notation:TitleStyle" xmi:id="_5mAQcew0EeiDiIttoROOIw"/>
       <styles xmi:type="notation:SortingStyle" xmi:id="_5mAQcuw0EeiDiIttoROOIw"/>
       <styles xmi:type="notation:FilteringStyle" xmi:id="_5mAQc-w0EeiDiIttoROOIw"/>
diff --git a/ONAP Information Model/Vnf.notation b/ONAP Information Model/Vnf.notation
index 45bf803..41e0e48 100644
--- a/ONAP Information Model/Vnf.notation
+++ b/ONAP Information Model/Vnf.notation
@@ -868,7 +868,7 @@
             <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="Vnf.uml#_pszPADd9EeiIfPeSAqyGdQ"/>
+          <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">
@@ -880,7 +880,7 @@
             <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="Vnf.uml#_qgZPIDd9EeiIfPeSAqyGdQ"/>
+          <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">
@@ -889,7 +889,7 @@
             <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="Vnf.uml#_rY7ZoDd9EeiIfPeSAqyGdQ"/>
+          <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">
@@ -898,7 +898,7 @@
             <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="Vnf.uml#_1X3vADd9EeiIfPeSAqyGdQ"/>
+          <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"/>
@@ -923,13 +923,13 @@
         <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="Vnf.uml#_AC2eIDQUEeixv_sLOod4lQ"/>
+      <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">
-        <eObjectValue xmi:type="uml:Class" href="Vnf.uml#_AC2eIDQUEeixv_sLOod4lQ"/>
+        <eObjectValue xmi:type="uml:Class" href="Common.uml#_AC2eIDQUEeixv_sLOod4lQ"/>
       </styles>
       <element xsi:nil="true"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gKvMUjkREeiWMf5FLWfdLA" x="200"/>
@@ -1595,7 +1595,7 @@
     <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="Vnf.uml#_AC2eIDQUEeixv_sLOod4lQ"/>
+        <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]"/>
@@ -2086,6 +2086,15 @@
           <element xmi:type="uml:Property" href="Vnf.uml#_ZhRloBlYEem_VM0Ij2_uSw"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_ZitJARlYEem_VM0Ij2_uSw"/>
         </children>
+        <children xmi:type="notation:Shape" xmi:id="_pyiq0C43EemS0_wZSU3sbA" type="Property_ClassAttributeLabel">
+          <children xmi:type="notation:DecorationNode" xmi:id="_pzOnUC43EemS0_wZSU3sbA" visible="false" type="StereotypeLabel">
+            <styles xmi:type="notation:StringValueStyle" xmi:id="_pzOnUS43EemS0_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="_pzOnUi43EemS0_wZSU3sbA"/>
+          </children>
+          <element xmi:type="uml:Property" href="Vnf.uml#_p8meQDa8EeivvI-m1BaAbA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_pyiq0S43EemS0_wZSU3sbA"/>
+        </children>
         <styles xmi:type="notation:TitleStyle" xmi:id="_zOg-FjQVEeixv_sLOod4lQ"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_zOg-FzQVEeixv_sLOod4lQ"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_zOg-GDQVEeixv_sLOod4lQ"/>
@@ -2109,7 +2118,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="181"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zOg-ETQVEeixv_sLOod4lQ" x="460" y="160" 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"/>
@@ -2340,17 +2349,14 @@
           <element xmi:type="uml:Property" href="Common.uml#_pJTZEDa8EeivvI-m1BaAbA"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_pNEewTa8EeivvI-m1BaAbA"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_qAgt4Da8EeivvI-m1BaAbA" type="Property_ClassAttributeLabel" fontColor="33023">
-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_qlh3oEbwEei7eo5RdnNiBQ" source="PapyrusCSSForceValue">
-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_qliesEbwEei7eo5RdnNiBQ" key="fillColor" value="true"/>
-          </eAnnotations>
-          <children xmi:type="notation:DecorationNode" xmi:id="_qELs8Da8EeivvI-m1BaAbA" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_qELs8Ta8EeivvI-m1BaAbA" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+        <children xmi:type="notation:Shape" xmi:id="_sJDzEC4zEemS0_wZSU3sbA" type="Property_ClassAttributeLabel">
+          <children xmi:type="notation:DecorationNode" xmi:id="_sJ8j4C4zEemS0_wZSU3sbA" visible="false" type="StereotypeLabel">
+            <styles xmi:type="notation:StringValueStyle" xmi:id="_sJ8j4S4zEemS0_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="_qELs8ja8EeivvI-m1BaAbA"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sJ8j4i4zEemS0_wZSU3sbA"/>
           </children>
-          <element xmi:type="uml:Property" href="Common.uml#_p8meQDa8EeivvI-m1BaAbA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_qAgt4Ta8EeivvI-m1BaAbA"/>
+          <element xmi:type="uml:Property" href="Common.uml#_MVvycC4zEemS0_wZSU3sbA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_sJDzES4zEemS0_wZSU3sbA"/>
         </children>
         <styles xmi:type="notation:TitleStyle" xmi:id="_7pXQZDa7EeivvI-m1BaAbA"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_7pXQZTa7EeivvI-m1BaAbA"/>
@@ -2375,7 +2381,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" height="141"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7pWpUTa7EeivvI-m1BaAbA" x="460" y="-40" height="161"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_7phBYDa7EeivvI-m1BaAbA" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_7phBYTa7EeivvI-m1BaAbA"/>
@@ -2487,48 +2493,6 @@
           <element xmi:type="uml:Property" href="Vnf.uml#_s7WyQDgYEeiOYfGHew0BGg"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_tJy24TgYEeiOYfGHew0BGg"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_DVJiYA57EemrJqq3q9vf6g" type="Property_ClassAttributeLabel" fontColor="16711680" fontName="Segoe UI">
-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_eB88MA57EemrJqq3q9vf6g" source="PapyrusCSSForceValue">
-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_eB9jQA57EemrJqq3q9vf6g" key="fontHeight" value="true"/>
-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_eB-xYA57EemrJqq3q9vf6g" key="bold" value="true"/>
-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_eB_YcA57EemrJqq3q9vf6g" key="italic" value="true"/>
-          </eAnnotations>
-          <children xmi:type="notation:DecorationNode" xmi:id="_DWrMYA57EemrJqq3q9vf6g" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_DWrMYQ57EemrJqq3q9vf6g" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DWrMYg57EemrJqq3q9vf6g"/>
-          </children>
-          <element xmi:type="uml:Property" href="Vnf.uml#_DQCY4A57EemrJqq3q9vf6g"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_DVJiYQ57EemrJqq3q9vf6g"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_UbAaoA58EemrJqq3q9vf6g" type="Property_ClassAttributeLabel" fontColor="16711680" fontName="Segoe UI">
-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ppiYcA59EemrJqq3q9vf6g" source="PapyrusCSSForceValue">
-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ppi_gA59EemrJqq3q9vf6g" key="fontHeight" value="true"/>
-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ppi_gQ59EemrJqq3q9vf6g" key="bold" value="true"/>
-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ppjmkA59EemrJqq3q9vf6g" key="italic" value="true"/>
-          </eAnnotations>
-          <children xmi:type="notation:DecorationNode" xmi:id="_Ub810A58EemrJqq3q9vf6g" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_Ub810Q58EemrJqq3q9vf6g" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ub810g58EemrJqq3q9vf6g"/>
-          </children>
-          <element xmi:type="uml:Property" href="Vnf.uml#_UWbcoA58EemrJqq3q9vf6g"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_UbAaoQ58EemrJqq3q9vf6g"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_gXpWUA59EemrJqq3q9vf6g" type="Property_ClassAttributeLabel" fontColor="16711680" fontName="Segoe UI">
-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_rBN9EA59EemrJqq3q9vf6g" source="PapyrusCSSForceValue">
-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rBN9EQ59EemrJqq3q9vf6g" key="fontHeight" value="true"/>
-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rBOkIA59EemrJqq3q9vf6g" key="bold" value="true"/>
-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rBPLMA59EemrJqq3q9vf6g" key="italic" value="true"/>
-          </eAnnotations>
-          <children xmi:type="notation:DecorationNode" xmi:id="_gY56kA59EemrJqq3q9vf6g" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_gY56kQ59EemrJqq3q9vf6g" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gY56kg59EemrJqq3q9vf6g"/>
-          </children>
-          <element xmi:type="uml:Property" href="Vnf.uml#_gTpnIA59EemrJqq3q9vf6g"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_gXpWUQ59EemrJqq3q9vf6g"/>
-        </children>
         <styles xmi:type="notation:TitleStyle" xmi:id="_SeL-pTgSEeiOYfGHew0BGg"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_SeL-pjgSEeiOYfGHew0BGg"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_SeL-pzgSEeiOYfGHew0BGg"/>
@@ -2667,7 +2631,7 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XeU0Air_EemS0_wZSU3sbA"/>
           </children>
-          <element xmi:type="uml:Property" href="Vnf.uml#_pszPADd9EeiIfPeSAqyGdQ"/>
+          <element xmi:type="uml:Property" href="Common.uml#_pszPADd9EeiIfPeSAqyGdQ"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_XcdLwCr_EemS0_wZSU3sbA"/>
         </children>
         <children xmi:type="notation:Shape" xmi:id="_Xcdy0Cr_EemS0_wZSU3sbA" type="Property_ClassAttributeLabel">
@@ -2676,7 +2640,7 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XeelAir_EemS0_wZSU3sbA"/>
           </children>
-          <element xmi:type="uml:Property" href="Vnf.uml#_qgZPIDd9EeiIfPeSAqyGdQ"/>
+          <element xmi:type="uml:Property" href="Common.uml#_qgZPIDd9EeiIfPeSAqyGdQ"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_Xcdy0Sr_EemS0_wZSU3sbA"/>
         </children>
         <children xmi:type="notation:Shape" xmi:id="_XceZ4Cr_EemS0_wZSU3sbA" type="Property_ClassAttributeLabel">
@@ -2685,7 +2649,7 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Xel5wir_EemS0_wZSU3sbA"/>
           </children>
-          <element xmi:type="uml:Property" href="Vnf.uml#_rY7ZoDd9EeiIfPeSAqyGdQ"/>
+          <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">
@@ -2694,7 +2658,7 @@
             <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="Vnf.uml#_1X3vADd9EeiIfPeSAqyGdQ"/>
+          <element xmi:type="uml:Property" href="Common.uml#_1X3vADd9EeiIfPeSAqyGdQ"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_XcfA8Sr_EemS0_wZSU3sbA"/>
         </children>
         <styles xmi:type="notation:TitleStyle" xmi:id="_HzhkhCr-EemS0_wZSU3sbA"/>
@@ -2826,7 +2790,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1pc1MisHEemS0_wZSU3sbA"/>
       </children>
       <element xmi:type="uml:Class" href="Vnf.uml#_ISONYDOSEeiHat9KcP8uWA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1pIFESsHEemS0_wZSU3sbA" x="320" y="820"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1pIFESsHEemS0_wZSU3sbA" x="320" y="840"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_1pqQkCsHEemS0_wZSU3sbA" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_1pqQkSsHEemS0_wZSU3sbA"/>
@@ -2933,7 +2897,7 @@
       <element xmi:type="uml:Association" href="Vnf.uml#_j97TUDWeEei9Ia34RXjpEg"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_kBuOMjWeEei9Ia34RXjpEg" points="[1201, 720, -643984, -643984]$[1300, 720, -643984, -643984]$[1300, 200, -643984, -643984]$[684, 200, -643984, -643984]"/>
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_kIQ7EDWeEei9Ia34RXjpEg" id="(1.0,0.19900497512437812)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_kIQ7ETWeEei9Ia34RXjpEg" id="(1.0,0.11049723756906077)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_kIQ7ETWeEei9Ia34RXjpEg" id="(1.0,0.09950248756218906)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_3_akdDaKEei23_xWdimG9w" type="StereotypeCommentLink" source="_6Mhj8DQTEeixv_sLOod4lQ" target="_3_akcDaKEei23_xWdimG9w">
       <styles xmi:type="notation:FontStyle" xmi:id="_3_akdTaKEei23_xWdimG9w"/>
@@ -2985,16 +2949,16 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7phocza7EeivvI-m1BaAbA"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7phodDa7EeivvI-m1BaAbA"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_W7gXMDdREeiIfPeSAqyGdQ" type="Generalization_Edge" source="_zOg-EDQVEeixv_sLOod4lQ" target="_7pWpUDa7EeivvI-m1BaAbA">
+    <edges xmi:type="notation:Connector" xmi:id="_W7gXMDdREeiIfPeSAqyGdQ" type="Generalization_Edge" source="_zOg-EDQVEeixv_sLOod4lQ" target="_7pWpUDa7EeivvI-m1BaAbA" routing="Tree">
       <children xmi:type="notation:DecorationNode" xmi:id="_W7gXMzdREeiIfPeSAqyGdQ" type="Generalization_StereotypeLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_qDqB4DdTEeiIfPeSAqyGdQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
         <layoutConstraint xmi:type="notation:Location" xmi:id="_W7gXNDdREeiIfPeSAqyGdQ" x="-1" y="38"/>
       </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, 220, -643984, -643984]$[620, 181, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XDo_gDdREeiIfPeSAqyGdQ" id="(0.5351170568561873,0.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XDo_gTdREeiIfPeSAqyGdQ" id="(0.5111821086261981,1.0)"/>
+      <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)"/>
     </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">
@@ -3025,7 +2989,7 @@
       <element xmi:type="uml:Association" href="Vnf.uml#_ufxV8DdVEeiIfPeSAqyGdQ"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_unBNcjdVEeiIfPeSAqyGdQ" points="[100, 760, -643984, -643984]$[100, 260, -643984, -643984]$[460, 260, -643984, -643984]"/>
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_u1bc4DdVEeiIfPeSAqyGdQ" id="(0.19933554817275748,0.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_u1bc4TdVEeiIfPeSAqyGdQ" id="(0.0,0.4419889502762431)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_u1bc4TdVEeiIfPeSAqyGdQ" id="(0.0,0.39800995024875624)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_oFePZDd-EeiIfPeSAqyGdQ" type="StereotypeCommentLink" source="_oFSpMDd-EeiIfPeSAqyGdQ" target="_oFePYDd-EeiIfPeSAqyGdQ">
       <styles xmi:type="notation:FontStyle" xmi:id="_oFePZTd-EeiIfPeSAqyGdQ"/>
@@ -3107,7 +3071,7 @@
       <element xmi:type="uml:Association" href="Vnf.uml#_mpiw4DkTEeiWMf5FLWfdLA"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_nNOFsjkTEeiWMf5FLWfdLA" points="[940, 400, -643984, -643984]$[940, 260, -643984, -643984]$[684, 260, -643984, -643984]"/>
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_n6_KoDkTEeiWMf5FLWfdLA" id="(0.10498687664041995,0.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_n6_xsDkTEeiWMf5FLWfdLA" id="(1.0,0.4419889502762431)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_n6_xsDkTEeiWMf5FLWfdLA" id="(1.0,0.39800995024875624)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_MWeoUDm5EeiWMf5FLWfdLA" type="StereotypeCommentLink" source="_MUJtEDm5EeiWMf5FLWfdLA" target="_MWeBQjm5EeiWMf5FLWfdLA">
       <styles xmi:type="notation:FontStyle" xmi:id="_MWeoUTm5EeiWMf5FLWfdLA"/>
@@ -3147,7 +3111,7 @@
       <styles xmi:type="notation:FontStyle" xmi:id="_hA8sQTm5EeiWMf5FLWfdLA"/>
       <element xmi:type="uml:Association" href="Vnf.uml#_gt50cDm5EeiWMf5FLWfdLA"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hA8sQjm5EeiWMf5FLWfdLA" points="[460, 220, -643984, -643984]$[300, 220, -643984, -643984]$[300, 181, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hmXtgDm5EeiWMf5FLWfdLA" id="(0.0,0.22099447513812154)"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hmXtgDm5EeiWMf5FLWfdLA" id="(0.0,0.19900497512437812)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hmXtgTm5EeiWMf5FLWfdLA" id="(0.7874015748031497,1.0)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_iFgOoDm7EeiWMf5FLWfdLA" type="Association_Edge" source="_Am1LkDQtEeixv_sLOod4lQ" target="_MUJtEDm5EeiWMf5FLWfdLA">
@@ -3312,7 +3276,7 @@
       <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.6629834254143646)"/>
+      <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)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_qE_QUCsDEemS0_wZSU3sbA" type="Association_Edge" source="_HzgWYCr-EemS0_wZSU3sbA" target="_oFSpMDd-EeiIfPeSAqyGdQ">
@@ -3757,48 +3721,6 @@
           <element xmi:type="uml:Property" href="Vnf.uml#_s7WyQDgYEeiOYfGHew0BGg"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_6GjbiTzqEeiuk5pWzMOpfA"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_3yMAEA57EemrJqq3q9vf6g" type="Property_ClassAttributeLabel" fontColor="16711680" fontName="Segoe UI">
-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_60iWwA57EemrJqq3q9vf6g" source="PapyrusCSSForceValue">
-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_60i90A57EemrJqq3q9vf6g" key="fontHeight" value="true"/>
-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_60i90Q57EemrJqq3q9vf6g" key="bold" value="true"/>
-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_60jk4A57EemrJqq3q9vf6g" key="italic" value="true"/>
-          </eAnnotations>
-          <children xmi:type="notation:DecorationNode" xmi:id="_3yjMcA57EemrJqq3q9vf6g" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_3yjMcQ57EemrJqq3q9vf6g" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3yjMcg57EemrJqq3q9vf6g"/>
-          </children>
-          <element xmi:type="uml:Property" href="Vnf.uml#_DQCY4A57EemrJqq3q9vf6g"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_3yMAEQ57EemrJqq3q9vf6g"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_G1tNIA59EemrJqq3q9vf6g" type="Property_ClassAttributeLabel" fontColor="16711680" fontName="Segoe UI">
-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IqeWYA59EemrJqq3q9vf6g" source="PapyrusCSSForceValue">
-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IqeWYQ59EemrJqq3q9vf6g" key="fontHeight" value="true"/>
-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Iqe9cA59EemrJqq3q9vf6g" key="bold" value="true"/>
-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Iqe9cQ59EemrJqq3q9vf6g" key="italic" value="true"/>
-          </eAnnotations>
-          <children xmi:type="notation:DecorationNode" xmi:id="_G2FnoA59EemrJqq3q9vf6g" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_G2FnoQ59EemrJqq3q9vf6g" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_G2Fnog59EemrJqq3q9vf6g"/>
-          </children>
-          <element xmi:type="uml:Property" href="Vnf.uml#_UWbcoA58EemrJqq3q9vf6g"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_G1tNIQ59EemrJqq3q9vf6g"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_4m6WsA59EemrJqq3q9vf6g" type="Property_ClassAttributeLabel" fontColor="16711680" fontName="Segoe UI">
-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_65CKUA59EemrJqq3q9vf6g" source="PapyrusCSSForceValue">
-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_65CKUQ59EemrJqq3q9vf6g" key="fontHeight" value="true"/>
-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_65CKUg59EemrJqq3q9vf6g" key="bold" value="true"/>
-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_65CxYA59EemrJqq3q9vf6g" key="italic" value="true"/>
-          </eAnnotations>
-          <children xmi:type="notation:DecorationNode" xmi:id="_4nN4sA59EemrJqq3q9vf6g" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_4nN4sQ59EemrJqq3q9vf6g" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4nN4sg59EemrJqq3q9vf6g"/>
-          </children>
-          <element xmi:type="uml:Property" href="Vnf.uml#_gTpnIA59EemrJqq3q9vf6g"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_4m6WsQ59EemrJqq3q9vf6g"/>
-        </children>
         <children xmi:type="notation:Shape" xmi:id="_-lQRkCsSEemS0_wZSU3sbA" type="Property_ClassAttributeLabel">
           <children xmi:type="notation:DecorationNode" xmi:id="_-l-DQCsSEemS0_wZSU3sbA" visible="false" type="StereotypeLabel">
             <styles xmi:type="notation:StringValueStyle" xmi:id="_-l-DQSsSEemS0_wZSU3sbA" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
@@ -4774,13 +4696,13 @@
         <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DrFc0kJ9EeiwbqJBYHKltg"/>
       </children>
-      <element xmi:type="uml:Class" href="Vnf.uml#_AC2eIDQUEeixv_sLOod4lQ"/>
+      <element xmi:type="uml:Class" href="Common.uml#_AC2eIDQUEeixv_sLOod4lQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Dq4BcUJ9EeiwbqJBYHKltg" x="580" y="860"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_DrIgIEJ9EeiwbqJBYHKltg" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_DrIgIUJ9EeiwbqJBYHKltg"/>
       <styles xmi:type="notation:EObjectValueStyle" xmi:id="_DrJHMEJ9EeiwbqJBYHKltg" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="Vnf.uml#_AC2eIDQUEeixv_sLOod4lQ"/>
+        <eObjectValue xmi:type="uml:Class" href="Common.uml#_AC2eIDQUEeixv_sLOod4lQ"/>
       </styles>
       <element xsi:nil="true"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DrIgIkJ9EeiwbqJBYHKltg" x="200"/>
@@ -5039,7 +4961,7 @@
     <edges xmi:type="notation:Connector" xmi:id="_DrJHMUJ9EeiwbqJBYHKltg" type="StereotypeCommentLink" source="_Dq4BcEJ9EeiwbqJBYHKltg" target="_DrIgIEJ9EeiwbqJBYHKltg">
       <styles xmi:type="notation:FontStyle" xmi:id="_DrJHMkJ9EeiwbqJBYHKltg"/>
       <styles xmi:type="notation:EObjectValueStyle" xmi:id="_DrJuQEJ9EeiwbqJBYHKltg" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="Vnf.uml#_AC2eIDQUEeixv_sLOod4lQ"/>
+        <eObjectValue xmi:type="uml:Class" href="Common.uml#_AC2eIDQUEeixv_sLOod4lQ"/>
       </styles>
       <element xsi:nil="true"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_DrJHM0J9EeiwbqJBYHKltg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
@@ -6666,28 +6588,6 @@
       <element xmi:type="uml:DataType" href="Vnf.uml#_HlF2kDmxEeiWMf5FLWfdLA"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2t-Z0XPXEeiuFfjlON-CuQ" x="20" y="600"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_3Jq3UHPXEeiuFfjlON-CuQ" type="Enumeration_Shape">
-      <children xmi:type="notation:DecorationNode" xmi:id="_3Jq3UnPXEeiuFfjlON-CuQ" type="Enumeration_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_3Jq3U3PXEeiuFfjlON-CuQ" type="Enumeration_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_3Jq3VHPXEeiuFfjlON-CuQ" y="15"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_3Jq3VXPXEeiuFfjlON-CuQ" type="Enumeration_LiteralCompartment">
-        <children xmi:type="notation:Shape" xmi:id="_-7HaYHPXEeiuFfjlON-CuQ" type="EnumerationLiteral_LiteralLabel">
-          <element xmi:type="uml:EnumerationLiteral" href="Common.uml#_W5tgEDnFEeiWMf5FLWfdLA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_-7HaYXPXEeiuFfjlON-CuQ"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_-7IBcHPXEeiuFfjlON-CuQ" type="EnumerationLiteral_LiteralLabel">
-          <element xmi:type="uml:EnumerationLiteral" href="Common.uml#_Z6H9EDnFEeiWMf5FLWfdLA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_-7IBcXPXEeiuFfjlON-CuQ"/>
-        </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="_3Jq3VnPXEeiuFfjlON-CuQ"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_3Jq3V3PXEeiuFfjlON-CuQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_3Jq3WHPXEeiuFfjlON-CuQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3Jq3WXPXEeiuFfjlON-CuQ"/>
-      </children>
-      <element xmi:type="uml:Enumeration" href="Common.uml#_Qmf1kDnFEeiWMf5FLWfdLA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3Jq3UXPXEeiuFfjlON-CuQ" x="780" y="640"/>
-    </children>
     <children xmi:type="notation:Shape" xmi:id="_M90gIHPYEeiuFfjlON-CuQ" type="Enumeration_Shape">
       <children xmi:type="notation:DecorationNode" xmi:id="_M91HMHPYEeiuFfjlON-CuQ" type="Enumeration_NameLabel"/>
       <children xmi:type="notation:DecorationNode" xmi:id="_M91HMXPYEeiuFfjlON-CuQ" type="Enumeration_FloatingNameLabel">
@@ -6796,7 +6696,7 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VfZfonPYEeiuFfjlON-CuQ"/>
           </children>
-          <element xmi:type="uml:Property" href="Vnf.uml#_GA6IYDd_EeiIfPeSAqyGdQ"/>
+          <element xmi:type="uml:Property" href="Common.uml#_GA6IYDd_EeiIfPeSAqyGdQ"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_VfBFIXPYEeiuFfjlON-CuQ"/>
         </children>
         <children xmi:type="notation:Shape" xmi:id="_VfBsMHPYEeiuFfjlON-CuQ" type="Property_DataTypeAttributeLabel">
@@ -6805,7 +6705,7 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Vfb74nPYEeiuFfjlON-CuQ"/>
           </children>
-          <element xmi:type="uml:Property" href="Vnf.uml#_G-MQADd_EeiIfPeSAqyGdQ"/>
+          <element xmi:type="uml:Property" href="Common.uml#_G-MQADd_EeiIfPeSAqyGdQ"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_VfBsMXPYEeiuFfjlON-CuQ"/>
         </children>
         <children xmi:type="notation:Shape" xmi:id="_VfBsMnPYEeiuFfjlON-CuQ" type="Property_DataTypeAttributeLabel">
@@ -6814,7 +6714,7 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VfeYInPYEeiuFfjlON-CuQ"/>
           </children>
-          <element xmi:type="uml:Property" href="Vnf.uml#_Hy64kDd_EeiIfPeSAqyGdQ"/>
+          <element xmi:type="uml:Property" href="Common.uml#_Hy64kDd_EeiIfPeSAqyGdQ"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_VfBsM3PYEeiuFfjlON-CuQ"/>
         </children>
         <children xmi:type="notation:Shape" xmi:id="_uIMnwPuHEeiYVshOvl6_ww" type="Property_DataTypeAttributeLabel" fontColor="16711680" fontName="Segoe UI">
@@ -6828,7 +6728,7 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uJuRwvuHEeiYVshOvl6_ww"/>
           </children>
-          <element xmi:type="uml:Property" href="Vnf.uml#_uFBX8PuHEeiYVshOvl6_ww"/>
+          <element xmi:type="uml:Property" href="Common.uml#_uFBX8PuHEeiYVshOvl6_ww"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_uIMnwfuHEeiYVshOvl6_ww"/>
         </children>
         <children xmi:type="notation:Shape" xmi:id="_RcyWwPuIEeiYVshOvl6_ww" type="Property_DataTypeAttributeLabel" fontColor="16711680" fontName="Segoe UI">
@@ -6842,7 +6742,7 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RdvZAvuIEeiYVshOvl6_ww"/>
           </children>
-          <element xmi:type="uml:Property" href="Vnf.uml#_RayLoPuIEeiYVshOvl6_ww"/>
+          <element xmi:type="uml:Property" href="Common.uml#_RayLoPuIEeiYVshOvl6_ww"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_RcyWwfuIEeiYVshOvl6_ww"/>
         </children>
         <children xmi:type="notation:Shape" xmi:id="_gVjh0PuIEeiYVshOvl6_ww" type="Property_DataTypeAttributeLabel" fontColor="16711680" fontName="Segoe UI">
@@ -6856,7 +6756,7 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gWUW0vuIEeiYVshOvl6_ww"/>
           </children>
-          <element xmi:type="uml:Property" href="Vnf.uml#_gUB30PuIEeiYVshOvl6_ww"/>
+          <element xmi:type="uml:Property" href="Common.uml#_gUB30PuIEeiYVshOvl6_ww"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_gVjh0fuIEeiYVshOvl6_ww"/>
         </children>
         <styles xmi:type="notation:TitleStyle" xmi:id="_R676ZHPYEeiuFfjlON-CuQ"/>
@@ -6870,7 +6770,7 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_R676a3PYEeiuFfjlON-CuQ"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_R676bHPYEeiuFfjlON-CuQ"/>
       </children>
-      <element xmi:type="uml:DataType" href="Vnf.uml#_B1G2UDd_EeiIfPeSAqyGdQ"/>
+      <element xmi:type="uml:DataType" href="Common.uml#_B1G2UDd_EeiIfPeSAqyGdQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_R67TUXPYEeiuFfjlON-CuQ" x="280" y="900"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_eXUikHPYEeiuFfjlON-CuQ" type="DataType_Shape">
@@ -7603,14 +7503,6 @@
       <element xsi:nil="true"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Q_QXJpUHEeiYXO5wr78TUw" x="840" y="460"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_touR9JUHEeiYXO5wr78TUw" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_touR9ZUHEeiYXO5wr78TUw"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_tou5AJUHEeiYXO5wr78TUw" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Enumeration" href="Common.uml#_Qmf1kDnFEeiWMf5FLWfdLA"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_touR9pUHEeiYXO5wr78TUw" x="480" y="620"/>
-    </children>
     <children xmi:type="notation:Shape" xmi:id="_yBMHAJUHEeiYXO5wr78TUw" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_yBMHAZUHEeiYXO5wr78TUw"/>
       <styles xmi:type="notation:EObjectValueStyle" xmi:id="_yBMHA5UHEeiYXO5wr78TUw" name="BASE_ELEMENT">
@@ -7630,7 +7522,7 @@
     <children xmi:type="notation:Shape" xmi:id="_8UBoxJUHEeiYXO5wr78TUw" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_8UBoxZUHEeiYXO5wr78TUw"/>
       <styles xmi:type="notation:EObjectValueStyle" xmi:id="_8UBox5UHEeiYXO5wr78TUw" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:DataType" href="Vnf.uml#_B1G2UDd_EeiIfPeSAqyGdQ"/>
+        <eObjectValue xmi:type="uml:DataType" href="Common.uml#_B1G2UDd_EeiIfPeSAqyGdQ"/>
       </styles>
       <element xsi:nil="true"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8UBoxpUHEeiYXO5wr78TUw" x="480" y="740"/>
@@ -8188,16 +8080,6 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Q_QXK5UHEeiYXO5wr78TUw"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Q_QXLJUHEeiYXO5wr78TUw"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_tou5AZUHEeiYXO5wr78TUw" type="StereotypeCommentLink" source="_3Jq3UHPXEeiuFfjlON-CuQ" target="_touR9JUHEeiYXO5wr78TUw">
-      <styles xmi:type="notation:FontStyle" xmi:id="_tou5ApUHEeiYXO5wr78TUw"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_tou5BpUHEeiYXO5wr78TUw" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Enumeration" href="Common.uml#_Qmf1kDnFEeiWMf5FLWfdLA"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_tou5A5UHEeiYXO5wr78TUw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tou5BJUHEeiYXO5wr78TUw"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tou5BZUHEeiYXO5wr78TUw"/>
-    </edges>
     <edges xmi:type="notation:Connector" xmi:id="_yBMHBJUHEeiYXO5wr78TUw" type="StereotypeCommentLink" source="_P04M0HPYEeiuFfjlON-CuQ" target="_yBMHAJUHEeiYXO5wr78TUw">
       <styles xmi:type="notation:FontStyle" xmi:id="_yBMHBZUHEeiYXO5wr78TUw"/>
       <styles xmi:type="notation:EObjectValueStyle" xmi:id="_yBMHCZUHEeiYXO5wr78TUw" name="BASE_ELEMENT">
@@ -8221,7 +8103,7 @@
     <edges xmi:type="notation:Connector" xmi:id="_8UBoyJUHEeiYXO5wr78TUw" type="StereotypeCommentLink" source="_R67TUHPYEeiuFfjlON-CuQ" target="_8UBoxJUHEeiYXO5wr78TUw">
       <styles xmi:type="notation:FontStyle" xmi:id="_8UBoyZUHEeiYXO5wr78TUw"/>
       <styles xmi:type="notation:EObjectValueStyle" xmi:id="_8UBozZUHEeiYXO5wr78TUw" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:DataType" href="Vnf.uml#_B1G2UDd_EeiIfPeSAqyGdQ"/>
+        <eObjectValue xmi:type="uml:DataType" href="Common.uml#_B1G2UDd_EeiIfPeSAqyGdQ"/>
       </styles>
       <element xsi:nil="true"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_8UBoypUHEeiYXO5wr78TUw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
@@ -8543,11 +8425,11 @@
       </children>
       <children xmi:type="notation:BasicCompartment" xmi:id="_MexCwZddEei-sOl6ywWHlg" type="Enumeration_LiteralCompartment">
         <children xmi:type="notation:Shape" xmi:id="_WsDWIJddEei-sOl6ywWHlg" type="EnumerationLiteral_LiteralLabel">
-          <element xmi:type="uml:EnumerationLiteral" href="Vnf.uml#_TXtQgJddEei-sOl6ywWHlg"/>
+          <element xmi:type="uml:EnumerationLiteral" href="Common.uml#_TXtQgJddEei-sOl6ywWHlg"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_WsDWIZddEei-sOl6ywWHlg"/>
         </children>
         <children xmi:type="notation:Shape" xmi:id="_WsD9MJddEei-sOl6ywWHlg" type="EnumerationLiteral_LiteralLabel">
-          <element xmi:type="uml:EnumerationLiteral" href="Vnf.uml#_UVFewJddEei-sOl6ywWHlg"/>
+          <element xmi:type="uml:EnumerationLiteral" href="Common.uml#_UVFewJddEei-sOl6ywWHlg"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_WsD9MZddEei-sOl6ywWHlg"/>
         </children>
         <styles xmi:type="notation:TitleStyle" xmi:id="_MexCwpddEei-sOl6ywWHlg"/>
@@ -8555,13 +8437,13 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_MexCxJddEei-sOl6ywWHlg"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MexCxZddEei-sOl6ywWHlg"/>
       </children>
-      <element xmi:type="uml:Enumeration" href="Vnf.uml#_MevNkJddEei-sOl6ywWHlg"/>
+      <element xmi:type="uml:Enumeration" href="Common.uml#_MevNkJddEei-sOl6ywWHlg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MewbsZddEei-sOl6ywWHlg" x="940" y="120"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_2JIypJdeEei-sOl6ywWHlg" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_2JIypZdeEei-sOl6ywWHlg"/>
       <styles xmi:type="notation:EObjectValueStyle" xmi:id="_2JIyp5deEei-sOl6ywWHlg" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Enumeration" href="Vnf.uml#_MevNkJddEei-sOl6ywWHlg"/>
+        <eObjectValue xmi:type="uml:Enumeration" href="Common.uml#_MevNkJddEei-sOl6ywWHlg"/>
       </styles>
       <element xsi:nil="true"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2JIyppdeEei-sOl6ywWHlg" x="1420" y="280"/>
@@ -8708,7 +8590,7 @@
     <edges xmi:type="notation:Connector" xmi:id="_2JIyqJdeEei-sOl6ywWHlg" type="StereotypeCommentLink" source="_MewbsJddEei-sOl6ywWHlg" target="_2JIypJdeEei-sOl6ywWHlg">
       <styles xmi:type="notation:FontStyle" xmi:id="_2JIyqZdeEei-sOl6ywWHlg"/>
       <styles xmi:type="notation:EObjectValueStyle" xmi:id="_2JIyrZdeEei-sOl6ywWHlg" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Enumeration" href="Vnf.uml#_MevNkJddEei-sOl6ywWHlg"/>
+        <eObjectValue xmi:type="uml:Enumeration" href="Common.uml#_MevNkJddEei-sOl6ywWHlg"/>
       </styles>
       <element xsi:nil="true"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_2JIyqpdeEei-sOl6ywWHlg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
@@ -8936,13 +8818,13 @@
         <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Y8jyIpssEeiPBvbfaqSLYg"/>
       </children>
-      <element xmi:type="uml:Class" href="Vnf.uml#_AC2eIDQUEeixv_sLOod4lQ"/>
+      <element xmi:type="uml:Class" href="Common.uml#_AC2eIDQUEeixv_sLOod4lQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Y8dEcZssEeiPBvbfaqSLYg" x="700" y="520" width="161" height="81"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_Y8sVA5ssEeiPBvbfaqSLYg" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_Y8sVBJssEeiPBvbfaqSLYg"/>
       <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Y8sVBpssEeiPBvbfaqSLYg" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="Vnf.uml#_AC2eIDQUEeixv_sLOod4lQ"/>
+        <eObjectValue xmi:type="uml:Class" href="Common.uml#_AC2eIDQUEeixv_sLOod4lQ"/>
       </styles>
       <element xsi:nil="true"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Y8sVBZssEeiPBvbfaqSLYg" x="200"/>
@@ -9310,7 +9192,7 @@
     <edges xmi:type="notation:Connector" xmi:id="_Y8sVB5ssEeiPBvbfaqSLYg" type="StereotypeCommentLink" source="_Y8dEcJssEeiPBvbfaqSLYg" target="_Y8sVA5ssEeiPBvbfaqSLYg">
       <styles xmi:type="notation:FontStyle" xmi:id="_Y8sVCJssEeiPBvbfaqSLYg"/>
       <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Y8sVDJssEeiPBvbfaqSLYg" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="Vnf.uml#_AC2eIDQUEeixv_sLOod4lQ"/>
+        <eObjectValue xmi:type="uml:Class" href="Common.uml#_AC2eIDQUEeixv_sLOod4lQ"/>
       </styles>
       <element xsi:nil="true"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Y8sVCZssEeiPBvbfaqSLYg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
@@ -9334,7 +9216,7 @@
         <layoutConstraint xmi:type="notation:Location" xmi:id="_xhSsMZssEeiPBvbfaqSLYg" x="1" y="38"/>
       </children>
       <styles xmi:type="notation:FontStyle" xmi:id="_xhSFIZssEeiPBvbfaqSLYg"/>
-      <element xmi:type="uml:Generalization" href="Vnf.uml#_xcr5AJssEeiPBvbfaqSLYg"/>
+      <element xmi:type="uml:Generalization" href="Common.uml#_xcr5AJssEeiPBvbfaqSLYg"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xhSFIpssEeiPBvbfaqSLYg" points="[780, 520, -643984, -643984]$[780, 480, -643984, -643984]$[633, 480, -643984, -643984]$[520, 480, -643984, -643984]$[520, 440, -643984, -643984]"/>
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xqsf0JssEeiPBvbfaqSLYg" id="(0.4968944099378882,0.0)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xqsf0ZssEeiPBvbfaqSLYg" id="(0.4979253112033195,1.0)"/>
@@ -9484,17 +9366,6 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_py3gc7eSEeiq7vtzCAMDQQ"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_py3gdLeSEeiq7vtzCAMDQQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_t3OtwLeSEeiq7vtzCAMDQQ" type="Generalization_Edge" source="_pyftALeSEeiq7vtzCAMDQQ" target="_Y8dEcJssEeiPBvbfaqSLYg">
-      <children xmi:type="notation:DecorationNode" xmi:id="_t3PU0LeSEeiq7vtzCAMDQQ" type="Generalization_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_fq3gQLeTEeiq7vtzCAMDQQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_t3PU0beSEeiq7vtzCAMDQQ" x="-1" y="38"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_t3OtwbeSEeiq7vtzCAMDQQ"/>
-      <element xmi:type="uml:Generalization" href="Common.uml#_tmOdULeSEeiq7vtzCAMDQQ"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_t3OtwreSEeiq7vtzCAMDQQ" points="[900, 660, -643984, -643984]$[900, 640, -643984, -643984]$[780, 640, -643984, -643984]$[780, 601, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uYVPsLeSEeiq7vtzCAMDQQ" id="(0.425531914893617,0.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uYVPsbeSEeiq7vtzCAMDQQ" id="(0.4968944099378882,1.0)"/>
-    </edges>
     <edges xmi:type="notation:Connector" xmi:id="_2iqCELxOEeiMnLuHd6ALAg" type="Association_Edge" source="_mcamcLIKEeid-vjMcczUWA" target="_mkZUIJpYEeidy9iGT_F5-w">
       <children xmi:type="notation:DecorationNode" xmi:id="_2itFYLxOEeiMnLuHd6ALAg" type="Association_StereotypeLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_48F-oLxOEeiMnLuHd6ALAg" name="IS_UPDATED_POSITION" booleanValue="true"/>
diff --git a/ONAP Information Model/Vnf.uml b/ONAP Information Model/Vnf.uml
index e3b7e8a..594b4e3 100644
--- a/ONAP Information Model/Vnf.uml
+++ b/ONAP Information Model/Vnf.uml
@@ -281,7 +281,9 @@ NOTE 2: virtualLinkProfile needs to be provided for all VLs that the CPs of the
           <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_KORdAEJ9EeiwbqJBYHKltg" key="nature" value="UML_Nature"/>
         </eAnnotations>
         <ownedEnd xmi:type="uml:Property" xmi:id="_KOSEEEJ9EeiwbqJBYHKltg" name="scalinggroup" type="_M45q8D0REeiuk5pWzMOpfA" association="_KOPAwEJ9EeiwbqJBYHKltg"/>
-        <ownedEnd xmi:type="uml:Property" xmi:id="_KOYxwEJ9EeiwbqJBYHKltg" name="vnfvirtuallinkdesc " type="_AC2eIDQUEeixv_sLOod4lQ" association="_KOPAwEJ9EeiwbqJBYHKltg"/>
+        <ownedEnd xmi:type="uml:Property" xmi:id="_KOYxwEJ9EeiwbqJBYHKltg" name="vnfvirtuallinkdesc " association="_KOPAwEJ9EeiwbqJBYHKltg">
+          <type xmi:type="uml:Class" href="Common.uml#_AC2eIDQUEeixv_sLOod4lQ"/>
+        </ownedEnd>
       </packagedElement>
       <packagedElement xmi:type="uml:Association" xmi:id="_oVoSIEJ9EeiwbqJBYHKltg" name="ServiceFlavorUsersHomingGroup" memberEnd="_oVpgQEJ9EeiwbqJBYHKltg _oVqHUEJ9EeiwbqJBYHKltg">
         <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_oVo5MEJ9EeiwbqJBYHKltg" source="org.eclipse.papyrus">
@@ -1163,43 +1165,6 @@ NOTE: Each identifier references an affinity or anti-affinity group which expres
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_HcFyAPxFEeijjKJn7OxwuQ" value="1"/>
         </ownedAttribute>
       </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_AC2eIDQUEeixv_sLOod4lQ" name="VirtualLinkDesc " isAbstract="true">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_Ey004LeVEeiq7vtzCAMDQQ" annotatedElement="_AC2eIDQUEeixv_sLOod4lQ">
-          <body>A communication channel that connects two or more devices, nodes, or entities.</body>
-        </ownedComment>
-        <generalization xmi:type="uml:Generalization" xmi:id="_xcr5AJssEeiPBvbfaqSLYg">
-          <general xmi:type="uml:Class" href="Resource.uml#_DAQisJpXEeidy9iGT_F5-w"/>
-        </generalization>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_pszPADd9EeiIfPeSAqyGdQ" name="virtualLinkDescId">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_IJjFUDd-EeiIfPeSAqyGdQ" annotatedElement="_pszPADd9EeiIfPeSAqyGdQ">
-            <body>Unique identifier of this internal VLD in VNFD.&#xD;
-</body>
-          </ownedComment>
-          <type xmi:type="uml:DataType" href="Common.uml#_AuYtcDkBEeiWMf5FLWfdLA"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_qgZPIDd9EeiIfPeSAqyGdQ" name="connectivityType">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_WA_YAJwgEeiPD5fN_oRNAg" annotatedElement="_qgZPIDd9EeiIfPeSAqyGdQ">
-            <body>Specifies the protocol exposed by a VL and the flow pattern supported by the VL.</body>
-          </ownedComment>
-          <type xmi:type="uml:DataType" href="Common.uml#_ImxsgDeBEeiIfPeSAqyGdQ"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_rY7ZoDd9EeiIfPeSAqyGdQ" name="testAccess">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_0-aJUDeBEeiIfPeSAqyGdQ" annotatedElement="_rY7ZoDd9EeiIfPeSAqyGdQ">
-            <body>Specifies test access facilities expected on the VL (e.g. none, passive monitoring, or active (intrusive) loopbacks at endpoints).</body>
-          </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2BU-4DeBEeiIfPeSAqyGdQ"/>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2BbskDeBEeiIfPeSAqyGdQ" value="*"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_1X3vADd9EeiIfPeSAqyGdQ" name="description">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_7k8YcDeBEeiIfPeSAqyGdQ" annotatedElement="_1X3vADd9EeiIfPeSAqyGdQ">
-            <body>Provides human-readable information on the purpose of the VL (e.g. control plane traffic).</body>
-          </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5ttxEDeBEeiIfPeSAqyGdQ"/>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5t5XQDeBEeiIfPeSAqyGdQ" value="1"/>
-        </ownedAttribute>
-      </packagedElement>
       <packagedElement xmi:type="uml:Class" xmi:id="_zOfv8DQVEeixv_sLOod4lQ" name="VduCpd ">
         <ownedComment xmi:type="uml:Comment" xmi:id="_-4XYgFqVEeiTzriVSbKglg" annotatedElement="_zOfv8DQVEeixv_sLOod4lQ">
           <body>A VduCpd information element is a type of Cpd and describes network connectivity between a VNFC instance (based on this VDU) and an internal VL.</body>
@@ -1273,10 +1238,11 @@ NOTE: Each identifier references an affinity or anti-affinity group which expres
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_UjCdYPuFEeikN6fzJzDfWw"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_UokdoPuFEeikN6fzJzDfWw" value="1"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_ZhRloBlYEem_VM0Ij2_uSw" name="qos" type="_B1G2UDd_EeiIfPeSAqyGdQ">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_ZhRloBlYEem_VM0Ij2_uSw" name="qos">
           <ownedComment xmi:type="uml:Comment" xmi:id="_aS1WsBleEem_VM0Ij2_uSw" annotatedElement="_ZhRloBlYEem_VM0Ij2_uSw">
             <body>Describe the Qos requirements of the VduCpd.</body>
           </ownedComment>
+          <type xmi:type="uml:DataType" href="Common.uml#_B1G2UDd_EeiIfPeSAqyGdQ"/>
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ux4cgBlYEem_VM0Ij2_uSw"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ux-jIBlYEem_VM0Ij2_uSw" value="1"/>
         </ownedAttribute>
@@ -1287,6 +1253,15 @@ NOTE: Each identifier references an affinity or anti-affinity group which expres
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_6rxHQCsBEemS0_wZSU3sbA"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_6rxHQSsBEemS0_wZSU3sbA" value="1"/>
         </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_p8meQDa8EeivvI-m1BaAbA" name="allowedAddressData">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_kI39QEbwEei7eo5RdnNiBQ" annotatedElement="_p8meQDa8EeivvI-m1BaAbA">
+            <body>For specifying floating IP(s) to be shared among Cpds, which are reserved for vnfReservedCpd described in the VNFD.&#xD;
+</body>
+          </ownedComment>
+          <type xmi:type="uml:DataType" href="Common.uml#_2aIggDa9EeivvI-m1BaAbA"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_H0-cMDa9EeivvI-m1BaAbA"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_H1CtoDa9EeivvI-m1BaAbA" value="*"/>
+        </ownedAttribute>
       </packagedElement>
       <packagedElement xmi:type="uml:Class" xmi:id="_p0UVsDQvEeixv_sLOod4lQ" name="VnfDf ">
         <ownedComment xmi:type="uml:Comment" xmi:id="_l0ZY4GNVEeio9amveq0yWQ" annotatedElement="_p0UVsDQvEeixv_sLOod4lQ">
@@ -1457,10 +1432,11 @@ A given element can belong to multiple groups.</body>
           <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 " type="_AC2eIDQUEeixv_sLOod4lQ" aggregation="shared" association="_Xh1EcDnPEeiWMf5FLWfdLA">
+        <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>
@@ -1501,7 +1477,7 @@ A given element can belong to multiple groups.</body>
         <ownedComment xmi:type="uml:Comment" xmi:id="_dcvukFqbEeiTzriVSbKglg" annotatedElement="_oFQM8Dd-EeiIfPeSAqyGdQ">
           <body>The VirtualLinkDescFlavour describes additional instantiation data for a given internal VL used in a DF.</body>
         </ownedComment>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_v0nsYDd-EeiIfPeSAqyGdQ" name="qos" type="_B1G2UDd_EeiIfPeSAqyGdQ">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_v0nsYDd-EeiIfPeSAqyGdQ" name="qos" type="_m4u3AC41EemS0_wZSU3sbA">
           <ownedComment xmi:type="uml:Comment" xmi:id="_28zsQDgcEeiOYfGHew0BGg" annotatedElement="_v0nsYDd-EeiIfPeSAqyGdQ">
             <body>QoS of the VL.</body>
           </ownedComment>
@@ -2088,27 +2064,6 @@ NOTE :  Each identifier references an affinity or anti-affinity group which expr
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_GWgskCsBEemS0_wZSU3sbA" value="1"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_GWhToCsBEemS0_wZSU3sbA" value="1"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DQCY4A57EemrJqq3q9vf6g" name="segmentationId">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_uPeTsA57EemrJqq3q9vf6g" annotatedElement="_DQCY4A57EemrJqq3q9vf6g">
-            <body>Network segment ID (VLAN/VxLAN ID).</body>
-          </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Xv5IQA57EemrJqq3q9vf6g"/>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Xv-n0A57EemrJqq3q9vf6g" value="1"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_UWbcoA58EemrJqq3q9vf6g" name="physicalNetwork">
-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ZgZAEA58EemrJqq3q9vf6g"/>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ZgnCgA58EemrJqq3q9vf6g" value="1"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_gTpnIA59EemrJqq3q9vf6g" name="routerExternal">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_2PRJ4A59EemrJqq3q9vf6g" annotatedElement="_gTpnIA59EemrJqq3q9vf6g">
-            <body>Specify if a vrouter comes from an external network.</body>
-          </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_j-NNUA59EemrJqq3q9vf6g"/>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_j-T7AA59EemrJqq3q9vf6g" value="1"/>
-        </ownedAttribute>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_5LWhwBx5Eemit6R65X1VNQ" name="virtualLinkProtocolData" type="_BAt7gBx6Eemit6R65X1VNQ">
           <ownedComment xmi:type="uml:Comment" xmi:id="_iqS6MBx6Eemit6R65X1VNQ" annotatedElement="_5LWhwBx5Eemit6R65X1VNQ">
             <body>Specifies the protocol data for a VL instantiated according to this profile. Cardinality 0 is used when no protocol data needs to be specified.</body>
@@ -2330,7 +2285,9 @@ 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="_AC2eIDQUEeixv_sLOod4lQ"/>
+        <generalization xmi:type="uml:Generalization" xmi:id="_LKhVgCr-EemS0_wZSU3sbA">
+          <general xmi:type="uml:Class" href="Common.uml#_AC2eIDQUEeixv_sLOod4lQ"/>
+        </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">
             <body>Specifies the virtualised resource related performance metrics on VLD level to be tracked by the VNFM.</body>
@@ -2351,7 +2308,9 @@ This could include the number of CPU cores on this logical node, a memory config
           <body>An AllottedLink is a link provided (or allotted) by some service instance.   The Allottedlink may be incorporated into the topology of some consuming service like other links. &#xD;
 </body>
         </ownedComment>
-        <generalization xmi:type="uml:Generalization" xmi:id="_lFpyYLILEeid-vjMcczUWA" general="_AC2eIDQUEeixv_sLOod4lQ"/>
+        <generalization xmi:type="uml:Generalization" xmi:id="_lFpyYLILEeid-vjMcczUWA">
+          <general xmi:type="uml:Class" href="Common.uml#_AC2eIDQUEeixv_sLOod4lQ"/>
+        </generalization>
       </packagedElement>
     </packagedElement>
     <packagedElement xmi:type="uml:Package" xmi:id="_zPN5MzOHEei5Af8DcjrhIQ" name="TypeDefinitions">
@@ -2516,52 +2475,6 @@ This could include the number of CPU cores on this logical node, a memory config
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3gek4Da6EeivvI-m1BaAbA" value="1"/>
         </ownedAttribute>
       </packagedElement>
-      <packagedElement xmi:type="uml:DataType" xmi:id="_B1G2UDd_EeiIfPeSAqyGdQ" name="QoS">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_DNOvkGNgEeio9amveq0yWQ" annotatedElement="_B1G2UDd_EeiIfPeSAqyGdQ">
-          <body>The QoS information element describes QoS data for a given VL used in a DF.</body>
-        </ownedComment>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_GA6IYDd_EeiIfPeSAqyGdQ" name="latency">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_P3EVMDd_EeiIfPeSAqyGdQ" annotatedElement="_GA6IYDd_EeiIfPeSAqyGdQ">
-            <body>Maximum latency in ms.&#xD;
-</body>
-          </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="Common.uml#_p3EKoDm0EeiWMf5FLWfdLA"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_G-MQADd_EeiIfPeSAqyGdQ" name="packetDelayVariation">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_V5HXMDd_EeiIfPeSAqyGdQ" annotatedElement="_G-MQADd_EeiIfPeSAqyGdQ">
-            <body>Maximum jitter in ms.</body>
-          </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="Common.uml#_p3EKoDm0EeiWMf5FLWfdLA"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_Hy64kDd_EeiIfPeSAqyGdQ" name="packetLossRatio">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_bo3vUDd_EeiIfPeSAqyGdQ" annotatedElement="_Hy64kDd_EeiIfPeSAqyGdQ">
-            <body>Maximum packet loss ratio. Cardinality is 0 if no packetLossRatio requirement exists.</body>
-          </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="Common.uml#_p3EKoDm0EeiWMf5FLWfdLA"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Z7MFgDd_EeiIfPeSAqyGdQ"/>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Z7WdkDd_EeiIfPeSAqyGdQ" value="1"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_uFBX8PuHEeiYVshOvl6_ww" name="qosId">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_LF1bwPuIEeiYVshOvl6_ww" annotatedElement="_uFBX8PuHEeiYVshOvl6_ww">
-            <body>Qos ID.</body>
-          </ownedComment>
-          <type xmi:type="uml:DataType" href="Common.uml#_AuYtcDkBEeiWMf5FLWfdLA"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_RayLoPuIEeiYVshOvl6_ww" name="qosName">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_ZP674PuIEeiYVshOvl6_ww" annotatedElement="_RayLoPuIEeiYVshOvl6_ww">
-            <body>Human readable Qos name.</body>
-          </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_gUB30PuIEeiYVshOvl6_ww" name="rules">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_yom7EPuLEeiYVshOvl6_ww" annotatedElement="_gUB30PuIEeiYVshOvl6_ww">
-            <body>Detailed requirements of Qos, including maximum bandwidth limitation{max_kbps}、maximum burst bandwidth limitation{max_burst_kbps} 、direction{egress|ingress}，etc.</body>
-          </ownedComment>
-          <type xmi:type="uml:DataType" href="Common.uml#_vxJ9ADafEei23_xWdimG9w"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_kTldoPuIEeiYVshOvl6_ww"/>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_kUKFYPuIEeiYVshOvl6_ww" value="*"/>
-        </ownedAttribute>
-      </packagedElement>
       <packagedElement xmi:type="uml:DataType" xmi:id="_ZqQQ8DkIEeiWMf5FLWfdLA" name="VnfConfigurableProperties">
         <ownedComment xmi:type="uml:Comment" xmi:id="_mg8PgDkIEeiWMf5FLWfdLA" annotatedElement="_ZqQQ8DkIEeiWMf5FLWfdLA">
           <body>This datatype defines the configurable properties of a VNF (e.g. related to auto scaling and auto healing). For a VNF instance, the value of these properties can be modified by the VNFM</body>
@@ -2927,21 +2840,15 @@ 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" type="_AC2eIDQUEeixv_sLOod4lQ">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_pEem4CpFEemS0_wZSU3sbA" name="intVirtualLinkDesc" visibility="public">
           <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:Enumeration" xmi:id="_MevNkJddEei-sOl6ywWHlg" name="AddressType">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_zYqPEJdeEei-sOl6ywWHlg" annotatedElement="_MevNkJddEei-sOl6ywWHlg">
-          <body>Type of address</body>
-        </ownedComment>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_TXtQgJddEei-sOl6ywWHlg" name="MAC"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_UVFewJddEei-sOl6ywWHlg" name="IP"/>
-      </packagedElement>
       <packagedElement xmi:type="uml:DataType" xmi:id="_hzvvUPxSEeijjKJn7OxwuQ" name="StorageQos">
         <ownedAttribute xmi:type="uml:Property" xmi:id="_tMfJMPxSEeijjKJn7OxwuQ" name="qosId">
           <ownedComment xmi:type="uml:Comment" xmi:id="_C1n00PxTEeijjKJn7OxwuQ" annotatedElement="_tMfJMPxSEeijjKJn7OxwuQ">
@@ -3014,6 +2921,14 @@ The attached VDUs shall connect to the same internal VLD.&#xD;
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_j1pWMRx-Eemit6R65X1VNQ" value="1"/>
         </ownedAttribute>
       </packagedElement>
+      <packagedElement xmi:type="uml:DataType" xmi:id="_m4u3AC41EemS0_wZSU3sbA" name="VnfQoS">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_3Q70gC41EemS0_wZSU3sbA" annotatedElement="_m4u3AC41EemS0_wZSU3sbA">
+          <body>The QoS as applied to the vnf.</body>
+        </ownedComment>
+        <generalization xmi:type="uml:Generalization" xmi:id="_Bx_YcC42EemS0_wZSU3sbA">
+          <general xmi:type="uml:DataType" href="Common.uml#_B1G2UDd_EeiIfPeSAqyGdQ"/>
+        </generalization>
+      </packagedElement>
     </packagedElement>
     <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_0Mc-4D2KEeiFiY3bcpqGkg">
       <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EesFsKVyEeikF6xsfT18UA" source="PapyrusVersion">
@@ -3028,6 +2943,12 @@ The attached VDUs shall connect to the same internal VLD.&#xD;
       </eAnnotations>
       <appliedProfile xmi:type="uml:Profile" href="OpenModel_Profile.profile.uml#_m1xqsHBgEd6FKu9XX1078A"/>
     </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_BVoS8C4-EemS0_wZSU3sbA">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_BVxc4C4-EemS0_wZSU3sbA" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_Kv8EIKFXEeS_KNX0nfvIVQ"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#ActionLanguage"/>
+    </profileApplication>
   </uml:Package>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_ONpBgzaIEei23_xWdimG9w" base_StructuralFeature="_u3j0EDOVEeiHat9KcP8uWA"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_ONpokTaIEei23_xWdimG9w" base_StructuralFeature="_vRy4kDQPEeixv_sLOod4lQ"/>
@@ -3136,11 +3057,18 @@ 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:OpenModelClass xmi:id="_ONuhFDaIEei23_xWdimG9w" base_Class="_AC2eIDQUEeixv_sLOod4lQ"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_pszPATd9EeiIfPeSAqyGdQ" base_StructuralFeature="_pszPADd9EeiIfPeSAqyGdQ" isInvariant="true"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_qgZ2MDd9EeiIfPeSAqyGdQ" base_StructuralFeature="_qgZPIDd9EeiIfPeSAqyGdQ"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_rY7ZoTd9EeiIfPeSAqyGdQ" base_StructuralFeature="_rY7ZoDd9EeiIfPeSAqyGdQ"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_1X3vATd9EeiIfPeSAqyGdQ" base_StructuralFeature="_1X3vADd9EeiIfPeSAqyGdQ"/>
+  <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"/>
@@ -3220,9 +3148,15 @@ 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="_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: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"/>
@@ -3341,11 +3275,18 @@ 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="_zuNAQJT4EeiYXO5wr78TUw" base_Element="_AC2eIDQUEeixv_sLOod4lQ"/>
-  <OpenModel_Profile:Preliminary xmi:id="_00PbQJT4EeiYXO5wr78TUw" base_Element="_pszPADd9EeiIfPeSAqyGdQ"/>
-  <OpenModel_Profile:Preliminary xmi:id="_2KjG4JT4EeiYXO5wr78TUw" base_Element="_qgZPIDd9EeiIfPeSAqyGdQ"/>
-  <OpenModel_Profile:Preliminary xmi:id="_3eA54JT4EeiYXO5wr78TUw" base_Element="_rY7ZoDd9EeiIfPeSAqyGdQ"/>
-  <OpenModel_Profile:Preliminary xmi:id="_4brcAJT4EeiYXO5wr78TUw" base_Element="_1X3vADd9EeiIfPeSAqyGdQ"/>
+  <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"/>
@@ -3455,10 +3396,15 @@ 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="_8TIQ4JUHEeiYXO5wr78TUw" base_Element="_B1G2UDd_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: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"/>
@@ -3499,9 +3445,12 @@ The attached VDUs shall connect to the same internal VLD.&#xD;
   <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="_18lkYJdeEei-sOl6ywWHlg" base_Element="_MevNkJddEei-sOl6ywWHlg"/>
-  <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: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"/>
@@ -3569,9 +3518,15 @@ 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="_uFBX8PuHEeiYVshOvl6_ww"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_RayLofuIEeiYVshOvl6_ww" base_StructuralFeature="_RayLoPuIEeiYVshOvl6_ww"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_gUB30fuIEeiYVshOvl6_ww" base_StructuralFeature="_gUB30PuIEeiYVshOvl6_ww"/>
+  <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"/>
@@ -3583,9 +3538,6 @@ The attached VDUs shall connect to the same internal VLD.&#xD;
   <OpenModel_Profile:OpenModelAttribute xmi:id="_rBniMfxUEeijjKJn7OxwuQ" base_StructuralFeature="_rBniMPxUEeijjKJn7OxwuQ"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_rVW9kfxUEeijjKJn7OxwuQ" base_StructuralFeature="_rVW9kPxUEeijjKJn7OxwuQ"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_4r4bcA5rEemrJqq3q9vf6g" base_StructuralFeature="_4rzi8A5rEemrJqq3q9vf6g"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_DQC_8A57EemrJqq3q9vf6g" base_StructuralFeature="_DQCY4A57EemrJqq3q9vf6g"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_UWcDsA58EemrJqq3q9vf6g" base_StructuralFeature="_UWbcoA58EemrJqq3q9vf6g"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_gTpnIQ59EemrJqq3q9vf6g" base_StructuralFeature="_gTpnIA59EemrJqq3q9vf6g"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_nUxZ8RDBEemFz_A_9-IJMQ" base_StructuralFeature="_nUxZ8BDBEemFz_A_9-IJMQ"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_43vsARDCEemFz_A_9-IJMQ" base_StructuralFeature="_43vsABDCEemFz_A_9-IJMQ"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_jdpEoBhGEemuHZJuk7cVtw" base_StructuralFeature="_DTLDYj2sEeiu6I5JfRTxxQ"/>
@@ -3649,7 +3601,6 @@ The attached VDUs shall connect to the same internal VLD.&#xD;
   <OpenModel_Profile:PassedByReference xmi:id="_hPlFACo2EemZ-7haRVvogQ" base_Property="_MxzowjagEei23_xWdimG9w"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_NQ4FcCo3EemZ-7haRVvogQ" base_StructuralFeature="_NQ3eYCo3EemZ-7haRVvogQ"/>
   <OpenModel_Profile:Experimental xmi:id="_QfLYACo4EemZ-7haRVvogQ" base_Element="_NQ3eYCo3EemZ-7haRVvogQ"/>
-  <ActionLanguage:TextualRepresentation xmi:id="_kmLigCo4EemZ-7haRVvogQ" base_Comment="_kl9gECo4EemZ-7haRVvogQ" language="org.eclipse.papyrus.uml.textedit.property.xtext.UmlProperty"/>
   <OpenModel_Profile:Reference xmi:id="_8uslMCo5EemS0_wZSU3sbA" base_Element="_J0Zx0DOSEeiHat9KcP8uWA" reference="IFA011 v2.5.1"/>
   <OpenModel_Profile:OpenModelClass xmi:id="_u4E-MCo6EemS0_wZSU3sbA" base_Class="_u4EXICo6EemS0_wZSU3sbA"/>
   <OpenModel_Profile:Preliminary xmi:id="_6WjzsCo6EemS0_wZSU3sbA" base_Element="_u4EXICo6EemS0_wZSU3sbA"/>
@@ -3687,7 +3638,6 @@ The attached VDUs shall connect to the same internal VLD.&#xD;
   <OpenModel_Profile:OpenModelAttribute xmi:id="_fcJasSpFEemS0_wZSU3sbA" base_StructuralFeature="_fcJasCpFEemS0_wZSU3sbA"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_pEfN8CpFEemS0_wZSU3sbA" base_StructuralFeature="_pEem4CpFEemS0_wZSU3sbA"/>
   <OpenModel_Profile:PassedByReference xmi:id="_2kTpECpFEemS0_wZSU3sbA" base_Property="_pEem4CpFEemS0_wZSU3sbA"/>
-  <OpenModel_Profile:Reference xmi:id="_nEaXICpGEemS0_wZSU3sbA" base_Element="_AC2eIDQUEeixv_sLOod4lQ" reference="IFA011 v2.5.1"/>
   <OpenModel_Profile:Obsolete xmi:id="_yh6VMCpGEemS0_wZSU3sbA" base_Element="_aQl4oCpBEemS0_wZSU3sbA"/>
   <OpenModel_Profile:Experimental xmi:id="_3AyUQCpGEemS0_wZSU3sbA" base_Element="_iunqUCpAEemS0_wZSU3sbA"/>
   <OpenModel_Profile:Experimental xmi:id="_8rXRcCpGEemS0_wZSU3sbA" base_Element="_4oVvoCpAEemS0_wZSU3sbA"/>
@@ -3765,7 +3715,6 @@ The attached VDUs shall connect to the same internal VLD.&#xD;
   <OpenModel_Profile:Reference xmi:id="_o5LVsCvNEemS0_wZSU3sbA" base_Element="_lp6e4DatEei23_xWdimG9w" reference="IFA011 v2.5.1"/>
   <OpenModel_Profile:Reference xmi:id="_srGIICvNEemS0_wZSU3sbA" base_Element="_AJK9MDa0Eei23_xWdimG9w" reference="IFA011 v2.5.1"/>
   <OpenModel_Profile:Reference xmi:id="_xq1YkCvNEemS0_wZSU3sbA" base_Element="_tIZ6oDa2Eei23_xWdimG9w" reference="IFA011 v2.5.1"/>
-  <OpenModel_Profile:Reference xmi:id="_2s5kQCvNEemS0_wZSU3sbA" base_Element="_B1G2UDd_EeiIfPeSAqyGdQ" reference="IFA011 v2.5.1"/>
   <OpenModel_Profile:Reference xmi:id="_5dZV8CvNEemS0_wZSU3sbA" base_Element="_ZqQQ8DkIEeiWMf5FLWfdLA" reference="IFA011 v2.5.1"/>
   <OpenModel_Profile:Reference xmi:id="_8Si-ICvNEemS0_wZSU3sbA" base_Element="_iZQzADkJEeiWMf5FLWfdLA" reference="IFA011 v2.5.1"/>
   <OpenModel_Profile:Reference xmi:id="_AI0FECvOEemS0_wZSU3sbA" base_Element="_1HQGsDkKEeiWMf5FLWfdLA" reference="IFA011 v2.5.1"/>
@@ -3785,4 +3734,7 @@ The attached VDUs shall connect to the same internal VLD.&#xD;
   <OpenModel_Profile:Experimental xmi:id="_AsiyUCvQEemS0_wZSU3sbA" base_Element="_lIdLMivPEemS0_wZSU3sbA"/>
   <OpenModel_Profile:PassedByReference xmi:id="_DCFGUCvQEemS0_wZSU3sbA" base_Property="_lIdLMivPEemS0_wZSU3sbA"/>
   <OpenModel_Profile:Obsolete xmi:id="_GA4c8CvUEemS0_wZSU3sbA" base_Element="_X3eqgDTQEeiwQ6KPLHcy4g"/>
+  <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"/>
 </xmi:XMI>