Weekly integration work. See log.

Issue-ID: MODELING-104 Change-Id: Id0a1964a27aab13b3322c232b5f5c94b750877cb Signed-off-by: jjewitt58 <jessie.jewitt@oamtechnologies.com>
author: jjewitt58 <jessie.jewitt@oamtechnologies.com> 2018-08-24 09:37:26 -0700
committer: jjewitt58 <jessie.jewitt@oamtechnologies.com> 2018-08-24 09:37:26 -0700
commit: f9b03a06d7c827b4ef57106c00a262b79567b42f (patch)
tree: 4b09e443c5206d313f896933978063b82a2eff5b
parent: 30830bfb435e6ee3a1cdbf2b4be6b90464b7c90b (diff)
6 files changed, 727 insertions, 1348 deletions
diff --git a/papyrus/ONAP Information Model/Common.uml b/papyrus/ONAP Information Model/Common.uml
index 278c74c..5804e36 100644
--- a/papyrus/ONAP Information Model/Common.uml
+++ b/papyrus/ONAP Information Model/Common.uml
@@ -263,6 +263,84 @@ Note: the description of this class are different in ETSI GS NFV IFA 011 and ETS
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_GNeq4JddEei-sOl6ywWHlg" value="1"/>
         </ownedAttribute>
       </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>
+        </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">
+            <body>Identifier of this Cpd information element.&#xD;
+</body>
+          </ownedComment>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_lRLQ8Da8EeivvI-m1BaAbA" name="cpRole">
+          <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;
+For example a VNF with a tree flow pattern within the VNF will have legal cpRoles of ROOT and LEAF.&#xD;
+</body>
+          </ownedComment>
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_9HlFYDa8EeivvI-m1BaAbA"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_9HrMADa8EeivvI-m1BaAbA" value="1"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_luvWsDa8EeivvI-m1BaAbA" name="description">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_cEl9wEbwEei7eo5RdnNiBQ" annotatedElement="_luvWsDa8EeivvI-m1BaAbA">
+            <body>Provides human-readable information on the purpose of the CP (e.g. CP for control plane traffic).&#xD;
+</body>
+          </ownedComment>
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_-jjUIDa8EeivvI-m1BaAbA"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_-jozsDa8EeivvI-m1BaAbA" value="1"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_oWHBkDa8EeivvI-m1BaAbA" name="cpProtocol" type="_PjIasDa9EeivvI-m1BaAbA">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_eZqXsEbwEei7eo5RdnNiBQ" annotatedElement="_oWHBkDa8EeivvI-m1BaAbA">
+            <body>Identifies the protocol layering information the CP uses for connectivity purposes and associated information. There shall be one cpProtocol for each layer protocol as indicated by the attribute layerProtocol.&#xD;
+&#xD;
+Editor's note: the attribute &quot;layerProtocol&quot; still needs further discussion and not included in this table.&#xD;
+</body>
+          </ownedComment>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DooXkDa9EeivvI-m1BaAbA" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DospADa9EeivvI-m1BaAbA" value="*"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_pJTZEDa8EeivvI-m1BaAbA" name="trunkMode">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_gaoJ4EbwEei7eo5RdnNiBQ" annotatedElement="_pJTZEDa8EeivvI-m1BaAbA">
+            <body>Information about whether the CP instantiated from this CPD is in Trunk mode (802.1Q or other).&#xD;
+</body>
+          </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>
+          </ownedComment>
+          <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="_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>
+        </ownedComment>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_6g1tYDnBEeiWMf5FLWfdLA" name="groupId" type="_AuYtcDkBEeiWMf5FLWfdLA">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_6g1tYTnBEeiWMf5FLWfdLA" annotatedElement="_6g1tYDnBEeiWMf5FLWfdLA">
+            <body>Identifies an affinity or anti-affinity group to which the affinity or anti-affinity rule applies.&#xD;
+</body>
+          </ownedComment>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_6g3ikDnBEeiWMf5FLWfdLA" name="type" type="_tMoywDnJEeiWMf5FLWfdLA">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_6g3ikTnBEeiWMf5FLWfdLA" annotatedElement="_6g3ikDnBEeiWMf5FLWfdLA">
+            <body>Specifies whether the rule is an affinity rule or an anti-affinity rule.</body>
+          </ownedComment>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_6g4wsDnBEeiWMf5FLWfdLA" name="scope" type="_B3kJsDnKEeiWMf5FLWfdLA">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_6g4wsTnBEeiWMf5FLWfdLA" annotatedElement="_6g4wsDnBEeiWMf5FLWfdLA">
+            <body>Specifies the scope of the rule.</body>
+          </ownedComment>
+        </ownedAttribute>
+      </packagedElement>
     </packagedElement>
     <packagedElement xmi:type="uml:Package" xmi:id="_QVhWcDOHEei5Af8DcjrhIQ" name="Associations">
       <packagedElement xmi:type="uml:Association" xmi:id="_vV0jwES0EeiVGPeZpaYNtQ" name="VirtualLinkHasLinkPort" memberEnd="_vV1x4kS0EeiVGPeZpaYNtQ _vWZykES0EeiVGPeZpaYNtQ">
@@ -626,6 +704,92 @@ NOTE: The present document does not specify the means to declare different bitra
         <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_95b1UDnLEeiWMf5FLWfdLA" name="IPV6"/>
         <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="__bv8oDnLEeiWMf5FLWfdLA" name="PSEUDOWIRE"/>
       </packagedElement>
+      <packagedElement xmi:type="uml:DataType" xmi:id="_7hn1IDd1EeiIfPeSAqyGdQ" name="LocalAffinityOrAntiAffinityRule">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_20J6EGNfEeio9amveq0yWQ" annotatedElement="_7hn1IDd1EeiIfPeSAqyGdQ">
+          <body>The LocalAffinityOrAntiAffinityRule describes the affinity or anti-affinity rule applicable between the virtualization containers to be created based on a particular VDU, or between internal VLs to be created based on a particular VnfVirtualLinkDesc. &#xD;
+Per VNF, the affinity/anti-affinity rules defined using this information element, using the AffinityOrAntiAffinityGroup information element, and using the placement constraints in the GrantLifecycleOperation as defined in ETSI GS NFV IFA 007 [i.3] should be conflict-free. In case of conflicts, the placement constraints in the GrantLifecycleOperation shall take precedence. &#xD;
+</body>
+        </ownedComment>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_EjJgADd2EeiIfPeSAqyGdQ" name="type" type="_tMoywDnJEeiWMf5FLWfdLA">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_uoCBoDd3EeiIfPeSAqyGdQ" annotatedElement="_EjJgADd2EeiIfPeSAqyGdQ">
+            <body>Specifies whether the rule is an affinity rule or an anti-affinity rule.&#xD;
+</body>
+          </ownedComment>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_F5b9gDd2EeiIfPeSAqyGdQ" name="scope" type="_B3kJsDnKEeiWMf5FLWfdLA">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yop-cDd3EeiIfPeSAqyGdQ" annotatedElement="_F5b9gDd2EeiIfPeSAqyGdQ">
+            <body>Specifies the scope of the rule.</body>
+          </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="_PjIasDa9EeivvI-m1BaAbA" name="CpProtocolData">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_kSumQGNfEeio9amveq0yWQ" annotatedElement="_PjIasDa9EeivvI-m1BaAbA">
+          <body>A CpProtocolData information element describes and associates the protocol layer that a CP uses together with other protocol and connection point information.</body>
+        </ownedComment>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_oa2iMDa9EeivvI-m1BaAbA" name="associatedLayerProtocol" type="_tFQGcDnLEeiWMf5FLWfdLA">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_zWCdYDa9EeivvI-m1BaAbA" annotatedElement="_oa2iMDa9EeivvI-m1BaAbA">
+            <body>One of the values of the attribute layerProtocol of the Cpd IE.&#xD;
+</body>
+          </ownedComment>
+        </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>
+          </ownedComment>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_xOJj0Da9EeivvI-m1BaAbA"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xORfoDa9EeivvI-m1BaAbA" value="*"/>
+        </ownedAttribute>
+      </packagedElement>
+      <packagedElement xmi:type="uml:DataType" xmi:id="_2aIggDa9EeivvI-m1BaAbA" name="AddressData">
+        <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">
+          <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>
+          </ownedComment>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_BxokQDa-EeivvI-m1BaAbA" name="l2AddressData" type="_X9TdUDdPEeiIfPeSAqyGdQ">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_O8qjQDdPEeiIfPeSAqyGdQ" annotatedElement="_BxokQDa-EeivvI-m1BaAbA">
+            <body>Provides the information on the MAC addresses to be assigned to the CP(s) instantiated from the parent CPD.&#xD;
+Shall be present when the addressType is MAC address.</body>
+          </ownedComment>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_L3I8wDdPEeiIfPeSAqyGdQ"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_L3NOMDdPEeiIfPeSAqyGdQ" value="1"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_CUeLkDa-EeivvI-m1BaAbA" name="l3AddressData" type="_4oResDdPEeiIfPeSAqyGdQ">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_UN-r4DdPEeiIfPeSAqyGdQ" annotatedElement="_CUeLkDa-EeivvI-m1BaAbA">
+            <body>Provides the information on the IP addresses to be assigned to the CP instantiated from the parent CPD.&#xD;
+Shall be present when the addressType is IP address.</body>
+          </ownedComment>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_SKejEDdPEeiIfPeSAqyGdQ"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_SKiNcDdPEeiIfPeSAqyGdQ" value="1"/>
+        </ownedAttribute>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Enumeration" xmi:id="_tMoywDnJEeiWMf5FLWfdLA" name="RuleType">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_xofTADnJEeiWMf5FLWfdLA" annotatedElement="_tMoywDnJEeiWMf5FLWfdLA">
+          <body>Specifies the type of rule.</body>
+        </ownedComment>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_zZIKMDnJEeiWMf5FLWfdLA" name="AFFINITY"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_1qskMDnJEeiWMf5FLWfdLA" name="ANTI_AFFINITY"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Enumeration" xmi:id="_B3kJsDnKEeiWMf5FLWfdLA" name="RuleScope">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_F2zmcDnKEeiWMf5FLWfdLA" annotatedElement="_B3kJsDnKEeiWMf5FLWfdLA">
+          <body>Defines the scope of the rule.</body>
+        </ownedComment>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_IJCHwDnKEeiWMf5FLWfdLA" name="NFVI_POP"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_LgsnIDnKEeiWMf5FLWfdLA" name="ZONE"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ON-FsDnKEeiWMf5FLWfdLA" name="ZONE_GROUP"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_RUyssDnKEeiWMf5FLWfdLA" name="NFVI_NODE"/>
+      </packagedElement>
     </packagedElement>
     <packagedElement xmi:type="uml:Package" xmi:id="_mi5hgIbfEei-x_BD9U-ssQ" name="Event">
       <packagedElement xmi:type="uml:Package" xmi:id="_rmBdIIbfEei-x_BD9U-ssQ" name="EventObjectClasses">
@@ -3162,4 +3326,37 @@ Note: current data type (String) may be changed to Common Resource Datatype L3Ad
   <OpenModel_Profile:OpenModelAttribute xmi:id="_E2dKsacNEeiFp-jDq2Hw-A" base_StructuralFeature="_E2dKsKcNEeiFp-jDq2Hw-A"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_FgDhUacNEeiFp-jDq2Hw-A" base_StructuralFeature="_FgDhUKcNEeiFp-jDq2Hw-A"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_GHjmMacNEeiFp-jDq2Hw-A" base_StructuralFeature="_GHjmMKcNEeiFp-jDq2Hw-A"/>
+  <OpenModel_Profile:Preliminary xmi:id="_YOFpUKezEeixw5Ke5QD1pQ" base_Element="_VtzSoESyEeiVGPeZpaYNtQ"/>
+  <OpenModel_Profile:Preliminary xmi:id="_i11R0Ke4Eeixw5Ke5QD1pQ" base_Element="_Tw5PIES0EeiVGPeZpaYNtQ"/>
+  <OpenModel_Profile:Preliminary xmi:id="_nyvQsKe4Eeixw5Ke5QD1pQ" base_Element="_il0cAES0EeiVGPeZpaYNtQ"/>
+  <OpenModel_Profile:Preliminary xmi:id="_r54FMKe4Eeixw5Ke5QD1pQ" base_Element="_8naVoES0EeiVGPeZpaYNtQ"/>
+  <OpenModel_Profile:OpenModelClass xmi:id="_2J-cAKe4Eeixw5Ke5QD1pQ" base_Class="_7pUNEDa7EeivvI-m1BaAbA"/>
+  <OpenModel_Profile:OpenModelClass xmi:id="_3uaqQKe4Eeixw5Ke5QD1pQ" base_Class="_0AbUYDnBEeiWMf5FLWfdLA"/>
+  <OpenModel_Profile:Preliminary xmi:id="_6UO18Ke4Eeixw5Ke5QD1pQ" base_Element="_7pUNEDa7EeivvI-m1BaAbA"/>
+  <OpenModel_Profile:Preliminary xmi:id="_8jVx0Ke4Eeixw5Ke5QD1pQ" base_Element="_0AbUYDnBEeiWMf5FLWfdLA"/>
+  <OpenModel_Profile:Preliminary xmi:id="__h6bwKe4Eeixw5Ke5QD1pQ" base_Element="_AuYtcDkBEeiWMf5FLWfdLA"/>
+  <OpenModel_Profile:Preliminary xmi:id="_BU2ZAKe5Eeixw5Ke5QD1pQ" base_Element="_vxJ9ADafEei23_xWdimG9w"/>
+  <OpenModel_Profile:Preliminary xmi:id="_DMU4AKe5Eeixw5Ke5QD1pQ" base_Element="_z8XDAJQyEei6kI-JPNdeuw"/>
+  <OpenModel_Profile:Preliminary xmi:id="_Gv66kKe5Eeixw5Ke5QD1pQ" base_Element="_P-qXMD2vEeiu6I5JfRTxxQ"/>
+  <OpenModel_Profile:Preliminary xmi:id="_IbgSoKe5Eeixw5Ke5QD1pQ" base_Element="_RVZi0D2-Eeiu6I5JfRTxxQ"/>
+  <OpenModel_Profile:Preliminary xmi:id="_KERAMKe5Eeixw5Ke5QD1pQ" base_Element="_nPNHsD2-Eeiu6I5JfRTxxQ"/>
+  <OpenModel_Profile:Preliminary xmi:id="_LkXhAKe5Eeixw5Ke5QD1pQ" base_Element="_oXexoD2uEeiu6I5JfRTxxQ"/>
+  <OpenModel_Profile:Preliminary xmi:id="_NfABsKe5Eeixw5Ke5QD1pQ" base_Element="_YQwQ0D0NEeiWMf5FLWfdLA"/>
+  <OpenModel_Profile:Preliminary xmi:id="_Pib5EKe5Eeixw5Ke5QD1pQ" base_Element="_8dlAoD0TEeiWMf5FLWfdLA"/>
+  <OpenModel_Profile:Preliminary xmi:id="_RcSWoKe5Eeixw5Ke5QD1pQ" base_Element="_8rNJgD2uEeiu6I5JfRTxxQ"/>
+  <OpenModel_Profile:Preliminary xmi:id="_TCEosKe5Eeixw5Ke5QD1pQ" base_Element="_p3EKoDm0EeiWMf5FLWfdLA"/>
+  <OpenModel_Profile:Preliminary xmi:id="_VA9-UKe5Eeixw5Ke5QD1pQ" base_Element="_2x4t0InuEeiOe-BKGdv_Yg"/>
+  <OpenModel_Profile:Preliminary xmi:id="_W4FQ8Ke5Eeixw5Ke5QD1pQ" base_Element="_ImxsgDeBEeiIfPeSAqyGdQ"/>
+  <OpenModel_Profile:Preliminary xmi:id="_YkfvcKe5Eeixw5Ke5QD1pQ" base_Element="_4oResDdPEeiIfPeSAqyGdQ"/>
+  <OpenModel_Profile:Preliminary xmi:id="_alnSoKe5Eeixw5Ke5QD1pQ" base_Element="_X9TdUDdPEeiIfPeSAqyGdQ"/>
+  <OpenModel_Profile:Preliminary xmi:id="_clBloKe5Eeixw5Ke5QD1pQ" base_Element="_Dg2QIJaaEeiGg_moIHe9Sw"/>
+  <OpenModel_Profile:Preliminary xmi:id="_eMQpMKe5Eeixw5Ke5QD1pQ" base_Element="_W7iKYJaeEeiGg_moIHe9Sw"/>
+  <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"/>
+  <OpenModel_Profile:Preliminary xmi:id="_t0PDoKe5Eeixw5Ke5QD1pQ" base_Element="_B3kJsDnKEeiWMf5FLWfdLA"/>
 </xmi:XMI>
diff --git a/papyrus/ONAP Information Model/Integration/Integration Log.xlsx b/papyrus/ONAP Information Model/Integration/Integration Log.xlsx
new file mode 100644
index 0000000..baab645
--- /dev/null
+++ b/papyrus/ONAP Information Model/Integration/Integration Log.xlsx
diff --git a/papyrus/ONAP Information Model/Resource.uml b/papyrus/ONAP Information Model/Resource.uml
index d63ce19..e8711bc 100644
--- a/papyrus/ONAP Information Model/Resource.uml
+++ b/papyrus/ONAP Information Model/Resource.uml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:OpenModel_Profile="http:///schemas/OpenModel_Profile/_zWCisKVxEeikF6xsfT18UA/26" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http:///schemas/OpenModel_Profile/_zWCisKVxEeikF6xsfT18UA/26 OpenModel_Profile.profile.uml#_zWYg8KVxEeikF6xsfT18UA">
+<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:OpenModel_Profile="http:///schemas/OpenModel_Profile/_zWCisKVxEeikF6xsfT18UA/26" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http:///schemas/OpenModel_Profile/_zWCisKVxEeikF6xsfT18UA/26 OpenModel_Profile.profile.uml#_zWYg8KVxEeikF6xsfT18UA">
   <uml:Package xmi:id="_jh99MDOHEei5Af8DcjrhIQ" name="Resource">
     <packagedElement xmi:type="uml:Package" xmi:id="_lK97UDOHEei5Af8DcjrhIQ" name="Associations"/>
     <packagedElement xmi:type="uml:Package" xmi:id="_lK-iYDOHEei5Af8DcjrhIQ" name="Diagrams"/>
@@ -214,7 +214,7 @@ NOTE: Every VNF, VL and nested NS whose descriptor is referenced by the NS DF sh
           <ownedComment xmi:type="uml:Comment" xmi:id="_cByPsEPiEeiVGPeZpaYNtQ" annotatedElement="_actGkj2zEeiu6I5JfRTxxQ">
             <body>Specifies affinity or anti-affinity relationship applicable between the VNF instances created using different VNFDs, the Virtual Link instances created using different NsVirtualLinkDescs or the nested NS instances created using different NSDs in the same affinity or anti-affinity group.</body>
           </ownedComment>
-          <type xmi:type="uml:Class" href="Vnf.uml#_0AbUYDnBEeiWMf5FLWfdLA"/>
+          <type xmi:type="uml:Class" href="Common.uml#_0AbUYDnBEeiWMf5FLWfdLA"/>
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_acvi0D2zEeiu6I5JfRTxxQ"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_acwJ4D2zEeiu6I5JfRTxxQ" value="*"/>
           <association xmi:type="uml:Association" href="Service.uml#_acr4cD2zEeiu6I5JfRTxxQ"/>
@@ -337,7 +337,7 @@ NOTE 2: The presence of a VNFD or PNFD identifier in a VNFFGD does not imply tha
           <body>The SAPD class specifies the information used to instantiate the service access points of an NS. A Sapd inherits from the Cpd class. All attributes of the Cpd are also attributes of the Sapd.</body>
         </ownedComment>
         <generalization xmi:type="uml:Generalization" xmi:id="_TsplgD2nEeiu6I5JfRTxxQ">
-          <general xmi:type="uml:Class" href="Vnf.uml#_7pUNEDa7EeivvI-m1BaAbA"/>
+          <general xmi:type="uml:Class" href="Common.uml#_7pUNEDa7EeivvI-m1BaAbA"/>
         </generalization>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_45TagzzEEeiWMf5FLWfdLA" name="sapAddressAssignment">
           <ownedComment xmi:type="uml:Comment" xmi:id="_45TahDzEEeiWMf5FLWfdLA" annotatedElement="_45TagzzEEeiWMf5FLWfdLA">
@@ -350,7 +350,7 @@ If it is set to True, management and orchestration functions are responsible for
           <ownedComment xmi:type="uml:Comment" xmi:id="_45TahjzEEeiWMf5FLWfdLA" annotatedElement="_45TahTzEEeiWMf5FLWfdLA">
             <body>References the descriptor of VNF or PNF external connection points the SAPs instantiated from this SAPD are mapped to. </body>
           </ownedComment>
-          <type xmi:type="uml:Class" href="Vnf.uml#_7pUNEDa7EeivvI-m1BaAbA"/>
+          <type xmi:type="uml:Class" href="Common.uml#_7pUNEDa7EeivvI-m1BaAbA"/>
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_45TahzzEEeiWMf5FLWfdLA"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_45TaiDzEEeiWMf5FLWfdLA" value="1"/>
         </ownedAttribute>
@@ -366,11 +366,14 @@ If it is set to True, management and orchestration functions are responsible for
         <ownedComment xmi:type="uml:Comment" xmi:id="_13TCETzEEeiWMf5FLWfdLA" annotatedElement="_13TCEDzEEeiWMf5FLWfdLA">
           <body>The Pnfd class is a deployment template enabling on-boarding PNFs and referencing them from an NSD. It focuses on connectivity aspects only.</body>
         </ownedComment>
+        <generalization xmi:type="uml:Generalization" xmi:id="_lh0B0Ke2Eeixw5Ke5QD1pQ">
+          <general xmi:type="uml:Class" href="Vnf.uml#_O385oJssEeiPBvbfaqSLYg"/>
+        </generalization>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_13TCEjzEEeiWMf5FLWfdLA" name="pnfdId">
           <ownedComment xmi:type="uml:Comment" xmi:id="_13TCEzzEEeiWMf5FLWfdLA" annotatedElement="_13TCEjzEEeiWMf5FLWfdLA">
             <body>Identifier of this Pnfd class. It uniquely identifies the PNFD.</body>
           </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="../NfvInformationModel/NfvModel.uml#_ijP2UEDOEeW6nNR00wt2vw"/>
+          <type xmi:type="uml:DataType" href="Common.uml#_AuYtcDkBEeiWMf5FLWfdLA"/>
         </ownedAttribute>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_13TCFDzEEeiWMf5FLWfdLA" name="provider">
           <ownedComment xmi:type="uml:Comment" xmi:id="_13TCFTzEEeiWMf5FLWfdLA" annotatedElement="_13TCFDzEEeiWMf5FLWfdLA">
@@ -383,25 +386,33 @@ NOTE: 	The provider of the PNFD might be different from the provider of the PNF.
           <ownedComment xmi:type="uml:Comment" xmi:id="_13TCFzzEEeiWMf5FLWfdLA" annotatedElement="_13TCFjzEEeiWMf5FLWfdLA">
             <body>Identifies the version of the PNFD</body>
           </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="../NfvInformationModel/NfvModel.uml#_J90d8Jy-EeWdBv9DVHQu3Q"/>
+          <type xmi:type="uml:PrimitiveType" href="Common.uml#_oXexoD2uEeiu6I5JfRTxxQ"/>
         </ownedAttribute>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_13TCGDzEEeiWMf5FLWfdLA" name="security">
           <ownedComment xmi:type="uml:Comment" xmi:id="_13TCGTzEEeiWMf5FLWfdLA" annotatedElement="_13TCGDzEEeiWMf5FLWfdLA">
             <body>Provides a signature to prevent tampering.</body>
           </ownedComment>
-          <type xmi:type="uml:DataType" href="../NfvInformationModel/NfvModel.uml#_yS45sJy9EeWdBv9DVHQu3Q"/>
+          <type xmi:type="uml:DataType" href="Common.uml#_P-qXMD2vEeiu6I5JfRTxxQ"/>
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_13TCGjzEEeiWMf5FLWfdLA"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_13TCGzzEEeiWMf5FLWfdLA" value="1"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_13TCHDzEEeiWMf5FLWfdLA" name="pnfExtCpd " aggregation="composite">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_13TCHDzEEeiWMf5FLWfdLA" name="pnfExtCpd " type="_bd53ADzFEeiWMf5FLWfdLA" aggregation="composite">
           <ownedComment xmi:type="uml:Comment" xmi:id="_13TCHTzEEeiWMf5FLWfdLA" annotatedElement="_13TCHDzEEeiWMf5FLWfdLA">
             <body>Specifies the characteristics of one or more connection points where to connect the PNF to a VL.</body>
           </ownedComment>
-          <type xmi:type="uml:Class" href="Service.uml#_bd53ADzFEeiWMf5FLWfdLA"/>
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_13TCHjzEEeiWMf5FLWfdLA" value="1"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_13TCHzzEEeiWMf5FLWfdLA" value="*"/>
         </ownedAttribute>
       </packagedElement>
+      <packagedElement xmi:type="uml:Class" xmi:id="_bd53ADzFEeiWMf5FLWfdLA" name="PnfExtCpd ">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_bd53ATzFEeiWMf5FLWfdLA" annotatedElement="_bd53ADzFEeiWMf5FLWfdLA">
+          <body>A PnfExtCpd is a type of Cpd and describes the characteristics of an external interface, a.k.a external CP, where to connect the PNF to a VL. &#xD;
+A PnfExtCpd inherits from the Cpd Class.</body>
+        </ownedComment>
+        <generalization xmi:type="uml:Generalization" xmi:id="_wyByMEPnEeiVGPeZpaYNtQ">
+          <general xmi:type="uml:Class" href="Common.uml#_7pUNEDa7EeivvI-m1BaAbA"/>
+        </generalization>
+      </packagedElement>
     </packagedElement>
     <packagedElement xmi:type="uml:Package" xmi:id="_lK_JcTOHEei5Af8DcjrhIQ" name="TypeDefinitions">
       <packagedElement xmi:type="uml:DataType" xmi:id="_kEaPVjzEEeiWMf5FLWfdLA" name="NsLifeCycleManagementScript">
@@ -505,6 +516,12 @@ One and only one of the attributes shall be included (i.e. there is a XOR relati
         </ownedAttribute>
       </packagedElement>
     </packagedElement>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_nRfaQKe3Eeixw5Ke5QD1pQ">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_nSCM0Ke3Eeixw5Ke5QD1pQ" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="OpenModel_Profile.profile.uml#_zWYg8KVxEeikF6xsfT18UA"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="OpenModel_Profile.profile.uml#_m1xqsHBgEd6FKu9XX1078A"/>
+    </profileApplication>
   </uml:Package>
   <OpenModel_Profile:Preliminary xmi:id="_B4awgKZCEeixw5Ke5QD1pQ" base_Element="_CE1gEKY7Eeixw5Ke5QD1pQ"/>
   <OpenModel_Profile:Preliminary xmi:id="_PnCKsKZEEeixw5Ke5QD1pQ" base_Element="_JDB-oj2rEeiu6I5JfRTxxQ"/>
diff --git a/papyrus/ONAP Information Model/Service.uml b/papyrus/ONAP Information Model/Service.uml
index 6461a96..4370dfa 100644
--- a/papyrus/ONAP Information Model/Service.uml
+++ b/papyrus/ONAP Information Model/Service.uml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:OpenModel_Profile="http:///schemas/OpenModel_Profile/_zWCisKVxEeikF6xsfT18UA/26" xmlns:OpenModel_Profile_1="http:///schemas/OpenModel_Profile/_JpOasIJYEee3epvelL_xvA/25" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http:///schemas/OpenModel_Profile/_zWCisKVxEeikF6xsfT18UA/26 OpenModel_Profile.profile.uml#_zWYg8KVxEeikF6xsfT18UA http:///schemas/OpenModel_Profile/_JpOasIJYEee3epvelL_xvA/25 OpenModel_Profile.profile.uml#_JpVIYIJYEee3epvelL_xvA">
+<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:OpenModel_Profile="http:///schemas/OpenModel_Profile/_zWCisKVxEeikF6xsfT18UA/26" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http:///schemas/OpenModel_Profile/_zWCisKVxEeikF6xsfT18UA/26 OpenModel_Profile.profile.uml#_zWYg8KVxEeikF6xsfT18UA">
   <uml:Package xmi:id="_Z4LYcDOHEei5Af8DcjrhIQ" name="Service">
     <packagedElement xmi:type="uml:Package" xmi:id="_fXMl4DOHEei5Af8DcjrhIQ" name="Associations">
       <packagedElement xmi:type="uml:Association" xmi:id="_qK6eYD0PEeiWMf5FLWfdLA" name="ServiceComprisedOf" memberEnd="_qK86oD0PEeiWMf5FLWfdLA _qK_W4D0PEeiWMf5FLWfdLA">
@@ -602,7 +602,6 @@ If null, then represents to the end of time&#xD;
           <ownedComment xmi:type="uml:Comment" xmi:id="_13eBMzzEEeiWMf5FLWfdLA" annotatedElement="_13eBMjzEEeiWMf5FLWfdLA">
             <body>Identifies this nfpd class within a VNFFGD.</body>
           </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="../NfvInformationModel/NfvModel.uml#_ijP2UEDOEeW6nNR00wt2vw"/>
         </ownedAttribute>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_13eBNDzEEeiWMf5FLWfdLA" name="nfpRule">
           <ownedComment xmi:type="uml:Comment" xmi:id="_13eBNTzEEeiWMf5FLWfdLA" annotatedElement="_13eBNDzEEeiWMf5FLWfdLA">
@@ -610,18 +609,12 @@ If null, then represents to the end of time&#xD;
 The rule may be expressed as a criteria constructed out of atomic assertions linked by Boolean operators AND, OR and NOT. &#xD;
 NOTE: 	Examples of atomic assertions are assertions on packet header fields’ values, date and time ranges, etc.</body>
           </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="../NfvInformationModel/NfvModel.uml#_X0O7MEY6EeWVsKu18RjDQg"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_13eBNjzEEeiWMf5FLWfdLA"/>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_13eBNzzEEeiWMf5FLWfdLA" value="1"/>
         </ownedAttribute>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_13eBODzEEeiWMf5FLWfdLA" name="cpd">
           <ownedComment xmi:type="uml:Comment" xmi:id="_13eBOTzEEeiWMf5FLWfdLA" annotatedElement="_13eBODzEEeiWMf5FLWfdLA">
             <body>References the descriptor of a connection point to be traversed by the traffic flows matching the criteria. This shall be a connection point attached to one of the constituent VNFs and PNFs of the parent VNFFG, or a SAP of one of the constituent nested NSs of the parent VNFFG.&#xD;
 NOTE: 	When multiple values are provided, the order is significant and specifies the sequence of connection points to be traversed.</body>
           </ownedComment>
-          <type xmi:type="uml:Class" href="../NfvInformationModel/NfvModel.uml#_RzYd-pHCEeWkU9xzYCztUg"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_13eBOjzEEeiWMf5FLWfdLA" value="1"/>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_13eBOzzEEeiWMf5FLWfdLA" value="*"/>
         </ownedAttribute>
       </packagedElement>
       <packagedElement xmi:type="uml:Class" xmi:id="_45XE4DzEEeiWMf5FLWfdLA" name="VnfProfile">
@@ -669,9 +662,6 @@ If not present, the default instantiation level as declared in the VNFD shall be
             <body>Identifier(s) of the affinity or anti-affinity group(s) the VnfProfile belongs to. &#xD;
 NOTE: Each identifier references an affinity or anti-affinity group which expresses affinity or anti-affinity relationships between the VNF instance(s) created using this VnfProfile and the VNF instance(s) created using other VnfProfile(s) in the same group.</body>
           </ownedComment>
-          <type xmi:type="uml:Class" href="../NfvInformationModel/NfvModel.uml#_cUN-oATWEea-RJOoE5lL-w"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_45XE-TzEEeiWMf5FLWfdLA"/>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_45XE-jzEEeiWMf5FLWfdLA" value="*"/>
         </ownedAttribute>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_45XE-zzEEeiWMf5FLWfdLA" name="nsVirtualLinkConnectivity" type="_kEZorTzEEeiWMf5FLWfdLA">
           <ownedComment xmi:type="uml:Comment" xmi:id="_45XE_DzEEeiWMf5FLWfdLA" annotatedElement="_45XE-zzEEeiWMf5FLWfdLA">
@@ -726,7 +716,7 @@ NOTE: Each identifier references an affinity or anti-affinity group which expres
             <body>Identifies an affinity or anti-affinity group the VLs instantiated according to the VlProfile belong to. &#xD;
 NOTE : 	Each identifier references an affinity or anti-affinity group which expresses affinity or anti-affinity relationship between the VL(s) using this VirtualLinkProfile and the VL(s) using other VirtualLinkProfile(s) in the same group.</body>
           </ownedComment>
-          <type xmi:type="uml:Class" href="Vnf.uml#_0AbUYDnBEeiWMf5FLWfdLA"/>
+          <type xmi:type="uml:Class" href="Common.uml#_0AbUYDnBEeiWMf5FLWfdLA"/>
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_45bWXDzEEeiWMf5FLWfdLA"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_45bWXTzEEeiWMf5FLWfdLA" value="*"/>
         </ownedAttribute>
@@ -869,7 +859,7 @@ NS levels may be used in the context of NS scaling and in this case they are ref
           <ownedComment xmi:type="uml:Comment" xmi:id="_GY8PfjzFEeiWMf5FLWfdLA" annotatedElement="_GY8PfTzFEeiWMf5FLWfdLA">
             <body>Identifies an affinity or anti-affinity group the NSs created according to this NsProfile belong to. </body>
           </ownedComment>
-          <type xmi:type="uml:Class" href="Vnf.uml#_0AbUYDnBEeiWMf5FLWfdLA"/>
+          <type xmi:type="uml:Class" href="Common.uml#_0AbUYDnBEeiWMf5FLWfdLA"/>
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_GY8PfzzFEeiWMf5FLWfdLA"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_GY8PgDzFEeiWMf5FLWfdLA" value="*"/>
         </ownedAttribute>
@@ -1006,15 +996,11 @@ NOTE: Cardinality of zero is only valid for a non-instantiated NS.&#xD;
           <ownedComment xmi:type="uml:Comment" xmi:id="_1WdwczzFEeiWMf5FLWfdLA" annotatedElement="_1WdwcjzFEeiWMf5FLWfdLA">
             <body>Identier of this Vnffg class.</body>
           </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="../NfvInformationModel/NfvModel.uml#_ijP2UEDOEeW6nNR00wt2vw"/>
         </ownedAttribute>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_1WdwdDzFEeiWMf5FLWfdLA" name="nfId">
           <ownedComment xmi:type="uml:Comment" xmi:id="_1WdwdTzFEeiWMf5FLWfdLA" annotatedElement="_1WdwdDzFEeiWMf5FLWfdLA">
             <body>Identifier of the constituent NFs of the VNFFG</body>
           </ownedComment>
-          <type xmi:type="uml:Class" href="../NfvInformationModel/NfvModel.uml#_ab2ZVIPEEeWwYYWsl-GrVw"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_1WdwdjzFEeiWMf5FLWfdLA" value="1"/>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1WdwdzzFEeiWMf5FLWfdLA" value="*"/>
         </ownedAttribute>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_1WdweDzFEeiWMf5FLWfdLA" name="virtualLinkId">
           <ownedComment xmi:type="uml:Comment" xmi:id="_1WdweTzFEeiWMf5FLWfdLA" annotatedElement="_1WdweDzFEeiWMf5FLWfdLA">
@@ -1028,17 +1014,11 @@ NOTE: Cardinality of zero is only valid for a non-instantiated NS.&#xD;
             <body>Identifiers of the CP instances attached to the constituent VNFs and PNFs or the sap instances of the VNFFG.&#xD;
 NOTE: It indicates an exhaustive list of all the CP instances and SAP instances of the VNFFG.</body>
           </ownedComment>
-          <type xmi:type="uml:Class" href="../NfvInformationModel/NfvModel.uml#_2T5FQIkaEeW19aRC6Vd4Hg"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_1WeXgzzFEeiWMf5FLWfdLA" value="1"/>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1WeXhDzFEeiWMf5FLWfdLA" value="*"/>
         </ownedAttribute>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_1WeXhTzFEeiWMf5FLWfdLA" name="nfp" aggregation="composite">
           <ownedComment xmi:type="uml:Comment" xmi:id="_1WeXhjzFEeiWMf5FLWfdLA" annotatedElement="_1WeXhTzFEeiWMf5FLWfdLA">
             <body>Information on the NFPs of this VNFFG. </body>
           </ownedComment>
-          <type xmi:type="uml:Class" href="../NfvInformationModel/NfvModel.uml#_fyAisEsfEeWcHrzD5qesGA"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_1WeXhzzFEeiWMf5FLWfdLA" value="1"/>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1WeXiDzFEeiWMf5FLWfdLA" value="*"/>
         </ownedAttribute>
       </packagedElement>
       <packagedElement xmi:type="uml:Class" xmi:id="_6GPSQDzFEeiWMf5FLWfdLA" name="NsVirtualLink">
@@ -1052,18 +1032,12 @@ NOTE: It indicates an exhaustive list of all the CP instances and SAP instances
           <ownedComment xmi:type="uml:Comment" xmi:id="_6GPSRDzFEeiWMf5FLWfdLA" annotatedElement="_6GPSQzzFEeiWMf5FLWfdLA">
             <body>Virtualised network resource(s) realizing this VL.</body>
           </ownedComment>
-          <type xmi:type="uml:Class" href="../NfvInformationModel/NfvModel.uml#_eagakGUFEeWlAMAFzEXAIw"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_6GPSRTzFEeiWMf5FLWfdLA"/>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_6GPSRjzFEeiWMf5FLWfdLA" value="*"/>
         </ownedAttribute>
       </packagedElement>
       <packagedElement xmi:type="uml:Class" xmi:id="_BJMXoDzGEeiWMf5FLWfdLA" name="NsLinkPort">
         <ownedComment xmi:type="uml:Comment" xmi:id="_BJMXoTzGEeiWMf5FLWfdLA" annotatedElement="_BJMXoDzGEeiWMf5FLWfdLA">
           <body>Respresents the port of a NS VL. </body>
         </ownedComment>
-        <generalization xmi:type="uml:Generalization" xmi:id="_BJMXojzGEeiWMf5FLWfdLA">
-          <general xmi:type="uml:Class" href="../NfvInformationModel/NfvModel.uml#_vA-lYBbBEeazLP0woFFIFw"/>
-        </generalization>
       </packagedElement>
       <packagedElement xmi:type="uml:Class" xmi:id="_Jvy-QD0MEeiWMf5FLWfdLA" name="ServiceDescriptor">
         <ownedComment xmi:type="uml:Comment" xmi:id="_R35GwD0MEeiWMf5FLWfdLA" annotatedElement="_Jvy-QD0MEeiWMf5FLWfdLA">
@@ -1485,7 +1459,6 @@ NOTE: It indicates an exhaustive list of all the CP instances and SAP instances
           <ownedComment xmi:type="uml:Comment" xmi:id="_6GUx1DzFEeiWMf5FLWfdLA" annotatedElement="_6GUx0zzFEeiWMf5FLWfdLA">
             <body>Cpd used to deploy this PNF CP.</body>
           </ownedComment>
-          <type xmi:type="uml:Class" href="../NfvInformationModel/NfvModel.uml#_RzYd-pHCEeWkU9xzYCztUg"/>
         </ownedAttribute>
       </packagedElement>
       <packagedElement xmi:type="uml:Class" xmi:id="_GYYOwDzFEeiWMf5FLWfdLA" name="PnfProfile">
@@ -1507,15 +1480,6 @@ NOTE: It indicates an exhaustive list of all the CP instances and SAP instances
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_GYYOxzzFEeiWMf5FLWfdLA" value="*"/>
         </ownedAttribute>
       </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_bd53ADzFEeiWMf5FLWfdLA" name="PnfExtCpd ">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_bd53ATzFEeiWMf5FLWfdLA" annotatedElement="_bd53ADzFEeiWMf5FLWfdLA">
-          <body>A PnfExtCpd is a type of Cpd and describes the characteristics of an external interface, a.k.a external CP, where to connect the PNF to a VL. &#xD;
-A PnfExtCpd inherits from the Cpd Class.</body>
-        </ownedComment>
-        <generalization xmi:type="uml:Generalization" xmi:id="_wyByMEPnEeiVGPeZpaYNtQ">
-          <general xmi:type="uml:Class" href="Vnf.uml#_7pUNEDa7EeivvI-m1BaAbA"/>
-        </generalization>
-      </packagedElement>
     </packagedElement>
     <packagedElement xmi:type="uml:Package" xmi:id="_fXObEDOHEei5Af8DcjrhIQ" name="TypeDefinitions">
       <packagedElement xmi:type="uml:DataType" xmi:id="_kEZoUjzEEeiWMf5FLWfdLA" name="VnfIndicatorData">
@@ -1526,13 +1490,11 @@ A PnfExtCpd inherits from the Cpd Class.</body>
           <ownedComment xmi:type="uml:Comment" xmi:id="_kEZoVTzEEeiWMf5FLWfdLA" annotatedElement="_kEZoVDzEEeiWMf5FLWfdLA">
             <body>Identifies a VNFD.</body>
           </ownedComment>
-          <type xmi:type="uml:Class" href="../NfvInformationModel/NfvModel.uml#_acIs8YPEEeWwYYWsl-GrVw"/>
         </ownedAttribute>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_kEZoVjzEEeiWMf5FLWfdLA" name="vnfIndicator">
           <ownedComment xmi:type="uml:Comment" xmi:id="_kEZoVzzEEeiWMf5FLWfdLA" annotatedElement="_kEZoVjzEEeiWMf5FLWfdLA">
             <body>Identifies a VNF indicator within the VNFD.</body>
           </ownedComment>
-          <type xmi:type="uml:Class" href="../NfvInformationModel/NfvModel.uml#_3b-mMATCEea-RJOoE5lL-w"/>
         </ownedAttribute>
       </packagedElement>
       <packagedElement xmi:type="uml:DataType" xmi:id="_kEZorTzEEeiWMf5FLWfdLA" name="NsVirtualLinkConnectivity">
@@ -1548,9 +1510,6 @@ A PnfExtCpd inherits from the Cpd Class.</body>
           <ownedComment xmi:type="uml:Comment" xmi:id="_kEZosjzEEeiWMf5FLWfdLA" annotatedElement="_kEZosTzEEeiWMf5FLWfdLA">
             <body>References the descriptor of a connection point on a VNF/PNF or a SAP which connects to virtual links instantiated from the profile identified in the virtualLinkProfileId attribute.</body>
           </ownedComment>
-          <type xmi:type="uml:Class" href="../NfvInformationModel/NfvModel.uml#_RzYd-pHCEeWkU9xzYCztUg"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_kEZoszzEEeiWMf5FLWfdLA" value="1"/>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_kEZotDzEEeiWMf5FLWfdLA" value="*"/>
         </ownedAttribute>
       </packagedElement>
       <packagedElement xmi:type="uml:DataType" xmi:id="_kEZowTzEEeiWMf5FLWfdLA" name="VnfToLevelMapping">
@@ -1586,7 +1545,6 @@ NOTE 3: 	When the corresponding NS level is used in the context of NS scaling, t
             <body>Specifies the bit rate requirements for the NS level.&#xD;
 NOTE: 	It shall be in the range of minBitrateRequirements - maxBitrateRequirements, as specified in the referenced VirtualLinkProfile.</body>
           </ownedComment>
-          <type xmi:type="uml:DataType" href="../NfvInformationModel/NfvModel.uml#_KdoUYATSEea-RJOoE5lL-w"/>
         </ownedAttribute>
       </packagedElement>
       <packagedElement xmi:type="uml:DataType" xmi:id="_kEZozTzEEeiWMf5FLWfdLA" name="NsToLevelMapping">
@@ -1628,21 +1586,21 @@ NOTE 3: 	When the corresponding NS level is used in the context of NS scaling, t
       <appliedProfile xmi:type="uml:Profile" href="OpenModel_Profile.profile.uml#_m1xqsHBgEd6FKu9XX1078A"/>
     </profileApplication>
   </uml:Package>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_evD4gKbuEeixw5Ke5QD1pQ">
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_n0q_0Ke3Eeixw5Ke5QD1pQ">
     <base_StructuralFeature xmi:type="uml:Property" href="Resource.uml#_kEZBozzEEeiWMf5FLWfdLA"/>
   </OpenModel_Profile:OpenModelAttribute>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_evEfkKbuEeixw5Ke5QD1pQ">
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_n0wfYKe3Eeixw5Ke5QD1pQ">
     <base_StructuralFeature xmi:type="uml:Property" href="Resource.uml#_kEZBpTzEEeiWMf5FLWfdLA"/>
   </OpenModel_Profile:OpenModelAttribute>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_evFGoKbuEeixw5Ke5QD1pQ">
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_n01X4Ke3Eeixw5Ke5QD1pQ">
     <base_StructuralFeature xmi:type="uml:Property" href="Resource.uml#_kEZBqTzEEeiWMf5FLWfdLA"/>
   </OpenModel_Profile:OpenModelAttribute>
   <OpenModel_Profile:OpenModelClass xmi:id="_kFsosTzEEeiWMf5FLWfdLA" base_Class="_kEZB9jzEEeiWMf5FLWfdLA"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_kFsosjzEEeiWMf5FLWfdLA" base_StructuralFeature="_kEZB-DzEEeiWMf5FLWfdLA"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_evG70KbuEeixw5Ke5QD1pQ">
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_n1A-EKe3Eeixw5Ke5QD1pQ">
     <base_StructuralFeature xmi:type="uml:Property" href="Resource.uml#_kEZoSjzEEeiWMf5FLWfdLA"/>
   </OpenModel_Profile:OpenModelAttribute>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_evHi4KbuEeixw5Ke5QD1pQ">
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_n1F2kKe3Eeixw5Ke5QD1pQ">
     <base_StructuralFeature xmi:type="uml:Property" href="Resource.uml#_kEZoTjzEEeiWMf5FLWfdLA"/>
   </OpenModel_Profile:OpenModelAttribute>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_kFvsADzEEeiWMf5FLWfdLA" base_StructuralFeature="_kEZoVDzEEeiWMf5FLWfdLA"/>
@@ -1655,107 +1613,107 @@ NOTE 3: 	When the corresponding NS level is used in the context of NS scaling, t
   <OpenModel_Profile:OpenModelAttribute xmi:id="_kGTssjzEEeiWMf5FLWfdLA" base_StructuralFeature="_kEZoyzzEEeiWMf5FLWfdLA"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_kGTsszzEEeiWMf5FLWfdLA" base_StructuralFeature="_kEZozzzEEeiWMf5FLWfdLA"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_kGUTwDzEEeiWMf5FLWfdLA" base_StructuralFeature="_kEZo0TzEEeiWMf5FLWfdLA"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_evFtsabuEeixw5Ke5QD1pQ">
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_n063cKe3Eeixw5Ke5QD1pQ">
     <base_StructuralFeature xmi:type="uml:Property" href="Resource.uml#_kEZo-zzEEeiWMf5FLWfdLA"/>
   </OpenModel_Profile:OpenModelAttribute>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_evCDUKbuEeixw5Ke5QD1pQ">
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_n0jrEKe3Eeixw5Ke5QD1pQ">
     <base_StructuralFeature xmi:type="uml:Property" href="Resource.uml#_kEaPWDzEEeiWMf5FLWfdLA"/>
   </OpenModel_Profile:OpenModelAttribute>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_evCqYKbuEeixw5Ke5QD1pQ">
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_n0nVcKe3Eeixw5Ke5QD1pQ">
     <base_StructuralFeature xmi:type="uml:Property" href="Resource.uml#_kEaPXDzEEeiWMf5FLWfdLA"/>
   </OpenModel_Profile:OpenModelAttribute>
-  <OpenModel_Profile:OpenModelClass xmi:id="_eunMkKbuEeixw5Ke5QD1pQ">
+  <OpenModel_Profile:OpenModelClass xmi:id="_nSCz4Ke3Eeixw5Ke5QD1pQ">
     <base_Class xmi:type="uml:Class" href="Resource.uml#_13KfMDzEEeiWMf5FLWfdLA"/>
   </OpenModel_Profile:OpenModelClass>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_eupo0KbuEeixw5Ke5QD1pQ" isInvariant="true">
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_ntW24Ke3Eeixw5Ke5QD1pQ" isInvariant="true">
     <base_StructuralFeature xmi:type="uml:Property" href="Resource.uml#_13KfMjzEEeiWMf5FLWfdLA"/>
   </OpenModel_Profile:OpenModelAttribute>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_euqP4abuEeixw5Ke5QD1pQ">
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_nuTSEKe3Eeixw5Ke5QD1pQ">
     <base_StructuralFeature xmi:type="uml:Property" href="Resource.uml#_13KfNDzEEeiWMf5FLWfdLA"/>
   </OpenModel_Profile:OpenModelAttribute>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_eureAKbuEeixw5Ke5QD1pQ">
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_nue4QKe3Eeixw5Ke5QD1pQ">
     <base_StructuralFeature xmi:type="uml:Property" href="Resource.uml#_13KfNjzEEeiWMf5FLWfdLA"/>
   </OpenModel_Profile:OpenModelAttribute>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_eusFEKbuEeixw5Ke5QD1pQ">
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_nurskKe3Eeixw5Ke5QD1pQ">
     <base_StructuralFeature xmi:type="uml:Property" href="Resource.uml#_13LGQDzEEeiWMf5FLWfdLA"/>
   </OpenModel_Profile:OpenModelAttribute>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_eutTMKbuEeixw5Ke5QD1pQ">
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_nu5vAKe3Eeixw5Ke5QD1pQ">
     <base_StructuralFeature xmi:type="uml:Property" href="Resource.uml#_13LGQjzEEeiWMf5FLWfdLA"/>
   </OpenModel_Profile:OpenModelAttribute>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_eut6QabuEeixw5Ke5QD1pQ">
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_nvEHEKe3Eeixw5Ke5QD1pQ">
     <base_StructuralFeature xmi:type="uml:Property" href="Resource.uml#_13LGYDzEEeiWMf5FLWfdLA"/>
   </OpenModel_Profile:OpenModelAttribute>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_euvvcKbuEeixw5Ke5QD1pQ">
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_nvVz4Ke3Eeixw5Ke5QD1pQ">
     <base_StructuralFeature xmi:type="uml:Property" href="Resource.uml#_13LGZDzEEeiWMf5FLWfdLA"/>
   </OpenModel_Profile:OpenModelAttribute>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_euxkoKbuEeixw5Ke5QD1pQ">
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_nvXCAKe3Eeixw5Ke5QD1pQ">
     <base_StructuralFeature xmi:type="uml:Property" href="Resource.uml#_13LGbDzEEeiWMf5FLWfdLA"/>
   </OpenModel_Profile:OpenModelAttribute>
-  <OpenModel_Profile:OpenModelClass xmi:id="_13TpIDzEEeiWMf5FLWfdLA">
+  <OpenModel_Profile:OpenModelClass xmi:id="_n0I0UKe3Eeixw5Ke5QD1pQ">
     <base_Class xmi:type="uml:Class" href="Resource.uml#_13TCEDzEEeiWMf5FLWfdLA"/>
   </OpenModel_Profile:OpenModelClass>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_13TpITzEEeiWMf5FLWfdLA">
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_n0PiAKe3Eeixw5Ke5QD1pQ">
     <base_StructuralFeature xmi:type="uml:Property" href="Resource.uml#_13TCEjzEEeiWMf5FLWfdLA"/>
   </OpenModel_Profile:OpenModelAttribute>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_13TpIjzEEeiWMf5FLWfdLA">
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_n0UagKe3Eeixw5Ke5QD1pQ">
     <base_StructuralFeature xmi:type="uml:Property" href="Resource.uml#_13TCFDzEEeiWMf5FLWfdLA"/>
   </OpenModel_Profile:OpenModelAttribute>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_13TpIzzEEeiWMf5FLWfdLA">
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_n0YE4Ke3Eeixw5Ke5QD1pQ">
     <base_StructuralFeature xmi:type="uml:Property" href="Resource.uml#_13TCFjzEEeiWMf5FLWfdLA"/>
   </OpenModel_Profile:OpenModelAttribute>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_13TpJDzEEeiWMf5FLWfdLA">
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_n0bIMKe3Eeixw5Ke5QD1pQ">
     <base_StructuralFeature xmi:type="uml:Property" href="Resource.uml#_13TCGDzEEeiWMf5FLWfdLA"/>
   </OpenModel_Profile:OpenModelAttribute>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_13TpJTzEEeiWMf5FLWfdLA">
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_n0fZoKe3Eeixw5Ke5QD1pQ">
     <base_StructuralFeature xmi:type="uml:Property" href="Resource.uml#_13TCHDzEEeiWMf5FLWfdLA"/>
   </OpenModel_Profile:OpenModelAttribute>
-  <OpenModel_Profile:OpenModelClass xmi:id="_eu9K0KbuEeixw5Ke5QD1pQ">
+  <OpenModel_Profile:OpenModelClass xmi:id="_nve90ae3Eeixw5Ke5QD1pQ">
     <base_Class xmi:type="uml:Class" href="Resource.uml#_13WFYDzEEeiWMf5FLWfdLA"/>
   </OpenModel_Profile:OpenModelClass>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_eu-Y8KbuEeixw5Ke5QD1pQ">
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_nvgL8Ke3Eeixw5Ke5QD1pQ">
     <base_StructuralFeature xmi:type="uml:Property" href="Resource.uml#_13WFYzzEEeiWMf5FLWfdLA"/>
   </OpenModel_Profile:OpenModelAttribute>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_eu_AAabuEeixw5Ke5QD1pQ">
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_nvhaEKe3Eeixw5Ke5QD1pQ">
     <base_StructuralFeature xmi:type="uml:Property" href="Resource.uml#_13WFZzzEEeiWMf5FLWfdLA"/>
   </OpenModel_Profile:OpenModelAttribute>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_evAOIKbuEeixw5Ke5QD1pQ">
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_nvtAQKe3Eeixw5Ke5QD1pQ">
     <base_StructuralFeature xmi:type="uml:Property" href="Resource.uml#_13WFaTzEEeiWMf5FLWfdLA"/>
   </OpenModel_Profile:OpenModelAttribute>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_evBcQKbuEeixw5Ke5QD1pQ">
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_nwecUKe3Eeixw5Ke5QD1pQ">
     <base_StructuralFeature xmi:type="uml:Property" href="Resource.uml#_13WFbTzEEeiWMf5FLWfdLA"/>
   </OpenModel_Profile:OpenModelAttribute>
-  <OpenModel_Profile:OpenModelClass xmi:id="_13ZIyDzEEeiWMf5FLWfdLA">
+  <OpenModel_Profile:OpenModelClass xmi:id="_nzG5kKe3Eeixw5Ke5QD1pQ">
     <base_Class xmi:type="uml:Class" href="Resource.uml#_13ZIsDzEEeiWMf5FLWfdLA"/>
   </OpenModel_Profile:OpenModelClass>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_13ZvwTzEEeiWMf5FLWfdLA">
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_nzYmYKe3Eeixw5Ke5QD1pQ">
     <base_StructuralFeature xmi:type="uml:Property" href="Resource.uml#_13ZItDzEEeiWMf5FLWfdLA"/>
   </OpenModel_Profile:OpenModelAttribute>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_13ZvxDzEEeiWMf5FLWfdLA">
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_nzde4Ke3Eeixw5Ke5QD1pQ">
     <base_StructuralFeature xmi:type="uml:Property" href="Resource.uml#_13ZIwDzEEeiWMf5FLWfdLA"/>
   </OpenModel_Profile:OpenModelAttribute>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_13ZvxTzEEeiWMf5FLWfdLA">
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_nzhwUKe3Eeixw5Ke5QD1pQ">
     <base_StructuralFeature xmi:type="uml:Property" href="Resource.uml#_13ZIxDzEEeiWMf5FLWfdLA"/>
   </OpenModel_Profile:OpenModelAttribute>
   <OpenModel_Profile:OpenModelClass xmi:id="_13eBPDzEEeiWMf5FLWfdLA" base_Class="_13eBMDzEEeiWMf5FLWfdLA"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_13eoQDzEEeiWMf5FLWfdLA" base_StructuralFeature="_13eBMjzEEeiWMf5FLWfdLA"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_13eoQTzEEeiWMf5FLWfdLA" base_StructuralFeature="_13eBNDzEEeiWMf5FLWfdLA"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_13eoQjzEEeiWMf5FLWfdLA" base_StructuralFeature="_13eBODzEEeiWMf5FLWfdLA"/>
-  <OpenModel_Profile:OpenModelClass xmi:id="_13hrkDzEEeiWMf5FLWfdLA">
+  <OpenModel_Profile:OpenModelClass xmi:id="_nwm_MKe3Eeixw5Ke5QD1pQ">
     <base_Class xmi:type="uml:Class" href="Resource.uml#_13gdcDzEEeiWMf5FLWfdLA"/>
   </OpenModel_Profile:OpenModelClass>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_13hrkTzEEeiWMf5FLWfdLA">
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_nwviEKe3Eeixw5Ke5QD1pQ">
     <base_StructuralFeature xmi:type="uml:Property" href="Resource.uml#_13gdcjzEEeiWMf5FLWfdLA"/>
   </OpenModel_Profile:OpenModelAttribute>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_13iSoDzEEeiWMf5FLWfdLA">
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_nw9kgKe3Eeixw5Ke5QD1pQ">
     <base_StructuralFeature xmi:type="uml:Property" href="Resource.uml#_13gddDzEEeiWMf5FLWfdLA"/>
   </OpenModel_Profile:OpenModelAttribute>
-  <OpenModel_Profile:OpenModelClass xmi:id="_45UBkDzEEeiWMf5FLWfdLA">
+  <OpenModel_Profile:OpenModelClass xmi:id="_nzt9kKe3Eeixw5Ke5QD1pQ">
     <base_Class xmi:type="uml:Class" href="Resource.uml#_45TagDzEEeiWMf5FLWfdLA"/>
   </OpenModel_Profile:OpenModelClass>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_45VPsDzEEeiWMf5FLWfdLA">
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_nzyPAKe3Eeixw5Ke5QD1pQ">
     <base_StructuralFeature xmi:type="uml:Property" href="Resource.uml#_45TagzzEEeiWMf5FLWfdLA"/>
   </OpenModel_Profile:OpenModelAttribute>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_45VPsTzEEeiWMf5FLWfdLA">
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_nz3ukKe3Eeixw5Ke5QD1pQ">
     <base_StructuralFeature xmi:type="uml:Property" href="Resource.uml#_45TahTzEEeiWMf5FLWfdLA"/>
   </OpenModel_Profile:OpenModelAttribute>
   <OpenModel_Profile:OpenModelClass xmi:id="_45Xr8DzEEeiWMf5FLWfdLA" base_Class="_45XE4DzEEeiWMf5FLWfdLA"/>
@@ -1791,7 +1749,9 @@ NOTE 3: 	When the corresponding NS level is used in the context of NS scaling, t
   <OpenModel_Profile:OpenModelAttribute xmi:id="_GY-rsTzFEeiWMf5FLWfdLA" base_StructuralFeature="_GY8PeTzFEeiWMf5FLWfdLA"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_GY-rsjzFEeiWMf5FLWfdLA" base_StructuralFeature="_GY8PezzFEeiWMf5FLWfdLA"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_GY-rszzFEeiWMf5FLWfdLA" base_StructuralFeature="_GY8PfTzFEeiWMf5FLWfdLA"/>
-  <OpenModel_Profile:OpenModelClass xmi:id="_bd6eEDzFEeiWMf5FLWfdLA" base_Class="_bd53ADzFEeiWMf5FLWfdLA"/>
+  <OpenModel_Profile:OpenModelClass xmi:id="_bd6eEDzFEeiWMf5FLWfdLA">
+    <base_Class xmi:type="uml:Class" href="Resource.uml#_bd53ADzFEeiWMf5FLWfdLA"/>
+  </OpenModel_Profile:OpenModelClass>
   <OpenModel_Profile:OpenModelClass xmi:id="_beAksDzFEeiWMf5FLWfdLA" base_Class="_bd_WkDzFEeiWMf5FLWfdLA"/>
   <OpenModel_Profile:OpenModelClass xmi:id="_beGEQDzFEeiWMf5FLWfdLA" base_Class="_beE2IDzFEeiWMf5FLWfdLA"/>
   <OpenModel_Profile:OpenModelClass xmi:id="_1WXCxDzFEeiWMf5FLWfdLA" base_Class="_1WWbsDzFEeiWMf5FLWfdLA"/>
@@ -1866,59 +1826,59 @@ NOTE 3: 	When the corresponding NS level is used in the context of NS scaling, t
   <OpenModel_Profile:OpenModelAttribute xmi:id="_SyQqAT0cEeiWMf5FLWfdLA" base_StructuralFeature="_SyQqAD0cEeiWMf5FLWfdLA"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_wPinYz0cEeiWMf5FLWfdLA" base_StructuralFeature="_wPinYj0cEeiWMf5FLWfdLA"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_wPlqsj0cEeiWMf5FLWfdLA" base_StructuralFeature="_wPlqsT0cEeiWMf5FLWfdLA"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_euyywKbuEeixw5Ke5QD1pQ">
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_nvYQIae3Eeixw5Ke5QD1pQ">
     <base_StructuralFeature xmi:type="uml:Property" href="Resource.uml#_jBZXYD2mEeiu6I5JfRTxxQ"/>
   </OpenModel_Profile:OpenModelAttribute>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_jBeP4T2mEeiu6I5JfRTxxQ" base_StructuralFeature="_jBeP4D2mEeiu6I5JfRTxxQ"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_eu0A4KbuEeixw5Ke5QD1pQ">
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_nvZeQKe3Eeixw5Ke5QD1pQ">
     <base_StructuralFeature xmi:type="uml:Property" href="Resource.uml#_qMMUsD2nEeiu6I5JfRTxxQ"/>
   </OpenModel_Profile:OpenModelAttribute>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_qMPYAT2nEeiu6I5JfRTxxQ" base_StructuralFeature="_qMPYAD2nEeiu6I5JfRTxxQ"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_eu1PAKbuEeixw5Ke5QD1pQ">
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_nvaFUKe3Eeixw5Ke5QD1pQ">
     <base_StructuralFeature xmi:type="uml:Property" href="Resource.uml#_Wi5kcj2oEeiu6I5JfRTxxQ"/>
   </OpenModel_Profile:OpenModelAttribute>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_Wi8Asj2oEeiu6I5JfRTxxQ" base_StructuralFeature="_Wi8AsT2oEeiu6I5JfRTxxQ"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_0Py1sD2pEeiu6I5JfRTxxQ">
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_nzmBwKe3Eeixw5Ke5QD1pQ">
     <base_StructuralFeature xmi:type="uml:Property" href="Resource.uml#_0PyOoT2pEeiu6I5JfRTxxQ"/>
   </OpenModel_Profile:OpenModelAttribute>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_0P0q4T2pEeiu6I5JfRTxxQ" base_StructuralFeature="_0P0q4D2pEeiu6I5JfRTxxQ"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_eu3EMabuEeixw5Ke5QD1pQ">
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_nvasYKe3Eeixw5Ke5QD1pQ">
     <base_StructuralFeature xmi:type="uml:Property" href="Resource.uml#_YX8Ikj2qEeiu6I5JfRTxxQ"/>
   </OpenModel_Profile:OpenModelAttribute>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_YX-k0T2qEeiu6I5JfRTxxQ" base_StructuralFeature="_YX-k0D2qEeiu6I5JfRTxxQ"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_eu4SUabuEeixw5Ke5QD1pQ">
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_nvbTcae3Eeixw5Ke5QD1pQ">
     <base_StructuralFeature xmi:type="uml:Property" href="Resource.uml#_JDB-oj2rEeiu6I5JfRTxxQ"/>
   </OpenModel_Profile:OpenModelAttribute>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_JDEa4T2rEeiu6I5JfRTxxQ" base_StructuralFeature="_JDEa4D2rEeiu6I5JfRTxxQ"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_eu6HgKbuEeixw5Ke5QD1pQ">
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_nvchkae3Eeixw5Ke5QD1pQ">
     <base_StructuralFeature xmi:type="uml:Property" href="Resource.uml#_wdAOoD2rEeiu6I5JfRTxxQ"/>
   </OpenModel_Profile:OpenModelAttribute>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_wdCq4T2rEeiu6I5JfRTxxQ" base_StructuralFeature="_wdCq4D2rEeiu6I5JfRTxxQ"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_DTJ1Qj2sEeiu6I5JfRTxxQ">
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_nzqTMKe3Eeixw5Ke5QD1pQ">
     <base_StructuralFeature xmi:type="uml:Property" href="Resource.uml#_DTJ1QT2sEeiu6I5JfRTxxQ"/>
   </OpenModel_Profile:OpenModelAttribute>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_DTLqcD2sEeiu6I5JfRTxxQ" base_StructuralFeature="_DTLDYj2sEeiu6I5JfRTxxQ"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_eu78sKbuEeixw5Ke5QD1pQ">
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_nveWwKe3Eeixw5Ke5QD1pQ">
     <base_StructuralFeature xmi:type="uml:Property" href="Resource.uml#_yX0DkD2tEeiu6I5JfRTxxQ"/>
   </OpenModel_Profile:OpenModelAttribute>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_yX3G4D2tEeiu6I5JfRTxxQ" base_StructuralFeature="_yX2f0D2tEeiu6I5JfRTxxQ"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_-84UYD2yEeiu6I5JfRTxxQ">
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_nxa3gKe3Eeixw5Ke5QD1pQ">
     <base_StructuralFeature xmi:type="uml:Property" href="Resource.uml#_-83tUj2yEeiu6I5JfRTxxQ"/>
   </OpenModel_Profile:OpenModelAttribute>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_-85igj2yEeiu6I5JfRTxxQ" base_StructuralFeature="_-85igT2yEeiu6I5JfRTxxQ"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_acttoD2zEeiu6I5JfRTxxQ">
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_nxz5EKe3Eeixw5Ke5QD1pQ">
     <base_StructuralFeature xmi:type="uml:Property" href="Resource.uml#_actGkj2zEeiu6I5JfRTxxQ"/>
   </OpenModel_Profile:OpenModelAttribute>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_acww8D2zEeiu6I5JfRTxxQ" base_StructuralFeature="_acwJ4T2zEeiu6I5JfRTxxQ"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="__KZ9kT2zEeiu6I5JfRTxxQ">
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_nx-4MKe3Eeixw5Ke5QD1pQ">
     <base_StructuralFeature xmi:type="uml:Property" href="Resource.uml#__KZ9kD2zEeiu6I5JfRTxxQ"/>
   </OpenModel_Profile:OpenModelAttribute>
   <OpenModel_Profile:OpenModelAttribute xmi:id="__Kbywj2zEeiu6I5JfRTxxQ" base_StructuralFeature="__KbywT2zEeiu6I5JfRTxxQ"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_hPo9gT20Eeiu6I5JfRTxxQ">
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_nyJ3UKe3Eeixw5Ke5QD1pQ">
     <base_StructuralFeature xmi:type="uml:Property" href="Resource.uml#_hPo9gD20Eeiu6I5JfRTxxQ"/>
   </OpenModel_Profile:OpenModelAttribute>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_hQ6I0T20Eeiu6I5JfRTxxQ" base_StructuralFeature="_hQ6I0D20Eeiu6I5JfRTxxQ"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_VJiR4D21Eeiu6I5JfRTxxQ">
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_nyU2cKe3Eeixw5Ke5QD1pQ">
     <base_StructuralFeature xmi:type="uml:Property" href="Resource.uml#_VJhq0j21Eeiu6I5JfRTxxQ"/>
   </OpenModel_Profile:OpenModelAttribute>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_VJkuID21Eeiu6I5JfRTxxQ" base_StructuralFeature="_VJkHET21Eeiu6I5JfRTxxQ"/>
@@ -1926,14 +1886,14 @@ NOTE 3: 	When the corresponding NS level is used in the context of NS scaling, t
   <OpenModel_Profile:OpenModelAttribute xmi:id="_r-78UD21Eeiu6I5JfRTxxQ" base_StructuralFeature="_r-7VQD21Eeiu6I5JfRTxxQ"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_LJFrMD22Eeiu6I5JfRTxxQ" base_StructuralFeature="_LJFEIj22Eeiu6I5JfRTxxQ"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_LJdeoT22Eeiu6I5JfRTxxQ" base_StructuralFeature="_LJdeoD22Eeiu6I5JfRTxxQ"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_0f4NMD22Eeiu6I5JfRTxxQ">
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_nyfOgKe3Eeixw5Ke5QD1pQ">
     <base_StructuralFeature xmi:type="uml:Property" href="Resource.uml#_0f3mIj22Eeiu6I5JfRTxxQ"/>
   </OpenModel_Profile:OpenModelAttribute>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_0f6CYz22Eeiu6I5JfRTxxQ" base_StructuralFeature="_0f6CYj22Eeiu6I5JfRTxxQ"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_DquKQT24Eeiu6I5JfRTxxQ" base_StructuralFeature="_DquKQD24Eeiu6I5JfRTxxQ"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_Dqv_cj24Eeiu6I5JfRTxxQ" base_StructuralFeature="_Dqv_cT24Eeiu6I5JfRTxxQ"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_kyxJMz24Eeiu6I5JfRTxxQ" base_StructuralFeature="_kyxJMj24Eeiu6I5JfRTxxQ"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_kzQ4cT24Eeiu6I5JfRTxxQ">
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_nypmkKe3Eeixw5Ke5QD1pQ">
     <base_StructuralFeature xmi:type="uml:Property" href="Resource.uml#_kzQ4cD24Eeiu6I5JfRTxxQ"/>
   </OpenModel_Profile:OpenModelAttribute>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_IhnyUj25Eeiu6I5JfRTxxQ" base_StructuralFeature="_IhnyUT25Eeiu6I5JfRTxxQ"/>
@@ -1942,7 +1902,7 @@ NOTE 3: 	When the corresponding NS level is used in the context of NS scaling, t
   <OpenModel_Profile:OpenModelAttribute xmi:id="_g9coAj25Eeiu6I5JfRTxxQ" base_StructuralFeature="_g9coAT25Eeiu6I5JfRTxxQ"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_PKjYsD26Eeiu6I5JfRTxxQ" base_StructuralFeature="_PKixoj26Eeiu6I5JfRTxxQ"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_PK26sj26Eeiu6I5JfRTxxQ" base_StructuralFeature="_PK26sT26Eeiu6I5JfRTxxQ"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_nO2fMD26Eeiu6I5JfRTxxQ">
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_ny43IKe3Eeixw5Ke5QD1pQ">
     <base_StructuralFeature xmi:type="uml:Property" href="Resource.uml#_nO14IT26Eeiu6I5JfRTxxQ"/>
   </OpenModel_Profile:OpenModelAttribute>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_nO4UYj26Eeiu6I5JfRTxxQ" base_StructuralFeature="_nO4UYT26Eeiu6I5JfRTxxQ"/>
@@ -1964,9 +1924,6 @@ NOTE 3: 	When the corresponding NS level is used in the context of NS scaling, t
   <OpenModel_Profile:OpenModelAttribute xmi:id="_bnHAokS4EeiVGPeZpaYNtQ" base_StructuralFeature="_bnHAoES4EeiVGPeZpaYNtQ"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_AeuMIES6EeiVGPeZpaYNtQ" base_StructuralFeature="_Aes-AUS6EeiVGPeZpaYNtQ"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_AfWeQkS6EeiVGPeZpaYNtQ" base_StructuralFeature="_AfWeQES6EeiVGPeZpaYNtQ"/>
-  <OpenModel_Profile_1:OpenModelAttribute xmi:id="_8diZMES6EeiVGPeZpaYNtQ">
-    <base_StructuralFeature xmi:type="uml:Property" href="Common.uml#_8dhyIES6EeiVGPeZpaYNtQ"/>
-  </OpenModel_Profile_1:OpenModelAttribute>
   <OpenModel_Profile:OpenModelClass xmi:id="_mrLLIYn9EeiOe-BKGdv_Yg" base_Class="_mrJV8In9EeiOe-BKGdv_Yg"/>
   <OpenModel_Profile:OpenModelClass xmi:id="_wnhfgIn9EeiOe-BKGdv_Yg" base_Class="_wng4cIn9EeiOe-BKGdv_Yg"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_Q--H8Yn-EeiOe-BKGdv_Yg" base_StructuralFeature="_Q-9g4In-EeiOe-BKGdv_Yg"/>
@@ -2023,113 +1980,113 @@ NOTE 3: 	When the corresponding NS level is used in the context of NS scaling, t
   <OpenModel_Profile:OpenModelAttribute xmi:id="__dJeUZEAEei9Vqs7Ti8Wxg" base_StructuralFeature="__dI3QJEAEei9Vqs7Ti8Wxg"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_BD-5QZEBEei9Vqs7Ti8Wxg" base_StructuralFeature="_BD-SMJEBEei9Vqs7Ti8Wxg"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_9p9M8pEBEei9Vqs7Ti8Wxg" base_StructuralFeature="_9p9M8JEBEei9Vqs7Ti8Wxg"/>
-  <OpenModel_Profile:Experimental xmi:id="_euq28KbuEeixw5Ke5QD1pQ">
+  <OpenModel_Profile:Experimental xmi:id="_nubN4Ke3Eeixw5Ke5QD1pQ">
     <base_Element xmi:type="uml:Property" href="Resource.uml#_13KfNDzEEeiWMf5FLWfdLA"/>
   </OpenModel_Profile:Experimental>
-  <OpenModel_Profile:Experimental xmi:id="_eureAabuEeixw5Ke5QD1pQ">
+  <OpenModel_Profile:Experimental xmi:id="_nuopQKe3Eeixw5Ke5QD1pQ">
     <base_Element xmi:type="uml:Property" href="Resource.uml#_13KfNjzEEeiWMf5FLWfdLA"/>
   </OpenModel_Profile:Experimental>
-  <OpenModel_Profile:Experimental xmi:id="_eussIKbuEeixw5Ke5QD1pQ">
+  <OpenModel_Profile:Experimental xmi:id="_nu02gKe3Eeixw5Ke5QD1pQ">
     <base_Element xmi:type="uml:Property" href="Resource.uml#_13LGQDzEEeiWMf5FLWfdLA"/>
   </OpenModel_Profile:Experimental>
-  <OpenModel_Profile:Experimental xmi:id="_eut6QKbuEeixw5Ke5QD1pQ">
+  <OpenModel_Profile:Experimental xmi:id="_nvAcsKe3Eeixw5Ke5QD1pQ">
     <base_Element xmi:type="uml:Property" href="Resource.uml#_13LGQjzEEeiWMf5FLWfdLA"/>
   </OpenModel_Profile:Experimental>
-  <OpenModel_Profile:PassedByReference xmi:id="_eu5gcKbuEeixw5Ke5QD1pQ">
+  <OpenModel_Profile:PassedByReference xmi:id="_nvb6gKe3Eeixw5Ke5QD1pQ">
     <base_Property xmi:type="uml:Property" href="Resource.uml#_JDB-oj2rEeiu6I5JfRTxxQ"/>
   </OpenModel_Profile:PassedByReference>
-  <OpenModel_Profile:Experimental xmi:id="_eu6ukKbuEeixw5Ke5QD1pQ">
+  <OpenModel_Profile:Experimental xmi:id="_nvdIoKe3Eeixw5Ke5QD1pQ">
     <base_Element xmi:type="uml:Property" href="Resource.uml#_wdAOoD2rEeiu6I5JfRTxxQ"/>
   </OpenModel_Profile:Experimental>
-  <OpenModel_Profile:PassedByReference xmi:id="_eu7VoKbuEeixw5Ke5QD1pQ">
+  <OpenModel_Profile:PassedByReference xmi:id="_nvdvsKe3Eeixw5Ke5QD1pQ">
     <base_Property xmi:type="uml:Property" href="Resource.uml#_wdAOoD2rEeiu6I5JfRTxxQ"/>
   </OpenModel_Profile:PassedByReference>
-  <OpenModel_Profile:Experimental xmi:id="_eu0n8KbuEeixw5Ke5QD1pQ">
+  <OpenModel_Profile:Experimental xmi:id="_nvZeQae3Eeixw5Ke5QD1pQ">
     <base_Element xmi:type="uml:Property" href="Resource.uml#_qMMUsD2nEeiu6I5JfRTxxQ"/>
   </OpenModel_Profile:Experimental>
-  <OpenModel_Profile:Experimental xmi:id="_eu12EKbuEeixw5Ke5QD1pQ">
+  <OpenModel_Profile:Experimental xmi:id="_nvaFUae3Eeixw5Ke5QD1pQ">
     <base_Element xmi:type="uml:Property" href="Resource.uml#_Wi5kcj2oEeiu6I5JfRTxxQ"/>
   </OpenModel_Profile:Experimental>
-  <OpenModel_Profile:Experimental xmi:id="_euzZ0KbuEeixw5Ke5QD1pQ">
+  <OpenModel_Profile:Experimental xmi:id="_nvY3MKe3Eeixw5Ke5QD1pQ">
     <base_Element xmi:type="uml:Property" href="Resource.uml#_jBZXYD2mEeiu6I5JfRTxxQ"/>
   </OpenModel_Profile:Experimental>
-  <OpenModel_Profile:Experimental xmi:id="_pjjIwJmbEeiSm9XNElOsxQ">
+  <OpenModel_Profile:Experimental xmi:id="_nzwZ0Ke3Eeixw5Ke5QD1pQ">
     <base_Element xmi:type="uml:Class" href="Resource.uml#_45TagDzEEeiWMf5FLWfdLA"/>
   </OpenModel_Profile:Experimental>
-  <OpenModel_Profile:Experimental xmi:id="_sLwhIJmbEeiSm9XNElOsxQ">
+  <OpenModel_Profile:Experimental xmi:id="_nz15YKe3Eeixw5Ke5QD1pQ">
     <base_Element xmi:type="uml:Property" href="Resource.uml#_45TagzzEEeiWMf5FLWfdLA"/>
   </OpenModel_Profile:Experimental>
-  <OpenModel_Profile:Experimental xmi:id="_0PYZUJmbEeiSm9XNElOsxQ">
+  <OpenModel_Profile:Experimental xmi:id="_nz8AAKe3Eeixw5Ke5QD1pQ">
     <base_Element xmi:type="uml:Property" href="Resource.uml#_45TahTzEEeiWMf5FLWfdLA"/>
   </OpenModel_Profile:Experimental>
-  <OpenModel_Profile:PassedByReference xmi:id="_5aPUoJmbEeiSm9XNElOsxQ">
+  <OpenModel_Profile:PassedByReference xmi:id="_nz91MKe3Eeixw5Ke5QD1pQ">
     <base_Property xmi:type="uml:Property" href="Resource.uml#_45TahTzEEeiWMf5FLWfdLA"/>
   </OpenModel_Profile:PassedByReference>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_KDzu8JmcEeiSm9XNElOsxQ">
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_n0ARcKe3Eeixw5Ke5QD1pQ">
     <base_StructuralFeature xmi:type="uml:Property" href="Resource.uml#_KDyg0JmcEeiSm9XNElOsxQ"/>
   </OpenModel_Profile:OpenModelAttribute>
-  <OpenModel_Profile:Experimental xmi:id="_Yk-SUJmcEeiSm9XNElOsxQ">
+  <OpenModel_Profile:Experimental xmi:id="_n0D70Ke3Eeixw5Ke5QD1pQ">
     <base_Element xmi:type="uml:Property" href="Resource.uml#_KDyg0JmcEeiSm9XNElOsxQ"/>
   </OpenModel_Profile:Experimental>
-  <OpenModel_Profile:PassedByReference xmi:id="_YlugQJmcEeiSm9XNElOsxQ">
+  <OpenModel_Profile:PassedByReference xmi:id="_n0FxAKe3Eeixw5Ke5QD1pQ">
     <base_Property xmi:type="uml:Property" href="Resource.uml#_KDyg0JmcEeiSm9XNElOsxQ"/>
   </OpenModel_Profile:PassedByReference>
-  <OpenModel_Profile:Experimental xmi:id="_G79XwJmdEeiSm9XNElOsxQ">
+  <OpenModel_Profile:Experimental xmi:id="_nwrQoKe3Eeixw5Ke5QD1pQ">
     <base_Element xmi:type="uml:Class" href="Resource.uml#_13gdcDzEEeiWMf5FLWfdLA"/>
   </OpenModel_Profile:Experimental>
-  <OpenModel_Profile:Experimental xmi:id="_N0R6cJmdEeiSm9XNElOsxQ">
+  <OpenModel_Profile:Experimental xmi:id="_nw5TEKe3Eeixw5Ke5QD1pQ">
     <base_Element xmi:type="uml:Property" href="Resource.uml#_13gdcjzEEeiWMf5FLWfdLA"/>
   </OpenModel_Profile:Experimental>
-  <OpenModel_Profile:Experimental xmi:id="_Q5bGcJmdEeiSm9XNElOsxQ">
+  <OpenModel_Profile:Experimental xmi:id="_nxH8kKe3Eeixw5Ke5QD1pQ">
     <base_Element xmi:type="uml:Property" href="Resource.uml#_13gddDzEEeiWMf5FLWfdLA"/>
   </OpenModel_Profile:Experimental>
-  <OpenModel_Profile:Experimental xmi:id="_i3SaMJmdEeiSm9XNElOsxQ">
+  <OpenModel_Profile:Experimental xmi:id="_nxlPkKe3Eeixw5Ke5QD1pQ">
     <base_Element xmi:type="uml:Property" href="Resource.uml#_-83tUj2yEeiu6I5JfRTxxQ"/>
   </OpenModel_Profile:Experimental>
-  <OpenModel_Profile:Experimental xmi:id="_zEzxsJmdEeiSm9XNElOsxQ">
+  <OpenModel_Profile:Experimental xmi:id="_nx7N0Ke3Eeixw5Ke5QD1pQ">
     <base_Element xmi:type="uml:Property" href="Resource.uml#_actGkj2zEeiu6I5JfRTxxQ"/>
   </OpenModel_Profile:Experimental>
-  <OpenModel_Profile:Experimental xmi:id="_6QSg8JmdEeiSm9XNElOsxQ">
+  <OpenModel_Profile:Experimental xmi:id="_nyFl4Ke3Eeixw5Ke5QD1pQ">
     <base_Element xmi:type="uml:Property" href="Resource.uml#__KZ9kD2zEeiu6I5JfRTxxQ"/>
   </OpenModel_Profile:Experimental>
-  <OpenModel_Profile:Experimental xmi:id="_9zx10JmdEeiSm9XNElOsxQ">
+  <OpenModel_Profile:Experimental xmi:id="_nyRMEKe3Eeixw5Ke5QD1pQ">
     <base_Element xmi:type="uml:Property" href="Resource.uml#_hPo9gD20Eeiu6I5JfRTxxQ"/>
   </OpenModel_Profile:Experimental>
-  <OpenModel_Profile:Experimental xmi:id="_CvGgUJmeEeiSm9XNElOsxQ">
+  <OpenModel_Profile:Experimental xmi:id="_nybkIKe3Eeixw5Ke5QD1pQ">
     <base_Element xmi:type="uml:Property" href="Resource.uml#_VJhq0j21Eeiu6I5JfRTxxQ"/>
   </OpenModel_Profile:Experimental>
-  <OpenModel_Profile:Experimental xmi:id="_HzNTYJmeEeiSm9XNElOsxQ">
+  <OpenModel_Profile:Experimental xmi:id="_nyl8MKe3Eeixw5Ke5QD1pQ">
     <base_Element xmi:type="uml:Property" href="Resource.uml#_0f3mIj22Eeiu6I5JfRTxxQ"/>
   </OpenModel_Profile:Experimental>
-  <OpenModel_Profile:Experimental xmi:id="_MgxOsJmeEeiSm9XNElOsxQ">
+  <OpenModel_Profile:Experimental xmi:id="_nyyJcKe3Eeixw5Ke5QD1pQ">
     <base_Element xmi:type="uml:Property" href="Resource.uml#_kzQ4cD24Eeiu6I5JfRTxxQ"/>
   </OpenModel_Profile:Experimental>
-  <OpenModel_Profile:Experimental xmi:id="_RBirMJmeEeiSm9XNElOsxQ">
+  <OpenModel_Profile:Experimental xmi:id="_nzCBEKe3Eeixw5Ke5QD1pQ">
     <base_Element xmi:type="uml:Property" href="Resource.uml#_nO14IT26Eeiu6I5JfRTxxQ"/>
   </OpenModel_Profile:Experimental>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_CtTpMJmhEeiSm9XNElOsxQ">
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_nxphAKe3Eeixw5Ke5QD1pQ">
     <base_StructuralFeature xmi:type="uml:Property" href="Resource.uml#_CtSbEJmhEeiSm9XNElOsxQ"/>
   </OpenModel_Profile:OpenModelAttribute>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_CtWFcJmhEeiSm9XNElOsxQ" base_StructuralFeature="_CtVeYJmhEeiSm9XNElOsxQ"/>
-  <OpenModel_Profile:Experimental xmi:id="_doePIJmhEeiSm9XNElOsxQ">
+  <OpenModel_Profile:Experimental xmi:id="_nxxc0Ke3Eeixw5Ke5QD1pQ">
     <base_Element xmi:type="uml:Property" href="Resource.uml#_CtSbEJmhEeiSm9XNElOsxQ"/>
   </OpenModel_Profile:Experimental>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_OGG4AJmiEeiSm9XNElOsxQ">
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_nxM1EKe3Eeixw5Ke5QD1pQ">
     <base_StructuralFeature xmi:type="uml:Property" href="Resource.uml#_OGFC0JmiEeiSm9XNElOsxQ"/>
   </OpenModel_Profile:OpenModelAttribute>
-  <OpenModel_Profile:Experimental xmi:id="_fzEB8JmiEeiSm9XNElOsxQ">
+  <OpenModel_Profile:Experimental xmi:id="_nxWmEKe3Eeixw5Ke5QD1pQ">
     <base_Element xmi:type="uml:Property" href="Resource.uml#_OGFC0JmiEeiSm9XNElOsxQ"/>
   </OpenModel_Profile:Experimental>
-  <OpenModel_Profile:Experimental xmi:id="_Ebf-cJmjEeiSm9XNElOsxQ">
+  <OpenModel_Profile:Experimental xmi:id="_nzLyEKe3Eeixw5Ke5QD1pQ">
     <base_Element xmi:type="uml:Class" href="Resource.uml#_13ZIsDzEEeiWMf5FLWfdLA"/>
   </OpenModel_Profile:Experimental>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_0xThAZmjEeiSm9XNElOsxQ">
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_nzO1YKe3Eeixw5Ke5QD1pQ">
     <base_StructuralFeature xmi:type="uml:Property" href="Resource.uml#_0xS58JmjEeiSm9XNElOsxQ"/>
   </OpenModel_Profile:OpenModelAttribute>
-  <OpenModel_Profile:Experimental xmi:id="_GKA5QJmkEeiSm9XNElOsxQ">
+  <OpenModel_Profile:Experimental xmi:id="_nzU8AKe3Eeixw5Ke5QD1pQ">
     <base_Element xmi:type="uml:Property" href="Resource.uml#_0xS58JmjEeiSm9XNElOsxQ"/>
   </OpenModel_Profile:Experimental>
-  <OpenModel_Profile:Experimental xmi:id="_aWuqMJmkEeiSm9XNElOsxQ">
+  <OpenModel_Profile:Experimental xmi:id="_n0MesKe3Eeixw5Ke5QD1pQ">
     <base_Element xmi:type="uml:Class" href="Resource.uml#_13TCEDzEEeiWMf5FLWfdLA"/>
   </OpenModel_Profile:Experimental>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_y6aiAqLREeiz_K9hWIugxQ" base_StructuralFeature="_y6aiAKLREeiz_K9hWIugxQ"/>
@@ -2144,42 +2101,62 @@ NOTE 3: 	When the corresponding NS level is used in the context of NS scaling, t
     <base_StructuralFeature xmi:type="uml:Property" href="Vnf.uml#_51TjIEJ_EeiwbqJBYHKltg"/>
   </OpenModel_Profile:OpenModelAttribute>
   <OpenModel_Profile:Future xmi:id="_WmuCEKVyEeikF6xsfT18UA" base_Element="_13eBMDzEEeiWMf5FLWfdLA"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_lV590KY3Eeixw5Ke5QD1pQ"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_euvIYabuEeixw5Ke5QD1pQ">
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_nvPGMKe3Eeixw5Ke5QD1pQ">
     <base_StructuralFeature xmi:type="uml:Property" href="Resource.uml#_CE1gEKY7Eeixw5Ke5QD1pQ"/>
   </OpenModel_Profile:OpenModelAttribute>
-  <OpenModel_Profile:Preliminary xmi:id="_eupBwKbuEeixw5Ke5QD1pQ">
+  <OpenModel_Profile:Preliminary xmi:id="_ntTzkKe3Eeixw5Ke5QD1pQ">
     <base_Element xmi:type="uml:Class" href="Resource.uml#_13KfMDzEEeiWMf5FLWfdLA"/>
   </OpenModel_Profile:Preliminary>
-  <OpenModel_Profile:Preliminary xmi:id="_euqP4KbuEeixw5Ke5QD1pQ">
+  <OpenModel_Profile:Preliminary xmi:id="_nuPAoKe3Eeixw5Ke5QD1pQ">
     <base_Element xmi:type="uml:Property" href="Resource.uml#_13KfMjzEEeiWMf5FLWfdLA"/>
   </OpenModel_Profile:Preliminary>
-  <OpenModel_Profile:Preliminary xmi:id="_euuhUKbuEeixw5Ke5QD1pQ">
+  <OpenModel_Profile:Preliminary xmi:id="_nvLb0Ke3Eeixw5Ke5QD1pQ">
     <base_Element xmi:type="uml:Property" href="Resource.uml#_13LGYDzEEeiWMf5FLWfdLA"/>
   </OpenModel_Profile:Preliminary>
-  <OpenModel_Profile:Preliminary xmi:id="_euwWgKbuEeixw5Ke5QD1pQ">
+  <OpenModel_Profile:Preliminary xmi:id="_nvWa8Ke3Eeixw5Ke5QD1pQ">
     <base_Element xmi:type="uml:Property" href="Resource.uml#_13LGZDzEEeiWMf5FLWfdLA"/>
   </OpenModel_Profile:Preliminary>
-  <OpenModel_Profile:Preliminary xmi:id="_euyLsKbuEeixw5Ke5QD1pQ">
+  <OpenModel_Profile:Preliminary xmi:id="_nvYQIKe3Eeixw5Ke5QD1pQ">
     <base_Element xmi:type="uml:Property" href="Resource.uml#_13LGbDzEEeiWMf5FLWfdLA"/>
   </OpenModel_Profile:Preliminary>
-  <OpenModel_Profile:Preliminary xmi:id="_eu8jwKbuEeixw5Ke5QD1pQ">
+  <OpenModel_Profile:Preliminary xmi:id="_nve90Ke3Eeixw5Ke5QD1pQ">
     <base_Element xmi:type="uml:Property" href="Resource.uml#_yX0DkD2tEeiu6I5JfRTxxQ"/>
   </OpenModel_Profile:Preliminary>
-  <OpenModel_Profile:Preliminary xmi:id="_eu9x4KbuEeixw5Ke5QD1pQ">
+  <OpenModel_Profile:Preliminary xmi:id="_nvfk4Ke3Eeixw5Ke5QD1pQ">
     <base_Element xmi:type="uml:Class" href="Resource.uml#_13WFYDzEEeiWMf5FLWfdLA"/>
   </OpenModel_Profile:Preliminary>
-  <OpenModel_Profile:Preliminary xmi:id="_eu_AAKbuEeixw5Ke5QD1pQ">
+  <OpenModel_Profile:Preliminary xmi:id="_nvgzAKe3Eeixw5Ke5QD1pQ">
     <base_Element xmi:type="uml:Property" href="Resource.uml#_13WFYzzEEeiWMf5FLWfdLA"/>
   </OpenModel_Profile:Preliminary>
-  <OpenModel_Profile:Preliminary xmi:id="_eu_nEKbuEeixw5Ke5QD1pQ">
+  <OpenModel_Profile:Preliminary xmi:id="_nvou0Ke3Eeixw5Ke5QD1pQ">
     <base_Element xmi:type="uml:Property" href="Resource.uml#_13WFZzzEEeiWMf5FLWfdLA"/>
   </OpenModel_Profile:Preliminary>
-  <OpenModel_Profile:Preliminary xmi:id="_evBcQabuEeixw5Ke5QD1pQ">
+  <OpenModel_Profile:Preliminary xmi:id="_nwki8Ke3Eeixw5Ke5QD1pQ">
     <base_Element xmi:type="uml:Property" href="Resource.uml#_13WFbTzEEeiWMf5FLWfdLA"/>
   </OpenModel_Profile:Preliminary>
-  <OpenModel_Profile:Preliminary xmi:id="_evA1MKbuEeixw5Ke5QD1pQ">
+  <OpenModel_Profile:Preliminary xmi:id="_nvzt8Ke3Eeixw5Ke5QD1pQ">
     <base_Element xmi:type="uml:Property" href="Resource.uml#_13WFaTzEEeiWMf5FLWfdLA"/>
   </OpenModel_Profile:Preliminary>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_SgN9EKbuEeixw5Ke5QD1pQ"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_8diZMES6EeiVGPeZpaYNtQ">
+    <base_StructuralFeature xmi:type="uml:Property" href="Common.uml#_8dhyIES6EeiVGPeZpaYNtQ"/>
+  </OpenModel_Profile:OpenModelAttribute>
+  <OpenModel_Profile:Future xmi:id="_DhzH0KewEeixw5Ke5QD1pQ" base_Element="_45XE4DzEEeiWMf5FLWfdLA"/>
+  <OpenModel_Profile:Future xmi:id="_IofU0KewEeixw5Ke5QD1pQ" base_Element="_45bWUDzEEeiWMf5FLWfdLA"/>
+  <OpenModel_Profile:Future xmi:id="_NTGp0KewEeixw5Ke5QD1pQ" base_Element="_kEZB9jzEEeiWMf5FLWfdLA"/>
+  <OpenModel_Profile:Future xmi:id="_PPHDgKewEeixw5Ke5QD1pQ" base_Element="_GYmRMDzFEeiWMf5FLWfdLA"/>
+  <OpenModel_Profile:Future xmi:id="_QvlXwKewEeixw5Ke5QD1pQ" base_Element="_GYs-4DzFEeiWMf5FLWfdLA"/>
+  <OpenModel_Profile:Future xmi:id="_S1488KewEeixw5Ke5QD1pQ" base_Element="_GY8PcDzFEeiWMf5FLWfdLA"/>
+  <OpenModel_Profile:Future xmi:id="_U0fXoKewEeixw5Ke5QD1pQ" base_Element="_bd_WkDzFEeiWMf5FLWfdLA"/>
+  <OpenModel_Profile:Future xmi:id="_Wk-d0KewEeixw5Ke5QD1pQ" base_Element="_beE2IDzFEeiWMf5FLWfdLA"/>
+  <OpenModel_Profile:Future xmi:id="_YWbNUKewEeixw5Ke5QD1pQ" base_Element="_1WWbsDzFEeiWMf5FLWfdLA"/>
+  <OpenModel_Profile:Future xmi:id="_aRpj4KewEeixw5Ke5QD1pQ" base_Element="_1Wb7QDzFEeiWMf5FLWfdLA"/>
+  <OpenModel_Profile:Future xmi:id="_caI6YKewEeixw5Ke5QD1pQ" base_Element="_1WdwcDzFEeiWMf5FLWfdLA"/>
+  <OpenModel_Profile:Future xmi:id="_d5BTMKewEeixw5Ke5QD1pQ" base_Element="_6GPSQDzFEeiWMf5FLWfdLA"/>
+  <OpenModel_Profile:Future xmi:id="_fug1MKewEeixw5Ke5QD1pQ" base_Element="_BJMXoDzGEeiWMf5FLWfdLA"/>
+  <OpenModel_Profile:Future xmi:id="_kt0AwKewEeixw5Ke5QD1pQ" base_Element="_6GSVkDzFEeiWMf5FLWfdLA"/>
+  <OpenModel_Profile:Future xmi:id="_mbit4KewEeixw5Ke5QD1pQ" base_Element="_6GUx0DzFEeiWMf5FLWfdLA"/>
+  <OpenModel_Profile:Future xmi:id="_oXoAEKewEeixw5Ke5QD1pQ" base_Element="_GYYOwDzFEeiWMf5FLWfdLA"/>
+  <OpenModel_Profile:Future xmi:id="_p-yLIKewEeixw5Ke5QD1pQ">
+    <base_Element xmi:type="uml:Class" href="Resource.uml#_bd53ADzFEeiWMf5FLWfdLA"/>
+  </OpenModel_Profile:Future>
 </xmi:XMI>
diff --git a/papyrus/ONAP Information Model/Vnf.notation b/papyrus/ONAP Information Model/Vnf.notation
index f1e0753..359bbff 100644
--- a/papyrus/ONAP Information Model/Vnf.notation
+++ b/papyrus/ONAP Information Model/Vnf.notation
@@ -13,11 +13,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xdsUUkfXEeimoNQADLD_mg"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_rVpi_oUrEeiRGZJrXkgR0w" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_rVpi_4UrEeiRGZJrXkgR0w" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rVpjAIUrEeiRGZJrXkgR0w"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_qFisADOUEeiHat9KcP8uWA"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_qF0Y0TOUEeiHat9KcP8uWA"/>
         </children>
@@ -27,11 +22,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xdtickfXEeimoNQADLD_mg"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_rVqxIYUrEeiRGZJrXkgR0w" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_rVqxIoUrEeiRGZJrXkgR0w" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rVqxI4UrEeiRGZJrXkgR0w"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_Sz6jIDOVEeiHat9KcP8uWA"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_S0Lo4TOVEeiHat9KcP8uWA"/>
         </children>
@@ -41,11 +31,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xduJgkfXEeimoNQADLD_mg"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_rVr_QoUrEeiRGZJrXkgR0w" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_rVr_Q4UrEeiRGZJrXkgR0w" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rVr_RIUrEeiRGZJrXkgR0w"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_hUYi8DOVEeiHat9KcP8uWA"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_hUposTOVEeiHat9KcP8uWA"/>
         </children>
@@ -55,11 +40,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xdvXokfXEeimoNQADLD_mg"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_rVt0YoUrEeiRGZJrXkgR0w" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_rVt0Y4UrEeiRGZJrXkgR0w" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rVt0ZIUrEeiRGZJrXkgR0w"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_Psi3oDOXEeiHat9KcP8uWA"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_PsxhITOXEeiHat9KcP8uWA"/>
         </children>
@@ -69,11 +49,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xdv-skfXEeimoNQADLD_mg"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_rVvCloUrEeiRGZJrXkgR0w" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_rVvCl4UrEeiRGZJrXkgR0w" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rVvCmIUrEeiRGZJrXkgR0w"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_Txwn0DQLEeixv_sLOod4lQ"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_T2eIsTQLEeixv_sLOod4lQ"/>
         </children>
@@ -83,11 +58,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xdxM0kfXEeimoNQADLD_mg"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_rVw3vIUrEeiRGZJrXkgR0w" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_rVw3vYUrEeiRGZJrXkgR0w" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rVw3voUrEeiRGZJrXkgR0w"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_d9nX0DQLEeixv_sLOod4lQ"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_d-Ob0TQLEeixv_sLOod4lQ"/>
         </children>
@@ -97,11 +67,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xdya8kfXEeimoNQADLD_mg"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_rVyF5oUrEeiRGZJrXkgR0w" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_rVyF54UrEeiRGZJrXkgR0w" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rVyF6IUrEeiRGZJrXkgR0w"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_nVSR0DQLEeixv_sLOod4lQ"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_nVma4TQLEeixv_sLOod4lQ"/>
         </children>
@@ -111,11 +76,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xdzpEkfXEeimoNQADLD_mg"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_rVz7EYUrEeiRGZJrXkgR0w" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_rVz7EoUrEeiRGZJrXkgR0w" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rVz7E4UrEeiRGZJrXkgR0w"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_zS9kwDQLEeixv_sLOod4lQ"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_zTOqgTQLEeixv_sLOod4lQ"/>
         </children>
@@ -125,11 +85,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xd03MkfXEeimoNQADLD_mg"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_rV1wNIUrEeiRGZJrXkgR0w" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_rV1wNYUrEeiRGZJrXkgR0w" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rV1wNoUrEeiRGZJrXkgR0w"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_-WAbcDQLEeixv_sLOod4lQ"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_-WRhMTQLEeixv_sLOod4lQ"/>
         </children>
@@ -139,11 +94,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xd1eQkfXEeimoNQADLD_mg"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_rV3lYoUrEeiRGZJrXkgR0w" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_rV3lY4UrEeiRGZJrXkgR0w" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rV3lZIUrEeiRGZJrXkgR0w"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_IW__QDQMEeixv_sLOod4lQ"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_IXRFATQMEeixv_sLOod4lQ"/>
         </children>
@@ -153,11 +103,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xd2sYkfXEeimoNQADLD_mg"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_rV4zhoUrEeiRGZJrXkgR0w" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_rV4zh4UrEeiRGZJrXkgR0w" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rV4ziIUrEeiRGZJrXkgR0w"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_LgNf8DTdEeiwQ6KPLHcy4g"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_LglTYTTdEeiwQ6KPLHcy4g"/>
         </children>
@@ -167,11 +112,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xd36gkfXEeimoNQADLD_mg"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_rV6osIUrEeiRGZJrXkgR0w" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_rV6osYUrEeiRGZJrXkgR0w" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rV6osoUrEeiRGZJrXkgR0w"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_X1lEsDTeEeiwQ6KPLHcy4g"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_X5LyUTTeEeiwQ6KPLHcy4g"/>
         </children>
@@ -181,11 +121,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xd5IokfXEeimoNQADLD_mg"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_rV8d5oUrEeiRGZJrXkgR0w" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_rV8d54UrEeiRGZJrXkgR0w" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rV8d6IUrEeiRGZJrXkgR0w"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_CnvFoDkKEeiWMf5FLWfdLA"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_-oj9QTmsEeiWMf5FLWfdLA"/>
         </children>
@@ -195,11 +130,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xd5vtEfXEeimoNQADLD_mg"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_rV-6JoUrEeiRGZJrXkgR0w" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_rV-6J4UrEeiRGZJrXkgR0w" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rV-6KIUrEeiRGZJrXkgR0w"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_zr-tcDkIEeiWMf5FLWfdLA"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_-pjbwTmsEeiWMf5FLWfdLA"/>
         </children>
@@ -209,11 +139,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xd690kfXEeimoNQADLD_mg"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_rWAIUoUrEeiRGZJrXkgR0w" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_rWAIU4UrEeiRGZJrXkgR0w" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rWAIVIUrEeiRGZJrXkgR0w"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_HklksDkLEeiWMf5FLWfdLA"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_-pkC0TmsEeiWMf5FLWfdLA"/>
         </children>
@@ -239,11 +164,6 @@
         <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OPSASDaIEei23_xWdimG9w"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_rViONIUrEeiRGZJrXkgR0w" visible="false" type="StereotypeLabel">
-        <styles xmi:type="notation:StringValueStyle" xmi:id="_rViONYUrEeiRGZJrXkgR0w" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-        <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rViONoUrEeiRGZJrXkgR0w"/>
-      </children>
       <element xmi:type="uml:Class" href="Vnf.uml#_aaEZADOREeiHat9KcP8uWA"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aaUQoTOREeiHat9KcP8uWA" x="60" y="200" width="441" height="281"/>
     </children>
@@ -262,11 +182,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xeFV4kfXEeimoNQADLD_mg"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_H2gnPoXjEei3S_qasA4xqA" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_H2gnP4XjEei3S_qasA4xqA" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H2gnQIXjEei3S_qasA4xqA"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_l8PhgDWbEei9Ia34RXjpEg"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_l8y7ITWbEei9Ia34RXjpEg"/>
         </children>
@@ -276,11 +191,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xeGkAkfXEeimoNQADLD_mg"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_H2icZoXjEei3S_qasA4xqA" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_H2icZ4XjEei3S_qasA4xqA" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H2icaIXjEei3S_qasA4xqA"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_wWU6wDWbEei9Ia34RXjpEg"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_wWyNwTWbEei9Ia34RXjpEg"/>
         </children>
@@ -290,11 +200,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xeHLFEfXEeimoNQADLD_mg"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_H2jqkoXjEei3S_qasA4xqA" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_H2jqk4XjEei3S_qasA4xqA" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H2jqlIXjEei3S_qasA4xqA"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_2-9boDWbEei9Ia34RXjpEg"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_2_Y5cTWbEei9Ia34RXjpEg"/>
         </children>
@@ -304,11 +209,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xeIZMkfXEeimoNQADLD_mg"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_H2lfwoXjEei3S_qasA4xqA" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_H2lfw4XjEei3S_qasA4xqA" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H2lfxIXjEei3S_qasA4xqA"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_mq0DkDafEei23_xWdimG9w"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_mvUwITafEei23_xWdimG9w"/>
         </children>
@@ -318,11 +218,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xeJnUkfXEeimoNQADLD_mg"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_H2nU8IXjEei3S_qasA4xqA" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_H2nU8YXjEei3S_qasA4xqA" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H2nU8oXjEei3S_qasA4xqA"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_1yX4kDafEei23_xWdimG9w"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_13MHITafEei23_xWdimG9w"/>
         </children>
@@ -332,11 +227,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xeKOYkfXEeimoNQADLD_mg"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_H2pKFIXjEei3S_qasA4xqA" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_H2pKFYXjEei3S_qasA4xqA" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H2pKFoXjEei3S_qasA4xqA"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_mIpmIDapEei23_xWdimG9w"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_mNY8MTapEei23_xWdimG9w"/>
         </children>
@@ -346,11 +236,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xeLcgkfXEeimoNQADLD_mg"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_H2qYQIXjEei3S_qasA4xqA" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_H2qYQYXjEei3S_qasA4xqA" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H2qYQoXjEei3S_qasA4xqA"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_mC-f4DmyEeiWMf5FLWfdLA"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_D1POwTmzEeiWMf5FLWfdLA"/>
         </children>
@@ -360,11 +245,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xeMDkkfXEeimoNQADLD_mg"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_H2sNYIXjEei3S_qasA4xqA" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_H2sNYYXjEei3S_qasA4xqA" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H2sNYoXjEei3S_qasA4xqA"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_HN9eEDmzEeiWMf5FLWfdLA"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_UpzYITmzEeiWMf5FLWfdLA"/>
         </children>
@@ -390,11 +270,6 @@
         <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OPJdZDaIEei23_xWdimG9w"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_rWKgVIUrEeiRGZJrXkgR0w" visible="false" type="StereotypeLabel">
-        <styles xmi:type="notation:StringValueStyle" xmi:id="_rWKgVYUrEeiRGZJrXkgR0w" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-        <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rWKgVoUrEeiRGZJrXkgR0w"/>
-      </children>
       <element xmi:type="uml:Class" href="Vnf.uml#_e5WnwDOREeiHat9KcP8uWA"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e5ZEATOREeiHat9KcP8uWA" x="180" y="540" width="341" height="181"/>
     </children>
@@ -410,11 +285,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xeSxQkfXEeimoNQADLD_mg"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_H23MiIXjEei3S_qasA4xqA" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_H23MiYXjEei3S_qasA4xqA" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H23MioXjEei3S_qasA4xqA"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_CEDZsDatEei23_xWdimG9w"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_CE5HMTatEei23_xWdimG9w"/>
         </children>
@@ -424,11 +294,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xeTYWEfXEeimoNQADLD_mg"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_H25BuIXjEei3S_qasA4xqA" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_H25BuYXjEei3S_qasA4xqA" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H25BuoXjEei3S_qasA4xqA"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_Z9PKcDavEei23_xWdimG9w"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9r2YTavEei23_xWdimG9w"/>
         </children>
@@ -438,11 +303,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xeUmckfXEeimoNQADLD_mg"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_H26P4oXjEei3S_qasA4xqA" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_H26P44XjEei3S_qasA4xqA" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H26P5IXjEei3S_qasA4xqA"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_S4W1oDazEei23_xWdimG9w"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_S4weQTazEei23_xWdimG9w"/>
         </children>
@@ -452,11 +312,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xeVNi0fXEeimoNQADLD_mg"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_H28FCIXjEei3S_qasA4xqA" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_H28FCYXjEei3S_qasA4xqA" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H28FCoXjEei3S_qasA4xqA"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_cn9ugDazEei23_xWdimG9w"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_cojkYTazEei23_xWdimG9w"/>
         </children>
@@ -466,11 +321,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xeWbokfXEeimoNQADLD_mg"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_H296NIXjEei3S_qasA4xqA" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_H296NYXjEei3S_qasA4xqA" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H296NoXjEei3S_qasA4xqA"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_6gNJkDazEei23_xWdimG9w"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_6g338TazEei23_xWdimG9w"/>
         </children>
@@ -480,11 +330,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xeXCu0fXEeimoNQADLD_mg"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_H2_IXIXjEei3S_qasA4xqA" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_H2_IXYXjEei3S_qasA4xqA" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H2_IXoXjEei3S_qasA4xqA"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_1iyicDa1Eei23_xWdimG9w"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_1jYYUTa1Eei23_xWdimG9w"/>
         </children>
@@ -510,11 +355,6 @@
         <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OPyWmjaIEei23_xWdimG9w"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_rWf3gIUrEeiRGZJrXkgR0w" visible="false" type="StereotypeLabel">
-        <styles xmi:type="notation:StringValueStyle" xmi:id="_rWf3gYUrEeiRGZJrXkgR0w" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-        <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rWf3goUrEeiRGZJrXkgR0w"/>
-      </children>
       <element xmi:type="uml:Class" href="Vnf.uml#_-gDvwDOREeiHat9KcP8uWA"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-gFk8TOREeiHat9KcP8uWA" x="540" y="300" width="421" height="141"/>
     </children>
@@ -530,11 +370,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xebUIkfXEeimoNQADLD_mg"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_H3F2AIXjEei3S_qasA4xqA" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_H3F2AYXjEei3S_qasA4xqA" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H3F2AoXjEei3S_qasA4xqA"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_lDoCUDaqEei23_xWdimG9w"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_lEioUTaqEei23_xWdimG9w"/>
         </children>
@@ -544,11 +379,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xeb7MkfXEeimoNQADLD_mg"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_H3HELoXjEei3S_qasA4xqA" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_H3HEL4XjEei3S_qasA4xqA" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H3HEMIXjEei3S_qasA4xqA"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_v5FwADaqEei23_xWdimG9w"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_v5gmwTaqEei23_xWdimG9w"/>
         </children>
@@ -558,11 +388,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xedJUkfXEeimoNQADLD_mg"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_H3I5UIXjEei3S_qasA4xqA" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_H3I5UYXjEei3S_qasA4xqA" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H3I5UoXjEei3S_qasA4xqA"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_OYLvsDarEei23_xWdimG9w"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_OYw-gTarEei23_xWdimG9w"/>
         </children>
@@ -572,11 +397,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xedwbUfXEeimoNQADLD_mg"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_H3KHfIXjEei3S_qasA4xqA" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_H3KHfYXjEei3S_qasA4xqA" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H3KHfoXjEei3S_qasA4xqA"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_WJJxoDarEei23_xWdimG9w"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_WJqH8TarEei23_xWdimG9w"/>
         </children>
@@ -586,11 +406,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xee-gkfXEeimoNQADLD_mg"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_H3L8ooXjEei3S_qasA4xqA" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_H3L8o4XjEei3S_qasA4xqA" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H3L8pIXjEei3S_qasA4xqA"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_bcG5ADarEei23_xWdimG9w"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_bcvLITarEei23_xWdimG9w"/>
         </children>
@@ -600,11 +415,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xegMokfXEeimoNQADLD_mg"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_H3Nx1oXjEei3S_qasA4xqA" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_H3Nx14XjEei3S_qasA4xqA" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H3Nx2IXjEei3S_qasA4xqA"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_k5xGQDarEei23_xWdimG9w"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_k6SDoTarEei23_xWdimG9w"/>
         </children>
@@ -614,11 +424,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xegzskfXEeimoNQADLD_mg"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_H3PnDoXjEei3S_qasA4xqA" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_H3PnD4XjEei3S_qasA4xqA" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H3PnEIXjEei3S_qasA4xqA"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_svqrgDarEei23_xWdimG9w"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_swPTQTarEei23_xWdimG9w"/>
         </children>
@@ -628,11 +433,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xeiB0kfXEeimoNQADLD_mg"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_H3SDUIXjEei3S_qasA4xqA" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_H3SDUYXjEei3S_qasA4xqA" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H3SDUoXjEei3S_qasA4xqA"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_43h1MDarEei23_xWdimG9w"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_435ooTarEei23_xWdimG9w"/>
         </children>
@@ -642,11 +442,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xeio4kfXEeimoNQADLD_mg"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_H3T4fIXjEei3S_qasA4xqA" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_H3T4fYXjEei3S_qasA4xqA" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H3T4foXjEei3S_qasA4xqA"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_DhvVIDasEei23_xWdimG9w"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_DiI9wTasEei23_xWdimG9w"/>
         </children>
@@ -656,11 +451,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xej3AkfXEeimoNQADLD_mg"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_H3WUvIXjEei3S_qasA4xqA" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_H3WUvYXjEei3S_qasA4xqA" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H3WUvoXjEei3S_qasA4xqA"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_QAAzsDasEei23_xWdimG9w"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_QAxosTasEei23_xWdimG9w"/>
         </children>
@@ -670,11 +460,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xekeEkfXEeimoNQADLD_mg"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_H3YJ8oXjEei3S_qasA4xqA" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_H3YJ84XjEei3S_qasA4xqA" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H3YJ9IXjEei3S_qasA4xqA"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_9W_HADm0EeiWMf5FLWfdLA"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_jlPx0Tm1EeiWMf5FLWfdLA"/>
         </children>
@@ -684,11 +469,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xelsNEfXEeimoNQADLD_mg"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_H3amIoXjEei3S_qasA4xqA" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_H3amI4XjEei3S_qasA4xqA" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H3amJIXjEei3S_qasA4xqA"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_SW0-ADm1EeiWMf5FLWfdLA"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_jlRnATm1EeiWMf5FLWfdLA"/>
         </children>
@@ -714,11 +494,6 @@
         <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OPuFJDaIEei23_xWdimG9w"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_rWxkVIUrEeiRGZJrXkgR0w" visible="false" type="StereotypeLabel">
-        <styles xmi:type="notation:StringValueStyle" xmi:id="_rWxkVYUrEeiRGZJrXkgR0w" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-        <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rWxkVoUrEeiRGZJrXkgR0w"/>
-      </children>
       <element xmi:type="uml:Class" href="Vnf.uml#_J0Zx0DOSEeiHat9KcP8uWA"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J0bnATOSEeiHat9KcP8uWA" x="880" y="520" height="241"/>
     </children>
@@ -734,11 +509,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xeqkskfXEeimoNQADLD_mg"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_H3hT4oXjEei3S_qasA4xqA" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_H3hT44XjEei3S_qasA4xqA" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H3hT5IXjEei3S_qasA4xqA"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_4y_6QDdKEeiIfPeSAqyGdQ"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_45wpkTdKEeiIfPeSAqyGdQ"/>
         </children>
@@ -748,11 +518,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xerLzUfXEeimoNQADLD_mg"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_H3jJEIXjEei3S_qasA4xqA" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_H3jJEYXjEei3S_qasA4xqA" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H3jJEoXjEei3S_qasA4xqA"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_6sJ0QDdKEeiIfPeSAqyGdQ"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_6tvvsTdKEeiIfPeSAqyGdQ"/>
         </children>
@@ -762,11 +527,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xesZ4kfXEeimoNQADLD_mg"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_H3k-NoXjEei3S_qasA4xqA" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_H3k-N4XjEei3S_qasA4xqA" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H3k-OIXjEei3S_qasA4xqA"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_7J45IDdKEeiIfPeSAqyGdQ"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_7OVUQTdKEeiIfPeSAqyGdQ"/>
         </children>
@@ -776,11 +536,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xetA_UfXEeimoNQADLD_mg"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_H3mzYoXjEei3S_qasA4xqA" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_H3mzY4XjEei3S_qasA4xqA" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H3mzZIXjEei3S_qasA4xqA"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_8OQgMDdKEeiIfPeSAqyGdQ"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_8SguETdKEeiIfPeSAqyGdQ"/>
         </children>
@@ -790,11 +545,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xeuPEkfXEeimoNQADLD_mg"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_H3oBkoXjEei3S_qasA4xqA" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_H3oBk4XjEei3S_qasA4xqA" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H3oBlIXjEei3S_qasA4xqA"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_86kMkDdKEeiIfPeSAqyGdQ"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_8-8WQTdKEeiIfPeSAqyGdQ"/>
         </children>
@@ -807,11 +557,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xeu2KEfXEeimoNQADLD_mg"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_H3p2uoXjEei3S_qasA4xqA" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_H3p2u4XjEei3S_qasA4xqA" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H3p2vIXjEei3S_qasA4xqA"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_9jZuMDdKEeiIfPeSAqyGdQ"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_9not8TdKEeiIfPeSAqyGdQ"/>
         </children>
@@ -837,11 +582,6 @@
         <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OQLYIjaIEei23_xWdimG9w"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_rXMbFIUrEeiRGZJrXkgR0w" visible="false" type="StereotypeLabel">
-        <styles xmi:type="notation:StringValueStyle" xmi:id="_rXMbFYUrEeiRGZJrXkgR0w" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-        <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rXMbFoUrEeiRGZJrXkgR0w"/>
-      </children>
       <element xmi:type="uml:Class" href="Vnf.uml#_K_9mADOSEeiHat9KcP8uWA"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_K__bMTOSEeiHat9KcP8uWA" x="980" y="320" width="361" height="141"/>
     </children>
@@ -857,11 +597,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xe2x8kfXEeimoNQADLD_mg"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_H3014oXjEei3S_qasA4xqA" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_H30144XjEei3S_qasA4xqA" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H3015IXjEei3S_qasA4xqA"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_2cgCgDeCEeiIfPeSAqyGdQ"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_2kdrsTeCEeiIfPeSAqyGdQ"/>
         </children>
@@ -871,11 +606,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xe1j0kfXEeimoNQADLD_mg"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_H32rDoXjEei3S_qasA4xqA" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_H32rD4XjEei3S_qasA4xqA" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H32rEIXjEei3S_qasA4xqA"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_vbvVgDeCEeiIfPeSAqyGdQ"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_vj0TcTeCEeiIfPeSAqyGdQ"/>
         </children>
@@ -901,11 +631,6 @@
         <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OQdE9jaIEei23_xWdimG9w"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_rXfWBIUrEeiRGZJrXkgR0w" visible="false" type="StereotypeLabel">
-        <styles xmi:type="notation:StringValueStyle" xmi:id="_rXfWBYUrEeiRGZJrXkgR0w" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-        <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rXfWBoUrEeiRGZJrXkgR0w"/>
-      </children>
       <element xmi:type="uml:Class" href="Vnf.uml#_p0UVsDQvEeixv_sLOod4lQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_p0Vj0TQvEeixv_sLOod4lQ" x="920" y="120" width="241" height="81"/>
     </children>
@@ -921,11 +646,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xe6cUkfXEeimoNQADLD_mg"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_H4AcCoXjEei3S_qasA4xqA" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_H4AcC4XjEei3S_qasA4xqA" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H4AcDIXjEei3S_qasA4xqA"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_x-RHEDkLEeiWMf5FLWfdLA"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_VPIMoTkMEeiWMf5FLWfdLA"/>
         </children>
@@ -935,11 +655,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H4BqIoXjEei3S_qasA4xqA"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_H4CRQIXjEei3S_qasA4xqA" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_H4CRQYXjEei3S_qasA4xqA" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H4CRQoXjEei3S_qasA4xqA"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_A4oNkDkMEeiWMf5FLWfdLA"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_VQ6VUTkMEeiWMf5FLWfdLA"/>
         </children>
@@ -965,11 +680,6 @@
         <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_re0IYjc_EeiIfPeSAqyGdQ"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_e2KdZJTXEeiYXO5wr78TUw" visible="false" type="StereotypeLabel">
-        <styles xmi:type="notation:StringValueStyle" xmi:id="_e2KdZZTXEeiYXO5wr78TUw" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-        <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e2KdZpTXEeiYXO5wr78TUw"/>
-      </children>
       <element xmi:type="uml:Class" href="Vnf.uml#_X3eqgDTQEeiwQ6KPLHcy4g"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YQdLMTTQEeiwQ6KPLHcy4g" x="-140" y="60" width="241" height="81"/>
     </children>
@@ -988,11 +698,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xfENUkfXEeimoNQADLD_mg"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_rYBhhoUrEeiRGZJrXkgR0w" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_rYBhh4UrEeiRGZJrXkgR0w" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rYBhiIUrEeiRGZJrXkgR0w"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_a5biQDg2EeiOYfGHew0BGg"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_bBQBgTg2EeiOYfGHew0BGg"/>
         </children>
@@ -1002,11 +707,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xfFbckfXEeimoNQADLD_mg"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_rYDWwoUrEeiRGZJrXkgR0w" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_rYDWw4UrEeiRGZJrXkgR0w" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rYDWxIUrEeiRGZJrXkgR0w"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_btdAMDg2EeiOYfGHew0BGg"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_b1DdATg2EeiOYfGHew0BGg"/>
         </children>
@@ -1016,11 +716,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xfGCi0fXEeimoNQADLD_mg"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_rYFy8oUrEeiRGZJrXkgR0w" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_rYFy84UrEeiRGZJrXkgR0w" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rYFy9IUrEeiRGZJrXkgR0w"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_cggNwDg2EeiOYfGHew0BGg"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_coByETg2EeiOYfGHew0BGg"/>
         </children>
@@ -1030,11 +725,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xfHQokfXEeimoNQADLD_mg"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_rYHBGoUrEeiRGZJrXkgR0w" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_rYHBG4UrEeiRGZJrXkgR0w" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rYHBHIUrEeiRGZJrXkgR0w"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_dP31MDg2EeiOYfGHew0BGg"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_dXZZgTg2EeiOYfGHew0BGg"/>
         </children>
@@ -1060,11 +750,6 @@
         <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-qgc8TgKEeiOYfGHew0BGg"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_rX5lsoUrEeiRGZJrXkgR0w" visible="false" type="StereotypeLabel">
-        <styles xmi:type="notation:StringValueStyle" xmi:id="_rX5ls4UrEeiRGZJrXkgR0w" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-        <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rX5ltIUrEeiRGZJrXkgR0w"/>
-      </children>
       <element xmi:type="uml:Class" href="Vnf.uml#_tEnEsDTSEeiwQ6KPLHcy4g"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tEo54TTSEeiwQ6KPLHcy4g" x="-220" y="220" width="261" height="121"/>
     </children>
@@ -1144,11 +829,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xfNXQkfXEeimoNQADLD_mg"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_H4cg4oXjEei3S_qasA4xqA" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_H4cg44XjEei3S_qasA4xqA" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H4cg5IXjEei3S_qasA4xqA"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_pszPADd9EeiIfPeSAqyGdQ"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_lyjwcTkREeiWMf5FLWfdLA"/>
         </children>
@@ -1161,11 +841,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xfOlYkfXEeimoNQADLD_mg"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_H4dvDIXjEei3S_qasA4xqA" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_H4dvDYXjEei3S_qasA4xqA" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H4dvDoXjEei3S_qasA4xqA"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_qgZPIDd9EeiIfPeSAqyGdQ"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_5B8qUTm9EeiWMf5FLWfdLA"/>
         </children>
@@ -1175,11 +850,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xfPMdEfXEeimoNQADLD_mg"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_H4e9MoXjEei3S_qasA4xqA" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_H4e9M4XjEei3S_qasA4xqA" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H4e9NIXjEei3S_qasA4xqA"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_rY7ZoDd9EeiIfPeSAqyGdQ"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_5B94cTm9EeiWMf5FLWfdLA"/>
         </children>
@@ -1189,11 +859,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xfQakkfXEeimoNQADLD_mg"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_H4gyVIXjEei3S_qasA4xqA" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_H4gyVYXjEei3S_qasA4xqA" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H4gyVoXjEei3S_qasA4xqA"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_1X3vADd9EeiIfPeSAqyGdQ"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_5CA7wTm9EeiWMf5FLWfdLA"/>
         </children>
@@ -1203,11 +868,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xfRoskfXEeimoNQADLD_mg"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_H4iAgIXjEei3S_qasA4xqA" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_H4iAgYXjEei3S_qasA4xqA" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H4iAgoXjEei3S_qasA4xqA"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_2FzMADd9EeiIfPeSAqyGdQ"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_5CEmITm9EeiWMf5FLWfdLA"/>
         </children>
@@ -1233,11 +893,6 @@
         <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0KPrkjzeEeiuk5pWzMOpfA"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_rYKEaIUrEeiRGZJrXkgR0w" visible="false" type="StereotypeLabel">
-        <styles xmi:type="notation:StringValueStyle" xmi:id="_rYKEaYUrEeiRGZJrXkgR0w" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-        <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rYKEaoUrEeiRGZJrXkgR0w"/>
-      </children>
       <element xmi:type="uml:Class" href="Vnf.uml#_AC2eIDQUEeixv_sLOod4lQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gG2K0TkREeiWMf5FLWfdLA" x="500" y="60" height="121"/>
     </children>
@@ -1261,11 +916,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xfXIQkfXEeimoNQADLD_mg"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_H4sYhoXjEei3S_qasA4xqA" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_H4sYh4XjEei3S_qasA4xqA" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H4sYiIXjEei3S_qasA4xqA"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_v0nsYDd-EeiIfPeSAqyGdQ"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_cpxeYTm-EeiWMf5FLWfdLA"/>
         </children>
@@ -1275,11 +925,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xfYWYkfXEeimoNQADLD_mg"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_H4u0woXjEei3S_qasA4xqA" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_H4u0w4XjEei3S_qasA4xqA" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H4u0xIXjEei3S_qasA4xqA"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_uXGXkDnFEeiWMf5FLWfdLA"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_6a7V0DnFEeiWMf5FLWfdLA"/>
         </children>
@@ -1318,11 +963,6 @@
         <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rYZ8A4UrEeiRGZJrXkgR0w"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_rYajFIUrEeiRGZJrXkgR0w" visible="false" type="StereotypeLabel">
-        <styles xmi:type="notation:StringValueStyle" xmi:id="_rYajFYUrEeiRGZJrXkgR0w" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-        <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rYajFoUrEeiRGZJrXkgR0w"/>
-      </children>
       <element xmi:type="uml:Class" href="Vnf.uml#_oFQM8Dd-EeiIfPeSAqyGdQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XVHG0Tm-EeiWMf5FLWfdLA" x="240" y="-20" height="81"/>
     </children>
@@ -1334,7 +974,7 @@
       <element xsi:nil="true"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XW1lIjm-EeiWMf5FLWfdLA" x="200"/>
     </children>
-    <styles xmi:type="notation:StringValueStyle" xmi:id="_ZmiqUTOREeiHat9KcP8uWA" name="diagram_compatibility_version" stringValue="1.3.0"/>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_ZmiqUTOREeiHat9KcP8uWA" name="diagram_compatibility_version" stringValue="1.4.0"/>
     <styles xmi:type="notation:DiagramStyle" xmi:id="_ZmiqUjOREeiHat9KcP8uWA"/>
     <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_ZmiqUzOREeiHat9KcP8uWA" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
       <owner xmi:type="uml:Package" href="Vnf.uml#_zPN5MDOHEei5Af8DcjrhIQ"/>
@@ -1897,11 +1537,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qGi5kjgeEeiOYfGHew0BGg"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_eIUNMEbpEei7eo5RdnNiBQ" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_eIUNMUbpEei7eo5RdnNiBQ" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eIUNMkbpEei7eo5RdnNiBQ"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_Sz6jIDOVEeiHat9KcP8uWA"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_qGcy8TgeEeiOYfGHew0BGg"/>
         </children>
@@ -1911,11 +1546,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qGhEYjgeEeiOYfGHew0BGg"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_eIRw8EbpEei7eo5RdnNiBQ" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_eIRw8UbpEei7eo5RdnNiBQ" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eIRw8kbpEei7eo5RdnNiBQ"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_qFisADOUEeiHat9KcP8uWA"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_qGcL4TgeEeiOYfGHew0BGg"/>
         </children>
@@ -1925,11 +1555,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qGkuwjgeEeiOYfGHew0BGg"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_eIWpeEbpEei7eo5RdnNiBQ" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_eIWpeUbpEei7eo5RdnNiBQ" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eIWpekbpEei7eo5RdnNiBQ"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_hUYi8DOVEeiHat9KcP8uWA"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_qGcy8zgeEeiOYfGHew0BGg"/>
         </children>
@@ -1939,11 +1564,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qGmj8jgeEeiOYfGHew0BGg"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_eIZFuEbpEei7eo5RdnNiBQ" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_eIZFuUbpEei7eo5RdnNiBQ" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eIZFukbpEei7eo5RdnNiBQ"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_Psi3oDOXEeiHat9KcP8uWA"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_qGdaATgeEeiOYfGHew0BGg"/>
         </children>
@@ -1953,11 +1573,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qGoZIjgeEeiOYfGHew0BGg"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_eIcJAEbpEei7eo5RdnNiBQ" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_eIcJAUbpEei7eo5RdnNiBQ" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eIcJAkbpEei7eo5RdnNiBQ"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_Txwn0DQLEeixv_sLOod4lQ"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_qGdaAzgeEeiOYfGHew0BGg"/>
         </children>
@@ -1967,11 +1582,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qGqOUjgeEeiOYfGHew0BGg"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_eIfMUEbpEei7eo5RdnNiBQ" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_eIfMUUbpEei7eo5RdnNiBQ" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eIfMUkbpEei7eo5RdnNiBQ"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_d9nX0DQLEeixv_sLOod4lQ"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_qGdaBTgeEeiOYfGHew0BGg"/>
         </children>
@@ -1981,11 +1591,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qGsDgjgeEeiOYfGHew0BGg"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_eIhomEbpEei7eo5RdnNiBQ" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_eIhomUbpEei7eo5RdnNiBQ" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eIhomkbpEei7eo5RdnNiBQ"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_nVSR0DQLEeixv_sLOod4lQ"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_qGdaBzgeEeiOYfGHew0BGg"/>
         </children>
@@ -1995,11 +1600,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qGt4sjgeEeiOYfGHew0BGg"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_eIlS9EbpEei7eo5RdnNiBQ" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_eIlS9UbpEei7eo5RdnNiBQ" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eIlS9kbpEei7eo5RdnNiBQ"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_zS9kwDQLEeixv_sLOod4lQ"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_qGdaCTgeEeiOYfGHew0BGg"/>
         </children>
@@ -2009,11 +1609,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qG6tAjgeEeiOYfGHew0BGg"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_eIo9UEbpEei7eo5RdnNiBQ" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_eIo9UUbpEei7eo5RdnNiBQ" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eIo9UkbpEei7eo5RdnNiBQ"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_-WAbcDQLEeixv_sLOod4lQ"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_qGeBETgeEeiOYfGHew0BGg"/>
         </children>
@@ -2023,11 +1618,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qG9JQjgeEeiOYfGHew0BGg"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_eIsApkbpEei7eo5RdnNiBQ" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_eIsAp0bpEei7eo5RdnNiBQ" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eIsAqEbpEei7eo5RdnNiBQ"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_IW__QDQMEeixv_sLOod4lQ"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_qGeBEzgeEeiOYfGHew0BGg"/>
         </children>
@@ -2037,11 +1627,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qG--cjgeEeiOYfGHew0BGg"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_eIuc6EbpEei7eo5RdnNiBQ" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_eIuc6UbpEei7eo5RdnNiBQ" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eIuc6kbpEei7eo5RdnNiBQ"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_LgNf8DTdEeiwQ6KPLHcy4g"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_qGeBFTgeEeiOYfGHew0BGg"/>
         </children>
@@ -2051,11 +1636,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qHAzojgeEeiOYfGHew0BGg"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_eIw5JEbpEei7eo5RdnNiBQ" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_eIw5JUbpEei7eo5RdnNiBQ" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eIw5JkbpEei7eo5RdnNiBQ"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_X1lEsDTeEeiwQ6KPLHcy4g"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_qGeBFzgeEeiOYfGHew0BGg"/>
         </children>
@@ -2065,20 +1645,10 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oOPScl3hEeiwL5tPgFMcjQ"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_oOQgkl3hEeiwL5tPgFMcjQ" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_oOQgk13hEeiwL5tPgFMcjQ" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oOQglF3hEeiwL5tPgFMcjQ"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_CnvFoDkKEeiWMf5FLWfdLA"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_oOLBAV3hEeiwL5tPgFMcjQ"/>
         </children>
         <children xmi:type="notation:Shape" xmi:id="_oOLoEF3hEeiwL5tPgFMcjQ" type="Property_ClassAttributeLabel">
-          <children xmi:type="notation:DecorationNode" xmi:id="_oOS81F3hEeiwL5tPgFMcjQ" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_oOS81V3hEeiwL5tPgFMcjQ" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oOS81l3hEeiwL5tPgFMcjQ"/>
-          </children>
           <children xmi:type="notation:DecorationNode" xmi:id="_oOSVwF3hEeiwL5tPgFMcjQ" visible="false" type="StereotypeLabel">
             <styles xmi:type="notation:StringValueStyle" xmi:id="_oOSVwV3hEeiwL5tPgFMcjQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
@@ -2093,11 +1663,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oOUK8l3hEeiwL5tPgFMcjQ"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_oOVZFF3hEeiwL5tPgFMcjQ" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_oOVZFV3hEeiwL5tPgFMcjQ" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oOVZFl3hEeiwL5tPgFMcjQ"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_HklksDkLEeiWMf5FLWfdLA"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_oOLoE13hEeiwL5tPgFMcjQ"/>
         </children>
@@ -2123,11 +1688,6 @@
         <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kt_74jc_EeiIfPeSAqyGdQ"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_eHtJMEbpEei7eo5RdnNiBQ" visible="false" type="StereotypeLabel">
-        <styles xmi:type="notation:StringValueStyle" xmi:id="_eHtJMUbpEei7eo5RdnNiBQ" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-        <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eHtJMkbpEei7eo5RdnNiBQ"/>
-      </children>
       <element xmi:type="uml:Class" href="Vnf.uml#_aaEZADOREeiHat9KcP8uWA"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6Mhj8TQTEeixv_sLOod4lQ" x="900" y="280" width="381" height="281"/>
     </children>
@@ -2143,11 +1703,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_p3ajkjd9EeiIfPeSAqyGdQ"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_eJR2gkbpEei7eo5RdnNiBQ" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_eJR2g0bpEei7eo5RdnNiBQ" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eJR2hEbpEei7eo5RdnNiBQ"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_pszPADd9EeiIfPeSAqyGdQ"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_p3XgQTd9EeiIfPeSAqyGdQ"/>
         </children>
@@ -2157,11 +1712,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qrXwEjd9EeiIfPeSAqyGdQ"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_eJU50kbpEei7eo5RdnNiBQ" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_eJU500bpEei7eo5RdnNiBQ" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eJU51EbpEei7eo5RdnNiBQ"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_qgZPIDd9EeiIfPeSAqyGdQ"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_qrUswTd9EeiIfPeSAqyGdQ"/>
         </children>
@@ -2171,11 +1721,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rkdUMjd9EeiIfPeSAqyGdQ"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_eJX9KEbpEei7eo5RdnNiBQ" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_eJX9KUbpEei7eo5RdnNiBQ" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eJX9KkbpEei7eo5RdnNiBQ"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_rY7ZoDd9EeiIfPeSAqyGdQ"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_rka38Td9EeiIfPeSAqyGdQ"/>
         </children>
@@ -2185,11 +1730,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1ig4wjd9EeiIfPeSAqyGdQ"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_eJbAdkbpEei7eo5RdnNiBQ" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_eJbAd0bpEei7eo5RdnNiBQ" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eJbAeEbpEei7eo5RdnNiBQ"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_1X3vADd9EeiIfPeSAqyGdQ"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_1idOYTd9EeiIfPeSAqyGdQ"/>
         </children>
@@ -2199,11 +1739,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2QicYjd9EeiIfPeSAqyGdQ"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_eJeDzEbpEei7eo5RdnNiBQ" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_eJeDzUbpEei7eo5RdnNiBQ" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eJeDzkbpEei7eo5RdnNiBQ"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_2FzMADd9EeiIfPeSAqyGdQ"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_2QfZETd9EeiIfPeSAqyGdQ"/>
         </children>
@@ -2229,11 +1764,6 @@
         <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kvRuQjc_EeiIfPeSAqyGdQ"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_eJD0FEbpEei7eo5RdnNiBQ" visible="false" type="StereotypeLabel">
-        <styles xmi:type="notation:StringValueStyle" xmi:id="_eJD0FUbpEei7eo5RdnNiBQ" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-        <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eJD0FkbpEei7eo5RdnNiBQ"/>
-      </children>
       <element xmi:type="uml:Class" href="Vnf.uml#_AC2eIDQUEeixv_sLOod4lQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AC4TUTQUEeixv_sLOod4lQ" x="300" y="600" width="381" height="121"/>
     </children>
@@ -2249,11 +1779,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7q-v0jdREeiIfPeSAqyGdQ"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_eJ1QIEbpEei7eo5RdnNiBQ" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_eJ1QIUbpEei7eo5RdnNiBQ" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eJ1QIkbpEei7eo5RdnNiBQ"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_7nJYsDdREeiIfPeSAqyGdQ"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_7q6eYTdREeiIfPeSAqyGdQ"/>
         </children>
@@ -2263,11 +1788,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8WIwMjdSEeiIfPeSAqyGdQ"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_eJ3FWkbpEei7eo5RdnNiBQ" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_eJ3FW0bpEei7eo5RdnNiBQ" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eJ3FXEbpEei7eo5RdnNiBQ"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_8R7loDdSEeiIfPeSAqyGdQ"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_8WEewTdSEeiIfPeSAqyGdQ"/>
         </children>
@@ -2277,11 +1797,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7hiqgTdSEeiIfPeSAqyGdQ"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_eJ6IqkbpEei7eo5RdnNiBQ" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_eJ6Iq0bpEei7eo5RdnNiBQ" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eJ6IrEbpEei7eo5RdnNiBQ"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_7dX8MDdSEeiIfPeSAqyGdQ"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_7hfAITdSEeiIfPeSAqyGdQ"/>
         </children>
@@ -2291,11 +1806,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9AD28jdSEeiIfPeSAqyGdQ"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_eJ9L9kbpEei7eo5RdnNiBQ" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_eJ9L90bpEei7eo5RdnNiBQ" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eJ9L-EbpEei7eo5RdnNiBQ"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_875IoDdSEeiIfPeSAqyGdQ"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_9AAMkTdSEeiIfPeSAqyGdQ"/>
         </children>
@@ -2321,11 +1831,6 @@
         <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kvhl4jc_EeiIfPeSAqyGdQ"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_eJqRBEbpEei7eo5RdnNiBQ" visible="false" type="StereotypeLabel">
-        <styles xmi:type="notation:StringValueStyle" xmi:id="_eJqRBUbpEei7eo5RdnNiBQ" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-        <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eJqRBkbpEei7eo5RdnNiBQ"/>
-      </children>
       <element xmi:type="uml:Class" href="Vnf.uml#_zOfv8DQVEeixv_sLOod4lQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zOg-ETQVEeixv_sLOod4lQ" x="460" y="180" height="121"/>
     </children>
@@ -2357,11 +1862,6 @@
         <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kvuaMjc_EeiIfPeSAqyGdQ"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_eKDSkkbpEei7eo5RdnNiBQ" visible="false" type="StereotypeLabel">
-        <styles xmi:type="notation:StringValueStyle" xmi:id="_eKDSk0bpEei7eo5RdnNiBQ" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-        <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eKDSlEbpEei7eo5RdnNiBQ"/>
-      </children>
       <element xmi:type="uml:Class" href="Vnf.uml#_AmzWYDQtEeixv_sLOod4lQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Am1LkTQtEeixv_sLOod4lQ" x="40" y="760" width="301" height="61"/>
     </children>
@@ -2377,11 +1877,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mwGiMjgeEeiOYfGHew0BGg"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_eKqWmEbpEei7eo5RdnNiBQ" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_eKqWmUbpEei7eo5RdnNiBQ" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eKqWmkbpEei7eo5RdnNiBQ"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_l8PhgDWbEei9Ia34RXjpEg"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_msUOYTgeEeiOYfGHew0BGg"/>
         </children>
@@ -2391,11 +1886,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mwIXYjgeEeiOYfGHew0BGg"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_eKsy3EbpEei7eo5RdnNiBQ" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_eKsy3UbpEei7eo5RdnNiBQ" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eKsy3kbpEei7eo5RdnNiBQ"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_wWU6wDWbEei9Ia34RXjpEg"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_msU1cTgeEeiOYfGHew0BGg"/>
         </children>
@@ -2405,11 +1895,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mwKMkjgeEeiOYfGHew0BGg"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_eKvPEkbpEei7eo5RdnNiBQ" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_eKvPE0bpEei7eo5RdnNiBQ" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eKvPFEbpEei7eo5RdnNiBQ"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_2-9boDWbEei9Ia34RXjpEg"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_msU1czgeEeiOYfGHew0BGg"/>
         </children>
@@ -2419,11 +1904,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mwMBwjgeEeiOYfGHew0BGg"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_eKxETEbpEei7eo5RdnNiBQ" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_eKxETUbpEei7eo5RdnNiBQ" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eKxETkbpEei7eo5RdnNiBQ"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_mq0DkDafEei23_xWdimG9w"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_msU1dTgeEeiOYfGHew0BGg"/>
         </children>
@@ -2433,11 +1913,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mwN28jgeEeiOYfGHew0BGg"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_eKy5fEbpEei7eo5RdnNiBQ" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_eKy5fUbpEei7eo5RdnNiBQ" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eKy5fkbpEei7eo5RdnNiBQ"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_1yX4kDafEei23_xWdimG9w"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_msU1dzgeEeiOYfGHew0BGg"/>
         </children>
@@ -2447,11 +1922,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mwPFEjgeEeiOYfGHew0BGg"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_RxhCQF0nEeiPYP0Fxe_LhQ" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_RxhCQV0nEeiPYP0Fxe_LhQ" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RxhCQl0nEeiPYP0Fxe_LhQ"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_mIpmIDapEei23_xWdimG9w"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_msU1eTgeEeiOYfGHew0BGg"/>
         </children>
@@ -2480,14 +1950,6 @@
         <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kwB8Mjc_EeiIfPeSAqyGdQ"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_eKfXcEbpEei7eo5RdnNiBQ" visible="false" type="StereotypeLabel">
-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_jgrLoF0nEeiPYP0Fxe_LhQ" source="PapyrusCSSForceValue">
-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_jgrLoV0nEeiPYP0Fxe_LhQ" key="visible" value="true"/>
-        </eAnnotations>
-        <styles xmi:type="notation:StringValueStyle" xmi:id="_eKfXcUbpEei7eo5RdnNiBQ" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-        <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eKfXckbpEei7eo5RdnNiBQ"/>
-      </children>
       <element xmi:type="uml:Class" href="Vnf.uml#_e5WnwDOREeiHat9KcP8uWA"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FEIKETWdEei9Ia34RXjpEg" x="960" y="680" width="301" height="141"/>
     </children>
@@ -2543,12 +2005,7 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kurA0ja8EeivvI-m1BaAbA"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_eLDYMkbpEei7eo5RdnNiBQ" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_eLDYM0bpEei7eo5RdnNiBQ" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eLDYNEbpEei7eo5RdnNiBQ"/>
-          </children>
-          <element xmi:type="uml:Property" href="Vnf.uml#_knSmcDa8EeivvI-m1BaAbA"/>
+          <element xmi:type="uml:Property" href="Common.uml#_knSmcDa8EeivvI-m1BaAbA"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_krETMTa8EeivvI-m1BaAbA"/>
         </children>
         <children xmi:type="notation:Shape" xmi:id="_lU1B4Da8EeivvI-m1BaAbA" type="Property_ClassAttributeLabel">
@@ -2557,12 +2014,7 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lYbvgja8EeivvI-m1BaAbA"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_eLFNYkbpEei7eo5RdnNiBQ" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_eLFNY0bpEei7eo5RdnNiBQ" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eLFNZEbpEei7eo5RdnNiBQ"/>
-          </children>
-          <element xmi:type="uml:Property" href="Vnf.uml#_lRLQ8Da8EeivvI-m1BaAbA"/>
+          <element xmi:type="uml:Property" href="Common.uml#_lRLQ8Da8EeivvI-m1BaAbA"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_lU1B4Ta8EeivvI-m1BaAbA"/>
         </children>
         <children xmi:type="notation:Shape" xmi:id="_lylU4Da8EeivvI-m1BaAbA" type="Property_ClassAttributeLabel">
@@ -2571,12 +2023,7 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l2s_4ja8EeivvI-m1BaAbA"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_eLHCkkbpEei7eo5RdnNiBQ" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_eLHCk0bpEei7eo5RdnNiBQ" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eLHClEbpEei7eo5RdnNiBQ"/>
-          </children>
-          <element xmi:type="uml:Property" href="Vnf.uml#_luvWsDa8EeivvI-m1BaAbA"/>
+          <element xmi:type="uml:Property" href="Common.uml#_luvWsDa8EeivvI-m1BaAbA"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_lylU4Ta8EeivvI-m1BaAbA"/>
         </children>
         <children xmi:type="notation:Shape" xmi:id="_oZ9m0Da8EeivvI-m1BaAbA" type="Property_ClassAttributeLabel">
@@ -2585,12 +2032,7 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_odbKgja8EeivvI-m1BaAbA"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_eLI3wkbpEei7eo5RdnNiBQ" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_eLI3w0bpEei7eo5RdnNiBQ" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eLI3xEbpEei7eo5RdnNiBQ"/>
-          </children>
-          <element xmi:type="uml:Property" href="Vnf.uml#_oWHBkDa8EeivvI-m1BaAbA"/>
+          <element xmi:type="uml:Property" href="Common.uml#_oWHBkDa8EeivvI-m1BaAbA"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_oZ9m0Ta8EeivvI-m1BaAbA"/>
         </children>
         <children xmi:type="notation:Shape" xmi:id="_pNEewDa8EeivvI-m1BaAbA" type="Property_ClassAttributeLabel">
@@ -2599,12 +2041,7 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pQsagja8EeivvI-m1BaAbA"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_eLKs8kbpEei7eo5RdnNiBQ" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_eLKs80bpEei7eo5RdnNiBQ" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eLKs9EbpEei7eo5RdnNiBQ"/>
-          </children>
-          <element xmi:type="uml:Property" href="Vnf.uml#_pJTZEDa8EeivvI-m1BaAbA"/>
+          <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">
@@ -2616,12 +2053,7 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qELs8ja8EeivvI-m1BaAbA"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_eLMiIkbpEei7eo5RdnNiBQ" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_eLMiI0bpEei7eo5RdnNiBQ" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eLMiJEbpEei7eo5RdnNiBQ"/>
-          </children>
-          <element xmi:type="uml:Property" href="Vnf.uml#_p8meQDa8EeivvI-m1BaAbA"/>
+          <element xmi:type="uml:Property" href="Common.uml#_p8meQDa8EeivvI-m1BaAbA"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_qAgt4Ta8EeivvI-m1BaAbA"/>
         </children>
         <styles xmi:type="notation:TitleStyle" xmi:id="_7pXQZDa7EeivvI-m1BaAbA"/>
@@ -2646,18 +2078,13 @@
         <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kwUQEjc_EeiIfPeSAqyGdQ"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_eK6ONEbpEei7eo5RdnNiBQ" visible="false" type="StereotypeLabel">
-        <styles xmi:type="notation:StringValueStyle" xmi:id="_eK6ONUbpEei7eo5RdnNiBQ" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-        <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eK6ONkbpEei7eo5RdnNiBQ"/>
-      </children>
-      <element xmi:type="uml:Class" href="Vnf.uml#_7pUNEDa7EeivvI-m1BaAbA"/>
+      <element xmi:type="uml:Class" href="Common.uml#_7pUNEDa7EeivvI-m1BaAbA"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7pWpUTa7EeivvI-m1BaAbA" x="460" height="141"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_7phBYDa7EeivvI-m1BaAbA" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_7phBYTa7EeivvI-m1BaAbA"/>
       <styles xmi:type="notation:EObjectValueStyle" xmi:id="_7phBYza7EeivvI-m1BaAbA" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="Vnf.uml#_7pUNEDa7EeivvI-m1BaAbA"/>
+        <eObjectValue xmi:type="uml:Class" href="Common.uml#_7pUNEDa7EeivvI-m1BaAbA"/>
       </styles>
       <element xsi:nil="true"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7phBYja7EeivvI-m1BaAbA" x="200"/>
@@ -2677,11 +2104,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wJVYIjd-EeiIfPeSAqyGdQ"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_eLZ9cEbpEei7eo5RdnNiBQ" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_eLZ9cUbpEei7eo5RdnNiBQ" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eLZ9ckbpEei7eo5RdnNiBQ"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_v0nsYDd-EeiIfPeSAqyGdQ"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_v_GeETd-EeiIfPeSAqyGdQ"/>
         </children>
@@ -2711,11 +2133,6 @@
         <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oFdBQjd-EeiIfPeSAqyGdQ"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_eLPlZEbpEei7eo5RdnNiBQ" visible="false" type="StereotypeLabel">
-        <styles xmi:type="notation:StringValueStyle" xmi:id="_eLPlZUbpEei7eo5RdnNiBQ" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-        <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eLPlZkbpEei7eo5RdnNiBQ"/>
-      </children>
       <element xmi:type="uml:Class" href="Vnf.uml#_oFQM8Dd-EeiIfPeSAqyGdQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oFSpMTd-EeiIfPeSAqyGdQ" x="600" y="420" width="281" height="80"/>
     </children>
@@ -2739,11 +2156,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uXQFUjgUEeiOYfGHew0BGg"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_eLn_6kbpEei7eo5RdnNiBQ" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_eLn_60bpEei7eo5RdnNiBQ" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eLn_7EbpEei7eo5RdnNiBQ"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_uA9FMDgUEeiOYfGHew0BGg"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_uMNS8TgUEeiOYfGHew0BGg"/>
         </children>
@@ -2758,11 +2170,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_D3M_wjgVEeiOYfGHew0BGg"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_eLqcIkbpEei7eo5RdnNiBQ" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_eLqcI0bpEei7eo5RdnNiBQ" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eLqcJEbpEei7eo5RdnNiBQ"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_DgtLUDgVEeiOYfGHew0BGg"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_Dr-nMTgVEeiOYfGHew0BGg"/>
         </children>
@@ -2772,11 +2179,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3VA1EjgVEeiOYfGHew0BGg"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_eLs4YEbpEei7eo5RdnNiBQ" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_eLs4YUbpEei7eo5RdnNiBQ" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eLs4YkbpEei7eo5RdnNiBQ"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_2-_hwDgVEeiOYfGHew0BGg"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_3KKP8TgVEeiOYfGHew0BGg"/>
         </children>
@@ -2786,11 +2188,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tUYWQjgYEeiOYfGHew0BGg"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_eLvUoEbpEei7eo5RdnNiBQ" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_eLvUoUbpEei7eo5RdnNiBQ" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eLvUokbpEei7eo5RdnNiBQ"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_s7WyQDgYEeiOYfGHew0BGg"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_tJy24TgYEeiOYfGHew0BGg"/>
         </children>
@@ -2803,11 +2200,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-tAO8jgYEeiOYfGHew0BGg"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_eLxJ1EbpEei7eo5RdnNiBQ" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_eLxJ1UbpEei7eo5RdnNiBQ" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eLxJ1kbpEei7eo5RdnNiBQ"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_-SutwDgYEeiOYfGHew0BGg"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_-h39ATgYEeiOYfGHew0BGg"/>
         </children>
@@ -2817,11 +2209,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="__tKrcjgYEeiOYfGHew0BGg"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_eLyYAkbpEei7eo5RdnNiBQ" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_eLyYA0bpEei7eo5RdnNiBQ" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eLyYBEbpEei7eo5RdnNiBQ"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#__S0RwDgYEeiOYfGHew0BGg"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="__iDAkTgYEeiOYfGHew0BGg"/>
         </children>
@@ -2831,11 +2218,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AbnF0jgZEeiOYfGHew0BGg"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_eL0NMkbpEei7eo5RdnNiBQ" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_eL0NM0bpEei7eo5RdnNiBQ" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eL0NNEbpEei7eo5RdnNiBQ"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_AApoIDgZEeiOYfGHew0BGg"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_AQMgATgZEeiOYfGHew0BGg"/>
         </children>
@@ -2845,11 +2227,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ByojIjgZEeiOYfGHew0BGg"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_eL3QdEbpEei7eo5RdnNiBQ" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_eL3QdUbpEei7eo5RdnNiBQ" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eL3QdkbpEei7eo5RdnNiBQ"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_BYBDsDgZEeiOYfGHew0BGg"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_BnuToTgZEeiOYfGHew0BGg"/>
         </children>
@@ -2875,11 +2252,6 @@
         <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SeReMjgSEeiOYfGHew0BGg"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_eLbypEbpEei7eo5RdnNiBQ" visible="false" type="StereotypeLabel">
-        <styles xmi:type="notation:StringValueStyle" xmi:id="_eLbypUbpEei7eo5RdnNiBQ" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-        <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eLbypkbpEei7eo5RdnNiBQ"/>
-      </children>
       <element xmi:type="uml:Class" href="Vnf.uml#_0lvvQDgREeiOYfGHew0BGg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SeL-oDgSEeiOYfGHew0BGg" x="140" y="360" width="441" height="170"/>
     </children>
@@ -2903,11 +2275,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RcqfAjm5EeiWMf5FLWfdLA"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_eMLZkEbpEei7eo5RdnNiBQ" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_eMLZkUbpEei7eo5RdnNiBQ" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eMLZkkbpEei7eo5RdnNiBQ"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_H9PXMDm5EeiWMf5FLWfdLA"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_RK6AoTm5EeiWMf5FLWfdLA"/>
         </children>
@@ -2917,11 +2284,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Rcv-kjm5EeiWMf5FLWfdLA"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_eMN1yEbpEei7eo5RdnNiBQ" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_eMN1yUbpEei7eo5RdnNiBQ" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eMN1ykbpEei7eo5RdnNiBQ"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_H9RMYDm5EeiWMf5FLWfdLA"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_RK6nsTm5EeiWMf5FLWfdLA"/>
         </children>
@@ -2931,11 +2293,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Rc1eIjm5EeiWMf5FLWfdLA"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_eMQSAkbpEei7eo5RdnNiBQ" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_eMQSA0bpEei7eo5RdnNiBQ" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eMQSBEbpEei7eo5RdnNiBQ"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_H9SagDm5EeiWMf5FLWfdLA"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_RK7OwTm5EeiWMf5FLWfdLA"/>
         </children>
@@ -2945,11 +2302,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Rc6Wojm5EeiWMf5FLWfdLA"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_eMSHPEbpEei7eo5RdnNiBQ" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_eMSHPUbpEei7eo5RdnNiBQ" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eMSHPkbpEei7eo5RdnNiBQ"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_H9TooDm5EeiWMf5FLWfdLA"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_RK710Tm5EeiWMf5FLWfdLA"/>
         </children>
@@ -2959,11 +2311,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Rc_PIjm5EeiWMf5FLWfdLA"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_eMT8bEbpEei7eo5RdnNiBQ" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_eMT8bUbpEei7eo5RdnNiBQ" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eMT8bkbpEei7eo5RdnNiBQ"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_H9Vd0Dm5EeiWMf5FLWfdLA"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_RK710zm5EeiWMf5FLWfdLA"/>
         </children>
@@ -2989,11 +2336,6 @@
         <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CZXckj5nEeijbdkIlrq2uQ"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_eMAaZEbpEei7eo5RdnNiBQ" visible="false" type="StereotypeLabel">
-        <styles xmi:type="notation:StringValueStyle" xmi:id="_eMAaZUbpEei7eo5RdnNiBQ" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-        <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eMAaZkbpEei7eo5RdnNiBQ"/>
-      </children>
       <element xmi:type="uml:Class" href="Vnf.uml#_8BUXwDm4EeiWMf5FLWfdLA"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MUKUIDm5EeiWMf5FLWfdLA" y="20" width="381" height="121"/>
     </children>
@@ -3005,7 +2347,7 @@
       <element xsi:nil="true"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MWeBRDm5EeiWMf5FLWfdLA" x="200"/>
     </children>
-    <styles xmi:type="notation:StringValueStyle" xmi:id="_tsOFETQTEeixv_sLOod4lQ" name="diagram_compatibility_version" stringValue="1.3.0"/>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_tsOFETQTEeixv_sLOod4lQ" name="diagram_compatibility_version" stringValue="1.4.0"/>
     <styles xmi:type="notation:DiagramStyle" xmi:id="_tsOFEjQTEeixv_sLOod4lQ"/>
     <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_tsOFEzQTEeixv_sLOod4lQ" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
       <owner xmi:type="uml:Package" href="Vnf.uml#_zPN5MDOHEei5Af8DcjrhIQ"/>
@@ -3188,7 +2530,7 @@
     <edges xmi:type="notation:Connector" xmi:id="_7phocDa7EeivvI-m1BaAbA" type="StereotypeCommentLink" source="_7pWpUDa7EeivvI-m1BaAbA" target="_7phBYDa7EeivvI-m1BaAbA">
       <styles xmi:type="notation:FontStyle" xmi:id="_7phocTa7EeivvI-m1BaAbA"/>
       <styles xmi:type="notation:EObjectValueStyle" xmi:id="_7phodTa7EeivvI-m1BaAbA" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="Vnf.uml#_7pUNEDa7EeivvI-m1BaAbA"/>
+        <eObjectValue xmi:type="uml:Class" href="Common.uml#_7pUNEDa7EeivvI-m1BaAbA"/>
       </styles>
       <element xsi:nil="true"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_7phocja7EeivvI-m1BaAbA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
@@ -3689,7 +3031,7 @@
             <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uP4likccEei7eo5RdnNiBQ"/>
           </children>
-          <element xmi:type="uml:Property" href="Vnf.uml#_6g1tYDnBEeiWMf5FLWfdLA"/>
+          <element xmi:type="uml:Property" href="Common.uml#_6g1tYDnBEeiWMf5FLWfdLA"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_KrlwkTzqEeiuk5pWzMOpfA"/>
         </children>
         <children xmi:type="notation:Shape" xmi:id="_Krm-sDzqEeiuk5pWzMOpfA" type="Property_ClassAttributeLabel">
@@ -3703,7 +3045,7 @@
             <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uP6atkccEei7eo5RdnNiBQ"/>
           </children>
-          <element xmi:type="uml:Property" href="Vnf.uml#_6g3ikDnBEeiWMf5FLWfdLA"/>
+          <element xmi:type="uml:Property" href="Common.uml#_6g3ikDnBEeiWMf5FLWfdLA"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_Krm-sTzqEeiuk5pWzMOpfA"/>
         </children>
         <children xmi:type="notation:Shape" xmi:id="_KrnlwDzqEeiuk5pWzMOpfA" type="Property_ClassAttributeLabel">
@@ -3717,7 +3059,7 @@
             <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uP7o2kccEei7eo5RdnNiBQ"/>
           </children>
-          <element xmi:type="uml:Property" href="Vnf.uml#_6g4wsDnBEeiWMf5FLWfdLA"/>
+          <element xmi:type="uml:Property" href="Common.uml#_6g4wsDnBEeiWMf5FLWfdLA"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_KrnlwTzqEeiuk5pWzMOpfA"/>
         </children>
         <styles xmi:type="notation:TitleStyle" xmi:id="_rc5EdjzfEeiuk5pWzMOpfA"/>
@@ -3747,13 +3089,13 @@
         <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uPwCpkccEei7eo5RdnNiBQ"/>
       </children>
-      <element xmi:type="uml:Class" href="Vnf.uml#_0AbUYDnBEeiWMf5FLWfdLA"/>
+      <element xmi:type="uml:Class" href="Common.uml#_0AbUYDnBEeiWMf5FLWfdLA"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rc5EcTzfEeiuk5pWzMOpfA" x="1040" y="220" width="241" height="101"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_rdDcgDzfEeiuk5pWzMOpfA" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_rdDcgTzfEeiuk5pWzMOpfA"/>
       <styles xmi:type="notation:EObjectValueStyle" xmi:id="_rdDcgzzfEeiuk5pWzMOpfA" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="Vnf.uml#_0AbUYDnBEeiWMf5FLWfdLA"/>
+        <eObjectValue xmi:type="uml:Class" href="Common.uml#_0AbUYDnBEeiWMf5FLWfdLA"/>
       </styles>
       <element xsi:nil="true"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rdDcgjzfEeiuk5pWzMOpfA" x="200"/>
@@ -4435,7 +3777,7 @@
     <edges xmi:type="notation:Connector" xmi:id="_rdDchDzfEeiuk5pWzMOpfA" type="StereotypeCommentLink" source="_rc5EcDzfEeiuk5pWzMOpfA" target="_rdDcgDzfEeiuk5pWzMOpfA">
       <styles xmi:type="notation:FontStyle" xmi:id="_rdDchTzfEeiuk5pWzMOpfA"/>
       <styles xmi:type="notation:EObjectValueStyle" xmi:id="_rdDciTzfEeiuk5pWzMOpfA" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="Vnf.uml#_0AbUYDnBEeiWMf5FLWfdLA"/>
+        <eObjectValue xmi:type="uml:Class" href="Common.uml#_0AbUYDnBEeiWMf5FLWfdLA"/>
       </styles>
       <element xsi:nil="true"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_rdDchjzfEeiuk5pWzMOpfA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
@@ -4755,11 +4097,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XHmJAj0QEeiuk5pWzMOpfA"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_qUinkkbrEei7eo5RdnNiBQ" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_qUink0brEei7eo5RdnNiBQ" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qUinlEbrEei7eo5RdnNiBQ"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_x-RHEDkLEeiWMf5FLWfdLA"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_XHieoT0QEeiuk5pWzMOpfA"/>
         </children>
@@ -4769,11 +4106,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XHolQj0QEeiuk5pWzMOpfA"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_qUj1tEbrEei7eo5RdnNiBQ" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_qUj1tUbrEei7eo5RdnNiBQ" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qUj1tkbrEei7eo5RdnNiBQ"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_A4oNkDkMEeiWMf5FLWfdLA"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_XHjFsT0QEeiuk5pWzMOpfA"/>
         </children>
@@ -4799,11 +4131,6 @@
         <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UGrVsj0QEeiuk5pWzMOpfA"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_qUdIAEbrEei7eo5RdnNiBQ" visible="false" type="StereotypeLabel">
-        <styles xmi:type="notation:StringValueStyle" xmi:id="_qUdIAUbrEei7eo5RdnNiBQ" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-        <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qUdIAkbrEei7eo5RdnNiBQ"/>
-      </children>
       <element xmi:type="uml:Class" href="Vnf.uml#_X3eqgDTQEeiwQ6KPLHcy4g"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UGiy0T0QEeiuk5pWzMOpfA" x="100" y="320"/>
     </children>
@@ -4827,11 +4154,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uh_qgj5bEeijbdkIlrq2uQ"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_qUtmwkbrEei7eo5RdnNiBQ" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_qUtmw0brEei7eo5RdnNiBQ" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qUtmxEbrEei7eo5RdnNiBQ"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_JHLc0D3BEeiFiY3bcpqGkg"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_JHaGUT3BEeiFiY3bcpqGkg"/>
         </children>
@@ -4860,11 +4182,6 @@
         <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kyi1oj2KEeiFiY3bcpqGkg"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_qUmR9EbrEei7eo5RdnNiBQ" visible="false" type="StereotypeLabel">
-        <styles xmi:type="notation:StringValueStyle" xmi:id="_qUmR9UbrEei7eo5RdnNiBQ" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-        <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qUmR9kbrEei7eo5RdnNiBQ"/>
-      </children>
       <element xmi:type="uml:Class" href="Vnf.uml#_CaBRQD0REeiuk5pWzMOpfA"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CaDGcT0REeiuk5pWzMOpfA" x="520" y="60" width="261"/>
     </children>
@@ -4888,11 +4205,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_O0d24j5dEeijbdkIlrq2uQ"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_qU50AkbrEei7eo5RdnNiBQ" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_qU50A0brEei7eo5RdnNiBQ" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qU50BEbrEei7eo5RdnNiBQ"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_O0DAID5dEeijbdkIlrq2uQ"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_O0XJMT5dEeijbdkIlrq2uQ"/>
         </children>
@@ -4902,11 +4214,6 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o4u0kj5eEeijbdkIlrq2uQ"/>
           </children>
-          <children xmi:type="notation:DecorationNode" xmi:id="_qU8QQkbrEei7eo5RdnNiBQ" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_qU8QQ0brEei7eo5RdnNiBQ" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-            <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qU8QREbrEei7eo5RdnNiBQ"/>
-          </children>
           <element xmi:type="uml:Property" href="Vnf.uml#_o4b5oD5eEeijbdkIlrq2uQ"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_o4ot8T5eEeijbdkIlrq2uQ"/>
         </children>
@@ -4932,11 +4239,6 @@
         <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kysmoj2KEeiFiY3bcpqGkg"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_qUzGREbrEei7eo5RdnNiBQ" visible="false" type="StereotypeLabel">
-        <styles xmi:type="notation:StringValueStyle" xmi:id="_qUzGRUbrEei7eo5RdnNiBQ" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-        <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qUzGRkbrEei7eo5RdnNiBQ"/>
-      </children>
       <element xmi:type="uml:Class" href="Vnf.uml#_FLWJYD0REeiuk5pWzMOpfA"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FLWwcT0REeiuk5pWzMOpfA" x="520" y="180" width="261"/>
     </children>
@@ -4976,11 +4278,6 @@
         <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ky1Jgj2KEeiFiY3bcpqGkg"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_qU_6kEbrEei7eo5RdnNiBQ" visible="false" type="StereotypeLabel">
-        <styles xmi:type="notation:StringValueStyle" xmi:id="_qU_6kUbrEei7eo5RdnNiBQ" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-        <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qU_6kkbrEei7eo5RdnNiBQ"/>
-      </children>
       <element xmi:type="uml:Class" href="Vnf.uml#_IYL40D0REeiuk5pWzMOpfA"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IYNG8T0REeiuk5pWzMOpfA" x="520" y="320" width="261"/>
     </children>
@@ -5020,11 +4317,6 @@
         <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ky8eQj2KEeiFiY3bcpqGkg"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_qVMH0EbrEei7eo5RdnNiBQ" visible="false" type="StereotypeLabel">
-        <styles xmi:type="notation:StringValueStyle" xmi:id="_qVMH0UbrEei7eo5RdnNiBQ" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-        <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qVMH0kbrEei7eo5RdnNiBQ"/>
-      </children>
       <element xmi:type="uml:Class" href="Vnf.uml#_KzEm4D0REeiuk5pWzMOpfA"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KzF1AT0REeiuk5pWzMOpfA" x="520" y="460" width="261"/>
     </children>
@@ -5103,11 +4395,6 @@
         <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DrFc0kJ9EeiwbqJBYHKltg"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_qVgQ5EbrEei7eo5RdnNiBQ" visible="false" type="StereotypeLabel">
-        <styles xmi:type="notation:StringValueStyle" xmi:id="_qVgQ5UbrEei7eo5RdnNiBQ" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-        <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qVgQ5kbrEei7eo5RdnNiBQ"/>
-      </children>
       <element xmi:type="uml:Class" href="Vnf.uml#_AC2eIDQUEeixv_sLOod4lQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Dq4BcUJ9EeiwbqJBYHKltg" x="580" y="860"/>
     </children>
@@ -5142,16 +4429,6 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_Yc8iQEJ9EeiwbqJBYHKltg"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Yc8iQUJ9EeiwbqJBYHKltg"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_qVnloEbrEei7eo5RdnNiBQ" visible="false" type="StereotypeLabel">
-        <styles xmi:type="notation:StringValueStyle" xmi:id="_qVnloUbrEei7eo5RdnNiBQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelClass"/>
-        <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qVnlokbrEei7eo5RdnNiBQ"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_qVpa1EbrEei7eo5RdnNiBQ" visible="false" type="StereotypeLabel">
-        <styles xmi:type="notation:StringValueStyle" xmi:id="_qVpa1UbrEei7eo5RdnNiBQ" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-        <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qVpa1kbrEei7eo5RdnNiBQ"/>
-      </children>
       <element xmi:type="uml:Class" href="Service.uml#_13gdcDzEEeiWMf5FLWfdLA"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Yc77IUJ9EeiwbqJBYHKltg" x="260" y="-100" height="61"/>
     </children>
@@ -5191,11 +4468,6 @@
         <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qVwIgkbrEei7eo5RdnNiBQ"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_qVxWpEbrEei7eo5RdnNiBQ" visible="false" type="StereotypeLabel">
-        <styles xmi:type="notation:StringValueStyle" xmi:id="_qVxWpUbrEei7eo5RdnNiBQ" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-        <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qVxWpkbrEei7eo5RdnNiBQ"/>
-      </children>
       <element xmi:type="uml:Class" href="Service.uml#_7SrB0D0VEeiWMf5FLWfdLA"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_djVNMUJ9EeiwbqJBYHKltg" x="520" y="-100" height="61"/>
     </children>
@@ -5279,11 +4551,6 @@
         <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NGuwgkKAEeiwbqJBYHKltg"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_qV-K9EbrEei7eo5RdnNiBQ" visible="false" type="StereotypeLabel">
-        <styles xmi:type="notation:StringValueStyle" xmi:id="_qV-K9UbrEei7eo5RdnNiBQ" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-        <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qV-K9kbrEei7eo5RdnNiBQ"/>
-      </children>
       <element xmi:type="uml:Class" href="Vnf.uml#_p0UVsDQvEeixv_sLOod4lQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NGlmkUKAEeiwbqJBYHKltg" x="1060" y="340" height="61"/>
     </children>
@@ -5323,11 +4590,6 @@
         <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_unkp8kKAEeiwbqJBYHKltg"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_qWH79EbrEei7eo5RdnNiBQ" visible="false" type="StereotypeLabel">
-        <styles xmi:type="notation:StringValueStyle" xmi:id="_qWH79UbrEei7eo5RdnNiBQ" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-        <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qWH79kbrEei7eo5RdnNiBQ"/>
-      </children>
       <element xmi:type="uml:Class" href="Vnf.uml#_e5WnwDOREeiHat9KcP8uWA"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uncuIUKAEeiwbqJBYHKltg" x="1080" y="800" height="73"/>
     </children>
@@ -5339,7 +4601,7 @@
       <element xsi:nil="true"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_unntRUKAEeiwbqJBYHKltg" x="200"/>
     </children>
-    <styles xmi:type="notation:StringValueStyle" xmi:id="_ojifoT0JEeiuk5pWzMOpfA" name="diagram_compatibility_version" stringValue="1.3.0"/>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_ojifoT0JEeiuk5pWzMOpfA" name="diagram_compatibility_version" stringValue="1.4.0"/>
     <styles xmi:type="notation:DiagramStyle" xmi:id="_ojifoj0JEeiuk5pWzMOpfA"/>
     <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_ojifoz0JEeiuk5pWzMOpfA" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
       <owner xmi:type="uml:Package" href="Vnf.uml#_zPN5MDOHEei5Af8DcjrhIQ"/>
@@ -6961,7 +6223,7 @@
             <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_faXl5nPWEeiuFfjlON-CuQ"/>
           </children>
-          <element xmi:type="uml:Property" href="Vnf.uml#_A8dPwDa-EeivvI-m1BaAbA"/>
+          <element xmi:type="uml:Property" href="Common.uml#_A8dPwDa-EeivvI-m1BaAbA"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_faKKgXPWEeiuFfjlON-CuQ"/>
         </children>
         <children xmi:type="notation:Shape" xmi:id="_faKKgnPWEeiuFfjlON-CuQ" type="Property_DataTypeAttributeLabel">
@@ -6975,7 +6237,7 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_faZbEnPWEeiuFfjlON-CuQ"/>
           </children>
-          <element xmi:type="uml:Property" href="Vnf.uml#_BxokQDa-EeivvI-m1BaAbA"/>
+          <element xmi:type="uml:Property" href="Common.uml#_BxokQDa-EeivvI-m1BaAbA"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_faKKg3PWEeiuFfjlON-CuQ"/>
         </children>
         <children xmi:type="notation:Shape" xmi:id="_faKxkHPWEeiuFfjlON-CuQ" type="Property_DataTypeAttributeLabel">
@@ -6989,7 +6251,7 @@
             <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_facebnPWEeiuFfjlON-CuQ"/>
           </children>
-          <element xmi:type="uml:Property" href="Vnf.uml#_CUeLkDa-EeivvI-m1BaAbA"/>
+          <element xmi:type="uml:Property" href="Common.uml#_CUeLkDa-EeivvI-m1BaAbA"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_faKxkXPWEeiuFfjlON-CuQ"/>
         </children>
         <styles xmi:type="notation:TitleStyle" xmi:id="_Yepw8nPWEeiuFfjlON-CuQ"/>
@@ -7003,7 +6265,7 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_Yepw-XPWEeiuFfjlON-CuQ"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Yepw-nPWEeiuFfjlON-CuQ"/>
       </children>
-      <element xmi:type="uml:DataType" href="Vnf.uml#_2aIggDa9EeivvI-m1BaAbA"/>
+      <element xmi:type="uml:DataType" href="Common.uml#_2aIggDa9EeivvI-m1BaAbA"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YepJ4XPWEeiuFfjlON-CuQ" x="40" y="20"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_ZruBAHPWEeiuFfjlON-CuQ" type="Enumeration_Shape">
@@ -7107,7 +6369,7 @@
             <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HBBnGHPXEeiuFfjlON-CuQ"/>
           </children>
-          <element xmi:type="uml:Property" href="Vnf.uml#_oa2iMDa9EeivvI-m1BaAbA"/>
+          <element xmi:type="uml:Property" href="Common.uml#_oa2iMDa9EeivvI-m1BaAbA"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_HA65UXPXEeiuFfjlON-CuQ"/>
         </children>
         <children xmi:type="notation:Shape" xmi:id="_HA65UnPXEeiuFfjlON-CuQ" type="Property_DataTypeAttributeLabel">
@@ -7121,7 +6383,7 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HBDcMnPXEeiuFfjlON-CuQ"/>
           </children>
-          <element xmi:type="uml:Property" href="Vnf.uml#_pMKqYDa9EeivvI-m1BaAbA"/>
+          <element xmi:type="uml:Property" href="Common.uml#_pMKqYDa9EeivvI-m1BaAbA"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_HA65U3PXEeiuFfjlON-CuQ"/>
         </children>
         <styles xmi:type="notation:TitleStyle" xmi:id="_0gGCdnPWEeiuFfjlON-CuQ"/>
@@ -7135,7 +6397,7 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_0gGCfXPWEeiuFfjlON-CuQ"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0gGCfnPWEeiuFfjlON-CuQ"/>
       </children>
-      <element xmi:type="uml:DataType" href="Vnf.uml#_PjIasDa9EeivvI-m1BaAbA"/>
+      <element xmi:type="uml:DataType" href="Common.uml#_PjIasDa9EeivvI-m1BaAbA"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0gGCcXPWEeiuFfjlON-CuQ" x="40" y="160"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_3y2zsHPWEeiuFfjlON-CuQ" type="Enumeration_Shape">
@@ -7454,7 +6716,7 @@
             <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yAjBZHPXEeiuFfjlON-CuQ"/>
           </children>
-          <element xmi:type="uml:Property" href="Vnf.uml#_EjJgADd2EeiIfPeSAqyGdQ"/>
+          <element xmi:type="uml:Property" href="Common.uml#_EjJgADd2EeiIfPeSAqyGdQ"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_yAUX4XPXEeiuFfjlON-CuQ"/>
         </children>
         <children xmi:type="notation:Shape" xmi:id="_yAU-8HPXEeiuFfjlON-CuQ" type="Property_DataTypeAttributeLabel">
@@ -7468,7 +6730,7 @@
             <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yAk2knPXEeiuFfjlON-CuQ"/>
           </children>
-          <element xmi:type="uml:Property" href="Vnf.uml#_F5b9gDd2EeiIfPeSAqyGdQ"/>
+          <element xmi:type="uml:Property" href="Common.uml#_F5b9gDd2EeiIfPeSAqyGdQ"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_yAU-8XPXEeiuFfjlON-CuQ"/>
         </children>
         <styles xmi:type="notation:TitleStyle" xmi:id="_6tYrJnPWEeiuFfjlON-CuQ"/>
@@ -7482,7 +6744,7 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_6tYrLXPWEeiuFfjlON-CuQ"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6tYrLnPWEeiuFfjlON-CuQ"/>
       </children>
-      <element xmi:type="uml:DataType" href="Vnf.uml#_7hn1IDd1EeiIfPeSAqyGdQ"/>
+      <element xmi:type="uml:DataType" href="Common.uml#_7hn1IDd1EeiIfPeSAqyGdQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6tYrIXPWEeiuFfjlON-CuQ" x="280" y="460"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_2MdBIHPXEeiuFfjlON-CuQ" type="DataType_Shape">
@@ -7602,11 +6864,11 @@
       </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="Vnf.uml#_W5tgEDnFEeiWMf5FLWfdLA"/>
+          <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="Vnf.uml#_Z6H9EDnFEeiWMf5FLWfdLA"/>
+          <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"/>
@@ -7614,7 +6876,7 @@
         <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="Vnf.uml#_Qmf1kDnFEeiWMf5FLWfdLA"/>
+      <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">
@@ -7872,19 +7134,19 @@
       </children>
       <children xmi:type="notation:BasicCompartment" xmi:id="_ocbxZXPYEeiuFfjlON-CuQ" type="Enumeration_LiteralCompartment">
         <children xmi:type="notation:Shape" xmi:id="_ua5T4HPYEeiuFfjlON-CuQ" type="EnumerationLiteral_LiteralLabel">
-          <element xmi:type="uml:EnumerationLiteral" href="Vnf.uml#_IJCHwDnKEeiWMf5FLWfdLA"/>
+          <element xmi:type="uml:EnumerationLiteral" href="Common.uml#_IJCHwDnKEeiWMf5FLWfdLA"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_ua5T4XPYEeiuFfjlON-CuQ"/>
         </children>
         <children xmi:type="notation:Shape" xmi:id="_ua5T4nPYEeiuFfjlON-CuQ" type="EnumerationLiteral_LiteralLabel">
-          <element xmi:type="uml:EnumerationLiteral" href="Vnf.uml#_LgsnIDnKEeiWMf5FLWfdLA"/>
+          <element xmi:type="uml:EnumerationLiteral" href="Common.uml#_LgsnIDnKEeiWMf5FLWfdLA"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_ua5T43PYEeiuFfjlON-CuQ"/>
         </children>
         <children xmi:type="notation:Shape" xmi:id="_ua5T5HPYEeiuFfjlON-CuQ" type="EnumerationLiteral_LiteralLabel">
-          <element xmi:type="uml:EnumerationLiteral" href="Vnf.uml#_ON-FsDnKEeiWMf5FLWfdLA"/>
+          <element xmi:type="uml:EnumerationLiteral" href="Common.uml#_ON-FsDnKEeiWMf5FLWfdLA"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_ua5T5XPYEeiuFfjlON-CuQ"/>
         </children>
         <children xmi:type="notation:Shape" xmi:id="_ua568HPYEeiuFfjlON-CuQ" type="EnumerationLiteral_LiteralLabel">
-          <element xmi:type="uml:EnumerationLiteral" href="Vnf.uml#_RUyssDnKEeiWMf5FLWfdLA"/>
+          <element xmi:type="uml:EnumerationLiteral" href="Common.uml#_RUyssDnKEeiWMf5FLWfdLA"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_ua568XPYEeiuFfjlON-CuQ"/>
         </children>
         <styles xmi:type="notation:TitleStyle" xmi:id="_ocbxZnPYEeiuFfjlON-CuQ"/>
@@ -7892,7 +7154,7 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_ocbxaHPYEeiuFfjlON-CuQ"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ocbxaXPYEeiuFfjlON-CuQ"/>
       </children>
-      <element xmi:type="uml:Enumeration" href="Vnf.uml#_B3kJsDnKEeiWMf5FLWfdLA"/>
+      <element xmi:type="uml:Enumeration" href="Common.uml#_B3kJsDnKEeiWMf5FLWfdLA"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ocbxYXPYEeiuFfjlON-CuQ" x="40" y="1080"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_stcTkHPYEeiuFfjlON-CuQ" type="Enumeration_Shape">
@@ -7902,11 +7164,11 @@
       </children>
       <children xmi:type="notation:BasicCompartment" xmi:id="_stcTlXPYEeiuFfjlON-CuQ" type="Enumeration_LiteralCompartment">
         <children xmi:type="notation:Shape" xmi:id="_vITMcHPYEeiuFfjlON-CuQ" type="EnumerationLiteral_LiteralLabel">
-          <element xmi:type="uml:EnumerationLiteral" href="Vnf.uml#_zZIKMDnJEeiWMf5FLWfdLA"/>
+          <element xmi:type="uml:EnumerationLiteral" href="Common.uml#_zZIKMDnJEeiWMf5FLWfdLA"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_vITMcXPYEeiuFfjlON-CuQ"/>
         </children>
         <children xmi:type="notation:Shape" xmi:id="_vITMcnPYEeiuFfjlON-CuQ" type="EnumerationLiteral_LiteralLabel">
-          <element xmi:type="uml:EnumerationLiteral" href="Vnf.uml#_1qskMDnJEeiWMf5FLWfdLA"/>
+          <element xmi:type="uml:EnumerationLiteral" href="Common.uml#_1qskMDnJEeiWMf5FLWfdLA"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_vITMc3PYEeiuFfjlON-CuQ"/>
         </children>
         <styles xmi:type="notation:TitleStyle" xmi:id="_stcTlnPYEeiuFfjlON-CuQ"/>
@@ -7914,7 +7176,7 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_stcTmHPYEeiuFfjlON-CuQ"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_stcTmXPYEeiuFfjlON-CuQ"/>
       </children>
-      <element xmi:type="uml:Enumeration" href="Vnf.uml#_tMoywDnJEeiWMf5FLWfdLA"/>
+      <element xmi:type="uml:Enumeration" href="Common.uml#_tMoywDnJEeiWMf5FLWfdLA"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_stcTkXPYEeiuFfjlON-CuQ" x="240" y="1080"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_tRjGMHPYEeiuFfjlON-CuQ" type="DataType_Shape">
@@ -8541,7 +7803,7 @@
     <children xmi:type="notation:Shape" xmi:id="_W3aSxJUGEeiYXO5wr78TUw" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_W3aSxZUGEeiYXO5wr78TUw"/>
       <styles xmi:type="notation:EObjectValueStyle" xmi:id="_W3aSx5UGEeiYXO5wr78TUw" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:DataType" href="Vnf.uml#_2aIggDa9EeivvI-m1BaAbA"/>
+        <eObjectValue xmi:type="uml:DataType" href="Common.uml#_2aIggDa9EeivvI-m1BaAbA"/>
       </styles>
       <element xsi:nil="true"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_W3aSxpUGEeiYXO5wr78TUw" x="240" y="20"/>
@@ -8573,7 +7835,7 @@
     <children xmi:type="notation:Shape" xmi:id="_llOLBJUGEeiYXO5wr78TUw" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_llOLBZUGEeiYXO5wr78TUw"/>
       <styles xmi:type="notation:EObjectValueStyle" xmi:id="_llOLB5UGEeiYXO5wr78TUw" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:DataType" href="Vnf.uml#_PjIasDa9EeivvI-m1BaAbA"/>
+        <eObjectValue xmi:type="uml:DataType" href="Common.uml#_PjIasDa9EeivvI-m1BaAbA"/>
       </styles>
       <element xsi:nil="true"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_llOLBpUGEeiYXO5wr78TUw" x="240" y="160"/>
@@ -8629,7 +7891,7 @@
     <children xmi:type="notation:Shape" xmi:id="_LC3RNJUHEeiYXO5wr78TUw" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_LC3RNZUHEeiYXO5wr78TUw"/>
       <styles xmi:type="notation:EObjectValueStyle" xmi:id="_LC3RN5UHEeiYXO5wr78TUw" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:DataType" href="Vnf.uml#_7hn1IDd1EeiIfPeSAqyGdQ"/>
+        <eObjectValue xmi:type="uml:DataType" href="Common.uml#_7hn1IDd1EeiIfPeSAqyGdQ"/>
       </styles>
       <element xsi:nil="true"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LC3RNpUHEeiYXO5wr78TUw" x="240" y="460"/>
@@ -8653,7 +7915,7 @@
     <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="Vnf.uml#_Qmf1kDnFEeiWMf5FLWfdLA"/>
+        <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"/>
@@ -8685,7 +7947,7 @@
     <children xmi:type="notation:Shape" xmi:id="_OOlw4JUIEeiYXO5wr78TUw" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_OOlw4ZUIEeiYXO5wr78TUw"/>
       <styles xmi:type="notation:EObjectValueStyle" xmi:id="_OOlw45UIEeiYXO5wr78TUw" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Enumeration" href="Vnf.uml#_B3kJsDnKEeiWMf5FLWfdLA"/>
+        <eObjectValue xmi:type="uml:Enumeration" href="Common.uml#_B3kJsDnKEeiWMf5FLWfdLA"/>
       </styles>
       <element xsi:nil="true"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OOlw4pUIEeiYXO5wr78TUw" x="240" y="900"/>
@@ -8693,7 +7955,7 @@
     <children xmi:type="notation:Shape" xmi:id="_Sy1YJJUIEeiYXO5wr78TUw" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_Sy1YJZUIEeiYXO5wr78TUw"/>
       <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Sy1YJ5UIEeiYXO5wr78TUw" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Enumeration" href="Vnf.uml#_tMoywDnJEeiWMf5FLWfdLA"/>
+        <eObjectValue xmi:type="uml:Enumeration" href="Common.uml#_tMoywDnJEeiWMf5FLWfdLA"/>
       </styles>
       <element xsi:nil="true"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Sy1YJpUIEeiYXO5wr78TUw" x="440" y="900"/>
@@ -8865,7 +8127,7 @@
     <edges xmi:type="notation:Connector" xmi:id="_W3aSyJUGEeiYXO5wr78TUw" type="StereotypeCommentLink" source="_YepJ4HPWEeiuFfjlON-CuQ" target="_W3aSxJUGEeiYXO5wr78TUw">
       <styles xmi:type="notation:FontStyle" xmi:id="_W3aSyZUGEeiYXO5wr78TUw"/>
       <styles xmi:type="notation:EObjectValueStyle" xmi:id="_W3aSzZUGEeiYXO5wr78TUw" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:DataType" href="Vnf.uml#_2aIggDa9EeivvI-m1BaAbA"/>
+        <eObjectValue xmi:type="uml:DataType" href="Common.uml#_2aIggDa9EeivvI-m1BaAbA"/>
       </styles>
       <element xsi:nil="true"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_W3aSypUGEeiYXO5wr78TUw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
@@ -8905,7 +8167,7 @@
     <edges xmi:type="notation:Connector" xmi:id="_llOLCJUGEeiYXO5wr78TUw" type="StereotypeCommentLink" source="_0gGCcHPWEeiuFfjlON-CuQ" target="_llOLBJUGEeiYXO5wr78TUw">
       <styles xmi:type="notation:FontStyle" xmi:id="_llOLCZUGEeiYXO5wr78TUw"/>
       <styles xmi:type="notation:EObjectValueStyle" xmi:id="_llOLDZUGEeiYXO5wr78TUw" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:DataType" href="Vnf.uml#_PjIasDa9EeivvI-m1BaAbA"/>
+        <eObjectValue xmi:type="uml:DataType" href="Common.uml#_PjIasDa9EeivvI-m1BaAbA"/>
       </styles>
       <element xsi:nil="true"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_llOLCpUGEeiYXO5wr78TUw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
@@ -8975,7 +8237,7 @@
     <edges xmi:type="notation:Connector" xmi:id="_LC3ROJUHEeiYXO5wr78TUw" type="StereotypeCommentLink" source="_6tYrIHPWEeiuFfjlON-CuQ" target="_LC3RNJUHEeiYXO5wr78TUw">
       <styles xmi:type="notation:FontStyle" xmi:id="_LC3ROZUHEeiYXO5wr78TUw"/>
       <styles xmi:type="notation:EObjectValueStyle" xmi:id="_LC3RPZUHEeiYXO5wr78TUw" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:DataType" href="Vnf.uml#_7hn1IDd1EeiIfPeSAqyGdQ"/>
+        <eObjectValue xmi:type="uml:DataType" href="Common.uml#_7hn1IDd1EeiIfPeSAqyGdQ"/>
       </styles>
       <element xsi:nil="true"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_LC3ROpUHEeiYXO5wr78TUw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
@@ -9005,7 +8267,7 @@
     <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="Vnf.uml#_Qmf1kDnFEeiWMf5FLWfdLA"/>
+        <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]"/>
@@ -9045,7 +8307,7 @@
     <edges xmi:type="notation:Connector" xmi:id="_OOlw5JUIEeiYXO5wr78TUw" type="StereotypeCommentLink" source="_ocbxYHPYEeiuFfjlON-CuQ" target="_OOlw4JUIEeiYXO5wr78TUw">
       <styles xmi:type="notation:FontStyle" xmi:id="_OOlw5ZUIEeiYXO5wr78TUw"/>
       <styles xmi:type="notation:EObjectValueStyle" xmi:id="_OOlw6ZUIEeiYXO5wr78TUw" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Enumeration" href="Vnf.uml#_B3kJsDnKEeiWMf5FLWfdLA"/>
+        <eObjectValue xmi:type="uml:Enumeration" href="Common.uml#_B3kJsDnKEeiWMf5FLWfdLA"/>
       </styles>
       <element xsi:nil="true"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_OOlw5pUIEeiYXO5wr78TUw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
@@ -9055,7 +8317,7 @@
     <edges xmi:type="notation:Connector" xmi:id="_Sy1YKJUIEeiYXO5wr78TUw" type="StereotypeCommentLink" source="_stcTkHPYEeiuFfjlON-CuQ" target="_Sy1YJJUIEeiYXO5wr78TUw">
       <styles xmi:type="notation:FontStyle" xmi:id="_Sy1YKZUIEeiYXO5wr78TUw"/>
       <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Sy1YLZUIEeiYXO5wr78TUw" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Enumeration" href="Vnf.uml#_tMoywDnJEeiWMf5FLWfdLA"/>
+        <eObjectValue xmi:type="uml:Enumeration" href="Common.uml#_tMoywDnJEeiWMf5FLWfdLA"/>
       </styles>
       <element xsi:nil="true"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Sy1YKpUIEeiYXO5wr78TUw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
@@ -9594,11 +8856,6 @@
         <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TEsakpXAEeitEu5uB9R53Q"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_TEtBqJXAEeitEu5uB9R53Q" visible="false" type="StereotypeLabel">
-        <styles xmi:type="notation:StringValueStyle" xmi:id="_TEtBqZXAEeitEu5uB9R53Q" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>
-        <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TEtBqpXAEeitEu5uB9R53Q"/>
-      </children>
       <element xmi:type="uml:Class" href="Common.uml#_VtzSoESyEeiVGPeZpaYNtQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TEg0YZXAEeitEu5uB9R53Q" x="400" y="160"/>
     </children>
@@ -9610,7 +8867,7 @@
       <element xsi:nil="true"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TEx6IpXAEeitEu5uB9R53Q" x="200"/>
     </children>
-    <styles xmi:type="notation:StringValueStyle" xmi:id="_O6Y9UZXAEeitEu5uB9R53Q" name="diagram_compatibility_version" stringValue="1.3.0"/>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_O6Y9UZXAEeitEu5uB9R53Q" name="diagram_compatibility_version" stringValue="1.4.0"/>
     <styles xmi:type="notation:DiagramStyle" xmi:id="_O6Y9UpXAEeitEu5uB9R53Q"/>
     <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_O6Y9U5XAEeitEu5uB9R53Q" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
       <owner xmi:type="uml:Package" href="Vnf.uml#_zPN5MDOHEei5Af8DcjrhIQ"/>
@@ -9912,45 +9169,6 @@
       <element xmi:type="uml:Comment" href="Vnf.uml#_X5PIYJs2EeiPBvbfaqSLYg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_X5Q9kZs2EeiPBvbfaqSLYg" x="1120" y="180" width="201" height="81"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_RiDucJs3EeiPBvbfaqSLYg" type="Class_Shape">
-      <children xmi:type="notation:DecorationNode" xmi:id="_RiEVgJs3EeiPBvbfaqSLYg" type="Class_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_RiEVgZs3EeiPBvbfaqSLYg" type="Class_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_RiEVgps3EeiPBvbfaqSLYg" y="15"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_RiEVg5s3EeiPBvbfaqSLYg" type="Class_AttributeCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_RiEVhJs3EeiPBvbfaqSLYg"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_RiEVhZs3EeiPBvbfaqSLYg"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_RiEVhps3EeiPBvbfaqSLYg"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RiEVh5s3EeiPBvbfaqSLYg"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_RiEViJs3EeiPBvbfaqSLYg" visible="false" type="Class_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_RiEViZs3EeiPBvbfaqSLYg"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_RiEVips3EeiPBvbfaqSLYg"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_RiEVi5s3EeiPBvbfaqSLYg"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RiEVjJs3EeiPBvbfaqSLYg"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_RiEVjZs3EeiPBvbfaqSLYg" visible="false" type="Class_NestedClassifierCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_RiEVjps3EeiPBvbfaqSLYg"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_RiEVj5s3EeiPBvbfaqSLYg"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_RiEVkJs3EeiPBvbfaqSLYg"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RiEVkZs3EeiPBvbfaqSLYg"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_NDfGUKY4Eeily5uFlujj3Q" visible="false" type="StereotypeLabel">
-        <styles xmi:type="notation:StringValueStyle" xmi:id="_NDfGUaY4Eeily5uFlujj3Q" name="stereotype" stringValue="OpenModel_Profile::OpenModelClass"/>
-        <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NDfGUqY4Eeily5uFlujj3Q"/>
-      </children>
-      <element xmi:type="uml:Class" href="Vnf.uml#_RiB5QJs3EeiPBvbfaqSLYg"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RiDucZs3EeiPBvbfaqSLYg" x="660" y="680" width="121" height="80"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_RiLqQ5s3EeiPBvbfaqSLYg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_RiLqRJs3EeiPBvbfaqSLYg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_RiLqRps3EeiPBvbfaqSLYg" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="Vnf.uml#_RiB5QJs3EeiPBvbfaqSLYg"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RiLqRZs3EeiPBvbfaqSLYg" x="200"/>
-    </children>
     <children xmi:type="notation:Shape" xmi:id="_xVcnkJs3EeiPBvbfaqSLYg" type="Class_Shape">
       <children xmi:type="notation:DecorationNode" xmi:id="_xVcnkps3EeiPBvbfaqSLYg" type="Class_NameLabel"/>
       <children xmi:type="notation:DecorationNode" xmi:id="_xVcnk5s3EeiPBvbfaqSLYg" type="Class_FloatingNameLabel">
@@ -10039,6 +9257,45 @@
       <element xsi:nil="true"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_r8SuwqLQEeiz_K9hWIugxQ" x="200"/>
     </children>
+    <children xmi:type="notation:Shape" xmi:id="_Tz-HEKe2Eeixw5Ke5QD1pQ" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_Tz-uIKe2Eeixw5Ke5QD1pQ" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Tz-uIae2Eeixw5Ke5QD1pQ" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Tz-uIqe2Eeixw5Ke5QD1pQ" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Tz-uI6e2Eeixw5Ke5QD1pQ" type="Class_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Tz-uJKe2Eeixw5Ke5QD1pQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Tz-uJae2Eeixw5Ke5QD1pQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Tz-uJqe2Eeixw5Ke5QD1pQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Tz-uJ6e2Eeixw5Ke5QD1pQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Tz-uKKe2Eeixw5Ke5QD1pQ" visible="false" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Tz_VMKe2Eeixw5Ke5QD1pQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Tz_VMae2Eeixw5Ke5QD1pQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Tz_VMqe2Eeixw5Ke5QD1pQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Tz_VM6e2Eeixw5Ke5QD1pQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Tz_VNKe2Eeixw5Ke5QD1pQ" visible="false" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Tz_VNae2Eeixw5Ke5QD1pQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Tz_VNqe2Eeixw5Ke5QD1pQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Tz_VN6e2Eeixw5Ke5QD1pQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Tz_VOKe2Eeixw5Ke5QD1pQ"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_T0LicKe2Eeixw5Ke5QD1pQ" visible="false" type="StereotypeLabel">
+        <styles xmi:type="notation:StringValueStyle" xmi:id="_T0Licae2Eeixw5Ke5QD1pQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelClass"/>
+        <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_T0Licqe2Eeixw5Ke5QD1pQ"/>
+      </children>
+      <element xmi:type="uml:Class" href="Resource.uml#_13TCEDzEEeiWMf5FLWfdLA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Tz-HEae2Eeixw5Ke5QD1pQ" x="660" y="680" height="81"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_T0UFUKe2Eeixw5Ke5QD1pQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_T0UFUae2Eeixw5Ke5QD1pQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_T0UFU6e2Eeixw5Ke5QD1pQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="Resource.uml#_13TCEDzEEeiWMf5FLWfdLA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_T0UFUqe2Eeixw5Ke5QD1pQ" x="200"/>
+    </children>
     <styles xmi:type="notation:StringValueStyle" xmi:id="_9U7NAZpVEeidy9iGT_F5-w" name="diagram_compatibility_version" stringValue="1.4.0"/>
     <styles xmi:type="notation:DiagramStyle" xmi:id="_9U7NAppVEeidy9iGT_F5-w"/>
     <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_9U7NA5pVEeidy9iGT_F5-w" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
@@ -10283,30 +9540,6 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xqsf0JssEeiPBvbfaqSLYg" id="(0.4838709677419355,0.0)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xqsf0ZssEeiPBvbfaqSLYg" id="(0.4979253112033195,1.0)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_RiLqR5s3EeiPBvbfaqSLYg" type="StereotypeCommentLink" source="_RiDucJs3EeiPBvbfaqSLYg" target="_RiLqQ5s3EeiPBvbfaqSLYg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_RiLqSJs3EeiPBvbfaqSLYg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_RiLqTJs3EeiPBvbfaqSLYg" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="Vnf.uml#_RiB5QJs3EeiPBvbfaqSLYg"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_RiLqSZs3EeiPBvbfaqSLYg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RiLqSps3EeiPBvbfaqSLYg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RiLqS5s3EeiPBvbfaqSLYg"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_dhQEUJs3EeiPBvbfaqSLYg" type="Generalization_Edge" source="_RiDucJs3EeiPBvbfaqSLYg" target="_O4DnUJssEeiPBvbfaqSLYg">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Xg7l8JwOEeiPD5fN_oRNAg" source="PapyrusCSSForceValue">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Xg7l8ZwOEeiPD5fN_oRNAg" key="routing" value="true"/>
-      </eAnnotations>
-      <children xmi:type="notation:DecorationNode" xmi:id="_dhQrYJs3EeiPBvbfaqSLYg" type="Generalization_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_fgVnMJs3EeiPBvbfaqSLYg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_dhQrYZs3EeiPBvbfaqSLYg" x="-1" y="38"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_dhQEUZs3EeiPBvbfaqSLYg"/>
-      <element xmi:type="uml:Generalization" href="Vnf.uml#_dSlWMJs3EeiPBvbfaqSLYg"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_dhQEUps3EeiPBvbfaqSLYg" points="[720, 680, -643984, -643984]$[720, 660, -643984, -643984]$[520, 660, -643984, -643984]$[520, 621, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_d1TowJs3EeiPBvbfaqSLYg" id="(0.49586776859504134,0.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_d1TowZs3EeiPBvbfaqSLYg" id="(0.5063291139240507,1.0)"/>
-    </edges>
     <edges xmi:type="notation:Connector" xmi:id="_xVkjYZs3EeiPBvbfaqSLYg" type="StereotypeCommentLink" source="_xVcnkJs3EeiPBvbfaqSLYg" target="_xVj8W5s3EeiPBvbfaqSLYg">
       <styles xmi:type="notation:FontStyle" xmi:id="_xVkjYps3EeiPBvbfaqSLYg"/>
       <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xVkjZps3EeiPBvbfaqSLYg" name="BASE_ELEMENT">
@@ -10400,5 +9633,26 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zdG_YKLREeiz_K9hWIugxQ" id="(1.0,0.49382716049382713)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zdHmcKLREeiz_K9hWIugxQ" id="(1.0,0.5)"/>
     </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_T0UFVKe2Eeixw5Ke5QD1pQ" type="StereotypeCommentLink" source="_Tz-HEKe2Eeixw5Ke5QD1pQ" target="_T0UFUKe2Eeixw5Ke5QD1pQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_T0UFVae2Eeixw5Ke5QD1pQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_T0VTcKe2Eeixw5Ke5QD1pQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="Resource.uml#_13TCEDzEEeiWMf5FLWfdLA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_T0UFVqe2Eeixw5Ke5QD1pQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_T0UsYKe2Eeixw5Ke5QD1pQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_T0UsYae2Eeixw5Ke5QD1pQ"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_lyx2AKe2Eeixw5Ke5QD1pQ" type="Generalization_Edge" source="_Tz-HEKe2Eeixw5Ke5QD1pQ" target="_O4DnUJssEeiPBvbfaqSLYg" routing="Tree">
+      <children xmi:type="notation:DecorationNode" xmi:id="_lyydEKe2Eeixw5Ke5QD1pQ" type="Generalization_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_sxRSIKe2Eeixw5Ke5QD1pQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_lyydEae2Eeixw5Ke5QD1pQ" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_lyx2Aae2Eeixw5Ke5QD1pQ"/>
+      <element xmi:type="uml:Generalization" href="Resource.uml#_lh0B0Ke2Eeixw5Ke5QD1pQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_lyx2Aqe2Eeixw5Ke5QD1pQ" points="[680, 680, -643984, -643984]$[680, 660, -643984, -643984]$[519, 660, -643984, -643984]$[519, 621, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mRsmoKe2Eeixw5Ke5QD1pQ" id="(0.2,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mRsmoae2Eeixw5Ke5QD1pQ" id="(0.5,1.0)"/>
+    </edges>
   </notation:Diagram>
 </xmi:XMI>
diff --git a/papyrus/ONAP Information Model/Vnf.uml b/papyrus/ONAP Information Model/Vnf.uml
index ec99a59..f440206 100644
--- a/papyrus/ONAP Information Model/Vnf.uml
+++ b/papyrus/ONAP Information Model/Vnf.uml
@@ -336,7 +336,9 @@ NOTE 2: virtualLinkProfile needs to be provided for all VLs that the CPs of the
         <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_mcfPwFqmEeiTzriVSbKglg" source="org.eclipse.papyrus">
           <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_mcfPwVqmEeiTzriVSbKglg" key="nature" value="UML_Nature"/>
         </eAnnotations>
-        <ownedEnd xmi:type="uml:Property" xmi:id="_mcgd4FqmEeiTzriVSbKglg" name="affinityorantiaffinitygroup" type="_0AbUYDnBEeiWMf5FLWfdLA" association="_mcaXQFqmEeiTzriVSbKglg"/>
+        <ownedEnd xmi:type="uml:Property" xmi:id="_mcgd4FqmEeiTzriVSbKglg" name="affinityorantiaffinitygroup" association="_mcaXQFqmEeiTzriVSbKglg">
+          <type xmi:type="uml:Class" href="Common.uml#_0AbUYDnBEeiWMf5FLWfdLA"/>
+        </ownedEnd>
         <ownedEnd xmi:type="uml:Property" xmi:id="_mciTEFqmEeiTzriVSbKglg" name="virtuallinkprofile" type="_0lvvQDgREeiOYfGHew0BGg" association="_mcaXQFqmEeiTzriVSbKglg"/>
       </packagedElement>
       <packagedElement xmi:type="uml:Association" xmi:id="_KOPAwEJ9EeiwbqJBYHKltg" memberEnd="_KOSEEEJ9EeiwbqJBYHKltg _KOYxwEJ9EeiwbqJBYHKltg">
@@ -917,11 +919,12 @@ ETSI GS NFV-IFA 011 V2.1.3&#xD;
           </ownedComment>
           <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_dFetsDdzEeiIfPeSAqyGdQ" name="localAffinityOrAntiAffinityRule" type="_7hn1IDd1EeiIfPeSAqyGdQ">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_dFetsDdzEeiIfPeSAqyGdQ" name="localAffinityOrAntiAffinityRule">
           <ownedComment xmi:type="uml:Comment" xmi:id="_2Ur2MDd1EeiIfPeSAqyGdQ" annotatedElement="_dFetsDdzEeiIfPeSAqyGdQ">
             <body>Specifies affinity or anti-affinity rules applicable between the virtualisation containers (e.g. virtual machines) to be created based on this VDU.&#xD;
 </body>
           </ownedComment>
+          <type xmi:type="uml:DataType" href="Common.uml#_7hn1IDd1EeiIfPeSAqyGdQ"/>
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_hw0hYJmdEeibE8EgApNciA"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_hw6oAJmdEeibE8EgApNciA" value="*"/>
         </ownedAttribute>
@@ -1098,7 +1101,9 @@ NOTE: Each identifier references an affinity or anti-affinity group which expres
         <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>
         </ownedComment>
-        <generalization xmi:type="uml:Generalization" xmi:id="_W3y74DdREeiIfPeSAqyGdQ" general="_7pUNEDa7EeivvI-m1BaAbA"/>
+        <generalization xmi:type="uml:Generalization" xmi:id="_W3y74DdREeiIfPeSAqyGdQ">
+          <general xmi:type="uml:Class" href="Common.uml#_7pUNEDa7EeivvI-m1BaAbA"/>
+        </generalization>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_7nJYsDdREeiIfPeSAqyGdQ" name="bitrateRequirement">
           <ownedComment xmi:type="uml:Comment" xmi:id="_B1YckDdSEeiIfPeSAqyGdQ" annotatedElement="_7nJYsDdREeiIfPeSAqyGdQ">
             <body>Bitrate requirement on this CP.&#xD;
@@ -1183,13 +1188,14 @@ If there is only one &quot;instantiationLevel&quot; entry, it shall be treated a
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_OCe9gDnBEeiWMf5FLWfdLA" value="1"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OCfkkDnBEeiWMf5FLWfdLA" value="*"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_Y7jjYTnCEeiWMf5FLWfdLA" name="_affinityOrAntiAffinityGroup" type="_0AbUYDnBEeiWMf5FLWfdLA" aggregation="shared" association="_Y7f5ADnCEeiWMf5FLWfdLA">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_Y7jjYTnCEeiWMf5FLWfdLA" name="_affinityOrAntiAffinityGroup" aggregation="shared" association="_Y7f5ADnCEeiWMf5FLWfdLA">
           <ownedComment xmi:type="uml:Comment" xmi:id="_UIlpAGNWEeio9amveq0yWQ" annotatedElement="_Y7jjYTnCEeiWMf5FLWfdLA">
             <body>Specifies affinity or anti-affinity relationship applicable between the virtualisation containers (e.g. virtual machines) to be created using different VDUs or internal VLs to be created using different VnfVirtualLinkDesc(s) in the same affinity or anti-affinity group.&#xD;
 &#xD;
 NOTE: In the present specification, including either VDU(s) or VnfVirtualLinkDesc(s) into the same affinity or anti-affinity group is supported. Extension to support including both VDU(s) and VnfVirtualLinkDesc(s) into the same affinity or anti-affinity group is left for future specification.&#xD;
 </body>
           </ownedComment>
+          <type xmi:type="uml:Class" href="Common.uml#_0AbUYDnBEeiWMf5FLWfdLA"/>
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Y8ia0DnCEeiWMf5FLWfdLA"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Y8ia0TnCEeiWMf5FLWfdLA" value="*"/>
         </ownedAttribute>
@@ -1322,64 +1328,6 @@ A given element can belong to multiple groups.</body>
           </ownedComment>
         </ownedAttribute>
       </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>
-        </ownedComment>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_knSmcDa8EeivvI-m1BaAbA" name="cpdId">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_XFxTUEbwEei7eo5RdnNiBQ" annotatedElement="_knSmcDa8EeivvI-m1BaAbA">
-            <body>Identifier of this Cpd information element.&#xD;
-</body>
-          </ownedComment>
-          <type xmi:type="uml:DataType" href="Common.uml#_AuYtcDkBEeiWMf5FLWfdLA"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_lRLQ8Da8EeivvI-m1BaAbA" name="cpRole">
-          <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;
-For example a VNF with a tree flow pattern within the VNF will have legal cpRoles of ROOT and LEAF.&#xD;
-</body>
-          </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_9HlFYDa8EeivvI-m1BaAbA"/>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_9HrMADa8EeivvI-m1BaAbA" value="1"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_luvWsDa8EeivvI-m1BaAbA" name="description">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_cEl9wEbwEei7eo5RdnNiBQ" annotatedElement="_luvWsDa8EeivvI-m1BaAbA">
-            <body>Provides human-readable information on the purpose of the CP (e.g. CP for control plane traffic).&#xD;
-</body>
-          </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_-jjUIDa8EeivvI-m1BaAbA"/>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_-jozsDa8EeivvI-m1BaAbA" value="1"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_oWHBkDa8EeivvI-m1BaAbA" name="cpProtocol" type="_PjIasDa9EeivvI-m1BaAbA">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_eZqXsEbwEei7eo5RdnNiBQ" annotatedElement="_oWHBkDa8EeivvI-m1BaAbA">
-            <body>Identifies the protocol layering information the CP uses for connectivity purposes and associated information. There shall be one cpProtocol for each layer protocol as indicated by the attribute layerProtocol.&#xD;
-&#xD;
-Editor's note: the attribute &quot;layerProtocol&quot; still needs further discussion and not included in this table.&#xD;
-</body>
-          </ownedComment>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DooXkDa9EeivvI-m1BaAbA" value="1"/>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DospADa9EeivvI-m1BaAbA" value="*"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_pJTZEDa8EeivvI-m1BaAbA" name="trunkMode">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_gaoJ4EbwEei7eo5RdnNiBQ" annotatedElement="_pJTZEDa8EeivvI-m1BaAbA">
-            <body>Information about whether the CP instantiated from this CPD is in Trunk mode (802.1Q or other).&#xD;
-</body>
-          </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>
-          </ownedComment>
-          <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="_oFQM8Dd-EeiIfPeSAqyGdQ" name="VirtualLinkDescFlavour">
         <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>
@@ -1400,87 +1348,6 @@ Editor's note: the attribute &quot;layerProtocol&quot; still needs further discu
           <type xmi:type="uml:DataType" href="Common.uml#_AuYtcDkBEeiWMf5FLWfdLA"/>
         </ownedAttribute>
       </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_0lvvQDgREeiOYfGHew0BGg" name="VirtualLinkProfile">
-        <ownedComment xmi:type="uml:Comment" xmi:id="__mm0oDgREeiOYfGHew0BGg" annotatedElement="_0lvvQDgREeiOYfGHew0BGg">
-          <body>The VirtualLinkProfile describes additional instantiation data for a given VL used in a DF.</body>
-        </ownedComment>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_uA9FMDgUEeiOYfGHew0BGg" name="localAffinityOrAntiAffinityRule" type="_7hn1IDd1EeiIfPeSAqyGdQ">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_3SRfkDgUEeiOYfGHew0BGg" annotatedElement="_uA9FMDgUEeiOYfGHew0BGg">
-            <body>Specifies affinity or anti-affinity rules applicable between the VLs based on this VnfVirtualLinkDesc.&#xD;
-&#xD;
-When the cardinality is greater than 1, both affinity rule(s) and anti-affinity rule(s) with different scopes are applicable to the VLs based on this VnfVirtualLinkDesc.&#xD;
-</body>
-          </ownedComment>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0ph7sDgUEeiOYfGHew0BGg"/>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0puwADgUEeiOYfGHew0BGg" value="*"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DgtLUDgVEeiOYfGHew0BGg" name="affinityOrAntiAffinityGroupId">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_0UUEMDgVEeiOYfGHew0BGg" annotatedElement="_DgtLUDgVEeiOYfGHew0BGg">
-            <body>Identifier(s) of the affinity or anti-affinity group(s) the VnfVirtualLinkDesc belongs to.&#xD;
-&#xD;
-NOTE: Each identifier references an affinity or anti-affinity group which expresses affinity or anti-affinity relationship between the VL(s) using this VnfVirtualLinkDesc and the VL(s) using other VnfVirtualLinkDesc(s) in the same group.&#xD;
-</body>
-          </ownedComment>
-          <type xmi:type="uml:DataType" href="Common.uml#_AuYtcDkBEeiWMf5FLWfdLA"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_LAkPIDgVEeiOYfGHew0BGg"/>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LArj4DgVEeiOYfGHew0BGg" value="*"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_2-_hwDgVEeiOYfGHew0BGg" name="maxBitRateRequirements">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_n6_2wDgYEeiOYfGHew0BGg" annotatedElement="_2-_hwDgVEeiOYfGHew0BGg">
-            <body>Specifies the minimum bitrate requirements for a VL instantiated according to this profile.&#xD;
-</body>
-          </ownedComment>
-          <type xmi:type="uml:DataType" href="Common.uml#_LsX6UDgXEeiOYfGHew0BGg"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_s7WyQDgYEeiOYfGHew0BGg" name="minBitRateRequirements">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_0SpI4DgYEeiOYfGHew0BGg" annotatedElement="_s7WyQDgYEeiOYfGHew0BGg">
-            <body>Specifies the minimum bitrate requirements for a VL instantiated according to this profile.&#xD;
-</body>
-          </ownedComment>
-          <type xmi:type="uml:DataType" href="Common.uml#_LsX6UDgXEeiOYfGHew0BGg"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_-SutwDgYEeiOYfGHew0BGg" name="initiationParameters">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_VxkhUDgaEeiOYfGHew0BGg" annotatedElement="_-SutwDgYEeiOYfGHew0BGg">
-            <body>Specifies initiation parameters for the virtual link.</body>
-          </ownedComment>
-          <type xmi:type="uml:DataType" href="Common.uml#_vxJ9ADafEei23_xWdimG9w"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_XeSh0DgaEeiOYfGHew0BGg"/>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_XeWzQDgaEeiOYfGHew0BGg" value="*"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="__S0RwDgYEeiOYfGHew0BGg" name="networkType" type="_Qmf1kDnFEeiWMf5FLWfdLA">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_2Dl3MDgaEeiOYfGHew0BGg" annotatedElement="__S0RwDgYEeiOYfGHew0BGg">
-            <body>Type of the network</body>
-          </ownedComment>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_z0F5wDgaEeiOYfGHew0BGg"/>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_z0JkIDgaEeiOYfGHew0BGg" value="1"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_AApoIDgZEeiOYfGHew0BGg" name="dhcpEnabled">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_Sprt4DgbEeiOYfGHew0BGg" annotatedElement="_AApoIDgZEeiOYfGHew0BGg">
-            <body>Indicating whether DHCP is enabled. Default is &quot;FALSE&quot; if not specified otherwise.</body>
-          </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_QRrUsDgbEeiOYfGHew0BGg"/>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_QRvmIDgbEeiOYfGHew0BGg" value="1"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_BYBDsDgZEeiOYfGHew0BGg" name="vlanTransparent">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_ZG8FMDgbEeiOYfGHew0BGg" annotatedElement="_BYBDsDgZEeiOYfGHew0BGg">
-            <body>Indicating whether &quot;VLAN Transparent Mode&quot; is supported. Default is &quot;FALSE&quot; if not specified otherwise.</body>
-          </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_XCkZsDgbEeiOYfGHew0BGg"/>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_XCndADgbEeiOYfGHew0BGg" value="1"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_uohQ8jgTEeiOYfGHew0BGg" name="_virtualLinkDescFlavour" type="_oFQM8Dd-EeiIfPeSAqyGdQ" aggregation="shared" association="_uogp4DgTEeiOYfGHew0BGg">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_Nj634FqfEeiTzriVSbKglg" annotatedElement="_uohQ8jgTEeiOYfGHew0BGg">
-            <body>Identifies a flavour within the VnfVirtualLinkDesc.</body>
-          </ownedComment>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_e_qiMDgSEeiOYfGHew0BGg" name="_virtualLinkDesc" type="_AC2eIDQUEeixv_sLOod4lQ" aggregation="shared" association="_e_oF8DgSEeiOYfGHew0BGg">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_mb4voFqiEeiTzriVSbKglg" annotatedElement="_e_qiMDgSEeiOYfGHew0BGg">
-            <body>Uniquely identifies a Vnf VLD.</body>
-          </ownedComment>
-        </ownedAttribute>
-      </packagedElement>
       <packagedElement xmi:type="uml:Class" xmi:id="_8BUXwDm4EeiWMf5FLWfdLA" name="VirtualNetworkInterfaceRequirements">
         <ownedComment xmi:type="uml:Comment" xmi:id="_DIyJsDm5EeiWMf5FLWfdLA" annotatedElement="_8BUXwDm4EeiWMf5FLWfdLA">
           <body>This class specifies requirements on a virtual network interface.</body>
@@ -1571,33 +1438,6 @@ NOTE: If not present, it is assumed that the bitrate requirements can be derived
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5CrQkJmYEeibE8EgApNciA" 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>
-        </ownedComment>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_6g1tYDnBEeiWMf5FLWfdLA" name="groupId">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_6g1tYTnBEeiWMf5FLWfdLA" annotatedElement="_6g1tYDnBEeiWMf5FLWfdLA">
-            <body>Identifies an affinity or anti-affinity group to which the affinity or anti-affinity rule applies.&#xD;
-</body>
-          </ownedComment>
-          <type xmi:type="uml:DataType" href="Common.uml#_AuYtcDkBEeiWMf5FLWfdLA"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_6g3ikDnBEeiWMf5FLWfdLA" name="type" type="_tMoywDnJEeiWMf5FLWfdLA">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_6g3ikTnBEeiWMf5FLWfdLA" annotatedElement="_6g3ikDnBEeiWMf5FLWfdLA">
-            <body>Specifies whether the rule is an affinity rule or an anti-affinity rule.</body>
-          </ownedComment>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_6g4wsDnBEeiWMf5FLWfdLA" name="scope" type="_B3kJsDnKEeiWMf5FLWfdLA">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_6g4wsTnBEeiWMf5FLWfdLA" annotatedElement="_6g4wsDnBEeiWMf5FLWfdLA">
-            <body>Specifies the scope of the rule.</body>
-          </ownedComment>
-        </ownedAttribute>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_DlOpkDnDEeiWMf5FLWfdLA" name="ScalingAspect">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_PNdQ8DnDEeiWMf5FLWfdLA" annotatedElement="_DlOpkDnDEeiWMf5FLWfdLA">
-          <body>The ScalingAspect class describes the details of an aspect used for horizontal scaling.</body>
-        </ownedComment>
-      </packagedElement>
       <packagedElement xmi:type="uml:Class" xmi:id="_DZsyMDnHEeiWMf5FLWfdLA" name="VduLevel">
         <ownedComment xmi:type="uml:Comment" xmi:id="_t2W2wFqaEeiTzriVSbKglg" annotatedElement="_DZsyMDnHEeiWMf5FLWfdLA">
           <body>The VduLevel information element indicates for a given VDU in a given level the number of instances to deploy.</body>
@@ -1667,15 +1507,6 @@ Diversity - Resources are geo-diverse ( cannot be co-located).&#xD;
         <ownedAttribute xmi:type="uml:Property" xmi:id="_O0DAID5dEeijbdkIlrq2uQ" name="placementStrategy" type="_AeSbgD5dEeijbdkIlrq2uQ"/>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_o4b5oD5eEeijbdkIlrq2uQ" name="strategScope"/>
       </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_M45q8D0REeiuk5pWzMOpfA" name="ScalingGroup">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_2o0Y8D5hEeijbdkIlrq2uQ" annotatedElement="_M45q8D0REeiuk5pWzMOpfA">
-          <body>A ScalingGroup determines which VNFC's (VDU's) are scaled together based on demand.&#xD;
-&#xD;
-&#xD;
-</body>
-        </ownedComment>
-        <generalization xmi:type="uml:Generalization" xmi:id="_-kSgYD0REeiuk5pWzMOpfA" general="_X3eqgDTQEeiwQ6KPLHcy4g"/>
-      </packagedElement>
       <packagedElement xmi:type="uml:Class" xmi:id="_fMPCUES6EeiVGPeZpaYNtQ" name="VnfExtCp">
         <ownedComment xmi:type="uml:Comment" xmi:id="_sxbFoES6EeiVGPeZpaYNtQ" annotatedElement="_fMPCUES6EeiVGPeZpaYNtQ">
           <body>Describes an external CP exposed by a VNF.</body>
@@ -2035,9 +1866,6 @@ Diversity - Resources are geo-diverse ( cannot be co-located).&#xD;
         <generalization xmi:type="uml:Generalization" xmi:id="_W1tqMJpXEeidy9iGT_F5-w" general="_DAQisJpXEeidy9iGT_F5-w"/>
       </packagedElement>
       <packagedElement xmi:type="uml:Class" xmi:id="_DAQisJpXEeidy9iGT_F5-w" name="ResourceDesc (ResourceSpecification)"/>
-      <packagedElement xmi:type="uml:Class" xmi:id="_RiB5QJs3EeiPBvbfaqSLYg" name="Pnfd">
-        <generalization xmi:type="uml:Generalization" xmi:id="_dSlWMJs3EeiPBvbfaqSLYg" general="_O385oJssEeiPBvbfaqSLYg"/>
-      </packagedElement>
       <packagedElement xmi:type="uml:Class" xmi:id="_xVaLUJs3EeiPBvbfaqSLYg" name="Anfd">
         <ownedComment xmi:type="uml:Comment" xmi:id="_2qM6sKY4Eeily5uFlujj3Q" annotatedElement="_xVaLUJs3EeiPBvbfaqSLYg">
           <body>An Anfd  (Allotted Network Function) is a network function provided (or allotted) by some service instance.   The allotted network function may be incorporated into the topology of some consuming service like other network functions.   The consuming service does not need to know that the resource is “allotted”.</body>
@@ -2050,6 +1878,103 @@ Diversity - Resources are geo-diverse ( cannot be co-located).&#xD;
         </ownedComment>
         <generalization xmi:type="uml:Generalization" xmi:id="_ujjIsJssEeiPBvbfaqSLYg" general="_DAQisJpXEeidy9iGT_F5-w"/>
       </packagedElement>
+      <packagedElement xmi:type="uml:Class" xmi:id="_0lvvQDgREeiOYfGHew0BGg" name="VirtualLinkProfile">
+        <ownedComment xmi:type="uml:Comment" xmi:id="__mm0oDgREeiOYfGHew0BGg" annotatedElement="_0lvvQDgREeiOYfGHew0BGg">
+          <body>The VirtualLinkProfile describes additional instantiation data for a given VL used in a DF.</body>
+        </ownedComment>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_uA9FMDgUEeiOYfGHew0BGg" name="localAffinityOrAntiAffinityRule">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_3SRfkDgUEeiOYfGHew0BGg" annotatedElement="_uA9FMDgUEeiOYfGHew0BGg">
+            <body>Specifies affinity or anti-affinity rules applicable between the VLs based on this VnfVirtualLinkDesc.&#xD;
+&#xD;
+When the cardinality is greater than 1, both affinity rule(s) and anti-affinity rule(s) with different scopes are applicable to the VLs based on this VnfVirtualLinkDesc.&#xD;
+</body>
+          </ownedComment>
+          <type xmi:type="uml:DataType" href="Common.uml#_7hn1IDd1EeiIfPeSAqyGdQ"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0ph7sDgUEeiOYfGHew0BGg"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0puwADgUEeiOYfGHew0BGg" value="*"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_DgtLUDgVEeiOYfGHew0BGg" name="affinityOrAntiAffinityGroupId">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_0UUEMDgVEeiOYfGHew0BGg" annotatedElement="_DgtLUDgVEeiOYfGHew0BGg">
+            <body>Identifier(s) of the affinity or anti-affinity group(s) the VnfVirtualLinkDesc belongs to.&#xD;
+&#xD;
+NOTE: Each identifier references an affinity or anti-affinity group which expresses affinity or anti-affinity relationship between the VL(s) using this VnfVirtualLinkDesc and the VL(s) using other VnfVirtualLinkDesc(s) in the same group.&#xD;
+</body>
+          </ownedComment>
+          <type xmi:type="uml:DataType" href="Common.uml#_AuYtcDkBEeiWMf5FLWfdLA"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_LAkPIDgVEeiOYfGHew0BGg"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LArj4DgVEeiOYfGHew0BGg" value="*"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_2-_hwDgVEeiOYfGHew0BGg" name="maxBitRateRequirements">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_n6_2wDgYEeiOYfGHew0BGg" annotatedElement="_2-_hwDgVEeiOYfGHew0BGg">
+            <body>Specifies the minimum bitrate requirements for a VL instantiated according to this profile.&#xD;
+</body>
+          </ownedComment>
+          <type xmi:type="uml:DataType" href="Common.uml#_LsX6UDgXEeiOYfGHew0BGg"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_s7WyQDgYEeiOYfGHew0BGg" name="minBitRateRequirements">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_0SpI4DgYEeiOYfGHew0BGg" annotatedElement="_s7WyQDgYEeiOYfGHew0BGg">
+            <body>Specifies the minimum bitrate requirements for a VL instantiated according to this profile.&#xD;
+</body>
+          </ownedComment>
+          <type xmi:type="uml:DataType" href="Common.uml#_LsX6UDgXEeiOYfGHew0BGg"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_-SutwDgYEeiOYfGHew0BGg" name="initiationParameters">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_VxkhUDgaEeiOYfGHew0BGg" annotatedElement="_-SutwDgYEeiOYfGHew0BGg">
+            <body>Specifies initiation parameters for the virtual link.</body>
+          </ownedComment>
+          <type xmi:type="uml:DataType" href="Common.uml#_vxJ9ADafEei23_xWdimG9w"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_XeSh0DgaEeiOYfGHew0BGg"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_XeWzQDgaEeiOYfGHew0BGg" value="*"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="__S0RwDgYEeiOYfGHew0BGg" name="networkType">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_2Dl3MDgaEeiOYfGHew0BGg" annotatedElement="__S0RwDgYEeiOYfGHew0BGg">
+            <body>Type of the network</body>
+          </ownedComment>
+          <type xmi:type="uml:Enumeration" href="Common.uml#_Qmf1kDnFEeiWMf5FLWfdLA"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_z0F5wDgaEeiOYfGHew0BGg"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_z0JkIDgaEeiOYfGHew0BGg" value="1"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_AApoIDgZEeiOYfGHew0BGg" name="dhcpEnabled">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_Sprt4DgbEeiOYfGHew0BGg" annotatedElement="_AApoIDgZEeiOYfGHew0BGg">
+            <body>Indicating whether DHCP is enabled. Default is &quot;FALSE&quot; if not specified otherwise.</body>
+          </ownedComment>
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_QRrUsDgbEeiOYfGHew0BGg"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_QRvmIDgbEeiOYfGHew0BGg" value="1"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_BYBDsDgZEeiOYfGHew0BGg" name="vlanTransparent">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_ZG8FMDgbEeiOYfGHew0BGg" annotatedElement="_BYBDsDgZEeiOYfGHew0BGg">
+            <body>Indicating whether &quot;VLAN Transparent Mode&quot; is supported. Default is &quot;FALSE&quot; if not specified otherwise.</body>
+          </ownedComment>
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_XCkZsDgbEeiOYfGHew0BGg"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_XCndADgbEeiOYfGHew0BGg" value="1"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_uohQ8jgTEeiOYfGHew0BGg" name="_virtualLinkDescFlavour" type="_oFQM8Dd-EeiIfPeSAqyGdQ" aggregation="shared" association="_uogp4DgTEeiOYfGHew0BGg">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_Nj634FqfEeiTzriVSbKglg" annotatedElement="_uohQ8jgTEeiOYfGHew0BGg">
+            <body>Identifies a flavour within the VnfVirtualLinkDesc.</body>
+          </ownedComment>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_e_qiMDgSEeiOYfGHew0BGg" name="_virtualLinkDesc" type="_AC2eIDQUEeixv_sLOod4lQ" aggregation="shared" association="_e_oF8DgSEeiOYfGHew0BGg">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_mb4voFqiEeiTzriVSbKglg" annotatedElement="_e_qiMDgSEeiOYfGHew0BGg">
+            <body>Uniquely identifies a Vnf VLD.</body>
+          </ownedComment>
+        </ownedAttribute>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Class" xmi:id="_DlOpkDnDEeiWMf5FLWfdLA" name="ScalingAspect">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_PNdQ8DnDEeiWMf5FLWfdLA" annotatedElement="_DlOpkDnDEeiWMf5FLWfdLA">
+          <body>The ScalingAspect class describes the details of an aspect used for horizontal scaling.</body>
+        </ownedComment>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Class" xmi:id="_M45q8D0REeiuk5pWzMOpfA" name="ScalingGroup">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_2o0Y8D5hEeijbdkIlrq2uQ" annotatedElement="_M45q8D0REeiuk5pWzMOpfA">
+          <body>A ScalingGroup determines which VNFC's (VDU's) are scaled together based on demand.&#xD;
+&#xD;
+&#xD;
+</body>
+        </ownedComment>
+        <generalization xmi:type="uml:Generalization" xmi:id="_-kSgYD0REeiuk5pWzMOpfA" general="_X3eqgDTQEeiwQ6KPLHcy4g"/>
+      </packagedElement>
     </packagedElement>
     <packagedElement xmi:type="uml:Package" xmi:id="_zPN5MzOHEei5Af8DcjrhIQ" name="TypeDefinitions">
       <packagedElement xmi:type="uml:DataType" xmi:id="_lp6e4DatEei23_xWdimG9w" name="LogicalNodeData ">
@@ -2213,73 +2138,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="_2aIggDa9EeivvI-m1BaAbA" name="AddressData">
-        <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">
-          <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>
-          </ownedComment>
-          <type xmi:type="uml:DataType" href="Common.uml#_AuYtcDkBEeiWMf5FLWfdLA"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_BxokQDa-EeivvI-m1BaAbA" name="l2AddressData">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_O8qjQDdPEeiIfPeSAqyGdQ" annotatedElement="_BxokQDa-EeivvI-m1BaAbA">
-            <body>Provides the information on the MAC addresses to be assigned to the CP(s) instantiated from the parent CPD.&#xD;
-Shall be present when the addressType is MAC address.</body>
-          </ownedComment>
-          <type xmi:type="uml:DataType" href="Common.uml#_X9TdUDdPEeiIfPeSAqyGdQ"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_L3I8wDdPEeiIfPeSAqyGdQ"/>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_L3NOMDdPEeiIfPeSAqyGdQ" value="1"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_CUeLkDa-EeivvI-m1BaAbA" name="l3AddressData">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_UN-r4DdPEeiIfPeSAqyGdQ" annotatedElement="_CUeLkDa-EeivvI-m1BaAbA">
-            <body>Provides the information on the IP addresses to be assigned to the CP instantiated from the parent CPD.&#xD;
-Shall be present when the addressType is IP address.</body>
-          </ownedComment>
-          <type xmi:type="uml:DataType" href="Common.uml#_4oResDdPEeiIfPeSAqyGdQ"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_SKejEDdPEeiIfPeSAqyGdQ"/>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_SKiNcDdPEeiIfPeSAqyGdQ" value="1"/>
-        </ownedAttribute>
-      </packagedElement>
-      <packagedElement xmi:type="uml:DataType" xmi:id="_PjIasDa9EeivvI-m1BaAbA" name="CpProtocolData">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_kSumQGNfEeio9amveq0yWQ" annotatedElement="_PjIasDa9EeivvI-m1BaAbA">
-          <body>A CpProtocolData information element describes and associates the protocol layer that a CP uses together with other protocol and connection point information.</body>
-        </ownedComment>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_oa2iMDa9EeivvI-m1BaAbA" name="associatedLayerProtocol">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_zWCdYDa9EeivvI-m1BaAbA" annotatedElement="_oa2iMDa9EeivvI-m1BaAbA">
-            <body>One of the values of the attribute layerProtocol of the Cpd IE.&#xD;
-</body>
-          </ownedComment>
-          <type xmi:type="uml:Enumeration" href="Common.uml#_tFQGcDnLEeiWMf5FLWfdLA"/>
-        </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>
-          </ownedComment>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_xOJj0Da9EeivvI-m1BaAbA"/>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xORfoDa9EeivvI-m1BaAbA" value="*"/>
-        </ownedAttribute>
-      </packagedElement>
-      <packagedElement xmi:type="uml:DataType" xmi:id="_7hn1IDd1EeiIfPeSAqyGdQ" name="LocalAffinityOrAntiAffinityRule">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_20J6EGNfEeio9amveq0yWQ" annotatedElement="_7hn1IDd1EeiIfPeSAqyGdQ">
-          <body>The LocalAffinityOrAntiAffinityRule describes the affinity or anti-affinity rule applicable between the virtualization containers to be created based on a particular VDU, or between internal VLs to be created based on a particular VnfVirtualLinkDesc. &#xD;
-Per VNF, the affinity/anti-affinity rules defined using this information element, using the AffinityOrAntiAffinityGroup information element, and using the placement constraints in the GrantLifecycleOperation as defined in ETSI GS NFV IFA 007 [i.3] should be conflict-free. In case of conflicts, the placement constraints in the GrantLifecycleOperation shall take precedence. &#xD;
-</body>
-        </ownedComment>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_EjJgADd2EeiIfPeSAqyGdQ" name="type" type="_tMoywDnJEeiWMf5FLWfdLA">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_uoCBoDd3EeiIfPeSAqyGdQ" annotatedElement="_EjJgADd2EeiIfPeSAqyGdQ">
-            <body>Specifies whether the rule is an affinity rule or an anti-affinity rule.&#xD;
-</body>
-          </ownedComment>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_F5b9gDd2EeiIfPeSAqyGdQ" name="scope" type="_B3kJsDnKEeiWMf5FLWfdLA">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_yop-cDd3EeiIfPeSAqyGdQ" annotatedElement="_F5b9gDd2EeiIfPeSAqyGdQ">
-            <body>Specifies the scope of the rule.</body>
-          </ownedComment>
-        </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>
@@ -2462,13 +2320,6 @@ NOTE: The MANO or NFVI may not support the recommended collectionPeriod based on
         <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_bbN9YDm6EeiWMf5FLWfdLA" name="DIRECT_PHYSICAL"/>
         <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_fCLdADm6EeiWMf5FLWfdLA" name="VIRTIO_FORWARDER"/>
       </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="_EYaAsDnIEeiWMf5FLWfdLA" name="ScaleInfo">
         <ownedComment xmi:type="uml:Comment" xmi:id="_G0jmIGNhEeio9amveq0yWQ" annotatedElement="_EYaAsDnIEeiWMf5FLWfdLA">
           <body>The ScaleInfo information element represents a scale level for a particular scaling aspect. </body>
@@ -2486,22 +2337,6 @@ NOTE: The MANO or NFVI may not support the recommended collectionPeriod based on
           <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
         </ownedAttribute>
       </packagedElement>
-      <packagedElement xmi:type="uml:Enumeration" xmi:id="_tMoywDnJEeiWMf5FLWfdLA" name="RuleType">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_xofTADnJEeiWMf5FLWfdLA" annotatedElement="_tMoywDnJEeiWMf5FLWfdLA">
-          <body>Specifies the type of rule.</body>
-        </ownedComment>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_zZIKMDnJEeiWMf5FLWfdLA" name="AFFINITY"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_1qskMDnJEeiWMf5FLWfdLA" name="ANTI_AFFINITY"/>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Enumeration" xmi:id="_B3kJsDnKEeiWMf5FLWfdLA" name="RuleScope">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_F2zmcDnKEeiWMf5FLWfdLA" annotatedElement="_B3kJsDnKEeiWMf5FLWfdLA">
-          <body>Defines the scope of the rule.</body>
-        </ownedComment>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_IJCHwDnKEeiWMf5FLWfdLA" name="NFVI_POP"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_LgsnIDnKEeiWMf5FLWfdLA" name="ZONE"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ON-FsDnKEeiWMf5FLWfdLA" name="ZONE_GROUP"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_RUyssDnKEeiWMf5FLWfdLA" name="NFVI_NODE"/>
-      </packagedElement>
       <packagedElement xmi:type="uml:Enumeration" xmi:id="_V9WhUDnMEeiWMf5FLWfdLA" name="PinningPolicy">
         <ownedComment xmi:type="uml:Comment" xmi:id="_Z4_QcDnMEeiWMf5FLWfdLA" annotatedElement="_V9WhUDnMEeiWMf5FLWfdLA">
           <body>Defines the CPU pinning policy.</body>
@@ -2755,13 +2590,27 @@ NOTE: The MANO or NFVI may not support the recommended collectionPeriod based on
   <OpenModel_Profile:OpenModelAttribute xmi:id="_btdnQDg2EeiOYfGHew0BGg" base_StructuralFeature="_btdAMDg2EeiOYfGHew0BGg"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_cggNwTg2EeiOYfGHew0BGg" base_StructuralFeature="_cggNwDg2EeiOYfGHew0BGg"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_dP31MTg2EeiOYfGHew0BGg" base_StructuralFeature="_dP31MDg2EeiOYfGHew0BGg"/>
-  <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="_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="_7pU0IDa7EeivvI-m1BaAbA">
+    <base_Class xmi:type="uml:Class" href="Common.uml#_7pUNEDa7EeivvI-m1BaAbA"/>
+  </OpenModel_Profile:OpenModelClass>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_knSmcTa8EeivvI-m1BaAbA">
+    <base_StructuralFeature xmi:type="uml:Property" href="Common.uml#_knSmcDa8EeivvI-m1BaAbA"/>
+  </OpenModel_Profile:OpenModelAttribute>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_lRLQ8Ta8EeivvI-m1BaAbA">
+    <base_StructuralFeature xmi:type="uml:Property" href="Common.uml#_lRLQ8Da8EeivvI-m1BaAbA"/>
+  </OpenModel_Profile:OpenModelAttribute>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_luv9wDa8EeivvI-m1BaAbA">
+    <base_StructuralFeature xmi:type="uml:Property" href="Common.uml#_luvWsDa8EeivvI-m1BaAbA"/>
+  </OpenModel_Profile:OpenModelAttribute>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_oWHBkTa8EeivvI-m1BaAbA">
+    <base_StructuralFeature xmi:type="uml:Property" href="Common.uml#_oWHBkDa8EeivvI-m1BaAbA"/>
+  </OpenModel_Profile:OpenModelAttribute>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_pJTZETa8EeivvI-m1BaAbA">
+    <base_StructuralFeature xmi:type="uml:Property" href="Common.uml#_pJTZEDa8EeivvI-m1BaAbA"/>
+  </OpenModel_Profile:OpenModelAttribute>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_p8meQTa8EeivvI-m1BaAbA">
+    <base_StructuralFeature xmi:type="uml:Property" href="Common.uml#_p8meQDa8EeivvI-m1BaAbA"/>
+  </OpenModel_Profile:OpenModelAttribute>
   <OpenModel_Profile:OpenModelClass xmi:id="_oFQM8Td-EeiIfPeSAqyGdQ" base_Class="_oFQM8Dd-EeiIfPeSAqyGdQ"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_v0nsYTd-EeiIfPeSAqyGdQ" base_StructuralFeature="_v0nsYDd-EeiIfPeSAqyGdQ"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_uXG-oDnFEeiWMf5FLWfdLA" base_StructuralFeature="_uXGXkDnFEeiWMf5FLWfdLA"/>
@@ -2785,10 +2634,18 @@ NOTE: The MANO or NFVI may not support the recommended collectionPeriod based on
   <OpenModel_Profile:OpenModelAttribute xmi:id="_jVi5MDnGEeiWMf5FLWfdLA" base_StructuralFeature="_jViSIDnGEeiWMf5FLWfdLA"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_f1tqYDnIEeiWMf5FLWfdLA" base_StructuralFeature="_f1tDUDnIEeiWMf5FLWfdLA"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_PJlgwDnHEeiWMf5FLWfdLA" base_StructuralFeature="_PJk5sjnHEeiWMf5FLWfdLA"/>
-  <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"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_6g5XwDnBEeiWMf5FLWfdLA" base_StructuralFeature="_6g4wsDnBEeiWMf5FLWfdLA"/>
+  <OpenModel_Profile:OpenModelClass xmi:id="_0Ab7cDnBEeiWMf5FLWfdLA">
+    <base_Class xmi:type="uml:Class" href="Common.uml#_0AbUYDnBEeiWMf5FLWfdLA"/>
+  </OpenModel_Profile:OpenModelClass>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_6g1tYjnBEeiWMf5FLWfdLA">
+    <base_StructuralFeature xmi:type="uml:Property" href="Common.uml#_6g1tYDnBEeiWMf5FLWfdLA"/>
+  </OpenModel_Profile:OpenModelAttribute>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_6g3ikjnBEeiWMf5FLWfdLA">
+    <base_StructuralFeature xmi:type="uml:Property" href="Common.uml#_6g3ikDnBEeiWMf5FLWfdLA"/>
+  </OpenModel_Profile:OpenModelAttribute>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_6g5XwDnBEeiWMf5FLWfdLA">
+    <base_StructuralFeature xmi:type="uml:Property" href="Common.uml#_6g4wsDnBEeiWMf5FLWfdLA"/>
+  </OpenModel_Profile:OpenModelAttribute>
   <OpenModel_Profile:OpenModelClass xmi:id="_DlPQoDnDEeiWMf5FLWfdLA" base_Class="_DlOpkDnDEeiWMf5FLWfdLA"/>
   <OpenModel_Profile:OpenModelClass xmi:id="_DZsyMTnHEeiWMf5FLWfdLA" base_Class="_DZsyMDnHEeiWMf5FLWfdLA"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_7vM5wDnIEeiWMf5FLWfdLA" base_StructuralFeature="_7vMSsDnIEeiWMf5FLWfdLA"/>
@@ -2825,13 +2682,27 @@ NOTE: The MANO or NFVI may not support the recommended collectionPeriod based on
   <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="_A8dPwTa-EeivvI-m1BaAbA" base_StructuralFeature="_A8dPwDa-EeivvI-m1BaAbA"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_BxpLUDa-EeivvI-m1BaAbA" base_StructuralFeature="_BxokQDa-EeivvI-m1BaAbA"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_CUeLkTa-EeivvI-m1BaAbA" base_StructuralFeature="_CUeLkDa-EeivvI-m1BaAbA"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_oa3JQDa9EeivvI-m1BaAbA" base_StructuralFeature="_oa2iMDa9EeivvI-m1BaAbA"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_pMLRcDa9EeivvI-m1BaAbA" base_StructuralFeature="_pMKqYDa9EeivvI-m1BaAbA"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_EjKHEDd2EeiIfPeSAqyGdQ" base_StructuralFeature="_EjJgADd2EeiIfPeSAqyGdQ"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_F5b9gTd2EeiIfPeSAqyGdQ" base_StructuralFeature="_F5b9gDd2EeiIfPeSAqyGdQ"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_A8dPwTa-EeivvI-m1BaAbA">
+    <base_StructuralFeature xmi:type="uml:Property" href="Common.uml#_A8dPwDa-EeivvI-m1BaAbA"/>
+  </OpenModel_Profile:OpenModelAttribute>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_BxpLUDa-EeivvI-m1BaAbA">
+    <base_StructuralFeature xmi:type="uml:Property" href="Common.uml#_BxokQDa-EeivvI-m1BaAbA"/>
+  </OpenModel_Profile:OpenModelAttribute>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_CUeLkTa-EeivvI-m1BaAbA">
+    <base_StructuralFeature xmi:type="uml:Property" href="Common.uml#_CUeLkDa-EeivvI-m1BaAbA"/>
+  </OpenModel_Profile:OpenModelAttribute>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_oa3JQDa9EeivvI-m1BaAbA">
+    <base_StructuralFeature xmi:type="uml:Property" href="Common.uml#_oa2iMDa9EeivvI-m1BaAbA"/>
+  </OpenModel_Profile:OpenModelAttribute>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_pMLRcDa9EeivvI-m1BaAbA">
+    <base_StructuralFeature xmi:type="uml:Property" href="Common.uml#_pMKqYDa9EeivvI-m1BaAbA"/>
+  </OpenModel_Profile:OpenModelAttribute>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_EjKHEDd2EeiIfPeSAqyGdQ">
+    <base_StructuralFeature xmi:type="uml:Property" href="Common.uml#_EjJgADd2EeiIfPeSAqyGdQ"/>
+  </OpenModel_Profile:OpenModelAttribute>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_F5b9gTd2EeiIfPeSAqyGdQ">
+    <base_StructuralFeature xmi:type="uml:Property" href="Common.uml#_F5b9gDd2EeiIfPeSAqyGdQ"/>
+  </OpenModel_Profile:OpenModelAttribute>
   <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"/>
@@ -2951,13 +2822,27 @@ NOTE: The MANO or NFVI may not support the recommended collectionPeriod based on
   <OpenModel_Profile:Preliminary xmi:id="_QcLkcJT1EeiYXO5wr78TUw" base_Element="_H9SagDm5EeiWMf5FLWfdLA"/>
   <OpenModel_Profile:Preliminary xmi:id="_Rf98sJT1EeiYXO5wr78TUw" base_Element="_H9Vd0Dm5EeiWMf5FLWfdLA"/>
   <OpenModel_Profile:Preliminary xmi:id="_TCrFkJT1EeiYXO5wr78TUw" base_Element="_H9TooDm5EeiWMf5FLWfdLA"/>
-  <OpenModel_Profile:Preliminary xmi:id="_YMEoUJT1EeiYXO5wr78TUw" base_Element="_7pUNEDa7EeivvI-m1BaAbA"/>
-  <OpenModel_Profile:Preliminary xmi:id="_glKaMJT1EeiYXO5wr78TUw" base_Element="_knSmcDa8EeivvI-m1BaAbA"/>
-  <OpenModel_Profile:Preliminary xmi:id="_hvUgMJT1EeiYXO5wr78TUw" base_Element="_lRLQ8Da8EeivvI-m1BaAbA"/>
-  <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="_YMEoUJT1EeiYXO5wr78TUw">
+    <base_Element xmi:type="uml:Class" href="Common.uml#_7pUNEDa7EeivvI-m1BaAbA"/>
+  </OpenModel_Profile:Preliminary>
+  <OpenModel_Profile:Preliminary xmi:id="_glKaMJT1EeiYXO5wr78TUw">
+    <base_Element xmi:type="uml:Property" href="Common.uml#_knSmcDa8EeivvI-m1BaAbA"/>
+  </OpenModel_Profile:Preliminary>
+  <OpenModel_Profile:Preliminary xmi:id="_hvUgMJT1EeiYXO5wr78TUw">
+    <base_Element xmi:type="uml:Property" href="Common.uml#_lRLQ8Da8EeivvI-m1BaAbA"/>
+  </OpenModel_Profile:Preliminary>
+  <OpenModel_Profile:Preliminary xmi:id="_i388MJT1EeiYXO5wr78TUw">
+    <base_Element xmi:type="uml:Property" href="Common.uml#_luvWsDa8EeivvI-m1BaAbA"/>
+  </OpenModel_Profile:Preliminary>
+  <OpenModel_Profile:Preliminary xmi:id="_kDQ4wJT1EeiYXO5wr78TUw">
+    <base_Element xmi:type="uml:Property" href="Common.uml#_oWHBkDa8EeivvI-m1BaAbA"/>
+  </OpenModel_Profile:Preliminary>
+  <OpenModel_Profile:Preliminary xmi:id="_lmmTwJT1EeiYXO5wr78TUw">
+    <base_Element xmi:type="uml:Property" href="Common.uml#_pJTZEDa8EeivvI-m1BaAbA"/>
+  </OpenModel_Profile:Preliminary>
+  <OpenModel_Profile:Preliminary xmi:id="_mm4FAJT1EeiYXO5wr78TUw">
+    <base_Element xmi:type="uml:Property" href="Common.uml#_p8meQDa8EeivvI-m1BaAbA"/>
+  </OpenModel_Profile:Preliminary>
   <OpenModel_Profile:Preliminary xmi:id="_VFbyEJT2EeiYXO5wr78TUw" base_Element="_zOfv8DQVEeixv_sLOod4lQ"/>
   <OpenModel_Profile:Preliminary xmi:id="_WExIIJT2EeiYXO5wr78TUw" base_Element="_7nJYsDdREeiIfPeSAqyGdQ"/>
   <OpenModel_Profile:Preliminary xmi:id="_XG894JT2EeiYXO5wr78TUw" base_Element="_8R7loDdSEeiIfPeSAqyGdQ"/>
@@ -3044,10 +2929,18 @@ NOTE: The MANO or NFVI may not support the recommended collectionPeriod based on
   <OpenModel_Profile:Preliminary xmi:id="_zQKAEJT9EeiYXO5wr78TUw" base_Element="_8OQgMDdKEeiIfPeSAqyGdQ"/>
   <OpenModel_Profile:Preliminary xmi:id="_0PJX4JT9EeiYXO5wr78TUw" base_Element="_9jZuMDdKEeiIfPeSAqyGdQ"/>
   <OpenModel_Profile:Experimental xmi:id="_Ta13gJUBEeiYXO5wr78TUw" base_Element="_DlOpkDnDEeiWMf5FLWfdLA"/>
-  <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"/>
-  <OpenModel_Profile:Preliminary xmi:id="_awZv0JUBEeiYXO5wr78TUw" base_Element="_6g4wsDnBEeiWMf5FLWfdLA"/>
+  <OpenModel_Profile:Preliminary xmi:id="_XkYfwJUBEeiYXO5wr78TUw">
+    <base_Element xmi:type="uml:Class" href="Common.uml#_0AbUYDnBEeiWMf5FLWfdLA"/>
+  </OpenModel_Profile:Preliminary>
+  <OpenModel_Profile:Preliminary xmi:id="_YpUHgJUBEeiYXO5wr78TUw">
+    <base_Element xmi:type="uml:Property" href="Common.uml#_6g1tYDnBEeiWMf5FLWfdLA"/>
+  </OpenModel_Profile:Preliminary>
+  <OpenModel_Profile:Preliminary xmi:id="_ZkJ_IJUBEeiYXO5wr78TUw">
+    <base_Element xmi:type="uml:Property" href="Common.uml#_6g3ikDnBEeiWMf5FLWfdLA"/>
+  </OpenModel_Profile:Preliminary>
+  <OpenModel_Profile:Preliminary xmi:id="_awZv0JUBEeiYXO5wr78TUw">
+    <base_Element xmi:type="uml:Property" href="Common.uml#_6g4wsDnBEeiWMf5FLWfdLA"/>
+  </OpenModel_Profile:Preliminary>
   <OpenModel_Profile:Preliminary xmi:id="_dvFHcJUBEeiYXO5wr78TUw" base_Element="_ISONYDOSEeiHat9KcP8uWA"/>
   <OpenModel_Profile:Preliminary xmi:id="_eoLSoJUBEeiYXO5wr78TUw" base_Element="_aikFADdzEeiIfPeSAqyGdQ"/>
   <OpenModel_Profile:Preliminary xmi:id="_fhlm4JUBEeiYXO5wr78TUw" base_Element="_bEqsgDdzEeiIfPeSAqyGdQ"/>
@@ -3094,24 +2987,44 @@ NOTE: The MANO or NFVI may not support the recommended collectionPeriod based on
   <OpenModel_Profile:Experimental xmi:id="_Arg4UJUGEeiYXO5wr78TUw" base_Element="_JqA_UHPTEeiuFfjlON-CuQ"/>
   <OpenModel_Profile:Experimental xmi:id="_CRvPQJUGEeiYXO5wr78TUw" base_Element="_QPdCQHPTEeiuFfjlON-CuQ"/>
   <OpenModel_Profile:Experimental xmi:id="_DlFtgJUGEeiYXO5wr78TUw" base_Element="_TkXIkHPTEeiuFfjlON-CuQ"/>
-  <OpenModel_Profile:Preliminary xmi:id="_U3UDQJUGEeiYXO5wr78TUw" base_Element="_A8dPwDa-EeivvI-m1BaAbA"/>
-  <OpenModel_Profile:Preliminary xmi:id="_W2o2sJUGEeiYXO5wr78TUw" base_Element="_2aIggDa9EeivvI-m1BaAbA"/>
-  <OpenModel_Profile:Preliminary xmi:id="_XpOxQJUGEeiYXO5wr78TUw" base_Element="_BxokQDa-EeivvI-m1BaAbA"/>
-  <OpenModel_Profile:Preliminary xmi:id="_Yhnx0JUGEeiYXO5wr78TUw" base_Element="_CUeLkDa-EeivvI-m1BaAbA"/>
+  <OpenModel_Profile:Preliminary xmi:id="_U3UDQJUGEeiYXO5wr78TUw">
+    <base_Element xmi:type="uml:Property" href="Common.uml#_A8dPwDa-EeivvI-m1BaAbA"/>
+  </OpenModel_Profile:Preliminary>
+  <OpenModel_Profile:Preliminary xmi:id="_W2o2sJUGEeiYXO5wr78TUw">
+    <base_Element xmi:type="uml:DataType" href="Common.uml#_2aIggDa9EeivvI-m1BaAbA"/>
+  </OpenModel_Profile:Preliminary>
+  <OpenModel_Profile:Preliminary xmi:id="_XpOxQJUGEeiYXO5wr78TUw">
+    <base_Element xmi:type="uml:Property" href="Common.uml#_BxokQDa-EeivvI-m1BaAbA"/>
+  </OpenModel_Profile:Preliminary>
+  <OpenModel_Profile:Preliminary xmi:id="_Yhnx0JUGEeiYXO5wr78TUw">
+    <base_Element xmi:type="uml:Property" href="Common.uml#_CUeLkDa-EeivvI-m1BaAbA"/>
+  </OpenModel_Profile:Preliminary>
   <OpenModel_Profile:Preliminary xmi:id="_cBQhcJUGEeiYXO5wr78TUw" base_Element="_DK1hoGjsEeip9umi7zNprw"/>
   <OpenModel_Profile:Preliminary xmi:id="_c7EeUJUGEeiYXO5wr78TUw" base_Element="_J4maIGjsEeip9umi7zNprw"/>
   <OpenModel_Profile:Preliminary xmi:id="_dyG0AJUGEeiYXO5wr78TUw" base_Element="_L1m5YGjsEeip9umi7zNprw"/>
   <OpenModel_Profile:Preliminary xmi:id="_gDtDMJUGEeiYXO5wr78TUw" base_Element="_pRh10DnOEeiWMf5FLWfdLA"/>
-  <OpenModel_Profile:Preliminary xmi:id="_lkekIJUGEeiYXO5wr78TUw" base_Element="_PjIasDa9EeivvI-m1BaAbA"/>
-  <OpenModel_Profile:Preliminary xmi:id="_qg2XgJUGEeiYXO5wr78TUw" base_Element="_oa2iMDa9EeivvI-m1BaAbA"/>
-  <OpenModel_Profile:Preliminary xmi:id="_rbHnYJUGEeiYXO5wr78TUw" base_Element="_pMKqYDa9EeivvI-m1BaAbA"/>
+  <OpenModel_Profile:Preliminary xmi:id="_lkekIJUGEeiYXO5wr78TUw">
+    <base_Element xmi:type="uml:DataType" href="Common.uml#_PjIasDa9EeivvI-m1BaAbA"/>
+  </OpenModel_Profile:Preliminary>
+  <OpenModel_Profile:Preliminary xmi:id="_qg2XgJUGEeiYXO5wr78TUw">
+    <base_Element xmi:type="uml:Property" href="Common.uml#_oa2iMDa9EeivvI-m1BaAbA"/>
+  </OpenModel_Profile:Preliminary>
+  <OpenModel_Profile:Preliminary xmi:id="_rbHnYJUGEeiYXO5wr78TUw">
+    <base_Element xmi:type="uml:Property" href="Common.uml#_pMKqYDa9EeivvI-m1BaAbA"/>
+  </OpenModel_Profile:Preliminary>
   <OpenModel_Profile:Preliminary xmi:id="_tzIAkJUGEeiYXO5wr78TUw" base_Element="_zR55wD5cEeijbdkIlrq2uQ"/>
   <OpenModel_Profile:Preliminary xmi:id="_ugpN4JUGEeiYXO5wr78TUw" base_Element="_1euWoD5cEeijbdkIlrq2uQ"/>
   <OpenModel_Profile:Preliminary xmi:id="_25PQgJUGEeiYXO5wr78TUw" base_Element="_c8RX8D3BEeiFiY3bcpqGkg"/>
   <OpenModel_Profile:Preliminary xmi:id="_AP5d4JUHEeiYXO5wr78TUw" base_Element="_nJzw0DnNEeiWMf5FLWfdLA"/>
-  <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="_LCFOEJUHEeiYXO5wr78TUw">
+    <base_Element xmi:type="uml:DataType" href="Common.uml#_7hn1IDd1EeiIfPeSAqyGdQ"/>
+  </OpenModel_Profile:Preliminary>
+  <OpenModel_Profile:Preliminary xmi:id="_L1qAEJUHEeiYXO5wr78TUw">
+    <base_Element xmi:type="uml:Property" href="Common.uml#_EjJgADd2EeiIfPeSAqyGdQ"/>
+  </OpenModel_Profile:Preliminary>
+  <OpenModel_Profile:Preliminary xmi:id="_Mjc6MJUHEeiYXO5wr78TUw">
+    <base_Element xmi:type="uml:Property" href="Common.uml#_F5b9gDd2EeiIfPeSAqyGdQ"/>
+  </OpenModel_Profile:Preliminary>
   <OpenModel_Profile:Preliminary xmi:id="_Ok7pwJUHEeiYXO5wr78TUw" base_Element="_lp6e4DatEei23_xWdimG9w"/>
   <OpenModel_Profile:Preliminary xmi:id="_PanUkJUHEeiYXO5wr78TUw" base_Element="_vXCEcDatEei23_xWdimG9w"/>
   <OpenModel_Profile:Preliminary xmi:id="_Q-gwQJUHEeiYXO5wr78TUw" base_Element="_HlF2kDmxEeiWMf5FLWfdLA"/>
@@ -3119,9 +3032,15 @@ NOTE: The MANO or NFVI may not support the recommended collectionPeriod based on
   <OpenModel_Profile:Preliminary xmi:id="_SYVC4JUHEeiYXO5wr78TUw" base_Element="_ZcmqsDmxEeiWMf5FLWfdLA"/>
   <OpenModel_Profile:Preliminary xmi:id="_TEXpgJUHEeiYXO5wr78TUw" base_Element="_Zcn40DmxEeiWMf5FLWfdLA"/>
   <OpenModel_Profile:Preliminary xmi:id="_T1j14JUHEeiYXO5wr78TUw" base_Element="_ZcpG8DmxEeiWMf5FLWfdLA"/>
-  <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="_tn5ykJUHEeiYXO5wr78TUw">
+    <base_Element xmi:type="uml:Enumeration" href="Common.uml#_Qmf1kDnFEeiWMf5FLWfdLA"/>
+  </OpenModel_Profile:Preliminary>
+  <OpenModel_Profile:Preliminary xmi:id="_ugdLMJUHEeiYXO5wr78TUw">
+    <base_Element xmi:type="uml:EnumerationLiteral" href="Common.uml#_W5tgEDnFEeiWMf5FLWfdLA"/>
+  </OpenModel_Profile:Preliminary>
+  <OpenModel_Profile:Preliminary xmi:id="_vUP_oJUHEeiYXO5wr78TUw">
+    <base_Element xmi:type="uml:EnumerationLiteral" href="Common.uml#_Z6H9EDnFEeiWMf5FLWfdLA"/>
+  </OpenModel_Profile:Preliminary>
   <OpenModel_Profile:Preliminary xmi:id="_yAT9QJUHEeiYXO5wr78TUw" base_Element="_V9WhUDnMEeiWMf5FLWfdLA"/>
   <OpenModel_Profile:Preliminary xmi:id="_y6SSMJUHEeiYXO5wr78TUw" base_Element="_a2rnwDnMEeiWMf5FLWfdLA"/>
   <OpenModel_Profile:Preliminary xmi:id="_z0URgJUHEeiYXO5wr78TUw" base_Element="_cc-3MDnMEeiWMf5FLWfdLA"/>
@@ -3133,14 +3052,30 @@ NOTE: The MANO or NFVI may not support the recommended collectionPeriod based on
   <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="_ONrx8JUIEeiYXO5wr78TUw" base_Element="_B3kJsDnKEeiWMf5FLWfdLA"/>
-  <OpenModel_Profile:Preliminary xmi:id="_O-PFIJUIEeiYXO5wr78TUw" base_Element="_IJCHwDnKEeiWMf5FLWfdLA"/>
-  <OpenModel_Profile:Preliminary xmi:id="_PrZtIJUIEeiYXO5wr78TUw" base_Element="_LgsnIDnKEeiWMf5FLWfdLA"/>
-  <OpenModel_Profile:Preliminary xmi:id="_Qh8TkJUIEeiYXO5wr78TUw" base_Element="_ON-FsDnKEeiWMf5FLWfdLA"/>
-  <OpenModel_Profile:Preliminary xmi:id="_RUXPAJUIEeiYXO5wr78TUw" base_Element="_RUyssDnKEeiWMf5FLWfdLA"/>
-  <OpenModel_Profile:Preliminary xmi:id="_SxwaEJUIEeiYXO5wr78TUw" base_Element="_tMoywDnJEeiWMf5FLWfdLA"/>
-  <OpenModel_Profile:Preliminary xmi:id="_Tg3i0JUIEeiYXO5wr78TUw" base_Element="_zZIKMDnJEeiWMf5FLWfdLA"/>
-  <OpenModel_Profile:Preliminary xmi:id="_UQqoEJUIEeiYXO5wr78TUw" base_Element="_1qskMDnJEeiWMf5FLWfdLA"/>
+  <OpenModel_Profile:Preliminary xmi:id="_ONrx8JUIEeiYXO5wr78TUw">
+    <base_Element xmi:type="uml:Enumeration" href="Common.uml#_B3kJsDnKEeiWMf5FLWfdLA"/>
+  </OpenModel_Profile:Preliminary>
+  <OpenModel_Profile:Preliminary xmi:id="_O-PFIJUIEeiYXO5wr78TUw">
+    <base_Element xmi:type="uml:EnumerationLiteral" href="Common.uml#_IJCHwDnKEeiWMf5FLWfdLA"/>
+  </OpenModel_Profile:Preliminary>
+  <OpenModel_Profile:Preliminary xmi:id="_PrZtIJUIEeiYXO5wr78TUw">
+    <base_Element xmi:type="uml:EnumerationLiteral" href="Common.uml#_LgsnIDnKEeiWMf5FLWfdLA"/>
+  </OpenModel_Profile:Preliminary>
+  <OpenModel_Profile:Preliminary xmi:id="_Qh8TkJUIEeiYXO5wr78TUw">
+    <base_Element xmi:type="uml:EnumerationLiteral" href="Common.uml#_ON-FsDnKEeiWMf5FLWfdLA"/>
+  </OpenModel_Profile:Preliminary>
+  <OpenModel_Profile:Preliminary xmi:id="_RUXPAJUIEeiYXO5wr78TUw">
+    <base_Element xmi:type="uml:EnumerationLiteral" href="Common.uml#_RUyssDnKEeiWMf5FLWfdLA"/>
+  </OpenModel_Profile:Preliminary>
+  <OpenModel_Profile:Preliminary xmi:id="_SxwaEJUIEeiYXO5wr78TUw">
+    <base_Element xmi:type="uml:Enumeration" href="Common.uml#_tMoywDnJEeiWMf5FLWfdLA"/>
+  </OpenModel_Profile:Preliminary>
+  <OpenModel_Profile:Preliminary xmi:id="_Tg3i0JUIEeiYXO5wr78TUw">
+    <base_Element xmi:type="uml:EnumerationLiteral" href="Common.uml#_zZIKMDnJEeiWMf5FLWfdLA"/>
+  </OpenModel_Profile:Preliminary>
+  <OpenModel_Profile:Preliminary xmi:id="_UQqoEJUIEeiYXO5wr78TUw">
+    <base_Element xmi:type="uml:EnumerationLiteral" href="Common.uml#_1qskMDnJEeiWMf5FLWfdLA"/>
+  </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"/>
@@ -3193,7 +3128,6 @@ NOTE: The MANO or NFVI may not support the recommended collectionPeriod based on
   <OpenModel_Profile:OpenModelAttribute xmi:id="_oiVLAZpZEeidy9iGT_F5-w" base_StructuralFeature="_oiUj8ppZEeidy9iGT_F5-w"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_oiY1YppZEeidy9iGT_F5-w" base_StructuralFeature="_oiY1YJpZEeidy9iGT_F5-w"/>
   <OpenModel_Profile:OpenModelClass xmi:id="_O385opssEeiPBvbfaqSLYg" base_Class="_O385oJssEeiPBvbfaqSLYg"/>
-  <OpenModel_Profile:OpenModelClass xmi:id="_RiB5Qps3EeiPBvbfaqSLYg" base_Class="_RiB5QJs3EeiPBvbfaqSLYg"/>
   <OpenModel_Profile:OpenModelClass xmi:id="_xVayYZs3EeiPBvbfaqSLYg" base_Class="_xVaLUJs3EeiPBvbfaqSLYg"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_etjC4Zs4EeiPBvbfaqSLYg" base_StructuralFeature="_etjC4Js4EeiPBvbfaqSLYg"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_etn7YJs4EeiPBvbfaqSLYg" base_StructuralFeature="_etnUUJs4EeiPBvbfaqSLYg"/>
@@ -3235,16 +3169,16 @@ NOTE: The MANO or NFVI may not support the recommended collectionPeriod based on
   <OpenModel_Profile:OpenModelClass xmi:id="_p_Z_8KVwEeikF6xsfT18UA" base_Class="_fMPCUES6EeiVGPeZpaYNtQ"/>
   <OpenModel_Profile:OpenModelClass xmi:id="_p_bOEKVwEeikF6xsfT18UA" base_Class="_Io3nQESzEeiVGPeZpaYNtQ"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_p_ccMKVwEeikF6xsfT18UA" base_StructuralFeature="_8c1OkES6EeiVGPeZpaYNtQ"/>
-  <OpenModel_Profile:OpenModelClass xmi:id="_ZE9UIKY4Eeily5uFlujj3Q">
+  <OpenModel_Profile:OpenModelClass xmi:id="_f72YgKeuEeixw5Ke5QD1pQ">
     <base_Class xmi:type="uml:Class" href="Service.uml#_iQkugJpYEeidy9iGT_F5-w"/>
   </OpenModel_Profile:OpenModelClass>
-  <OpenModel_Profile:OpenModelClass xmi:id="_ZE9UIaY4Eeily5uFlujj3Q">
+  <OpenModel_Profile:OpenModelClass xmi:id="_f76p8KeuEeixw5Ke5QD1pQ">
     <base_Class xmi:type="uml:Class" href="Service.uml#_BQaDwJpZEeidy9iGT_F5-w"/>
   </OpenModel_Profile:OpenModelClass>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_ZEidYqY4Eeily5uFlujj3Q">
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_erHJYKeuEeixw5Ke5QD1pQ">
     <base_StructuralFeature xmi:type="uml:Property" href="Service.uml#_NBiAApsrEeiPBvbfaqSLYg"/>
   </OpenModel_Profile:OpenModelAttribute>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_ZEjrgKY4Eeily5uFlujj3Q">
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_ftBSUKeuEeixw5Ke5QD1pQ">
     <base_StructuralFeature xmi:type="uml:Property" href="Service.uml#_NBj1MJsrEeiPBvbfaqSLYg"/>
   </OpenModel_Profile:OpenModelAttribute>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_YbTTIKY4Eeily5uFlujj3Q">
author	jjewitt58 <jessie.jewitt@oamtechnologies.com>	2018-08-24 09:37:26 -0700
committer	jjewitt58 <jessie.jewitt@oamtechnologies.com>	2018-08-24 09:37:26 -0700
commit	f9b03a06d7c827b4ef57106c00a262b79567b42f (patch)
tree	4b09e443c5206d313f896933978063b82a2eff5b
parent	30830bfb435e6ee3a1cdbf2b4be6b90464b7c90b (diff)