Merge "Update VNFD model to IFA011 v2.5.1"

author: Hui Deng <denghui12@huawei.com> 2019-02-11 06:31:45 +0000
committer: Gerrit Code Review <gerrit@onap.org> 2019-02-11 06:31:45 +0000
commit: 9d00d57bfa1a8b3ac071e0842008c4db6b38d6ba (patch)
tree: 96c43f53ff8b59f1e59eeeca3cb6dc789dd83015
parent: abe7c39bcad806d8c23d0ed6f9128c7a23ef8b07 (diff)
parent: d1902a5f7d52c92abae2f3d1585250d1875eab45 (diff)
2 files changed, 1630 insertions, 1014 deletions
diff --git a/ONAP Information Model/Vnf.notation b/ONAP Information Model/Vnf.notation
index 7733dc7..45bf803 100644
--- a/ONAP Information Model/Vnf.notation
+++ b/ONAP Information Model/Vnf.notation
@@ -248,6 +248,15 @@
           <element xmi:type="uml:Property" href="Vnf.uml#_HN9eEDmzEeiWMf5FLWfdLA"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_UpzYITmzEeiWMf5FLWfdLA"/>
         </children>
+        <children xmi:type="notation:Shape" xmi:id="_hg8P4Co4EemZ-7haRVvogQ" type="Property_ClassAttributeLabel">
+          <children xmi:type="notation:DecorationNode" xmi:id="_hhozcCo4EemZ-7haRVvogQ" visible="false" type="StereotypeLabel">
+            <styles xmi:type="notation:StringValueStyle" xmi:id="_hhozcSo4EemZ-7haRVvogQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hhozcio4EemZ-7haRVvogQ"/>
+          </children>
+          <element xmi:type="uml:Property" href="Vnf.uml#_NQ3eYCo3EemZ-7haRVvogQ"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_hg8P4So4EemZ-7haRVvogQ"/>
+        </children>
         <styles xmi:type="notation:TitleStyle" xmi:id="_e5ZrEzOREeiHat9KcP8uWA"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_e5ZrFDOREeiHat9KcP8uWA"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_e5ZrFTOREeiHat9KcP8uWA"/>
@@ -271,7 +280,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OPJdZDaIEei23_xWdimG9w"/>
       </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"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e5ZEATOREeiHat9KcP8uWA" x="180" y="540" width="341" height="201"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_-gFk8DOREeiHat9KcP8uWA" type="Class_Shape">
       <children xmi:type="notation:DecorationNode" xmi:id="_-gFk8jOREeiHat9KcP8uWA" type="Class_NameLabel"/>
@@ -288,15 +297,6 @@
           <element xmi:type="uml:Property" href="Vnf.uml#_CEDZsDatEei23_xWdimG9w"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_CE5HMTatEei23_xWdimG9w"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_Z9r2YDavEei23_xWdimG9w" type="Property_ClassAttributeLabel">
-          <children xmi:type="notation:DecorationNode" xmi:id="_xeTYVkfXEeimoNQADLD_mg" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_xeTYV0fXEeimoNQADLD_mg" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xeTYWEfXEeimoNQADLD_mg"/>
-          </children>
-          <element xmi:type="uml:Property" href="Vnf.uml#_Z9PKcDavEei23_xWdimG9w"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9r2YTavEei23_xWdimG9w"/>
-        </children>
         <children xmi:type="notation:Shape" xmi:id="_S4weQDazEei23_xWdimG9w" type="Property_ClassAttributeLabel">
           <children xmi:type="notation:DecorationNode" xmi:id="_xeUmcEfXEeimoNQADLD_mg" visible="false" type="StereotypeLabel">
             <styles xmi:type="notation:StringValueStyle" xmi:id="_xeUmcUfXEeimoNQADLD_mg" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
@@ -333,6 +333,15 @@
           <element xmi:type="uml:Property" href="Vnf.uml#_1iyicDa1Eei23_xWdimG9w"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_1jYYUTa1Eei23_xWdimG9w"/>
         </children>
+        <children xmi:type="notation:Shape" xmi:id="_TWW08CpCEemS0_wZSU3sbA" type="Property_ClassAttributeLabel">
+          <children xmi:type="notation:DecorationNode" xmi:id="_TXGb0CpCEemS0_wZSU3sbA" visible="false" type="StereotypeLabel">
+            <styles xmi:type="notation:StringValueStyle" xmi:id="_TXGb0SpCEemS0_wZSU3sbA" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TXGb0ipCEemS0_wZSU3sbA"/>
+          </children>
+          <element xmi:type="uml:Property" href="Vnf.uml#_BecYMCpCEemS0_wZSU3sbA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_TWW08SpCEemS0_wZSU3sbA"/>
+        </children>
         <styles xmi:type="notation:TitleStyle" xmi:id="_-gFk9jOREeiHat9KcP8uWA"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_-gFk9zOREeiHat9KcP8uWA"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_-gFk-DOREeiHat9KcP8uWA"/>
@@ -427,15 +436,6 @@
           <element xmi:type="uml:Property" href="Vnf.uml#_svqrgDarEei23_xWdimG9w"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_swPTQTarEei23_xWdimG9w"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_435ooDarEei23_xWdimG9w" type="Property_ClassAttributeLabel">
-          <children xmi:type="notation:DecorationNode" xmi:id="_xeiB0EfXEeimoNQADLD_mg" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_xeiB0UfXEeimoNQADLD_mg" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xeiB0kfXEeimoNQADLD_mg"/>
-          </children>
-          <element xmi:type="uml:Property" href="Vnf.uml#_43h1MDarEei23_xWdimG9w"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_435ooTarEei23_xWdimG9w"/>
-        </children>
         <children xmi:type="notation:Shape" xmi:id="_DiI9wDasEei23_xWdimG9w" type="Property_ClassAttributeLabel">
           <children xmi:type="notation:DecorationNode" xmi:id="_xeio4EfXEeimoNQADLD_mg" visible="false" type="StereotypeLabel">
             <styles xmi:type="notation:StringValueStyle" xmi:id="_xeio4UfXEeimoNQADLD_mg" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
@@ -530,36 +530,6 @@
           <element xmi:type="uml:Property" href="Vnf.uml#_7J45IDdKEeiIfPeSAqyGdQ"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_7OVUQTdKEeiIfPeSAqyGdQ"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_8SguEDdKEeiIfPeSAqyGdQ" type="Property_ClassAttributeLabel">
-          <children xmi:type="notation:DecorationNode" xmi:id="_xetA-0fXEeimoNQADLD_mg" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_xetA_EfXEeimoNQADLD_mg" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xetA_UfXEeimoNQADLD_mg"/>
-          </children>
-          <element xmi:type="uml:Property" href="Vnf.uml#_8OQgMDdKEeiIfPeSAqyGdQ"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_8SguETdKEeiIfPeSAqyGdQ"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_8-8WQDdKEeiIfPeSAqyGdQ" type="Property_ClassAttributeLabel">
-          <children xmi:type="notation:DecorationNode" xmi:id="_xeuPEEfXEeimoNQADLD_mg" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_xeuPEUfXEeimoNQADLD_mg" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xeuPEkfXEeimoNQADLD_mg"/>
-          </children>
-          <element xmi:type="uml:Property" href="Vnf.uml#_86kMkDdKEeiIfPeSAqyGdQ"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_8-8WQTdKEeiIfPeSAqyGdQ"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_9not8DdKEeiIfPeSAqyGdQ" type="Property_ClassAttributeLabel" fontColor="255">
-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_z8xDwDdNEeiIfPeSAqyGdQ" source="PapyrusCSSForceValue">
-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_z8xq0DdNEeiIfPeSAqyGdQ" key="fillColor" value="true"/>
-          </eAnnotations>
-          <children xmi:type="notation:DecorationNode" xmi:id="_xeu2JkfXEeimoNQADLD_mg" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_xeu2J0fXEeimoNQADLD_mg" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xeu2KEfXEeimoNQADLD_mg"/>
-          </children>
-          <element xmi:type="uml:Property" href="Vnf.uml#_9jZuMDdKEeiIfPeSAqyGdQ"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_9not8TdKEeiIfPeSAqyGdQ"/>
-        </children>
         <children xmi:type="notation:Shape" xmi:id="_QQpzMPwqEeijjKJn7OxwuQ" type="Property_ClassAttributeLabel" fontColor="16711680" fontName="Segoe UI">
           <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Xvkb0PwqEeijjKJn7OxwuQ" source="PapyrusCSSForceValue">
             <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Xvkb0fwqEeijjKJn7OxwuQ" key="fontHeight" value="true"/>
@@ -602,6 +572,33 @@
           <element xmi:type="uml:Property" href="Vnf.uml#_7qyuMPxEEeijjKJn7OxwuQ"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_7sORkfxEEeijjKJn7OxwuQ"/>
         </children>
+        <children xmi:type="notation:Shape" xmi:id="_D4v6oCpGEemS0_wZSU3sbA" type="Property_ClassAttributeLabel">
+          <children xmi:type="notation:DecorationNode" xmi:id="_D6Un8CpGEemS0_wZSU3sbA" visible="false" type="StereotypeLabel">
+            <styles xmi:type="notation:StringValueStyle" xmi:id="_D6Un8SpGEemS0_wZSU3sbA" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_D6Un8ipGEemS0_wZSU3sbA"/>
+          </children>
+          <element xmi:type="uml:Property" href="Vnf.uml#_nb_4ECpDEemS0_wZSU3sbA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_D4v6oSpGEemS0_wZSU3sbA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_D4zlACpGEemS0_wZSU3sbA" type="Property_ClassAttributeLabel">
+          <children xmi:type="notation:DecorationNode" xmi:id="_D6dK0CpGEemS0_wZSU3sbA" visible="false" type="StereotypeLabel">
+            <styles xmi:type="notation:StringValueStyle" xmi:id="_D6dK0SpGEemS0_wZSU3sbA" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_D6dK0ipGEemS0_wZSU3sbA"/>
+          </children>
+          <element xmi:type="uml:Property" href="Vnf.uml#_WPIG8CpEEemS0_wZSU3sbA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_D4zlASpGEemS0_wZSU3sbA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_D40MECpGEemS0_wZSU3sbA" type="Property_ClassAttributeLabel">
+          <children xmi:type="notation:DecorationNode" xmi:id="_D6mUwCpGEemS0_wZSU3sbA" visible="false" type="StereotypeLabel">
+            <styles xmi:type="notation:StringValueStyle" xmi:id="_D6mUwSpGEemS0_wZSU3sbA" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_D6mUwipGEemS0_wZSU3sbA"/>
+          </children>
+          <element xmi:type="uml:Property" href="Vnf.uml#_orvzQCpEEemS0_wZSU3sbA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_D40MESpGEemS0_wZSU3sbA"/>
+        </children>
         <styles xmi:type="notation:TitleStyle" xmi:id="_LAACRDOSEeiHat9KcP8uWA"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_LAACRTOSEeiHat9KcP8uWA"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_LAACRjOSEeiHat9KcP8uWA"/>
@@ -625,7 +622,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OQLYIjaIEei23_xWdimG9w"/>
       </children>
       <element xmi:type="uml:Class" href="Vnf.uml#_K_9mADOSEeiHat9KcP8uWA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_K__bMTOSEeiHat9KcP8uWA" x="980" y="300" width="361" height="181"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_K__bMTOSEeiHat9KcP8uWA" x="980" y="300" width="361" height="201"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_p0Vj0DQvEeixv_sLOod4lQ" type="Class_Shape">
       <children xmi:type="notation:DecorationNode" xmi:id="_p0WK4DQvEeixv_sLOod4lQ" type="Class_NameLabel"/>
@@ -674,7 +671,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OQdE9jaIEei23_xWdimG9w"/>
       </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"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_p0Vj0TQvEeixv_sLOod4lQ" x="920" y="20" width="241" height="81"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_YQdLMDTQEeiwQ6KPLHcy4g" type="Class_Shape">
       <children xmi:type="notation:DecorationNode" xmi:id="_YQr0sDTQEeiwQ6KPLHcy4g" type="Class_NameLabel"/>
@@ -904,15 +901,6 @@
           <element xmi:type="uml:Property" href="Vnf.uml#_1X3vADd9EeiIfPeSAqyGdQ"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_5CA7wTm9EeiWMf5FLWfdLA"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_5CEmIDm9EeiWMf5FLWfdLA" type="Property_ClassAttributeLabel">
-          <children xmi:type="notation:DecorationNode" xmi:id="_xfRosEfXEeimoNQADLD_mg" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_xfRosUfXEeimoNQADLD_mg" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xfRoskfXEeimoNQADLD_mg"/>
-          </children>
-          <element xmi:type="uml:Property" href="Vnf.uml#_2FzMADd9EeiIfPeSAqyGdQ"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_5CEmITm9EeiWMf5FLWfdLA"/>
-        </children>
         <styles xmi:type="notation:TitleStyle" xmi:id="_gHMJEDkREeiWMf5FLWfdLA"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_gHMJETkREeiWMf5FLWfdLA"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_gHMJEjkREeiWMf5FLWfdLA"/>
@@ -1016,6 +1004,158 @@
       <element xsi:nil="true"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XW1lIjm-EeiWMf5FLWfdLA" x="200"/>
     </children>
+    <children xmi:type="notation:Shape" xmi:id="_1CHtUCo0EemZ-7haRVvogQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_1CHtUSo0EemZ-7haRVvogQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1CJigCo0EemZ-7haRVvogQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="Vnf.uml#_ETpMkDTSEeiwQ6KPLHcy4g"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1CHtUio0EemZ-7haRVvogQ" x="60" y="-40"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_ahbYsCo7EemS0_wZSU3sbA" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_ahnl8Co7EemS0_wZSU3sbA" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_ahoNACo7EemS0_wZSU3sbA" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ahoNASo7EemS0_wZSU3sbA" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_aho0ECo7EemS0_wZSU3sbA" type="Class_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_aho0ESo7EemS0_wZSU3sbA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_aho0Eio7EemS0_wZSU3sbA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_aho0Eyo7EemS0_wZSU3sbA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aho0FCo7EemS0_wZSU3sbA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_ahpbICo7EemS0_wZSU3sbA" visible="false" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_ahpbISo7EemS0_wZSU3sbA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_ahpbIio7EemS0_wZSU3sbA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_ahpbIyo7EemS0_wZSU3sbA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ahpbJCo7EemS0_wZSU3sbA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_ahpbJSo7EemS0_wZSU3sbA" visible="false" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_ahpbJio7EemS0_wZSU3sbA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_ahpbJyo7EemS0_wZSU3sbA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_ahpbKCo7EemS0_wZSU3sbA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ahpbKSo7EemS0_wZSU3sbA"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_aiV-sCo7EemS0_wZSU3sbA" visible="false" type="StereotypeLabel">
+        <styles xmi:type="notation:StringValueStyle" xmi:id="_aiV-sSo7EemS0_wZSU3sbA" name="stereotype" stringValue="OpenModel_Profile::OpenModelClass"/>
+        <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aiV-sio7EemS0_wZSU3sbA"/>
+      </children>
+      <element xmi:type="uml:Class" href="Vnf.uml#_u4EXICo6EemS0_wZSU3sbA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ahbYsSo7EemS0_wZSU3sbA" x="1307" y="581" height="80"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_aimdYCo7EemS0_wZSU3sbA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_aimdYSo7EemS0_wZSU3sbA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_ainEcCo7EemS0_wZSU3sbA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="Vnf.uml#_u4EXICo6EemS0_wZSU3sbA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aimdYio7EemS0_wZSU3sbA" x="200"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_LPszsCo-EemS0_wZSU3sbA" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_LP0IcCo-EemS0_wZSU3sbA" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_LP0IcSo-EemS0_wZSU3sbA" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_LP0Icio-EemS0_wZSU3sbA" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_LP0vgCo-EemS0_wZSU3sbA" type="Class_AttributeCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_WQ20ACo-EemS0_wZSU3sbA" type="Property_ClassAttributeLabel">
+          <children xmi:type="notation:DecorationNode" xmi:id="_WUEgECo-EemS0_wZSU3sbA" visible="false" type="StereotypeLabel">
+            <styles xmi:type="notation:StringValueStyle" xmi:id="_WUEgESo-EemS0_wZSU3sbA" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WUEgEio-EemS0_wZSU3sbA"/>
+          </children>
+          <element xmi:type="uml:Property" href="Vnf.uml#_qPKK8Co9EemS0_wZSU3sbA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_WQ20ASo-EemS0_wZSU3sbA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_WQ4pMCo-EemS0_wZSU3sbA" type="Property_ClassAttributeLabel">
+          <children xmi:type="notation:DecorationNode" xmi:id="_WURUYCo-EemS0_wZSU3sbA" visible="false" type="StereotypeLabel">
+            <styles xmi:type="notation:StringValueStyle" xmi:id="_WURUYSo-EemS0_wZSU3sbA" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WURUYio-EemS0_wZSU3sbA"/>
+          </children>
+          <element xmi:type="uml:Property" href="Vnf.uml#_7P3S4Co9EemS0_wZSU3sbA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_WQ4pMSo-EemS0_wZSU3sbA"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_LP0vgSo-EemS0_wZSU3sbA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_LP0vgio-EemS0_wZSU3sbA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_LP0vgyo-EemS0_wZSU3sbA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LP0vhCo-EemS0_wZSU3sbA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_LP19oCo-EemS0_wZSU3sbA" visible="false" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_LP19oSo-EemS0_wZSU3sbA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_LP19oio-EemS0_wZSU3sbA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_LP19oyo-EemS0_wZSU3sbA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LP19pCo-EemS0_wZSU3sbA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_LP2ksCo-EemS0_wZSU3sbA" visible="false" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_LP2ksSo-EemS0_wZSU3sbA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_LP2ksio-EemS0_wZSU3sbA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_LP2ksyo-EemS0_wZSU3sbA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LP2ktCo-EemS0_wZSU3sbA"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_LQYwMCo-EemS0_wZSU3sbA" visible="false" type="StereotypeLabel">
+        <styles xmi:type="notation:StringValueStyle" xmi:id="_LQYwMSo-EemS0_wZSU3sbA" name="stereotype" stringValue="OpenModel_Profile::OpenModelClass"/>
+        <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LQYwMio-EemS0_wZSU3sbA"/>
+      </children>
+      <element xmi:type="uml:Class" href="Vnf.uml#_Lpu5wCo9EemS0_wZSU3sbA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LPszsSo-EemS0_wZSU3sbA" x="920" y="140" height="81"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_LQuucCo-EemS0_wZSU3sbA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_LQuucSo-EemS0_wZSU3sbA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_LQvVgCo-EemS0_wZSU3sbA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="Vnf.uml#_Lpu5wCo9EemS0_wZSU3sbA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LQuucio-EemS0_wZSU3sbA" x="200"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_WshGECvPEemS0_wZSU3sbA" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_WshtICvPEemS0_wZSU3sbA" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_WshtISvPEemS0_wZSU3sbA" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_WshtIivPEemS0_wZSU3sbA" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_WsiUMCvPEemS0_wZSU3sbA" type="Class_AttributeCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_h6ZTwCvPEemS0_wZSU3sbA" type="Property_ClassAttributeLabel">
+          <children xmi:type="notation:DecorationNode" xmi:id="_h9QagCvPEemS0_wZSU3sbA" visible="false" type="StereotypeLabel">
+            <styles xmi:type="notation:StringValueStyle" xmi:id="_h9QagSvPEemS0_wZSU3sbA" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_h9QagivPEemS0_wZSU3sbA"/>
+          </children>
+          <element xmi:type="uml:Property" href="Vnf.uml#_Eu3jcDnJEeiWMf5FLWfdLA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_h6Z60CvPEemS0_wZSU3sbA"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_WsiUMSvPEemS0_wZSU3sbA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_WsiUMivPEemS0_wZSU3sbA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_WsiUMyvPEemS0_wZSU3sbA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WsiUNCvPEemS0_wZSU3sbA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_WsiUNSvPEemS0_wZSU3sbA" visible="false" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_WsiUNivPEemS0_wZSU3sbA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_WsiUNyvPEemS0_wZSU3sbA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_WsiUOCvPEemS0_wZSU3sbA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WsiUOSvPEemS0_wZSU3sbA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_WsiUOivPEemS0_wZSU3sbA" visible="false" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_WsiUOyvPEemS0_wZSU3sbA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_WsiUPCvPEemS0_wZSU3sbA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_WsiUPSvPEemS0_wZSU3sbA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WsiUPivPEemS0_wZSU3sbA"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Ws0BACvPEemS0_wZSU3sbA" visible="false" type="StereotypeLabel">
+        <styles xmi:type="notation:StringValueStyle" xmi:id="_Ws0BASvPEemS0_wZSU3sbA" name="stereotype" stringValue="OpenModel_Profile::OpenModelClass"/>
+        <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ws0BAivPEemS0_wZSU3sbA"/>
+      </children>
+      <element xmi:type="uml:Class" href="Vnf.uml#_DZsyMDnHEeiWMf5FLWfdLA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WshGESvPEemS0_wZSU3sbA" x="580" y="740"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_Ws7VwyvPEemS0_wZSU3sbA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_Ws7VxCvPEemS0_wZSU3sbA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Ws780CvPEemS0_wZSU3sbA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="Vnf.uml#_DZsyMDnHEeiWMf5FLWfdLA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ws7VxSvPEemS0_wZSU3sbA" x="200"/>
+    </children>
     <styles xmi:type="notation:StringValueStyle" xmi:id="_ZmiqUTOREeiHat9KcP8uWA" name="diagram_compatibility_version" stringValue="1.4.0"/>
     <styles xmi:type="notation:DiagramStyle" xmi:id="_ZmiqUjOREeiHat9KcP8uWA"/>
     <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_ZmiqUzOREeiHat9KcP8uWA" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
@@ -1090,7 +1230,7 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vS-kUDQPEeixv_sLOod4lQ" id="(0.4988662131519274,1.0)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vS-kUTQPEeixv_sLOod4lQ" id="(0.2932551319648094,0.0)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_z04bsDQvEeixv_sLOod4lQ" type="Association_Edge" source="_aaUQoDOREeiHat9KcP8uWA" target="_p0Vj0DQvEeixv_sLOod4lQ">
+    <edges xmi:type="notation:Connector" xmi:id="_z04bsDQvEeixv_sLOod4lQ" type="Association_Edge" source="_aaUQoDOREeiHat9KcP8uWA" target="_p0Vj0DQvEeixv_sLOod4lQ" routing="Rectilinear">
       <children xmi:type="notation:DecorationNode" xmi:id="_z04bszQvEeixv_sLOod4lQ" type="Association_StereotypeLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_6CIBEDQvEeixv_sLOod4lQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
         <layoutConstraint xmi:type="notation:Location" xmi:id="_z04btDQvEeixv_sLOod4lQ" y="-20"/>
@@ -1124,11 +1264,11 @@
     <edges xmi:type="notation:Connector" xmi:id="_EUnc8DTSEeiwQ6KPLHcy4g" type="Association_Edge" source="_YQdLMDTQEeiwQ6KPLHcy4g" target="_aaUQoDOREeiHat9KcP8uWA">
       <children xmi:type="notation:DecorationNode" xmi:id="_EUoEADTSEeiwQ6KPLHcy4g" type="Association_StereotypeLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_GRI0ADTSEeiwQ6KPLHcy4g" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_EUoEATTSEeiwQ6KPLHcy4g" y="-20"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_EUoEATTSEeiwQ6KPLHcy4g" x="-4" y="-70"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_EUoEAjTSEeiwQ6KPLHcy4g" type="Association_NameLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_GRgAYDTSEeiwQ6KPLHcy4g" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_EUoEAzTSEeiwQ6KPLHcy4g" x="16" y="-22"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_EUoEAzTSEeiwQ6KPLHcy4g" x="16" y="-62"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_EUoEBDTSEeiwQ6KPLHcy4g" visible="false" type="Association_TargetRoleLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_GR63IDTSEeiwQ6KPLHcy4g" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -1294,7 +1434,7 @@
       <styles xmi:type="notation:FontStyle" xmi:id="_39Y7cTabEei23_xWdimG9w"/>
       <element xmi:type="uml:Association" href="Vnf.uml#_343n0DabEei23_xWdimG9w"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_39Y7cjabEei23_xWdimG9w" points="[521, 560, -643984, -643984]$[560, 560, -643984, -643984]$[560, 540, -643984, -643984]$[560, 520, -643984, -643984]$[660, 520, -643984, -643984]$[660, 441, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3-YZ8DabEei23_xWdimG9w" id="(1.0,0.11049723756906077)"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3-YZ8DabEei23_xWdimG9w" id="(1.0,0.09950248756218906)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3-YZ8TabEei23_xWdimG9w" id="(0.2850356294536817,1.0)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_u0WocDadEei23_xWdimG9w" type="Association_Edge" source="_K__bMDOSEeiHat9KcP8uWA" target="_e5ZEADOREeiHat9KcP8uWA">
@@ -1304,7 +1444,7 @@
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_u0WodTadEei23_xWdimG9w" type="Association_NameLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_VmsQsDaeEei23_xWdimG9w" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_u0WodjadEei23_xWdimG9w" x="37" y="61"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_u0WodjadEei23_xWdimG9w" x="27" y="161"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_u0WodzadEei23_xWdimG9w" visible="false" type="Association_TargetRoleLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_VnBn4DaeEei23_xWdimG9w" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -1326,7 +1466,7 @@
       <element xmi:type="uml:Association" href="Vnf.uml#_uwCwMDadEei23_xWdimG9w"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_u0WocjadEei23_xWdimG9w" points="[980, 420, -643984, -643984]$[1000, 500, -643984, -643984]$[780, 500, -643984, -643984]$[780, 600, -643984, -643984]$[381, 600, -643984, -643984]"/>
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_u1NkEDadEei23_xWdimG9w" id="(0.055401662049861494,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_u1NkETadEei23_xWdimG9w" id="(1.0,0.3314917127071823)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_u1NkETadEei23_xWdimG9w" id="(1.0,0.29850746268656714)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_M1pm8DagEei23_xWdimG9w" type="Association_Edge" source="_e5ZEADOREeiHat9KcP8uWA" target="_J0bnADOSEeiHat9KcP8uWA">
       <children xmi:type="notation:DecorationNode" xmi:id="_M1qOADagEei23_xWdimG9w" type="Association_StereotypeLabel">
@@ -1356,7 +1496,7 @@
       <styles xmi:type="notation:FontStyle" xmi:id="_M1pm8TagEei23_xWdimG9w"/>
       <element xmi:type="uml:Association" href="Vnf.uml#_MxzBsDagEei23_xWdimG9w"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_M1pm8jagEei23_xWdimG9w" points="[381, 660, -643984, -643984]$[500, 660, -643984, -643984]$[560, 660, -643984, -643984]$[880, 640, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_M2gikDagEei23_xWdimG9w" id="(1.0,0.6629834254143646)"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_M2gikDagEei23_xWdimG9w" id="(1.0,0.5970149253731343)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_M2gikTagEei23_xWdimG9w" id="(0.0,0.5809128630705395)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_xWEugDdyEeiIfPeSAqyGdQ" type="Association_Edge" source="_K__bMDOSEeiHat9KcP8uWA" target="_J0bnADOSEeiHat9KcP8uWA">
@@ -1366,7 +1506,7 @@
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_xWEuhTdyEeiIfPeSAqyGdQ" type="Association_NameLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_2DI6kDdyEeiIfPeSAqyGdQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_xWEuhjdyEeiIfPeSAqyGdQ" x="-14" y="2"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_xWEuhjdyEeiIfPeSAqyGdQ" x="-4" y="-78"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_xWEuhzdyEeiIfPeSAqyGdQ" visible="false" type="Association_TargetRoleLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_2G9DkDdyEeiIfPeSAqyGdQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -1419,7 +1559,7 @@
       <element xmi:type="uml:Association" href="Vnf.uml#__knLgDkMEeiWMf5FLWfdLA"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="__1Q2ojkMEeiWMf5FLWfdLA" points="[-140, 100, -643984, -643984]$[-240, 100, -643984, -643984]$[-240, 560, -643984, -643984]$[180, 560, -643984, -643984]"/>
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_AWEdoDkNEeiWMf5FLWfdLA" id="(0.0,0.49382716049382713)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_AWEdoTkNEeiWMf5FLWfdLA" id="(0.0,0.11049723756906077)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_AWEdoTkNEeiWMf5FLWfdLA" id="(0.0,0.09950248756218906)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_oEhTYDkOEeiWMf5FLWfdLA" type="Association_Edge" source="_aaUQoDOREeiHat9KcP8uWA" target="_K__bMDOSEeiHat9KcP8uWA">
       <children xmi:type="notation:DecorationNode" xmi:id="_oEihgDkOEeiWMf5FLWfdLA" type="Association_StereotypeLabel">
@@ -1462,37 +1602,6 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_gKxokDkREeiWMf5FLWfdLA"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_gKxokTkREeiWMf5FLWfdLA"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_zPXT0DkREeiWMf5FLWfdLA" type="Association_Edge" source="_aaUQoDOREeiHat9KcP8uWA" target="_gG2K0DkREeiWMf5FLWfdLA" routing="Rectilinear">
-      <children xmi:type="notation:DecorationNode" xmi:id="_zPX64DkREeiWMf5FLWfdLA" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_yFs_sJy_EeiLvPKMh61-Bg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_zPX64TkREeiWMf5FLWfdLA" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_zPX64jkREeiWMf5FLWfdLA" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_yGjUQJy_EeiLvPKMh61-Bg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_zPX64zkREeiWMf5FLWfdLA" y="-13"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_zPX65DkREeiWMf5FLWfdLA" visible="false" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_yHP30Jy_EeiLvPKMh61-Bg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_zPX65TkREeiWMf5FLWfdLA" x="27" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_zPX65jkREeiWMf5FLWfdLA" visible="false" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_yH7NQJy_EeiLvPKMh61-Bg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_zPX65zkREeiWMf5FLWfdLA" x="-27" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_zPX66DkREeiWMf5FLWfdLA" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_yInw0Jy_EeiLvPKMh61-Bg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_zPX66TkREeiWMf5FLWfdLA" x="23" y="-25"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_zPYh8DkREeiWMf5FLWfdLA" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_yJUUYJy_EeiLvPKMh61-Bg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_zPYh8TkREeiWMf5FLWfdLA" x="-16" y="27"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_zPXT0TkREeiWMf5FLWfdLA"/>
-      <element xmi:type="uml:Association" href="Vnf.uml#_yfiZYDkREeiWMf5FLWfdLA"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_zPXT0jkREeiWMf5FLWfdLA" points="[340, 200, -643984, -643984]$[340, 160, -643984, -643984]$[480, 160, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0-B1EDkREeiWMf5FLWfdLA" id="(0.6349206349206349,0.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0-CcIDkREeiWMf5FLWfdLA" id="(0.0,0.6611570247933884)"/>
-    </edges>
     <edges xmi:type="notation:Connector" xmi:id="_XW1lJDm-EeiWMf5FLWfdLA" type="StereotypeCommentLink" source="_XVHG0Dm-EeiWMf5FLWfdLA" target="_XW1lIDm-EeiWMf5FLWfdLA">
       <styles xmi:type="notation:FontStyle" xmi:id="_XW1lJTm-EeiWMf5FLWfdLA"/>
       <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XW2MMDm-EeiWMf5FLWfdLA" name="BASE_ELEMENT">
@@ -1503,37 +1612,6 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XW1lJzm-EeiWMf5FLWfdLA"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XW1lKDm-EeiWMf5FLWfdLA"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_oycgYDm-EeiWMf5FLWfdLA" type="Association_Edge" source="_gG2K0DkREeiWMf5FLWfdLA" target="_XVHG0Dm-EeiWMf5FLWfdLA">
-      <children xmi:type="notation:DecorationNode" xmi:id="_oydHcDm-EeiWMf5FLWfdLA" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_sNxb4DzsEeiuk5pWzMOpfA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_oydHcTm-EeiWMf5FLWfdLA" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_oydHcjm-EeiWMf5FLWfdLA" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_sObjMDzsEeiuk5pWzMOpfA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_oydHczm-EeiWMf5FLWfdLA" x="19" y="13"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_oydHdDm-EeiWMf5FLWfdLA" visible="false" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_sPJU4DzsEeiuk5pWzMOpfA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_oydHdTm-EeiWMf5FLWfdLA" x="27" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_oydHdjm-EeiWMf5FLWfdLA" visible="false" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_sP3GkDzsEeiuk5pWzMOpfA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_oydHdzm-EeiWMf5FLWfdLA" x="-28" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_oydHeDm-EeiWMf5FLWfdLA" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_sQbuUDzsEeiuk5pWzMOpfA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_oydHeTm-EeiWMf5FLWfdLA" x="27" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_oydHejm-EeiWMf5FLWfdLA" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_sQ950DzsEeiuk5pWzMOpfA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_oydHezm-EeiWMf5FLWfdLA" x="-28" y="-20"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_oycgYTm-EeiWMf5FLWfdLA"/>
-      <element xmi:type="uml:Association" href="Vnf.uml#_oUgnMDm-EeiWMf5FLWfdLA"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_oycgYjm-EeiWMf5FLWfdLA" points="[680, 80, -643984, -643984]$[680, 20, -643984, -643984]$[515, 20, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pM6O0Dm-EeiWMf5FLWfdLA" id="(0.4891304347826087,0.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pM6O0Tm-EeiWMf5FLWfdLA" id="(1.0,0.49382716049382713)"/>
-    </edges>
     <edges xmi:type="notation:Connector" xmi:id="_XycTUDnPEeiWMf5FLWfdLA" type="Association_Edge" source="_YQdLMDTQEeiwQ6KPLHcy4g" target="_gG2K0DkREeiWMf5FLWfdLA" routing="Rectilinear">
       <children xmi:type="notation:DecorationNode" xmi:id="_XyeIgDnPEeiWMf5FLWfdLA" type="Association_StereotypeLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Y3z_8DnPEeiWMf5FLWfdLA" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -1593,9 +1671,155 @@
       <styles xmi:type="notation:FontStyle" xmi:id="_7Yz3IRiwEemU7tpKjNcB0w"/>
       <element xmi:type="uml:Association" href="Vnf.uml#_7N9SABiwEemU7tpKjNcB0w"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_7Yz3IhiwEemU7tpKjNcB0w" points="[180, 640, -643984, -643984]$[20, 640, -643984, -643984]$[20, 783, -643984, -643984]$[340, 783, -643984, -643984]$[340, 721, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7dEsEBiwEemU7tpKjNcB0w" id="(0.0,0.5524861878453039)"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7dEsEBiwEemU7tpKjNcB0w" id="(0.0,0.4975124378109453)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7dEsERiwEemU7tpKjNcB0w" id="(0.46920821114369504,1.0)"/>
     </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_-P8hECovEemZ-7haRVvogQ" type="Association_Edge" source="_aaUQoDOREeiHat9KcP8uWA" target="_J0bnADOSEeiHat9KcP8uWA" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_-QCAoCovEemZ-7haRVvogQ" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_SApEYCowEemZ-7haRVvogQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_-QCnsCovEemZ-7haRVvogQ" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_-QDOwCovEemZ-7haRVvogQ" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_SE0ZwCowEemZ-7haRVvogQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_-QDOwSovEemZ-7haRVvogQ" x="-65" y="-80"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_-QDOwiovEemZ-7haRVvogQ" visible="false" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_SIVAwCowEemZ-7haRVvogQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_-QDOwyovEemZ-7haRVvogQ" x="81" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_-QDOxCovEemZ-7haRVvogQ" visible="false" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_SM4JkCowEemZ-7haRVvogQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_-QDOxSovEemZ-7haRVvogQ" x="-81" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_-QD10CovEemZ-7haRVvogQ" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_SRfj0CowEemZ-7haRVvogQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_-QD10SovEemZ-7haRVvogQ" x="24" y="-13"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_-QD10iovEemZ-7haRVvogQ" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_SVaagCowEemZ-7haRVvogQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_-QD10yovEemZ-7haRVvogQ" x="-81" y="-20"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_-P8hESovEemZ-7haRVvogQ"/>
+      <element xmi:type="uml:Association" href="Vnf.uml#_-JxnoCovEemZ-7haRVvogQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_-P8hEiovEemZ-7haRVvogQ" points="[501, 460, -643984, -643984]$[699, 460, -643984, -643984]$[699, 620, -643984, -643984]$[880, 620, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-a2JgCovEemZ-7haRVvogQ" id="(1.0,0.9252669039145908)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-a2JgSovEemZ-7haRVvogQ" id="(0.0,0.4149377593360996)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_1CLXsCo0EemZ-7haRVvogQ" type="StereotypeCommentLink" source="_EUnc8DTSEeiwQ6KPLHcy4g" target="_1CHtUCo0EemZ-7haRVvogQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_1CLXsSo0EemZ-7haRVvogQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1CMl0Co0EemZ-7haRVvogQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="Vnf.uml#_ETpMkDTSEeiwQ6KPLHcy4g"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1CLXsio0EemZ-7haRVvogQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1CL-wCo0EemZ-7haRVvogQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1CL-wSo0EemZ-7haRVvogQ"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_aio5oCo7EemS0_wZSU3sbA" type="StereotypeCommentLink" source="_ahbYsCo7EemS0_wZSU3sbA" target="_aimdYCo7EemS0_wZSU3sbA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_aio5oSo7EemS0_wZSU3sbA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_aiqHwCo7EemS0_wZSU3sbA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="Vnf.uml#_u4EXICo6EemS0_wZSU3sbA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_aio5oio7EemS0_wZSU3sbA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aipgsCo7EemS0_wZSU3sbA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aipgsSo7EemS0_wZSU3sbA"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_iLzDYCo7EemS0_wZSU3sbA" type="Association_Edge" source="_J0bnADOSEeiHat9KcP8uWA" target="_ahbYsCo7EemS0_wZSU3sbA">
+      <children xmi:type="notation:DecorationNode" xmi:id="_iL0RgCo7EemS0_wZSU3sbA" type="Association_StereotypeLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_iL04kCo7EemS0_wZSU3sbA" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_iL04kSo7EemS0_wZSU3sbA" type="Association_NameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_iL04kio7EemS0_wZSU3sbA" x="56" y="-73"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_iL04kyo7EemS0_wZSU3sbA" visible="false" type="Association_TargetRoleLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_iL04lCo7EemS0_wZSU3sbA" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_iL1foCo7EemS0_wZSU3sbA" visible="false" type="Association_SourceRoleLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_iL1foSo7EemS0_wZSU3sbA" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_iL1foio7EemS0_wZSU3sbA" type="Association_SourceMultiplicityLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_iL1foyo7EemS0_wZSU3sbA" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_iL1fpCo7EemS0_wZSU3sbA" type="Association_TargetMultiplicityLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_iL1fpSo7EemS0_wZSU3sbA" y="-20"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_iLzDYSo7EemS0_wZSU3sbA"/>
+      <element xmi:type="uml:Association" href="Vnf.uml#_iGbbMCo7EemS0_wZSU3sbA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_iLzDYio7EemS0_wZSU3sbA" points="[1242, 620, -643984, -643984]$[1307, 620, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_iWAIQCo7EemS0_wZSU3sbA" id="(1.0,0.4149377593360996)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_iWAIQSo7EemS0_wZSU3sbA" id="(0.0,0.4875)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_LQvVgSo-EemS0_wZSU3sbA" type="StereotypeCommentLink" source="_LPszsCo-EemS0_wZSU3sbA" target="_LQuucCo-EemS0_wZSU3sbA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_LQvVgio-EemS0_wZSU3sbA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_LQwjoCo-EemS0_wZSU3sbA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="Vnf.uml#_Lpu5wCo9EemS0_wZSU3sbA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_LQvVgyo-EemS0_wZSU3sbA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LQv8kCo-EemS0_wZSU3sbA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LQv8kSo-EemS0_wZSU3sbA"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_gpYHACo-EemS0_wZSU3sbA" type="Association_Edge" source="_-gFk8DOREeiHat9KcP8uWA" target="_LPszsCo-EemS0_wZSU3sbA" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_gpYuECo-EemS0_wZSU3sbA" type="Association_StereotypeLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_gpYuESo-EemS0_wZSU3sbA" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_gpYuEio-EemS0_wZSU3sbA" type="Association_NameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_gpYuEyo-EemS0_wZSU3sbA" x="116" y="-13"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_gpYuFCo-EemS0_wZSU3sbA" visible="false" type="Association_TargetRoleLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_gpZVICo-EemS0_wZSU3sbA" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_gpZVISo-EemS0_wZSU3sbA" visible="false" type="Association_SourceRoleLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_gpZVIio-EemS0_wZSU3sbA" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_gpZVIyo-EemS0_wZSU3sbA" type="Association_SourceMultiplicityLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_gpZVJCo-EemS0_wZSU3sbA" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_gpZVJSo-EemS0_wZSU3sbA" type="Association_TargetMultiplicityLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_gpZVJio-EemS0_wZSU3sbA" y="-20"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_gpYHASo-EemS0_wZSU3sbA"/>
+      <element xmi:type="uml:Association" href="Vnf.uml#_gmOFUCo-EemS0_wZSU3sbA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_gpYHAio-EemS0_wZSU3sbA" points="[920, 300, -643984, -643984]$[980, 221, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_gvy4ECo-EemS0_wZSU3sbA" id="(0.9026128266033254,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_gvy4ESo-EemS0_wZSU3sbA" id="(0.15306122448979592,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_Ws780SvPEemS0_wZSU3sbA" type="StereotypeCommentLink" source="_WshGECvPEemS0_wZSU3sbA" target="_Ws7VwyvPEemS0_wZSU3sbA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_Ws780ivPEemS0_wZSU3sbA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Ws8j4CvPEemS0_wZSU3sbA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="Vnf.uml#_DZsyMDnHEeiWMf5FLWfdLA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Ws780yvPEemS0_wZSU3sbA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ws781CvPEemS0_wZSU3sbA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ws781SvPEemS0_wZSU3sbA"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_lNjtoCvPEemS0_wZSU3sbA" type="Association_Edge" source="_WshGECvPEemS0_wZSU3sbA" target="_e5ZEADOREeiHat9KcP8uWA" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_lNjtoyvPEemS0_wZSU3sbA" type="Association_StereotypeLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_lNjtpCvPEemS0_wZSU3sbA" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_lNjtpSvPEemS0_wZSU3sbA" visible="false" type="Association_NameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_lNjtpivPEemS0_wZSU3sbA" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_lNkUsCvPEemS0_wZSU3sbA" visible="false" type="Association_TargetRoleLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_lNkUsSvPEemS0_wZSU3sbA" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_lNkUsivPEemS0_wZSU3sbA" visible="false" type="Association_SourceRoleLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_lNkUsyvPEemS0_wZSU3sbA" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_lNkUtCvPEemS0_wZSU3sbA" type="Association_SourceMultiplicityLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_lNkUtSvPEemS0_wZSU3sbA" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_lNkUtivPEemS0_wZSU3sbA" type="Association_TargetMultiplicityLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_lNkUtyvPEemS0_wZSU3sbA" y="-20"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_lNjtoSvPEemS0_wZSU3sbA"/>
+      <element xmi:type="uml:Association" href="Vnf.uml#_lIaH4CvPEemS0_wZSU3sbA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_lNjtoivPEemS0_wZSU3sbA" points="[640, 740, -643984, -643984]$[521, 700, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lUxI4CvPEemS0_wZSU3sbA" id="(0.2127659574468085,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lUxv8CvPEemS0_wZSU3sbA" id="(1.0,0.7960199004975125)"/>
+    </edges>
   </notation:Diagram>
   <notation:Diagram xmi:id="_tsOFEDQTEeixv_sLOod4lQ" type="PapyrusUMLClassDiagram" name="ONAP Vnfd - Topology View" measurementUnit="Pixel">
     <children xmi:type="notation:Shape" xmi:id="_6Mhj8DQTEeixv_sLOod4lQ" type="Class_Shape">
@@ -1764,82 +1988,6 @@
       <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="301"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_AC4TUDQUEeixv_sLOod4lQ" type="Class_Shape">
-      <children xmi:type="notation:DecorationNode" xmi:id="_AC46YDQUEeixv_sLOod4lQ" type="Class_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_AC46YTQUEeixv_sLOod4lQ" type="Class_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_AC46YjQUEeixv_sLOod4lQ" y="15"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_AC46YzQUEeixv_sLOod4lQ" type="Class_AttributeCompartment">
-        <children xmi:type="notation:Shape" xmi:id="_p3XgQDd9EeiIfPeSAqyGdQ" type="Property_ClassAttributeLabel">
-          <children xmi:type="notation:DecorationNode" xmi:id="_p3ajkDd9EeiIfPeSAqyGdQ" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_p3ajkTd9EeiIfPeSAqyGdQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_p3ajkjd9EeiIfPeSAqyGdQ"/>
-          </children>
-          <element xmi:type="uml:Property" href="Vnf.uml#_pszPADd9EeiIfPeSAqyGdQ"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_p3XgQTd9EeiIfPeSAqyGdQ"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_qrUswDd9EeiIfPeSAqyGdQ" type="Property_ClassAttributeLabel">
-          <children xmi:type="notation:DecorationNode" xmi:id="_qrXwEDd9EeiIfPeSAqyGdQ" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_qrXwETd9EeiIfPeSAqyGdQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qrXwEjd9EeiIfPeSAqyGdQ"/>
-          </children>
-          <element xmi:type="uml:Property" href="Vnf.uml#_qgZPIDd9EeiIfPeSAqyGdQ"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_qrUswTd9EeiIfPeSAqyGdQ"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_rka38Dd9EeiIfPeSAqyGdQ" type="Property_ClassAttributeLabel">
-          <children xmi:type="notation:DecorationNode" xmi:id="_rkdUMDd9EeiIfPeSAqyGdQ" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_rkdUMTd9EeiIfPeSAqyGdQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rkdUMjd9EeiIfPeSAqyGdQ"/>
-          </children>
-          <element xmi:type="uml:Property" href="Vnf.uml#_rY7ZoDd9EeiIfPeSAqyGdQ"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_rka38Td9EeiIfPeSAqyGdQ"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_1idOYDd9EeiIfPeSAqyGdQ" type="Property_ClassAttributeLabel">
-          <children xmi:type="notation:DecorationNode" xmi:id="_1ig4wDd9EeiIfPeSAqyGdQ" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_1ig4wTd9EeiIfPeSAqyGdQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1ig4wjd9EeiIfPeSAqyGdQ"/>
-          </children>
-          <element xmi:type="uml:Property" href="Vnf.uml#_1X3vADd9EeiIfPeSAqyGdQ"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_1idOYTd9EeiIfPeSAqyGdQ"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_2QfZEDd9EeiIfPeSAqyGdQ" type="Property_ClassAttributeLabel" fontColor="255">
-          <children xmi:type="notation:DecorationNode" xmi:id="_2QicYDd9EeiIfPeSAqyGdQ" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_2QicYTd9EeiIfPeSAqyGdQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2QicYjd9EeiIfPeSAqyGdQ"/>
-          </children>
-          <element xmi:type="uml:Property" href="Vnf.uml#_2FzMADd9EeiIfPeSAqyGdQ"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_2QfZETd9EeiIfPeSAqyGdQ"/>
-        </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="_AC46ZDQUEeixv_sLOod4lQ"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_AC46ZTQUEeixv_sLOod4lQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_AC46ZjQUEeixv_sLOod4lQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AC46ZzQUEeixv_sLOod4lQ"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_AC5hcDQUEeixv_sLOod4lQ" visible="false" type="Class_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_AC5hcTQUEeixv_sLOod4lQ"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_AC5hcjQUEeixv_sLOod4lQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_AC5hczQUEeixv_sLOod4lQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AC5hdDQUEeixv_sLOod4lQ"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_AC5hdTQUEeixv_sLOod4lQ" visible="false" type="Class_NestedClassifierCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_AC5hdjQUEeixv_sLOod4lQ"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_AC5hdzQUEeixv_sLOod4lQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_AC5heDQUEeixv_sLOod4lQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AC5heTQUEeixv_sLOod4lQ"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_kvRuQDc_EeiIfPeSAqyGdQ" visible="false" type="StereotypeLabel">
-        <styles xmi:type="notation:StringValueStyle" xmi:id="_kvRuQTc_EeiIfPeSAqyGdQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelClass"/>
-        <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kvRuQjc_EeiIfPeSAqyGdQ"/>
-      </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>
     <children xmi:type="notation:Shape" xmi:id="_zOg-EDQVEeixv_sLOod4lQ" type="Class_Shape">
       <children xmi:type="notation:DecorationNode" xmi:id="_zOg-EjQVEeixv_sLOod4lQ" type="Class_NameLabel"/>
       <children xmi:type="notation:DecorationNode" xmi:id="_zOg-EzQVEeixv_sLOod4lQ" type="Class_FloatingNameLabel">
@@ -1961,7 +2109,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kvhl4jc_EeiIfPeSAqyGdQ"/>
       </children>
       <element xmi:type="uml:Class" href="Vnf.uml#_zOfv8DQVEeixv_sLOod4lQ"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zOg-ETQVEeixv_sLOod4lQ" x="460" y="180" height="181"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zOg-ETQVEeixv_sLOod4lQ" x="460" y="160" height="181"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_Am1LkDQtEeixv_sLOod4lQ" type="Class_Shape">
       <children xmi:type="notation:DecorationNode" xmi:id="_Am1LkjQtEeixv_sLOod4lQ" type="Class_NameLabel"/>
@@ -2054,6 +2202,33 @@
           <element xmi:type="uml:Property" href="Vnf.uml#_mIpmIDapEei23_xWdimG9w"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_msU1eTgeEeiOYfGHew0BGg"/>
         </children>
+        <children xmi:type="notation:Shape" xmi:id="_Dz9poCo4EemZ-7haRVvogQ" type="Property_ClassAttributeLabel">
+          <children xmi:type="notation:DecorationNode" xmi:id="_D1tWECo4EemZ-7haRVvogQ" visible="false" type="StereotypeLabel">
+            <styles xmi:type="notation:StringValueStyle" xmi:id="_D1tWESo4EemZ-7haRVvogQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_D1tWEio4EemZ-7haRVvogQ"/>
+          </children>
+          <element xmi:type="uml:Property" href="Vnf.uml#_HN9eEDmzEeiWMf5FLWfdLA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_Dz9poSo4EemZ-7haRVvogQ"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_D0DJMCo4EemZ-7haRVvogQ" type="Property_ClassAttributeLabel">
+          <children xmi:type="notation:DecorationNode" xmi:id="_D1_C4Co4EemZ-7haRVvogQ" visible="false" type="StereotypeLabel">
+            <styles xmi:type="notation:StringValueStyle" xmi:id="_D1_C4So4EemZ-7haRVvogQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_D1_C4io4EemZ-7haRVvogQ"/>
+          </children>
+          <element xmi:type="uml:Property" href="Vnf.uml#_mC-f4DmyEeiWMf5FLWfdLA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_D0DJMSo4EemZ-7haRVvogQ"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_D0E-YCo4EemZ-7haRVvogQ" type="Property_ClassAttributeLabel">
+          <children xmi:type="notation:DecorationNode" xmi:id="_D2QvsCo4EemZ-7haRVvogQ" visible="false" type="StereotypeLabel">
+            <styles xmi:type="notation:StringValueStyle" xmi:id="_D2QvsSo4EemZ-7haRVvogQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_D2Qvsio4EemZ-7haRVvogQ"/>
+          </children>
+          <element xmi:type="uml:Property" href="Vnf.uml#_NQ3eYCo3EemZ-7haRVvogQ"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_D0E-YSo4EemZ-7haRVvogQ"/>
+        </children>
         <styles xmi:type="notation:TitleStyle" xmi:id="_FELNYTWdEei9Ia34RXjpEg"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_FELNYjWdEei9Ia34RXjpEg"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_FELNYzWdEei9Ia34RXjpEg"/>
@@ -2080,7 +2255,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kwB8Mjc_EeiIfPeSAqyGdQ"/>
       </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="161"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FEIKETWdEei9Ia34RXjpEg" x="960" y="680" width="301" height="201"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_3_akcDaKEei23_xWdimG9w" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_3_akcTaKEei23_xWdimG9w"/>
@@ -2090,14 +2265,6 @@
       <element xsi:nil="true"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3_akcjaKEei23_xWdimG9w" x="980" y="340"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_3_jHUzaKEei23_xWdimG9w" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_3_jHVDaKEei23_xWdimG9w"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_3_jHVjaKEei23_xWdimG9w" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="Vnf.uml#_AC2eIDQUEeixv_sLOod4lQ"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3_jHVTaKEei23_xWdimG9w" x="520" y="340"/>
-    </children>
     <children xmi:type="notation:Shape" xmi:id="_3_rDIDaKEei23_xWdimG9w" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_3_rDITaKEei23_xWdimG9w"/>
       <styles xmi:type="notation:EObjectValueStyle" xmi:id="_3_rDIzaKEei23_xWdimG9w" name="BASE_ELEMENT">
@@ -2302,20 +2469,6 @@
           <element xmi:type="uml:Property" href="Vnf.uml#_uA9FMDgUEeiOYfGHew0BGg"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_uMNS8TgUEeiOYfGHew0BGg"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_Dr-nMDgVEeiOYfGHew0BGg" type="Property_ClassAttributeLabel" fontColor="255" fontName="Segoe UI">
-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_BaMwMFqjEeiTzriVSbKglg" source="PapyrusCSSForceValue">
-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_BaMwMVqjEeiTzriVSbKglg" key="fontHeight" value="true"/>
-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_BaMwMlqjEeiTzriVSbKglg" key="bold" value="true"/>
-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_BaNXQFqjEeiTzriVSbKglg" key="italic" value="true"/>
-          </eAnnotations>
-          <children xmi:type="notation:DecorationNode" xmi:id="_D3M_wDgVEeiOYfGHew0BGg" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_D3M_wTgVEeiOYfGHew0BGg" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_D3M_wjgVEeiOYfGHew0BGg"/>
-          </children>
-          <element xmi:type="uml:Property" href="Vnf.uml#_DgtLUDgVEeiOYfGHew0BGg"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_Dr-nMTgVEeiOYfGHew0BGg"/>
-        </children>
         <children xmi:type="notation:Shape" xmi:id="_3KKP8DgVEeiOYfGHew0BGg" type="Property_ClassAttributeLabel">
           <children xmi:type="notation:DecorationNode" xmi:id="_3VA1EDgVEeiOYfGHew0BGg" visible="false" type="StereotypeLabel">
             <styles xmi:type="notation:StringValueStyle" xmi:id="_3VA1ETgVEeiOYfGHew0BGg" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
@@ -2334,45 +2487,6 @@
           <element xmi:type="uml:Property" href="Vnf.uml#_s7WyQDgYEeiOYfGHew0BGg"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_tJy24TgYEeiOYfGHew0BGg"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_-h39ADgYEeiOYfGHew0BGg" type="Property_ClassAttributeLabel" fontColor="4227327">
-          <children xmi:type="notation:DecorationNode" xmi:id="_-tAO8DgYEeiOYfGHew0BGg" visible="false" type="StereotypeLabel">
-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_E9k1IDgZEeiOYfGHew0BGg" source="PapyrusCSSForceValue">
-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_E9k1ITgZEeiOYfGHew0BGg" key="visible" value="true"/>
-            </eAnnotations>
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_-tAO8TgYEeiOYfGHew0BGg" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-tAO8jgYEeiOYfGHew0BGg"/>
-          </children>
-          <element xmi:type="uml:Property" href="Vnf.uml#_-SutwDgYEeiOYfGHew0BGg"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_-h39ATgYEeiOYfGHew0BGg"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="__iDAkDgYEeiOYfGHew0BGg" type="Property_ClassAttributeLabel" fontColor="4227327">
-          <children xmi:type="notation:DecorationNode" xmi:id="__tKrcDgYEeiOYfGHew0BGg" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="__tKrcTgYEeiOYfGHew0BGg" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="__tKrcjgYEeiOYfGHew0BGg"/>
-          </children>
-          <element xmi:type="uml:Property" href="Vnf.uml#__S0RwDgYEeiOYfGHew0BGg"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="__iDAkTgYEeiOYfGHew0BGg"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_AQMgADgZEeiOYfGHew0BGg" type="Property_ClassAttributeLabel" fontColor="4227327">
-          <children xmi:type="notation:DecorationNode" xmi:id="_AbnF0DgZEeiOYfGHew0BGg" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_AbnF0TgZEeiOYfGHew0BGg" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AbnF0jgZEeiOYfGHew0BGg"/>
-          </children>
-          <element xmi:type="uml:Property" href="Vnf.uml#_AApoIDgZEeiOYfGHew0BGg"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_AQMgATgZEeiOYfGHew0BGg"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_BnuToDgZEeiOYfGHew0BGg" type="Property_ClassAttributeLabel" fontColor="4227327">
-          <children xmi:type="notation:DecorationNode" xmi:id="_ByojIDgZEeiOYfGHew0BGg" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_ByojITgZEeiOYfGHew0BGg" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ByojIjgZEeiOYfGHew0BGg"/>
-          </children>
-          <element xmi:type="uml:Property" href="Vnf.uml#_BYBDsDgZEeiOYfGHew0BGg"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_BnuToTgZEeiOYfGHew0BGg"/>
-        </children>
         <children xmi:type="notation:Shape" xmi:id="_DVJiYA57EemrJqq3q9vf6g" type="Property_ClassAttributeLabel" fontColor="16711680" fontName="Segoe UI">
           <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_eB88MA57EemrJqq3q9vf6g" source="PapyrusCSSForceValue">
             <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_eB9jQA57EemrJqq3q9vf6g" key="fontHeight" value="true"/>
@@ -2438,7 +2552,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SeReMjgSEeiOYfGHew0BGg"/>
       </children>
       <element xmi:type="uml:Class" href="Vnf.uml#_0lvvQDgREeiOYfGHew0BGg"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SeL-oDgSEeiOYfGHew0BGg" x="140" y="360" width="441" height="181"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SeL-oDgSEeiOYfGHew0BGg" x="140" y="360" width="441" height="201"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_SeUhgDgSEeiOYfGHew0BGg" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_SeUhgTgSEeiOYfGHew0BGg"/>
@@ -2532,43 +2646,202 @@
       <element xsi:nil="true"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MWeBRDm5EeiWMf5FLWfdLA" x="200"/>
     </children>
+    <children xmi:type="notation:Shape" xmi:id="_HzgWYCr-EemS0_wZSU3sbA" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_HzhkgCr-EemS0_wZSU3sbA" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_HzhkgSr-EemS0_wZSU3sbA" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Hzhkgir-EemS0_wZSU3sbA" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Hzhkgyr-EemS0_wZSU3sbA" type="Class_AttributeCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_XcbWkCr_EemS0_wZSU3sbA" type="Property_ClassAttributeLabel">
+          <children xmi:type="notation:DecorationNode" xmi:id="_XeNfQCr_EemS0_wZSU3sbA" visible="false" type="StereotypeLabel">
+            <styles xmi:type="notation:StringValueStyle" xmi:id="_XeNfQSr_EemS0_wZSU3sbA" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XeNfQir_EemS0_wZSU3sbA"/>
+          </children>
+          <element xmi:type="uml:Property" href="Vnf.uml#_ZuR54Cr-EemS0_wZSU3sbA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_XcbWkSr_EemS0_wZSU3sbA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_XccksCr_EemS0_wZSU3sbA" type="Property_ClassAttributeLabel">
+          <children xmi:type="notation:DecorationNode" xmi:id="_XeU0ACr_EemS0_wZSU3sbA" visible="false" type="StereotypeLabel">
+            <styles xmi:type="notation:StringValueStyle" xmi:id="_XeU0ASr_EemS0_wZSU3sbA" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XeU0Air_EemS0_wZSU3sbA"/>
+          </children>
+          <element xmi:type="uml:Property" href="Vnf.uml#_pszPADd9EeiIfPeSAqyGdQ"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_XcdLwCr_EemS0_wZSU3sbA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_Xcdy0Cr_EemS0_wZSU3sbA" type="Property_ClassAttributeLabel">
+          <children xmi:type="notation:DecorationNode" xmi:id="_XeelACr_EemS0_wZSU3sbA" visible="false" type="StereotypeLabel">
+            <styles xmi:type="notation:StringValueStyle" xmi:id="_XeelASr_EemS0_wZSU3sbA" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XeelAir_EemS0_wZSU3sbA"/>
+          </children>
+          <element xmi:type="uml:Property" href="Vnf.uml#_qgZPIDd9EeiIfPeSAqyGdQ"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_Xcdy0Sr_EemS0_wZSU3sbA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_XceZ4Cr_EemS0_wZSU3sbA" type="Property_ClassAttributeLabel">
+          <children xmi:type="notation:DecorationNode" xmi:id="_Xel5wCr_EemS0_wZSU3sbA" visible="false" type="StereotypeLabel">
+            <styles xmi:type="notation:StringValueStyle" xmi:id="_Xel5wSr_EemS0_wZSU3sbA" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Xel5wir_EemS0_wZSU3sbA"/>
+          </children>
+          <element xmi:type="uml:Property" href="Vnf.uml#_rY7ZoDd9EeiIfPeSAqyGdQ"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_XceZ4Sr_EemS0_wZSU3sbA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_XcfA8Cr_EemS0_wZSU3sbA" type="Property_ClassAttributeLabel">
+          <children xmi:type="notation:DecorationNode" xmi:id="_Xet1kCr_EemS0_wZSU3sbA" visible="false" type="StereotypeLabel">
+            <styles xmi:type="notation:StringValueStyle" xmi:id="_Xet1kSr_EemS0_wZSU3sbA" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Xet1kir_EemS0_wZSU3sbA"/>
+          </children>
+          <element xmi:type="uml:Property" href="Vnf.uml#_1X3vADd9EeiIfPeSAqyGdQ"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_XcfA8Sr_EemS0_wZSU3sbA"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_HzhkhCr-EemS0_wZSU3sbA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_HzhkhSr-EemS0_wZSU3sbA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Hzhkhir-EemS0_wZSU3sbA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Hzhkhyr-EemS0_wZSU3sbA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_HzhkiCr-EemS0_wZSU3sbA" visible="false" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_HzhkiSr-EemS0_wZSU3sbA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Hzhkiir-EemS0_wZSU3sbA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Hzhkiyr-EemS0_wZSU3sbA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HzhkjCr-EemS0_wZSU3sbA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_HzhkjSr-EemS0_wZSU3sbA" visible="false" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_HziLkCr-EemS0_wZSU3sbA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_HziLkSr-EemS0_wZSU3sbA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_HziLkir-EemS0_wZSU3sbA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HziLkyr-EemS0_wZSU3sbA"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Hz5_ACr-EemS0_wZSU3sbA" visible="false" type="StereotypeLabel">
+        <styles xmi:type="notation:StringValueStyle" xmi:id="_Hz5_ASr-EemS0_wZSU3sbA" name="stereotype" stringValue="OpenModel_Profile::OpenModelClass"/>
+        <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Hz5_Air-EemS0_wZSU3sbA"/>
+      </children>
+      <element xmi:type="uml:Class" href="Vnf.uml#_-5-w8Cr9EemS0_wZSU3sbA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HzgWYSr-EemS0_wZSU3sbA" x="300" y="580"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_H0GMQCr-EemS0_wZSU3sbA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_H0GMQSr-EemS0_wZSU3sbA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_H0GMQyr-EemS0_wZSU3sbA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="Vnf.uml#_-5-w8Cr9EemS0_wZSU3sbA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H0GMQir-EemS0_wZSU3sbA" x="200"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_1pIFECsHEemS0_wZSU3sbA" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_1pIsICsHEemS0_wZSU3sbA" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_1pIsISsHEemS0_wZSU3sbA" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_1pIsIisHEemS0_wZSU3sbA" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_1pJTMCsHEemS0_wZSU3sbA" type="Class_AttributeCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_f0d0ACsJEemS0_wZSU3sbA" type="Property_ClassAttributeLabel">
+          <children xmi:type="notation:DecorationNode" xmi:id="_f2bi4CsJEemS0_wZSU3sbA" visible="false" type="StereotypeLabel">
+            <styles xmi:type="notation:StringValueStyle" xmi:id="_f2bi4SsJEemS0_wZSU3sbA" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_f2bi4isJEemS0_wZSU3sbA"/>
+          </children>
+          <element xmi:type="uml:Property" href="Vnf.uml#_bEqsgDdzEeiIfPeSAqyGdQ"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_f0d0ASsJEemS0_wZSU3sbA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_f0fCICsJEemS0_wZSU3sbA" type="Property_ClassAttributeLabel">
+          <children xmi:type="notation:DecorationNode" xmi:id="_f2i3oCsJEemS0_wZSU3sbA" visible="false" type="StereotypeLabel">
+            <styles xmi:type="notation:StringValueStyle" xmi:id="_f2i3oSsJEemS0_wZSU3sbA" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_f2i3oisJEemS0_wZSU3sbA"/>
+          </children>
+          <element xmi:type="uml:Property" href="Vnf.uml#_cCrM4DdzEeiIfPeSAqyGdQ"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_f0fpMCsJEemS0_wZSU3sbA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_f0gQQCsJEemS0_wZSU3sbA" type="Property_ClassAttributeLabel">
+          <children xmi:type="notation:DecorationNode" xmi:id="_f2qMYCsJEemS0_wZSU3sbA" visible="false" type="StereotypeLabel">
+            <styles xmi:type="notation:StringValueStyle" xmi:id="_f2qMYSsJEemS0_wZSU3sbA" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_f2qMYisJEemS0_wZSU3sbA"/>
+          </children>
+          <element xmi:type="uml:Property" href="Vnf.uml#_dFetsDdzEeiIfPeSAqyGdQ"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_f0gQQSsJEemS0_wZSU3sbA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_f0g3UCsJEemS0_wZSU3sbA" type="Property_ClassAttributeLabel">
+          <children xmi:type="notation:DecorationNode" xmi:id="_f2wTACsJEemS0_wZSU3sbA" visible="false" type="StereotypeLabel">
+            <styles xmi:type="notation:StringValueStyle" xmi:id="_f2wTASsJEemS0_wZSU3sbA" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_f2wTAisJEemS0_wZSU3sbA"/>
+          </children>
+          <element xmi:type="uml:Property" href="Vnf.uml#_dl5TIDdzEeiIfPeSAqyGdQ"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_f0g3USsJEemS0_wZSU3sbA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_f0iFcCsJEemS0_wZSU3sbA" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="Vnf.uml#_ehkRMDdzEeiIfPeSAqyGdQ"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_f0iFcSsJEemS0_wZSU3sbA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_f0isgCsJEemS0_wZSU3sbA" type="Property_ClassAttributeLabel">
+          <children xmi:type="notation:DecorationNode" xmi:id="_f2-8gCsJEemS0_wZSU3sbA" visible="false" type="StereotypeLabel">
+            <styles xmi:type="notation:StringValueStyle" xmi:id="_f2-8gSsJEemS0_wZSU3sbA" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_f2-8gisJEemS0_wZSU3sbA"/>
+          </children>
+          <element xmi:type="uml:Property" href="Vnf.uml#_fXB5kDdzEeiIfPeSAqyGdQ"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_f0isgSsJEemS0_wZSU3sbA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_f0jTkCsJEemS0_wZSU3sbA" type="Property_ClassAttributeLabel">
+          <children xmi:type="notation:DecorationNode" xmi:id="_f3FDICsJEemS0_wZSU3sbA" visible="false" type="StereotypeLabel">
+            <styles xmi:type="notation:StringValueStyle" xmi:id="_f3FDISsJEemS0_wZSU3sbA" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_f3FDIisJEemS0_wZSU3sbA"/>
+          </children>
+          <element xmi:type="uml:Property" href="Vnf.uml#_tID8QPuOEeiYVshOvl6_ww"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_f0jTkSsJEemS0_wZSU3sbA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_f0j6oCsJEemS0_wZSU3sbA" type="Property_ClassAttributeLabel">
+          <children xmi:type="notation:DecorationNode" xmi:id="_f3LJwCsJEemS0_wZSU3sbA" visible="false" type="StereotypeLabel">
+            <styles xmi:type="notation:StringValueStyle" xmi:id="_f3LJwSsJEemS0_wZSU3sbA" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_f3LJwisJEemS0_wZSU3sbA"/>
+          </children>
+          <element xmi:type="uml:Property" href="Vnf.uml#_4rzi8A5rEemrJqq3q9vf6g"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_f0j6oSsJEemS0_wZSU3sbA"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_1pJTMSsHEemS0_wZSU3sbA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_1pJTMisHEemS0_wZSU3sbA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_1pJTMysHEemS0_wZSU3sbA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1pJTNCsHEemS0_wZSU3sbA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_1pJTNSsHEemS0_wZSU3sbA" visible="false" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_1pJTNisHEemS0_wZSU3sbA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_1pJTNysHEemS0_wZSU3sbA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_1pJTOCsHEemS0_wZSU3sbA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1pJTOSsHEemS0_wZSU3sbA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_1pJTOisHEemS0_wZSU3sbA" visible="false" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_1pJTOysHEemS0_wZSU3sbA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_1pJTPCsHEemS0_wZSU3sbA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_1pJTPSsHEemS0_wZSU3sbA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1pJTPisHEemS0_wZSU3sbA"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_1pc1MCsHEemS0_wZSU3sbA" visible="false" type="StereotypeLabel">
+        <styles xmi:type="notation:StringValueStyle" xmi:id="_1pc1MSsHEemS0_wZSU3sbA" name="stereotype" stringValue="OpenModel_Profile::OpenModelClass"/>
+        <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1pc1MisHEemS0_wZSU3sbA"/>
+      </children>
+      <element xmi:type="uml:Class" href="Vnf.uml#_ISONYDOSEeiHat9KcP8uWA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1pIFESsHEemS0_wZSU3sbA" x="320" y="820"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_1pqQkCsHEemS0_wZSU3sbA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_1pqQkSsHEemS0_wZSU3sbA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1pq3oCsHEemS0_wZSU3sbA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="Vnf.uml#_ISONYDOSEeiHat9KcP8uWA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1pqQkisHEemS0_wZSU3sbA" x="200"/>
+    </children>
     <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"/>
     </styles>
     <element xmi:type="uml:Package" href="Vnf.uml#_zPN5MDOHEei5Af8DcjrhIQ"/>
-    <edges xmi:type="notation:Connector" xmi:id="_R8upwDQUEeixv_sLOod4lQ" type="Association_Edge" source="_AC4TUDQUEeixv_sLOod4lQ" target="_6Mhj8DQTEeixv_sLOod4lQ">
-      <children xmi:type="notation:DecorationNode" xmi:id="_R8vQ0DQUEeixv_sLOod4lQ" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_BTwacDQWEeixv_sLOod4lQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_R8vQ0TQUEeixv_sLOod4lQ" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_R8vQ0jQUEeixv_sLOod4lQ" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_BT6LcDQWEeixv_sLOod4lQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_R8vQ0zQUEeixv_sLOod4lQ" x="-42" y="-13"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_R8vQ1DQUEeixv_sLOod4lQ" visible="false" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_BT-c4DQWEeixv_sLOod4lQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_R8vQ1TQUEeixv_sLOod4lQ" x="42" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_R8vQ1jQUEeixv_sLOod4lQ" visible="false" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_BUD8cDQWEeixv_sLOod4lQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_R8vQ1zQUEeixv_sLOod4lQ" x="-42" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_R8vQ2DQUEeixv_sLOod4lQ" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_BUI08DQWEeixv_sLOod4lQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_R8vQ2TQUEeixv_sLOod4lQ" x="23" y="-13"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_R8vQ2jQUEeixv_sLOod4lQ" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_BUNtcDQWEeixv_sLOod4lQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_R8vQ2zQUEeixv_sLOod4lQ" x="-29" y="-13"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_R8upwTQUEeixv_sLOod4lQ"/>
-      <element xmi:type="uml:Association" href="Vnf.uml#_R8QvsDQUEeixv_sLOod4lQ"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_R8upwjQUEeixv_sLOod4lQ" points="[561, 620, -643984, -643984]$[840, 620, -643984, -643984]$[840, 540, -643984, -643984]$[900, 540, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_R89TQDQUEeixv_sLOod4lQ" id="(1.0,0.1652892561983471)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_R89TQTQUEeixv_sLOod4lQ" id="(0.0,0.8637873754152824)"/>
-    </edges>
     <edges xmi:type="notation:Connector" xmi:id="_LRy5cDQtEeixv_sLOod4lQ" type="Association_Edge" source="_Am1LkDQtEeixv_sLOod4lQ" target="_6Mhj8DQTEeixv_sLOod4lQ">
       <children xmi:type="notation:DecorationNode" xmi:id="_LRy5czQtEeixv_sLOod4lQ" type="Association_StereotypeLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_ND0QsDQtEeixv_sLOod4lQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -2631,7 +2904,7 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_P0IwADWdEei9Ia34RXjpEg" id="(0.31496062992125984,1.0)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_P0JXEDWdEei9Ia34RXjpEg" id="(0.19933554817275748,0.0)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_kBuOMDWeEei9Ia34RXjpEg" type="Association_Edge" source="_FEIKEDWdEei9Ia34RXjpEg" target="_zOg-EDQVEeixv_sLOod4lQ">
+    <edges xmi:type="notation:Connector" xmi:id="_kBuOMDWeEei9Ia34RXjpEg" type="Association_Edge" source="_FEIKEDWdEei9Ia34RXjpEg" target="_zOg-EDQVEeixv_sLOod4lQ" routing="Rectilinear">
       <children xmi:type="notation:DecorationNode" xmi:id="_kBu1QDWeEei9Ia34RXjpEg" type="Association_StereotypeLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_mhjtsDWeEei9Ia34RXjpEg" name="IS_UPDATED_POSITION" booleanValue="true"/>
         <layoutConstraint xmi:type="notation:Location" xmi:id="_kBu1QTWeEei9Ia34RXjpEg" y="-19"/>
@@ -2659,7 +2932,7 @@
       <styles xmi:type="notation:FontStyle" xmi:id="_kBuOMTWeEei9Ia34RXjpEg"/>
       <element xmi:type="uml:Association" href="Vnf.uml#_j97TUDWeEei9Ia34RXjpEg"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_kBuOMjWeEei9Ia34RXjpEg" points="[1201, 720, -643984, -643984]$[1300, 720, -643984, -643984]$[1300, 200, -643984, -643984]$[684, 200, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_kIQ7EDWeEei9Ia34RXjpEg" id="(1.0,0.2484472049689441)"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_kIQ7EDWeEei9Ia34RXjpEg" id="(1.0,0.19900497512437812)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_kIQ7ETWeEei9Ia34RXjpEg" id="(1.0,0.11049723756906077)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_3_akdDaKEei23_xWdimG9w" type="StereotypeCommentLink" source="_6Mhj8DQTEeixv_sLOod4lQ" target="_3_akcDaKEei23_xWdimG9w">
@@ -2672,16 +2945,6 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3_akdzaKEei23_xWdimG9w"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3_bLgDaKEei23_xWdimG9w"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_3_jHVzaKEei23_xWdimG9w" type="StereotypeCommentLink" source="_AC4TUDQUEeixv_sLOod4lQ" target="_3_jHUzaKEei23_xWdimG9w">
-      <styles xmi:type="notation:FontStyle" xmi:id="_3_jHWDaKEei23_xWdimG9w"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_3_jHXDaKEei23_xWdimG9w" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="Vnf.uml#_AC2eIDQUEeixv_sLOod4lQ"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3_jHWTaKEei23_xWdimG9w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3_jHWjaKEei23_xWdimG9w"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3_jHWzaKEei23_xWdimG9w"/>
-    </edges>
     <edges xmi:type="notation:Connector" xmi:id="_3_rDJDaKEei23_xWdimG9w" type="StereotypeCommentLink" source="_zOg-EDQVEeixv_sLOod4lQ" target="_3_rDIDaKEei23_xWdimG9w">
       <styles xmi:type="notation:FontStyle" xmi:id="_3_rDJTaKEei23_xWdimG9w"/>
       <styles xmi:type="notation:EObjectValueStyle" xmi:id="_3_rDKTaKEei23_xWdimG9w" name="BASE_ELEMENT">
@@ -2731,9 +2994,9 @@
       <element xmi:type="uml:Generalization" href="Vnf.uml#_W3y74DdREeiIfPeSAqyGdQ"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_W7gXMjdREeiIfPeSAqyGdQ" points="[620, 220, -643984, -643984]$[620, 181, -643984, -643984]"/>
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XDo_gDdREeiIfPeSAqyGdQ" id="(0.5351170568561873,0.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XDo_gTdREeiIfPeSAqyGdQ" id="(0.5042016806722689,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XDo_gTdREeiIfPeSAqyGdQ" id="(0.5111821086261981,1.0)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_unBNcDdVEeiIfPeSAqyGdQ" type="Association_Edge" source="_Am1LkDQtEeixv_sLOod4lQ" target="_zOg-EDQVEeixv_sLOod4lQ">
+    <edges xmi:type="notation:Connector" xmi:id="_unBNcDdVEeiIfPeSAqyGdQ" type="Association_Edge" source="_Am1LkDQtEeixv_sLOod4lQ" target="_zOg-EDQVEeixv_sLOod4lQ" routing="Rectilinear">
       <children xmi:type="notation:DecorationNode" xmi:id="_unB0gDdVEeiIfPeSAqyGdQ" type="Association_StereotypeLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_xGI7QDdVEeiIfPeSAqyGdQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
         <layoutConstraint xmi:type="notation:Location" xmi:id="_unB0gTdVEeiIfPeSAqyGdQ" x="1" y="-18"/>
@@ -2760,8 +3023,8 @@
       </children>
       <styles xmi:type="notation:FontStyle" xmi:id="_unBNcTdVEeiIfPeSAqyGdQ"/>
       <element xmi:type="uml:Association" href="Vnf.uml#_ufxV8DdVEeiIfPeSAqyGdQ"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_unBNcjdVEeiIfPeSAqyGdQ" points="[160, 760, -643984, -643984]$[120, 260, -643984, -643984]$[460, 260, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_u1bc4DdVEeiIfPeSAqyGdQ" id="(0.26578073089701,0.0)"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_unBNcjdVEeiIfPeSAqyGdQ" points="[100, 760, -643984, -643984]$[100, 260, -643984, -643984]$[460, 260, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_u1bc4DdVEeiIfPeSAqyGdQ" id="(0.19933554817275748,0.0)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_u1bc4TdVEeiIfPeSAqyGdQ" id="(0.0,0.4419889502762431)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_oFePZDd-EeiIfPeSAqyGdQ" type="StereotypeCommentLink" source="_oFSpMDd-EeiIfPeSAqyGdQ" target="_oFePYDd-EeiIfPeSAqyGdQ">
@@ -2774,37 +3037,6 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_oFePZzd-EeiIfPeSAqyGdQ"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_oFePaDd-EeiIfPeSAqyGdQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_al6oEDeAEeiIfPeSAqyGdQ" type="Association_Edge" source="_AC4TUDQUEeixv_sLOod4lQ" target="_oFSpMDd-EeiIfPeSAqyGdQ">
-      <children xmi:type="notation:DecorationNode" xmi:id="_al6oEzeAEeiIfPeSAqyGdQ" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_eYdFkDeAEeiIfPeSAqyGdQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_al6oFDeAEeiIfPeSAqyGdQ" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_al6oFTeAEeiIfPeSAqyGdQ" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_ejxkwDeAEeiIfPeSAqyGdQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_al6oFjeAEeiIfPeSAqyGdQ" x="4" y="-13"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_al6oFzeAEeiIfPeSAqyGdQ" visible="false" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_euOhQDeAEeiIfPeSAqyGdQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_al6oGDeAEeiIfPeSAqyGdQ" x="20" y="-39"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_al6oGTeAEeiIfPeSAqyGdQ" visible="false" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_e5bEoDeAEeiIfPeSAqyGdQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_al6oGjeAEeiIfPeSAqyGdQ" x="-39" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_al6oGzeAEeiIfPeSAqyGdQ" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_fEqrUDeAEeiIfPeSAqyGdQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_al6oHDeAEeiIfPeSAqyGdQ" x="13" y="-15"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_al6oHTeAEeiIfPeSAqyGdQ" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_fQTTkDeAEeiIfPeSAqyGdQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_al6oHjeAEeiIfPeSAqyGdQ" x="-13" y="-10"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_al6oETeAEeiIfPeSAqyGdQ"/>
-      <element xmi:type="uml:Association" href="Vnf.uml#_abF4IDeAEeiIfPeSAqyGdQ"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_al6oEjeAEeiIfPeSAqyGdQ" points="[520, 600, -643984, -643984]$[520, 580, -643984, -643984]$[760, 580, -643984, -643984]$[760, 520, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_a7kH8DeAEeiIfPeSAqyGdQ" id="(0.5774278215223098,0.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_a7kH8TeAEeiIfPeSAqyGdQ" id="(0.5693950177935944,1.0)"/>
-    </edges>
     <edges xmi:type="notation:Connector" xmi:id="_SeUhhDgSEeiOYfGHew0BGg" type="StereotypeCommentLink" source="_SeLXkDgSEeiOYfGHew0BGg" target="_SeUhgDgSEeiOYfGHew0BGg">
       <styles xmi:type="notation:FontStyle" xmi:id="_SeUhhTgSEeiOYfGHew0BGg"/>
       <styles xmi:type="notation:EObjectValueStyle" xmi:id="_SeUhiTgSEeiOYfGHew0BGg" name="BASE_ELEMENT">
@@ -2815,38 +3047,7 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SeUhhzgSEeiOYfGHew0BGg"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SeUhiDgSEeiOYfGHew0BGg"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_fKsGcDgSEeiOYfGHew0BGg" type="Association_Edge" source="_SeLXkDgSEeiOYfGHew0BGg" target="_AC4TUDQUEeixv_sLOod4lQ">
-      <children xmi:type="notation:DecorationNode" xmi:id="_fKsGczgSEeiOYfGHew0BGg" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_wydOYDgSEeiOYfGHew0BGg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_fKsGdDgSEeiOYfGHew0BGg" y="-19"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_fKsGdTgSEeiOYfGHew0BGg" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_w9hO4DgSEeiOYfGHew0BGg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_fKsGdjgSEeiOYfGHew0BGg" x="-1" y="18"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_fKsGdzgSEeiOYfGHew0BGg" visible="false" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_xIPRIDgSEeiOYfGHew0BGg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_fKsGeDgSEeiOYfGHew0BGg" x="18" y="-19"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_fKsGeTgSEeiOYfGHew0BGg" visible="false" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_xS5pADgSEeiOYfGHew0BGg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_fKsGejgSEeiOYfGHew0BGg" x="-17" y="18"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_fKsGezgSEeiOYfGHew0BGg" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_xdjZ0DgSEeiOYfGHew0BGg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_fKsGfDgSEeiOYfGHew0BGg" x="18" y="18"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_fKstgDgSEeiOYfGHew0BGg" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_xoznkDgSEeiOYfGHew0BGg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_fKstgTgSEeiOYfGHew0BGg" x="-17" y="-19"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_fKsGcTgSEeiOYfGHew0BGg"/>
-      <element xmi:type="uml:Association" href="Vnf.uml#_e_oF8DgSEeiOYfGHew0BGg"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_fKsGcjgSEeiOYfGHew0BGg" points="[500, 420, -643984, -643984]$[380, 440, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fgO4oDgSEeiOYfGHew0BGg" id="(0.5895691609977324,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fgO4oTgSEeiOYfGHew0BGg" id="(0.26246719160104987,0.0)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_uzOFEDgTEeiOYfGHew0BGg" type="Association_Edge" source="_SeLXkDgSEeiOYfGHew0BGg" target="_oFSpMDd-EeiIfPeSAqyGdQ">
+    <edges xmi:type="notation:Connector" xmi:id="_uzOFEDgTEeiOYfGHew0BGg" type="Association_Edge" source="_SeLXkDgSEeiOYfGHew0BGg" target="_oFSpMDd-EeiIfPeSAqyGdQ" routing="Rectilinear">
       <children xmi:type="notation:DecorationNode" xmi:id="_uzOFEzgTEeiOYfGHew0BGg" type="Association_StereotypeLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_yoOAsDgTEeiOYfGHew0BGg" name="IS_UPDATED_POSITION" booleanValue="true"/>
         <layoutConstraint xmi:type="notation:Location" xmi:id="_uzOFFDgTEeiOYfGHew0BGg" y="-20"/>
@@ -2874,7 +3075,7 @@
       <styles xmi:type="notation:FontStyle" xmi:id="_uzOFETgTEeiOYfGHew0BGg"/>
       <element xmi:type="uml:Association" href="Vnf.uml#_uogp4DgTEeiOYfGHew0BGg"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_uzOFEjgTEeiOYfGHew0BGg" points="[581, 380, -643984, -643984]$[780, 380, -643984, -643984]$[780, 400, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vJf3EDgTEeiOYfGHew0BGg" id="(1.0,0.11049723756906077)"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vJf3EDgTEeiOYfGHew0BGg" id="(1.0,0.09950248756218906)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vJf3ETgTEeiOYfGHew0BGg" id="(0.6405693950177936,0.0)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_nNOFsDkTEeiWMf5FLWfdLA" type="Association_Edge" source="_6Mhj8DQTEeixv_sLOod4lQ" target="_zOg-EDQVEeixv_sLOod4lQ" routing="Rectilinear">
@@ -2918,7 +3119,7 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MWeoUzm5EeiWMf5FLWfdLA"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MWeoVDm5EeiWMf5FLWfdLA"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_hA8sQDm5EeiWMf5FLWfdLA" type="Association_Edge" source="_zOg-EDQVEeixv_sLOod4lQ" target="_MUJtEDm5EeiWMf5FLWfdLA">
+    <edges xmi:type="notation:Connector" xmi:id="_hA8sQDm5EeiWMf5FLWfdLA" type="Association_Edge" source="_zOg-EDQVEeixv_sLOod4lQ" target="_MUJtEDm5EeiWMf5FLWfdLA" routing="Rectilinear">
       <children xmi:type="notation:DecorationNode" xmi:id="_hA8sQzm5EeiWMf5FLWfdLA" type="Association_StereotypeLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_b8ihoD2zEeiFiY3bcpqGkg" name="IS_UPDATED_POSITION" booleanValue="true"/>
         <layoutConstraint xmi:type="notation:Location" xmi:id="_hA8sRDm5EeiWMf5FLWfdLA" x="1" y="-18"/>
@@ -2987,13 +3188,13 @@
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_FzBN8hk6Eem_VM0Ij2_uSw" type="Association_NameLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_G22pgBk6Eem_VM0Ij2_uSw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_FzBN8xk6Eem_VM0Ij2_uSw" y="20"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_FzBN8xk6Eem_VM0Ij2_uSw" x="-34" y="-2"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_FzBN9Bk6Eem_VM0Ij2_uSw" type="Association_TargetRoleLabel">
+      <children xmi:type="notation:DecorationNode" xmi:id="_FzBN9Bk6Eem_VM0Ij2_uSw" visible="false" type="Association_TargetRoleLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_G4UpIBk6Eem_VM0Ij2_uSw" name="IS_UPDATED_POSITION" booleanValue="true"/>
         <layoutConstraint xmi:type="notation:Location" xmi:id="_FzBN9Rk6Eem_VM0Ij2_uSw" x="26" y="3"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_FzBN9hk6Eem_VM0Ij2_uSw" type="Association_SourceRoleLabel">
+      <children xmi:type="notation:DecorationNode" xmi:id="_FzBN9hk6Eem_VM0Ij2_uSw" visible="false" type="Association_SourceRoleLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_G5xaoBk6Eem_VM0Ij2_uSw" name="IS_UPDATED_POSITION" booleanValue="true"/>
         <layoutConstraint xmi:type="notation:Location" xmi:id="_FzBN9xk6Eem_VM0Ij2_uSw" x="-81" y="19"/>
       </children>
@@ -3009,7 +3210,204 @@
       <element xmi:type="uml:Association" href="Vnf.uml#_7N9SABiwEemU7tpKjNcB0w"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Fyis0hk6Eem_VM0Ij2_uSw" points="[1160, 841, -643984, -643984]$[1160, 903, -643984, -643984]$[1320, 903, -643984, -643984]$[1320, 760, -643984, -643984]$[1261, 760, -643984, -643984]"/>
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_F3FOkBk6Eem_VM0Ij2_uSw" id="(0.6644518272425249,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_F3FOkRk6Eem_VM0Ij2_uSw" id="(1.0,0.4968944099378882)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_F3FOkRk6Eem_VM0Ij2_uSw" id="(1.0,0.39800995024875624)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_H0GzUCr-EemS0_wZSU3sbA" type="StereotypeCommentLink" source="_HzgWYCr-EemS0_wZSU3sbA" target="_H0GMQCr-EemS0_wZSU3sbA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_H0GzUSr-EemS0_wZSU3sbA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_H0HaYCr-EemS0_wZSU3sbA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="Vnf.uml#_-5-w8Cr9EemS0_wZSU3sbA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_H0GzUir-EemS0_wZSU3sbA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_H0GzUyr-EemS0_wZSU3sbA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_H0GzVCr-EemS0_wZSU3sbA"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_29-40Cr_EemS0_wZSU3sbA" type="Association_Edge" source="_6Mhj8DQTEeixv_sLOod4lQ" target="_HzgWYCr-EemS0_wZSU3sbA" routing="Rectilinear">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_9DMjkCr_EemS0_wZSU3sbA" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_9DNKoCr_EemS0_wZSU3sbA" key="displayNameLabelIcon_value" value="true"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_29_f4Cr_EemS0_wZSU3sbA" type="Association_StereotypeLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_29_f4Sr_EemS0_wZSU3sbA" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_29_f4ir_EemS0_wZSU3sbA" type="Association_NameLabel">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_TXSQsCsAEemS0_wZSU3sbA" source="displayNameLabelIcon">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_TXSQsSsAEemS0_wZSU3sbA" key="displayNameLabelIcon_value" value="false"/>
+        </eAnnotations>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_29_f4yr_EemS0_wZSU3sbA" x="-54" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_29_f5Cr_EemS0_wZSU3sbA" visible="false" type="Association_TargetRoleLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_29_f5Sr_EemS0_wZSU3sbA" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_29_f5ir_EemS0_wZSU3sbA" visible="false" type="Association_SourceRoleLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_29_f5yr_EemS0_wZSU3sbA" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_29_f6Cr_EemS0_wZSU3sbA" type="Association_SourceMultiplicityLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_29_f6Sr_EemS0_wZSU3sbA" x="-34" y="13"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_29_f6ir_EemS0_wZSU3sbA" type="Association_TargetMultiplicityLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_29_f6yr_EemS0_wZSU3sbA" y="-20"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_29-40Sr_EemS0_wZSU3sbA"/>
+      <element xmi:type="uml:Association" href="Vnf.uml#_245kgCr_EemS0_wZSU3sbA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_29-40ir_EemS0_wZSU3sbA" points="[900, 540, -643984, -643984]$[676, 640, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3DNXECr_EemS0_wZSU3sbA" id="(0.0,0.8637873754152824)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3DNXESr_EemS0_wZSU3sbA" id="(1.0,0.37267080745341613)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_GY-xwCsBEemS0_wZSU3sbA" type="Association_Edge" source="_SeLXkDgSEeiOYfGHew0BGg" target="_HzgWYCr-EemS0_wZSU3sbA">
+      <children xmi:type="notation:DecorationNode" xmi:id="_GY_Y0CsBEemS0_wZSU3sbA" visible="false" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_pumTICsPEemS0_wZSU3sbA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_GY_Y0SsBEemS0_wZSU3sbA" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_GY_Y0isBEemS0_wZSU3sbA" visible="false" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_pxhrUCsPEemS0_wZSU3sbA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_GY_Y0ysBEemS0_wZSU3sbA" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_GY_Y1CsBEemS0_wZSU3sbA" visible="false" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_p0ZZICsPEemS0_wZSU3sbA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_GY_Y1SsBEemS0_wZSU3sbA" x="3" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_GY__4CsBEemS0_wZSU3sbA" visible="false" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_p3kB4CsPEemS0_wZSU3sbA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_GY__4SsBEemS0_wZSU3sbA" x="-3" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_GY__4isBEemS0_wZSU3sbA" visible="false" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_p6jEcCsPEemS0_wZSU3sbA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_GY__4ysBEemS0_wZSU3sbA" x="3" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_GY__5CsBEemS0_wZSU3sbA" visible="false" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_p_o_0CsPEemS0_wZSU3sbA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_GY__5SsBEemS0_wZSU3sbA" x="-3" y="-20"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_GY-xwSsBEemS0_wZSU3sbA"/>
+      <element xmi:type="uml:Association" href="Vnf.uml#_GWbNACsBEemS0_wZSU3sbA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_GY-xwisBEemS0_wZSU3sbA" points="[500, 561, -643984, -643984]$[500, 580, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GeGiUCsBEemS0_wZSU3sbA" id="(0.8163265306122449,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GeGiUSsBEemS0_wZSU3sbA" id="(0.5319148936170213,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_6t08wCsBEemS0_wZSU3sbA" type="Association_Edge" source="_zOg-EDQVEeixv_sLOod4lQ" target="_HzgWYCr-EemS0_wZSU3sbA" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_6t1j0CsBEemS0_wZSU3sbA" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_fq-lACsCEemS0_wZSU3sbA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_6t1j0SsBEemS0_wZSU3sbA" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_6t1j0isBEemS0_wZSU3sbA" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_ftUHUCsCEemS0_wZSU3sbA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_6t1j0ysBEemS0_wZSU3sbA" x="-73" y="-102"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_6t1j1CsBEemS0_wZSU3sbA" visible="false" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_fvRPICsCEemS0_wZSU3sbA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_6t1j1SsBEemS0_wZSU3sbA" x="110" y="-39"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_6t1j1isBEemS0_wZSU3sbA" visible="false" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_fxrp8CsCEemS0_wZSU3sbA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_6t1j1ysBEemS0_wZSU3sbA" x="-129" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_6t1j2CsBEemS0_wZSU3sbA" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_fzm8kCsCEemS0_wZSU3sbA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_6t1j2SsBEemS0_wZSU3sbA" x="15" y="-27"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_6t1j2isBEemS0_wZSU3sbA" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_f2OywCsCEemS0_wZSU3sbA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_6t1j2ysBEemS0_wZSU3sbA" x="-129" y="-20"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_6t08wSsBEemS0_wZSU3sbA"/>
+      <element xmi:type="uml:Association" href="Vnf.uml#_6rs10CsBEemS0_wZSU3sbA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_6t08wisBEemS0_wZSU3sbA" points="[460, 300, -643984, -643984]$[120, 300, -643984, -643984]$[120, 660, -643984, -643984]$[300, 660, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6zMk8CsBEemS0_wZSU3sbA" id="(0.0,0.6629834254143646)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6zNMACsBEemS0_wZSU3sbA" id="(0.0,0.4968944099378882)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_qE_QUCsDEemS0_wZSU3sbA" type="Association_Edge" source="_HzgWYCr-EemS0_wZSU3sbA" target="_oFSpMDd-EeiIfPeSAqyGdQ">
+      <children xmi:type="notation:DecorationNode" xmi:id="_qE_3YCsDEemS0_wZSU3sbA" type="Association_StereotypeLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_qE_3YSsDEemS0_wZSU3sbA" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_qE_3YisDEemS0_wZSU3sbA" visible="false" type="Association_NameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_qE_3YysDEemS0_wZSU3sbA" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_qFAecCsDEemS0_wZSU3sbA" visible="false" type="Association_TargetRoleLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_qFAecSsDEemS0_wZSU3sbA" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_qFAecisDEemS0_wZSU3sbA" visible="false" type="Association_SourceRoleLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_qFAecysDEemS0_wZSU3sbA" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_qFAedCsDEemS0_wZSU3sbA" type="Association_SourceMultiplicityLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_qFAedSsDEemS0_wZSU3sbA" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_qFAedisDEemS0_wZSU3sbA" type="Association_TargetMultiplicityLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_qFAedysDEemS0_wZSU3sbA" y="-20"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_qE_QUSsDEemS0_wZSU3sbA"/>
+      <element xmi:type="uml:Association" href="Vnf.uml#_qCk1gCsDEemS0_wZSU3sbA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_qE_QUisDEemS0_wZSU3sbA" points="[640, 580, -643984, -643984]$[640, 500, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_qKpMYCsDEemS0_wZSU3sbA" id="(0.9042553191489362,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_qKpzcCsDEemS0_wZSU3sbA" id="(0.1423487544483986,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_lcctACsFEemS0_wZSU3sbA" type="Association_Edge" source="_Am1LkDQtEeixv_sLOod4lQ" target="_HzgWYCr-EemS0_wZSU3sbA" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_lcdUECsFEemS0_wZSU3sbA" type="Association_StereotypeLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_lcdUESsFEemS0_wZSU3sbA" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_lcdUEisFEemS0_wZSU3sbA" visible="false" type="Association_NameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_lcdUEysFEemS0_wZSU3sbA" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_lcd7ICsFEemS0_wZSU3sbA" visible="false" type="Association_TargetRoleLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_lcd7ISsFEemS0_wZSU3sbA" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_lcd7IisFEemS0_wZSU3sbA" visible="false" type="Association_SourceRoleLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_lcd7IysFEemS0_wZSU3sbA" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_lcd7JCsFEemS0_wZSU3sbA" type="Association_SourceMultiplicityLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_lcd7JSsFEemS0_wZSU3sbA" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_lcd7JisFEemS0_wZSU3sbA" type="Association_TargetMultiplicityLabel">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_AqZsECsGEemS0_wZSU3sbA" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_AqaTICsGEemS0_wZSU3sbA" key="visible" value="true"/>
+        </eAnnotations>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_lcd7JysFEemS0_wZSU3sbA" y="-20"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_lcctASsFEemS0_wZSU3sbA"/>
+      <element xmi:type="uml:Association" href="Vnf.uml#_lZYx8CsFEemS0_wZSU3sbA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_lcctAisFEemS0_wZSU3sbA" points="[180, 760, -643984, -643984]$[300, 700, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ljP4kCsFEemS0_wZSU3sbA" id="(0.46511627906976744,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ljQfoCsFEemS0_wZSU3sbA" id="(0.0,0.7453416149068323)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_1pq3oSsHEemS0_wZSU3sbA" type="StereotypeCommentLink" source="_1pIFECsHEemS0_wZSU3sbA" target="_1pqQkCsHEemS0_wZSU3sbA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_1pq3oisHEemS0_wZSU3sbA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1presCsHEemS0_wZSU3sbA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="Vnf.uml#_ISONYDOSEeiHat9KcP8uWA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1pq3oysHEemS0_wZSU3sbA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1pq3pCsHEemS0_wZSU3sbA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1pq3pSsHEemS0_wZSU3sbA"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_6uh4oCsHEemS0_wZSU3sbA" type="Association_Edge" source="_1pIFECsHEemS0_wZSU3sbA" target="_FEIKEDWdEei9Ia34RXjpEg" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_6uifsCsHEemS0_wZSU3sbA" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_peBvQCsJEemS0_wZSU3sbA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_6uifsSsHEemS0_wZSU3sbA" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_6uifsisHEemS0_wZSU3sbA" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_pgsowCsJEemS0_wZSU3sbA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_6uifsysHEemS0_wZSU3sbA" x="-8" y="27"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_6uiftCsHEemS0_wZSU3sbA" visible="false" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_pi8rgCsJEemS0_wZSU3sbA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_6uiftSsHEemS0_wZSU3sbA" x="196" y="-21"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_6uiftisHEemS0_wZSU3sbA" visible="false" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_pmKXkCsJEemS0_wZSU3sbA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_6uiftysHEemS0_wZSU3sbA" x="-197" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_6ujGwCsHEemS0_wZSU3sbA" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_ppGW0CsJEemS0_wZSU3sbA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_6ujGwSsHEemS0_wZSU3sbA" x="196" y="19"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_6ujGwisHEemS0_wZSU3sbA" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_pr6aQCsJEemS0_wZSU3sbA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_6ujGwysHEemS0_wZSU3sbA" x="-197" y="-20"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_6uh4oSsHEemS0_wZSU3sbA"/>
+      <element xmi:type="uml:Association" href="Vnf.uml#_6rsAACsHEemS0_wZSU3sbA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_6uh4oisHEemS0_wZSU3sbA" points="[785, 840, -643984, -643984]$[920, 840, -643984, -643984]$[920, 800, -643984, -643984]$[960, 800, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6zjikCsHEemS0_wZSU3sbA" id="(1.0,0.09569377990430622)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6zkJoCsHEemS0_wZSU3sbA" id="(0.0,0.5970149253731343)"/>
     </edges>
   </notation:Diagram>
   <notation:Diagram xmi:id="_BbL9MDzfEeiuk5pWzMOpfA" type="PapyrusUMLClassDiagram" name="Vnf Deployment Flavor" measurementUnit="Pixel">
@@ -3076,15 +3474,6 @@
         <layoutConstraint xmi:type="notation:Location" xmi:id="_FrZ1MjzfEeiuk5pWzMOpfA" y="15"/>
       </children>
       <children xmi:type="notation:BasicCompartment" xmi:id="_FrZ1MzzfEeiuk5pWzMOpfA" type="Class_AttributeCompartment">
-        <children xmi:type="notation:Shape" xmi:id="_Pc8nwDzfEeiuk5pWzMOpfA" type="Property_ClassAttributeLabel">
-          <children xmi:type="notation:DecorationNode" xmi:id="_PdD8gDzfEeiuk5pWzMOpfA" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_PdD8gTzfEeiuk5pWzMOpfA" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PdD8gjzfEeiuk5pWzMOpfA"/>
-          </children>
-          <element xmi:type="uml:Property" href="Vnf.uml#_aikFADdzEeiIfPeSAqyGdQ"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_Pc8nwTzfEeiuk5pWzMOpfA"/>
-        </children>
         <children xmi:type="notation:Shape" xmi:id="_Pc9O0DzfEeiuk5pWzMOpfA" type="Property_ClassAttributeLabel">
           <children xmi:type="notation:DecorationNode" xmi:id="_PdHm4DzfEeiuk5pWzMOpfA" visible="false" type="StereotypeLabel">
             <styles xmi:type="notation:StringValueStyle" xmi:id="_PdHm4TzfEeiuk5pWzMOpfA" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
@@ -3275,6 +3664,33 @@
         <layoutConstraint xmi:type="notation:Location" xmi:id="_ZuRFkTzqEeiuk5pWzMOpfA" y="15"/>
       </children>
       <children xmi:type="notation:BasicCompartment" xmi:id="_ZuRFkjzqEeiuk5pWzMOpfA" type="Class_AttributeCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_1-9LECvLEemS0_wZSU3sbA" type="Property_ClassAttributeLabel">
+          <children xmi:type="notation:DecorationNode" xmi:id="_2AElYCvLEemS0_wZSU3sbA" visible="false" type="StereotypeLabel">
+            <styles xmi:type="notation:StringValueStyle" xmi:id="_2AElYSvLEemS0_wZSU3sbA" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2AElYivLEemS0_wZSU3sbA"/>
+          </children>
+          <element xmi:type="uml:Property" href="Vnf.uml#_O35QACvLEemS0_wZSU3sbA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_1-9LESvLEemS0_wZSU3sbA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_1--ZMCvLEemS0_wZSU3sbA" type="Property_ClassAttributeLabel">
+          <children xmi:type="notation:DecorationNode" xmi:id="_2AKsACvLEemS0_wZSU3sbA" visible="false" type="StereotypeLabel">
+            <styles xmi:type="notation:StringValueStyle" xmi:id="_2AKsASvLEemS0_wZSU3sbA" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2AKsAivLEemS0_wZSU3sbA"/>
+          </children>
+          <element xmi:type="uml:Property" href="Vnf.uml#_ZpVZUCvLEemS0_wZSU3sbA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_1--ZMSvLEemS0_wZSU3sbA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_1-_nUCvLEemS0_wZSU3sbA" type="Property_ClassAttributeLabel">
+          <children xmi:type="notation:DecorationNode" xmi:id="_2ARZsCvLEemS0_wZSU3sbA" visible="false" type="StereotypeLabel">
+            <styles xmi:type="notation:StringValueStyle" xmi:id="_2ARZsSvLEemS0_wZSU3sbA" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2ARZsivLEemS0_wZSU3sbA"/>
+          </children>
+          <element xmi:type="uml:Property" href="Vnf.uml#_hig8ECvLEemS0_wZSU3sbA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_1-_nUSvLEemS0_wZSU3sbA"/>
+        </children>
         <styles xmi:type="notation:TitleStyle" xmi:id="_ZuRFkzzqEeiuk5pWzMOpfA"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_ZuRFlDzqEeiuk5pWzMOpfA"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_ZuRFlTzqEeiuk5pWzMOpfA"/>
@@ -3323,15 +3739,6 @@
           <element xmi:type="uml:Property" href="Vnf.uml#_uA9FMDgUEeiOYfGHew0BGg"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_6GjbgzzqEeiuk5pWzMOpfA"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_6GjbhDzqEeiuk5pWzMOpfA" type="Property_ClassAttributeLabel">
-          <children xmi:type="notation:DecorationNode" xmi:id="_6G9EIDzqEeiuk5pWzMOpfA" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_6G9EITzqEeiuk5pWzMOpfA" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6G9EIjzqEeiuk5pWzMOpfA"/>
-          </children>
-          <element xmi:type="uml:Property" href="Vnf.uml#_DgtLUDgVEeiOYfGHew0BGg"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_6GjbhTzqEeiuk5pWzMOpfA"/>
-        </children>
         <children xmi:type="notation:Shape" xmi:id="_6GjbhjzqEeiuk5pWzMOpfA" type="Property_ClassAttributeLabel">
           <children xmi:type="notation:DecorationNode" xmi:id="_6G-5UDzqEeiuk5pWzMOpfA" visible="false" type="StereotypeLabel">
             <styles xmi:type="notation:StringValueStyle" xmi:id="_6G-5UTzqEeiuk5pWzMOpfA" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
@@ -3350,42 +3757,6 @@
           <element xmi:type="uml:Property" href="Vnf.uml#_s7WyQDgYEeiOYfGHew0BGg"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_6GjbiTzqEeiuk5pWzMOpfA"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_6GjbijzqEeiuk5pWzMOpfA" type="Property_ClassAttributeLabel">
-          <children xmi:type="notation:DecorationNode" xmi:id="_6HDKwDzqEeiuk5pWzMOpfA" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_6HDKwTzqEeiuk5pWzMOpfA" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6HDKwjzqEeiuk5pWzMOpfA"/>
-          </children>
-          <element xmi:type="uml:Property" href="Vnf.uml#_-SutwDgYEeiOYfGHew0BGg"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_6GjbizzqEeiuk5pWzMOpfA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_6GkCkDzqEeiuk5pWzMOpfA" type="Property_ClassAttributeLabel">
-          <children xmi:type="notation:DecorationNode" xmi:id="_6HE_8DzqEeiuk5pWzMOpfA" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_6HE_8TzqEeiuk5pWzMOpfA" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6HE_8jzqEeiuk5pWzMOpfA"/>
-          </children>
-          <element xmi:type="uml:Property" href="Vnf.uml#__S0RwDgYEeiOYfGHew0BGg"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_6GkCkTzqEeiuk5pWzMOpfA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_6GkCkjzqEeiuk5pWzMOpfA" type="Property_ClassAttributeLabel">
-          <children xmi:type="notation:DecorationNode" xmi:id="_6HGOEDzqEeiuk5pWzMOpfA" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_6HGOETzqEeiuk5pWzMOpfA" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6HGOEjzqEeiuk5pWzMOpfA"/>
-          </children>
-          <element xmi:type="uml:Property" href="Vnf.uml#_AApoIDgZEeiOYfGHew0BGg"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_6GkCkzzqEeiuk5pWzMOpfA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_6GkClDzqEeiuk5pWzMOpfA" type="Property_ClassAttributeLabel">
-          <children xmi:type="notation:DecorationNode" xmi:id="_6HIDQDzqEeiuk5pWzMOpfA" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_6HIDQTzqEeiuk5pWzMOpfA" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6HIDQjzqEeiuk5pWzMOpfA"/>
-          </children>
-          <element xmi:type="uml:Property" href="Vnf.uml#_BYBDsDgZEeiOYfGHew0BGg"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_6GkClTzqEeiuk5pWzMOpfA"/>
-        </children>
         <children xmi:type="notation:Shape" xmi:id="_3yMAEA57EemrJqq3q9vf6g" type="Property_ClassAttributeLabel" fontColor="16711680" fontName="Segoe UI">
           <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_60iWwA57EemrJqq3q9vf6g" source="PapyrusCSSForceValue">
             <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_60i90A57EemrJqq3q9vf6g" key="fontHeight" value="true"/>
@@ -3428,6 +3799,24 @@
           <element xmi:type="uml:Property" href="Vnf.uml#_gTpnIA59EemrJqq3q9vf6g"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_4m6WsQ59EemrJqq3q9vf6g"/>
         </children>
+        <children xmi:type="notation:Shape" xmi:id="_-lQRkCsSEemS0_wZSU3sbA" type="Property_ClassAttributeLabel">
+          <children xmi:type="notation:DecorationNode" xmi:id="_-l-DQCsSEemS0_wZSU3sbA" visible="false" type="StereotypeLabel">
+            <styles xmi:type="notation:StringValueStyle" xmi:id="_-l-DQSsSEemS0_wZSU3sbA" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-l-DQisSEemS0_wZSU3sbA"/>
+          </children>
+          <element xmi:type="uml:Property" href="Vnf.uml#_PYj-ECsQEemS0_wZSU3sbA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_-lQRkSsSEemS0_wZSU3sbA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_-lRfsCsSEemS0_wZSU3sbA" type="Property_ClassAttributeLabel">
+          <children xmi:type="notation:DecorationNode" xmi:id="_-mF_ECsSEemS0_wZSU3sbA" visible="false" type="StereotypeLabel">
+            <styles xmi:type="notation:StringValueStyle" xmi:id="_-mF_ESsSEemS0_wZSU3sbA" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-mF_EisSEemS0_wZSU3sbA"/>
+          </children>
+          <element xmi:type="uml:Property" href="Vnf.uml#_5LWhwBx5Eemit6R65X1VNQ"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_-lRfsSsSEemS0_wZSU3sbA"/>
+        </children>
         <styles xmi:type="notation:TitleStyle" xmi:id="_tqmRJDzqEeiuk5pWzMOpfA"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_tqmRJTzqEeiuk5pWzMOpfA"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_tqmRJjzqEeiuk5pWzMOpfA"/>
@@ -3451,7 +3840,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tqwpMjzqEeiuk5pWzMOpfA"/>
       </children>
       <element xmi:type="uml:Class" href="Vnf.uml#_0lvvQDgREeiOYfGHew0BGg"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tqlqETzqEeiuk5pWzMOpfA" x="880" y="-40" height="161"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tqlqETzqEeiuk5pWzMOpfA" x="880" y="-60" height="241"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_tqyeYzzqEeiuk5pWzMOpfA" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_tqyeZDzqEeiuk5pWzMOpfA"/>
@@ -3494,15 +3883,6 @@
           <element xmi:type="uml:Property" href="Vnf.uml#_f1tDUDnIEeiWMf5FLWfdLA"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_S9rGEzzrEeiuk5pWzMOpfA"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_S9rGFDzrEeiuk5pWzMOpfA" type="Property_ClassAttributeLabel">
-          <children xmi:type="notation:DecorationNode" xmi:id="_S-AdQDzrEeiuk5pWzMOpfA" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_S-AdQTzrEeiuk5pWzMOpfA" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_S-AdQjzrEeiuk5pWzMOpfA"/>
-          </children>
-          <element xmi:type="uml:Property" href="Vnf.uml#_PJk5sjnHEeiWMf5FLWfdLA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_S9rGFTzrEeiuk5pWzMOpfA"/>
-        </children>
         <children xmi:type="notation:Shape" xmi:id="_pxBEYJmYEeibE8EgApNciA" type="Property_ClassAttributeLabel">
           <children xmi:type="notation:DecorationNode" xmi:id="_pxVNcJmYEeibE8EgApNciA" visible="false" type="StereotypeLabel">
             <styles xmi:type="notation:StringValueStyle" xmi:id="_pxVNcZmYEeibE8EgApNciA" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
@@ -3551,15 +3931,6 @@
         <layoutConstraint xmi:type="notation:Location" xmi:id="_sFMkJDzrEeiuk5pWzMOpfA" y="15"/>
       </children>
       <children xmi:type="notation:BasicCompartment" xmi:id="_sFNLMDzrEeiuk5pWzMOpfA" type="Class_AttributeCompartment">
-        <children xmi:type="notation:Shape" xmi:id="_uD9W4DzrEeiuk5pWzMOpfA" type="Property_ClassAttributeLabel">
-          <children xmi:type="notation:DecorationNode" xmi:id="_uEPqwDzrEeiuk5pWzMOpfA" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_uEPqwTzrEeiuk5pWzMOpfA" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uEPqwjzrEeiuk5pWzMOpfA"/>
-          </children>
-          <element xmi:type="uml:Property" href="Vnf.uml#_7vMSsDnIEeiWMf5FLWfdLA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_uD9W4TzrEeiuk5pWzMOpfA"/>
-        </children>
         <children xmi:type="notation:Shape" xmi:id="_uD9W4jzrEeiuk5pWzMOpfA" type="Property_ClassAttributeLabel">
           <children xmi:type="notation:DecorationNode" xmi:id="_uESHADzrEeiuk5pWzMOpfA" visible="false" type="StereotypeLabel">
             <styles xmi:type="notation:StringValueStyle" xmi:id="_uESHATzrEeiuk5pWzMOpfA" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
@@ -3611,141 +3982,6 @@
         <layoutConstraint xmi:type="notation:Location" xmi:id="_hGJVQjzuEeiuk5pWzMOpfA" y="15"/>
       </children>
       <children xmi:type="notation:BasicCompartment" xmi:id="_hGJVQzzuEeiuk5pWzMOpfA" type="Class_AttributeCompartment">
-        <children xmi:type="notation:Shape" xmi:id="_l32JsDzuEeiuk5pWzMOpfA" type="Property_ClassAttributeLabel">
-          <children xmi:type="notation:DecorationNode" xmi:id="_l4KSwDzuEeiuk5pWzMOpfA" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_l4KSwTzuEeiuk5pWzMOpfA" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l4KSwjzuEeiuk5pWzMOpfA"/>
-          </children>
-          <element xmi:type="uml:Property" href="Vnf.uml#_Sz6jIDOVEeiHat9KcP8uWA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_l32JsTzuEeiuk5pWzMOpfA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_l32wwDzuEeiuk5pWzMOpfA" type="Property_ClassAttributeLabel">
-          <children xmi:type="notation:DecorationNode" xmi:id="_l4NWEDzuEeiuk5pWzMOpfA" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_l4NWETzuEeiuk5pWzMOpfA" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l4NWEjzuEeiuk5pWzMOpfA"/>
-          </children>
-          <element xmi:type="uml:Property" href="Vnf.uml#_hUYi8DOVEeiHat9KcP8uWA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_l32wwTzuEeiuk5pWzMOpfA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_l33X0DzuEeiuk5pWzMOpfA" type="Property_ClassAttributeLabel">
-          <children xmi:type="notation:DecorationNode" xmi:id="_l4PyUDzuEeiuk5pWzMOpfA" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_l4PyUTzuEeiuk5pWzMOpfA" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l4PyUjzuEeiuk5pWzMOpfA"/>
-          </children>
-          <element xmi:type="uml:Property" href="Vnf.uml#_Psi3oDOXEeiHat9KcP8uWA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_l33X0TzuEeiuk5pWzMOpfA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_l33X0jzuEeiuk5pWzMOpfA" type="Property_ClassAttributeLabel">
-          <children xmi:type="notation:DecorationNode" xmi:id="_l4SOkDzuEeiuk5pWzMOpfA" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_l4SOkTzuEeiuk5pWzMOpfA" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l4SOkjzuEeiuk5pWzMOpfA"/>
-          </children>
-          <element xmi:type="uml:Property" href="Vnf.uml#_Txwn0DQLEeixv_sLOod4lQ"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_l33X0zzuEeiuk5pWzMOpfA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_l33X1DzuEeiuk5pWzMOpfA" type="Property_ClassAttributeLabel">
-          <children xmi:type="notation:DecorationNode" xmi:id="_l4VR4DzuEeiuk5pWzMOpfA" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_l4VR4TzuEeiuk5pWzMOpfA" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l4VR4jzuEeiuk5pWzMOpfA"/>
-          </children>
-          <element xmi:type="uml:Property" href="Vnf.uml#_d9nX0DQLEeixv_sLOod4lQ"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_l33X1TzuEeiuk5pWzMOpfA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_l33X1jzuEeiuk5pWzMOpfA" type="Property_ClassAttributeLabel">
-          <children xmi:type="notation:DecorationNode" xmi:id="_l4XuIDzuEeiuk5pWzMOpfA" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_l4XuITzuEeiuk5pWzMOpfA" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l4XuIjzuEeiuk5pWzMOpfA"/>
-          </children>
-          <element xmi:type="uml:Property" href="Vnf.uml#_nVSR0DQLEeixv_sLOod4lQ"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_l33X1zzuEeiuk5pWzMOpfA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_l33X2DzuEeiuk5pWzMOpfA" type="Property_ClassAttributeLabel">
-          <children xmi:type="notation:DecorationNode" xmi:id="_l4ZjUDzuEeiuk5pWzMOpfA" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_l4ZjUTzuEeiuk5pWzMOpfA" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l4ZjUjzuEeiuk5pWzMOpfA"/>
-          </children>
-          <element xmi:type="uml:Property" href="Vnf.uml#_zS9kwDQLEeixv_sLOod4lQ"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_l33X2TzuEeiuk5pWzMOpfA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_l33X2jzuEeiuk5pWzMOpfA" type="Property_ClassAttributeLabel">
-          <children xmi:type="notation:DecorationNode" xmi:id="_l4bYgDzuEeiuk5pWzMOpfA" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_l4bYgTzuEeiuk5pWzMOpfA" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l4bYgjzuEeiuk5pWzMOpfA"/>
-          </children>
-          <element xmi:type="uml:Property" href="Vnf.uml#_-WAbcDQLEeixv_sLOod4lQ"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_l33X2zzuEeiuk5pWzMOpfA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_l33X3DzuEeiuk5pWzMOpfA" type="Property_ClassAttributeLabel">
-          <children xmi:type="notation:DecorationNode" xmi:id="_l4dNsDzuEeiuk5pWzMOpfA" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_l4dNsTzuEeiuk5pWzMOpfA" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l4dNsjzuEeiuk5pWzMOpfA"/>
-          </children>
-          <element xmi:type="uml:Property" href="Vnf.uml#_CnvFoDkKEeiWMf5FLWfdLA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_l33X3TzuEeiuk5pWzMOpfA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_l33-4DzuEeiuk5pWzMOpfA" type="Property_ClassAttributeLabel">
-          <children xmi:type="notation:DecorationNode" xmi:id="_l4gRADzuEeiuk5pWzMOpfA" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_l4gRATzuEeiuk5pWzMOpfA" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l4gRAjzuEeiuk5pWzMOpfA"/>
-          </children>
-          <element xmi:type="uml:Property" href="Vnf.uml#_qFisADOUEeiHat9KcP8uWA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_l33-4TzuEeiuk5pWzMOpfA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_l33-4jzuEeiuk5pWzMOpfA" type="Property_ClassAttributeLabel">
-          <children xmi:type="notation:DecorationNode" xmi:id="_l4iGMDzuEeiuk5pWzMOpfA" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_l4iGMTzuEeiuk5pWzMOpfA" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l4iGMjzuEeiuk5pWzMOpfA"/>
-          </children>
-          <element xmi:type="uml:Property" href="Vnf.uml#_IW__QDQMEeixv_sLOod4lQ"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_l33-4zzuEeiuk5pWzMOpfA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_l33-5DzuEeiuk5pWzMOpfA" type="Property_ClassAttributeLabel">
-          <children xmi:type="notation:DecorationNode" xmi:id="_l4kicDzuEeiuk5pWzMOpfA" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_l4kicTzuEeiuk5pWzMOpfA" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l4kicjzuEeiuk5pWzMOpfA"/>
-          </children>
-          <element xmi:type="uml:Property" href="Vnf.uml#_zr-tcDkIEeiWMf5FLWfdLA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_l33-5TzuEeiuk5pWzMOpfA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_l33-5jzuEeiuk5pWzMOpfA" type="Property_ClassAttributeLabel">
-          <children xmi:type="notation:DecorationNode" xmi:id="_l4mXoDzuEeiuk5pWzMOpfA" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_l4mXoTzuEeiuk5pWzMOpfA" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l4mXojzuEeiuk5pWzMOpfA"/>
-          </children>
-          <element xmi:type="uml:Property" href="Vnf.uml#_HklksDkLEeiWMf5FLWfdLA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_l33-5zzuEeiuk5pWzMOpfA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_l33-6DzuEeiuk5pWzMOpfA" type="Property_ClassAttributeLabel">
-          <children xmi:type="notation:DecorationNode" xmi:id="_l4oz4DzuEeiuk5pWzMOpfA" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_l4oz4TzuEeiuk5pWzMOpfA" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l4oz4jzuEeiuk5pWzMOpfA"/>
-          </children>
-          <element xmi:type="uml:Property" href="Vnf.uml#_LgNf8DTdEeiwQ6KPLHcy4g"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_l33-6TzuEeiuk5pWzMOpfA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_l34l8DzuEeiuk5pWzMOpfA" type="Property_ClassAttributeLabel">
-          <children xmi:type="notation:DecorationNode" xmi:id="_l4qpEDzuEeiuk5pWzMOpfA" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_l4qpETzuEeiuk5pWzMOpfA" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l4qpEjzuEeiuk5pWzMOpfA"/>
-          </children>
-          <element xmi:type="uml:Property" href="Vnf.uml#_X1lEsDTeEeiwQ6KPLHcy4g"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_l34l8TzuEeiuk5pWzMOpfA"/>
-        </children>
         <styles xmi:type="notation:TitleStyle" xmi:id="_hGJVRDzuEeiuk5pWzMOpfA"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_hGJVRTzuEeiuk5pWzMOpfA"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_hGJVRjzuEeiuk5pWzMOpfA"/>
@@ -3769,7 +4005,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hGUUYjzuEeiuk5pWzMOpfA"/>
       </children>
       <element xmi:type="uml:Class" href="Vnf.uml#_aaEZADOREeiHat9KcP8uWA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hGIuMTzuEeiuk5pWzMOpfA" x="420" y="400" height="321"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hGIuMTzuEeiuk5pWzMOpfA" x="560" y="420" height="81"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_hGXXszzuEeiuk5pWzMOpfA" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_hGXXtDzuEeiuk5pWzMOpfA"/>
@@ -3779,10 +4015,80 @@
       <element xsi:nil="true"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hGXXtTzuEeiuk5pWzMOpfA" x="200"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_fAdFADz3Eeiuk5pWzMOpfA" type="Comment_Shape">
-      <children xmi:type="notation:DecorationNode" xmi:id="_fAdFAjz3Eeiuk5pWzMOpfA" type="Comment_BodyLabel"/>
-      <element xmi:type="uml:Comment" href="Vnf.uml#_fAb24Dz3Eeiuk5pWzMOpfA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fAdFATz3Eeiuk5pWzMOpfA" x="380" y="-40"/>
+    <children xmi:type="notation:Shape" xmi:id="_Dm0VsCsNEemS0_wZSU3sbA" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_Dm08wCsNEemS0_wZSU3sbA" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Dm1j0CsNEemS0_wZSU3sbA" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Dm1j0SsNEemS0_wZSU3sbA" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Dm1j0isNEemS0_wZSU3sbA" type="Class_AttributeCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_SRA5QCsNEemS0_wZSU3sbA" type="Property_ClassAttributeLabel">
+          <children xmi:type="notation:DecorationNode" xmi:id="_SYk50CsNEemS0_wZSU3sbA" visible="false" type="StereotypeLabel">
+            <styles xmi:type="notation:StringValueStyle" xmi:id="_SYk50SsNEemS0_wZSU3sbA" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SYk50isNEemS0_wZSU3sbA"/>
+          </children>
+          <element xmi:type="uml:Property" href="Vnf.uml#_a5biQDg2EeiOYfGHew0BGg"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_SRA5QSsNEemS0_wZSU3sbA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_SRCHYCsNEemS0_wZSU3sbA" type="Property_ClassAttributeLabel">
+          <children xmi:type="notation:DecorationNode" xmi:id="_SYrngCsNEemS0_wZSU3sbA" visible="false" type="StereotypeLabel">
+            <styles xmi:type="notation:StringValueStyle" xmi:id="_SYrngSsNEemS0_wZSU3sbA" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SYrngisNEemS0_wZSU3sbA"/>
+          </children>
+          <element xmi:type="uml:Property" href="Vnf.uml#_btdAMDg2EeiOYfGHew0BGg"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_SRCucCsNEemS0_wZSU3sbA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_SRDVgCsNEemS0_wZSU3sbA" type="Property_ClassAttributeLabel">
+          <children xmi:type="notation:DecorationNode" xmi:id="_SYxuICsNEemS0_wZSU3sbA" visible="false" type="StereotypeLabel">
+            <styles xmi:type="notation:StringValueStyle" xmi:id="_SYxuISsNEemS0_wZSU3sbA" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SYxuIisNEemS0_wZSU3sbA"/>
+          </children>
+          <element xmi:type="uml:Property" href="Vnf.uml#_cggNwDg2EeiOYfGHew0BGg"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_SRDVgSsNEemS0_wZSU3sbA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_SRD8kCsNEemS0_wZSU3sbA" type="Property_ClassAttributeLabel">
+          <children xmi:type="notation:DecorationNode" xmi:id="_SY30wCsNEemS0_wZSU3sbA" visible="false" type="StereotypeLabel">
+            <styles xmi:type="notation:StringValueStyle" xmi:id="_SY30wSsNEemS0_wZSU3sbA" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SY30wisNEemS0_wZSU3sbA"/>
+          </children>
+          <element xmi:type="uml:Property" href="Vnf.uml#_dP31MDg2EeiOYfGHew0BGg"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_SRD8kSsNEemS0_wZSU3sbA"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Dm1j0ysNEemS0_wZSU3sbA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Dm1j1CsNEemS0_wZSU3sbA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Dm1j1SsNEemS0_wZSU3sbA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Dm1j1isNEemS0_wZSU3sbA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Dm1j1ysNEemS0_wZSU3sbA" visible="false" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Dm1j2CsNEemS0_wZSU3sbA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Dm1j2SsNEemS0_wZSU3sbA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Dm1j2isNEemS0_wZSU3sbA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Dm1j2ysNEemS0_wZSU3sbA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Dm1j3CsNEemS0_wZSU3sbA" visible="false" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Dm1j3SsNEemS0_wZSU3sbA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Dm1j3isNEemS0_wZSU3sbA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Dm1j3ysNEemS0_wZSU3sbA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Dm1j4CsNEemS0_wZSU3sbA"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_DnH3sCsNEemS0_wZSU3sbA" visible="false" type="StereotypeLabel">
+        <styles xmi:type="notation:StringValueStyle" xmi:id="_DnH3sSsNEemS0_wZSU3sbA" name="stereotype" stringValue="OpenModel_Profile::OpenModelClass"/>
+        <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DnH3sisNEemS0_wZSU3sbA"/>
+      </children>
+      <element xmi:type="uml:Class" href="Vnf.uml#_tEnEsDTSEeiwQ6KPLHcy4g"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Dm0VsSsNEemS0_wZSU3sbA" x="466" y="531"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_DnSPwysNEemS0_wZSU3sbA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_DnSPxCsNEemS0_wZSU3sbA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_DnS20CsNEemS0_wZSU3sbA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="Vnf.uml#_tEnEsDTSEeiwQ6KPLHcy4g"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DnSPxSsNEemS0_wZSU3sbA" x="200"/>
     </children>
     <styles xmi:type="notation:StringValueStyle" xmi:id="_BbL9MTzfEeiuk5pWzMOpfA" name="diagram_compatibility_version" stringValue="1.4.0"/>
     <styles xmi:type="notation:DiagramStyle" xmi:id="_BbL9MjzfEeiuk5pWzMOpfA"/>
@@ -3861,7 +4167,7 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ZufIBDzqEeiuk5pWzMOpfA"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ZufIBTzqEeiuk5pWzMOpfA"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_Zu5XsDzqEeiuk5pWzMOpfA" type="Association_Edge" source="_Fqi5kDzfEeiuk5pWzMOpfA" target="_ZuQegDzqEeiuk5pWzMOpfA">
+    <edges xmi:type="notation:Connector" xmi:id="_Zu5XsDzqEeiuk5pWzMOpfA" type="Association_Edge" source="_Fqi5kDzfEeiuk5pWzMOpfA" target="_ZuQegDzqEeiuk5pWzMOpfA" routing="Rectilinear">
       <children xmi:type="notation:DecorationNode" xmi:id="_Zu5XszzqEeiuk5pWzMOpfA" type="Association_StereotypeLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_aERKwDzqEeiuk5pWzMOpfA" name="IS_UPDATED_POSITION" booleanValue="true"/>
         <layoutConstraint xmi:type="notation:Location" xmi:id="_Zu5XtDzqEeiuk5pWzMOpfA" x="-1" y="-18"/>
@@ -3902,7 +4208,7 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tqyeajzqEeiuk5pWzMOpfA"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tqyeazzqEeiuk5pWzMOpfA"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_trUC0DzqEeiuk5pWzMOpfA" type="Association_Edge" source="_Fqi5kDzfEeiuk5pWzMOpfA" target="_tqlqEDzqEeiuk5pWzMOpfA">
+    <edges xmi:type="notation:Connector" xmi:id="_trUC0DzqEeiuk5pWzMOpfA" type="Association_Edge" source="_Fqi5kDzfEeiuk5pWzMOpfA" target="_tqlqEDzqEeiuk5pWzMOpfA" routing="Rectilinear">
       <children xmi:type="notation:DecorationNode" xmi:id="_trUp4DzqEeiuk5pWzMOpfA" type="Association_StereotypeLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_yxhHoDzqEeiuk5pWzMOpfA" name="IS_UPDATED_POSITION" booleanValue="true"/>
         <layoutConstraint xmi:type="notation:Location" xmi:id="_trUp4TzqEeiuk5pWzMOpfA" y="-19"/>
@@ -3931,7 +4237,7 @@
       <element xmi:type="uml:Association" href="Vnf.uml#_KN7jQDnAEeiWMf5FLWfdLA"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_trUC0jzqEeiuk5pWzMOpfA" points="[620, 220, -643984, -643984]$[620, 60, -643984, -643984]$[880, 60, -643984, -643984]"/>
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_yy8D8DzqEeiuk5pWzMOpfA" id="(0.5809128630705395,0.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_yy8rADzqEeiuk5pWzMOpfA" id="(0.0,0.6211180124223602)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_yy8rADzqEeiuk5pWzMOpfA" id="(0.0,0.4149377593360996)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_PGVBFzzrEeiuk5pWzMOpfA" type="StereotypeCommentLink" source="_PGLQEDzrEeiuk5pWzMOpfA" target="_PGVBEzzrEeiuk5pWzMOpfA">
       <styles xmi:type="notation:FontStyle" xmi:id="_PGVBGDzrEeiuk5pWzMOpfA"/>
@@ -4025,14 +4331,14 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hGXXujzuEeiuk5pWzMOpfA"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hGXXuzzuEeiuk5pWzMOpfA"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_hHBfADzuEeiuk5pWzMOpfA" type="Association_Edge" source="_hGIuMDzuEeiuk5pWzMOpfA" target="_Fqi5kDzfEeiuk5pWzMOpfA">
+    <edges xmi:type="notation:Connector" xmi:id="_hHBfADzuEeiuk5pWzMOpfA" type="Association_Edge" source="_hGIuMDzuEeiuk5pWzMOpfA" target="_Fqi5kDzfEeiuk5pWzMOpfA" routing="Rectilinear">
       <children xmi:type="notation:DecorationNode" xmi:id="_hHCGEDzuEeiuk5pWzMOpfA" type="Association_StereotypeLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_mqS6UDzuEeiuk5pWzMOpfA" name="IS_UPDATED_POSITION" booleanValue="true"/>
         <layoutConstraint xmi:type="notation:Location" xmi:id="_hHCGETzuEeiuk5pWzMOpfA" y="-19"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_hHCGEjzuEeiuk5pWzMOpfA" type="Association_NameLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_mq1F0DzuEeiuk5pWzMOpfA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_hHCGEzzuEeiuk5pWzMOpfA" x="-1" y="18"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_hHCGEzzuEeiuk5pWzMOpfA" x="9" y="57"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_hHCGFDzuEeiuk5pWzMOpfA" visible="false" type="Association_TargetRoleLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_mrRxwDzuEeiuk5pWzMOpfA" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -4052,17 +4358,10 @@
       </children>
       <styles xmi:type="notation:FontStyle" xmi:id="_hHBfATzuEeiuk5pWzMOpfA"/>
       <element xmi:type="uml:Association" href="Vnf.uml#_zxa4ADQvEeixv_sLOod4lQ"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hHBfAjzuEeiuk5pWzMOpfA" points="[960, 420, -643984, -643984]$[640, 420, -643984, -643984]$[600, 320, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mtIL4DzuEeiuk5pWzMOpfA" id="(0.46403712296983757,0.0)"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hHBfAjzuEeiuk5pWzMOpfA" points="[620, 420, -643984, -643984]$[620, 333, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mtIL4DzuEeiuk5pWzMOpfA" id="(0.45112781954887216,0.0)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mtIL4TzuEeiuk5pWzMOpfA" id="(0.5809128630705395,1.0)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_ieTr8Dz3Eeiuk5pWzMOpfA" type="Comment_AnnotatedElementEdge" source="_fAdFADz3Eeiuk5pWzMOpfA" target="_ZuQegDzqEeiuk5pWzMOpfA">
-      <styles xmi:type="notation:FontStyle" xmi:id="_ieTr8Tz3Eeiuk5pWzMOpfA"/>
-      <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ieTr8jz3Eeiuk5pWzMOpfA" points="[231, 80, -643984, -643984]$[280, 140, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_imPf8Dz3Eeiuk5pWzMOpfA" id="(0.6106870229007634,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_imPf8Tz3Eeiuk5pWzMOpfA" id="(0.8,0.0)"/>
-    </edges>
     <edges xmi:type="notation:Connector" xmi:id="_8ujN0D5xEeijbdkIlrq2uQ" type="Association_Edge" source="_Fqi5kDzfEeiuk5pWzMOpfA" target="_FrZOIDzfEeiuk5pWzMOpfA">
       <children xmi:type="notation:DecorationNode" xmi:id="_8ujN0z5xEeijbdkIlrq2uQ" type="Association_StereotypeLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_lKPZgD5yEeijbdkIlrq2uQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -4094,30 +4393,74 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_811hkD5xEeijbdkIlrq2uQ" id="(1.0,0.5309734513274337)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_811hkT5xEeijbdkIlrq2uQ" id="(0.08602150537634409,0.0)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_mnkeYFqmEeiTzriVSbKglg" type="Association_Edge" source="_tqlqEDzqEeiuk5pWzMOpfA" target="_rc5EcDzfEeiuk5pWzMOpfA" lineColor="255">
-      <children xmi:type="notation:DecorationNode" xmi:id="_mnkeY1qmEeiTzriVSbKglg" type="Association_StereotypeLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_mnkeZFqmEeiTzriVSbKglg" y="-20"/>
+    <edges xmi:type="notation:Connector" xmi:id="_DnS20SsNEemS0_wZSU3sbA" type="StereotypeCommentLink" source="_Dm0VsCsNEemS0_wZSU3sbA" target="_DnSPwysNEemS0_wZSU3sbA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_DnS20isNEemS0_wZSU3sbA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_DnTd4CsNEemS0_wZSU3sbA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="Vnf.uml#_tEnEsDTSEeiwQ6KPLHcy4g"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_DnS20ysNEemS0_wZSU3sbA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_DnS21CsNEemS0_wZSU3sbA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_DnS21SsNEemS0_wZSU3sbA"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_Z1KAICsNEemS0_wZSU3sbA" type="Association_Edge" source="_Fqi5kDzfEeiuk5pWzMOpfA" target="_Dm0VsCsNEemS0_wZSU3sbA">
+      <children xmi:type="notation:DecorationNode" xmi:id="_Z1KAIysNEemS0_wZSU3sbA" type="Association_StereotypeLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z1KAJCsNEemS0_wZSU3sbA" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Z1KAJSsNEemS0_wZSU3sbA" type="Association_NameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z1KAJisNEemS0_wZSU3sbA" x="-5" y="62"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Z1KAJysNEemS0_wZSU3sbA" visible="false" type="Association_TargetRoleLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z1KAKCsNEemS0_wZSU3sbA" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Z1KnMCsNEemS0_wZSU3sbA" visible="false" type="Association_SourceRoleLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z1KnMSsNEemS0_wZSU3sbA" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Z1KnMisNEemS0_wZSU3sbA" type="Association_SourceMultiplicityLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z1KnMysNEemS0_wZSU3sbA" y="20"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_mnkeZVqmEeiTzriVSbKglg" type="Association_NameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_mnkeZlqmEeiTzriVSbKglg" y="20"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Z1KnNCsNEemS0_wZSU3sbA" type="Association_TargetMultiplicityLabel">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_mgEMgCsNEemS0_wZSU3sbA" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_mgEMgSsNEemS0_wZSU3sbA" key="visible" value="true"/>
+        </eAnnotations>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z1KnNSsNEemS0_wZSU3sbA" y="-20"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_Z1KAISsNEemS0_wZSU3sbA"/>
+      <element xmi:type="uml:Association" href="Vnf.uml#_ZqPJkCsNEemS0_wZSU3sbA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Z1KAIisNEemS0_wZSU3sbA" points="[520, 333, -643984, -643984]$[520, 531, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aE0MwCsNEemS0_wZSU3sbA" id="(0.16597510373443983,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aE0MwSsNEemS0_wZSU3sbA" id="(0.20930232558139536,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_i831wCsREemS0_wZSU3sbA" type="Association_Edge" source="_tqlqEDzqEeiuk5pWzMOpfA" target="_rc5EcDzfEeiuk5pWzMOpfA">
+      <children xmi:type="notation:DecorationNode" xmi:id="_i84c0CsREemS0_wZSU3sbA" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_DaxrgCsSEemS0_wZSU3sbA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_i84c0SsREemS0_wZSU3sbA" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_i84c0isREemS0_wZSU3sbA" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_DjuMICsSEemS0_wZSU3sbA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_i84c0ysREemS0_wZSU3sbA" x="-4" y="-102"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_mnlFcFqmEeiTzriVSbKglg" visible="false" type="Association_TargetRoleLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_mnlFcVqmEeiTzriVSbKglg" y="-20"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_i84c1CsREemS0_wZSU3sbA" visible="false" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_DsUHcCsSEemS0_wZSU3sbA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_i84c1SsREemS0_wZSU3sbA" x="9" y="-20"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_mnlFclqmEeiTzriVSbKglg" visible="false" type="Association_SourceRoleLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_mnlFc1qmEeiTzriVSbKglg" y="20"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_i84c1isREemS0_wZSU3sbA" visible="false" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Dy53oCsSEemS0_wZSU3sbA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_i84c1ysREemS0_wZSU3sbA" x="-9" y="20"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_mnlFdFqmEeiTzriVSbKglg" type="Association_SourceMultiplicityLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_mnlFdVqmEeiTzriVSbKglg" y="20"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_i84c2CsREemS0_wZSU3sbA" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_D6IhACsSEemS0_wZSU3sbA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_i84c2SsREemS0_wZSU3sbA" x="9" y="20"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_mnlFdlqmEeiTzriVSbKglg" type="Association_TargetMultiplicityLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_mnlFd1qmEeiTzriVSbKglg" y="-20"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_i84c2isREemS0_wZSU3sbA" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_EBqsYCsSEemS0_wZSU3sbA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_i84c2ysREemS0_wZSU3sbA" x="-9" y="-20"/>
       </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_mnkeYVqmEeiTzriVSbKglg"/>
-      <element xmi:type="uml:Association" href="Vnf.uml#_mcaXQFqmEeiTzriVSbKglg"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_mnkeYlqmEeiTzriVSbKglg" points="[1160, 121, -643984, -643984]$[1180, 220, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mx9wgFqmEeiTzriVSbKglg" id="(0.6021505376344086,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mx-XkFqmEeiTzriVSbKglg" id="(0.4979253112033195,0.0)"/>
+      <styles xmi:type="notation:FontStyle" xmi:id="_i831wSsREemS0_wZSU3sbA"/>
+      <element xmi:type="uml:Association" href="Vnf.uml#_ix6i8CsREemS0_wZSU3sbA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_i831wisREemS0_wZSU3sbA" points="[1200, 121, -643984, -643984]$[1200, 220, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jNJtcCsREemS0_wZSU3sbA" id="(0.6881720430107527,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jNJtcSsREemS0_wZSU3sbA" id="(0.6639004149377593,0.0)"/>
     </edges>
   </notation:Diagram>
   <notation:Diagram xmi:id="_ojifoD0JEeiuk5pWzMOpfA" type="PapyrusUMLClassDiagram" name="Vnf Element Group" measurementUnit="Pixel">
@@ -7574,20 +7917,6 @@
       <element xmi:type="uml:DataType" href="Vnf.uml#_cyGIcPxUEeijjKJn7OxwuQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cySVsfxUEeijjKJn7OxwuQ" x="960" y="1600"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_GktMABsbEem5EIL2nWKfdQ" type="Enumeration_Shape">
-      <children xmi:type="notation:DecorationNode" xmi:id="_GkwPUBsbEem5EIL2nWKfdQ" type="Enumeration_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_GkwPURsbEem5EIL2nWKfdQ" type="Enumeration_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_GkwPUhsbEem5EIL2nWKfdQ" y="15"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_Gkw2YBsbEem5EIL2nWKfdQ" type="Enumeration_LiteralCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_Gkw2YRsbEem5EIL2nWKfdQ"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_Gkw2YhsbEem5EIL2nWKfdQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_Gkw2YxsbEem5EIL2nWKfdQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Gkw2ZBsbEem5EIL2nWKfdQ"/>
-      </children>
-      <element xmi:type="uml:Enumeration" href="Vnf.uml#_GkdUYBsbEem5EIL2nWKfdQ"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GktMARsbEem5EIL2nWKfdQ" x="1163" y="1601"/>
-    </children>
     <children xmi:type="notation:Shape" xmi:id="_BA46oBx6Eemit6R65X1VNQ" type="DataType_Shape" fontColor="16711680">
       <children xmi:type="notation:DecorationNode" xmi:id="_BBILMBx6Eemit6R65X1VNQ" type="DataType_NameLabel"/>
       <children xmi:type="notation:DecorationNode" xmi:id="_BBILMRx6Eemit6R65X1VNQ" type="DataType_FloatingNameLabel">
diff --git a/ONAP Information Model/Vnf.uml b/ONAP Information Model/Vnf.uml
index 0ef0e72..e3b7e8a 100644
--- a/ONAP Information Model/Vnf.uml
+++ b/ONAP Information Model/Vnf.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: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">
+<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ActionLanguage="http://www.omg.org/spec/ALF/20120827/ActionLanguage-Profile" 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://www.omg.org/spec/ALF/20120827/ActionLanguage-Profile pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_Kv8EIKFXEeS_KNX0nfvIVQ http:///schemas/OpenModel_Profile/_zWCisKVxEeikF6xsfT18UA/26 OpenModel_Profile.profile.uml#_zWYg8KVxEeikF6xsfT18UA">
   <uml:Package xmi:id="_xXjM8DOHEei5Af8DcjrhIQ" name="Vnf">
     <packagedElement xmi:type="uml:Package" xmi:id="_zPNSIDOHEei5Af8DcjrhIQ" name="Associations">
       <packagedElement xmi:type="uml:Association" xmi:id="_u3e7kDOVEeiHat9KcP8uWA" name="VnfdUsesVCDesc" memberEnd="_u3gwwDOVEeiHat9KcP8uWA _u3j0EDOVEeiHat9KcP8uWA">
@@ -20,25 +20,6 @@
         </ownedComment>
         <ownedEnd xmi:type="uml:Property" xmi:id="_vRy4kDQPEeixv_sLOod4lQ" name="_vnfd" type="_aaEZADOREeiHat9KcP8uWA" association="_vRNCsDQPEeixv_sLOod4lQ"/>
       </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_R8QvsDQUEeixv_sLOod4lQ" name="VnfdHasVL" memberEnd="_R8RWwjQUEeixv_sLOod4lQ _R8R90DQUEeixv_sLOod4lQ">
-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R8RWwDQUEeixv_sLOod4lQ" source="org.eclipse.papyrus">
-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R8RWwTQUEeixv_sLOod4lQ" key="nature" value="UML_Nature"/>
-        </eAnnotations>
-        <ownedComment xmi:type="uml:Comment" xmi:id="_JyTwkDQVEeixv_sLOod4lQ" annotatedElement="_R8QvsDQUEeixv_sLOod4lQ">
-          <body>Represents the type of network connectivity mandated by the VNF provider between two or more CPs which includes at least one internal CP.</body>
-        </ownedComment>
-        <ownedComment xmi:type="uml:Comment" xmi:id="_h9PGoDTdEeiwQ6KPLHcy4g" annotatedElement="_R8QvsDQUEeixv_sLOod4lQ">
-          <body>References to VnfVirtualLinkDesc that are part of this group.</body>
-        </ownedComment>
-        <ownedEnd xmi:type="uml:Property" xmi:id="_R8RWwjQUEeixv_sLOod4lQ" type="_aaEZADOREeiHat9KcP8uWA" association="_R8QvsDQUEeixv_sLOod4lQ">
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_XwLPEDQUEeixv_sLOod4lQ"/>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_XwZ4kDQUEeixv_sLOod4lQ" value="1"/>
-        </ownedEnd>
-        <ownedEnd xmi:type="uml:Property" xmi:id="_R8R90DQUEeixv_sLOod4lQ" type="_AC2eIDQUEeixv_sLOod4lQ" association="_R8QvsDQUEeixv_sLOod4lQ">
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ZVQ9kDQUEeixv_sLOod4lQ"/>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ZViqYDQUEeixv_sLOod4lQ" value="*"/>
-        </ownedEnd>
-      </packagedElement>
       <packagedElement xmi:type="uml:Association" xmi:id="_zxa4ADQvEeixv_sLOod4lQ" name="VnfdHasVnfDf" memberEnd="_zxa4AzQvEeixv_sLOod4lQ _zxbfEDQvEeixv_sLOod4lQ">
         <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_zxa4ATQvEeixv_sLOod4lQ" source="org.eclipse.papyrus">
           <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zxa4AjQvEeixv_sLOod4lQ" key="nature" value="UML_Nature"/>
@@ -87,7 +68,7 @@
         </eAnnotations>
         <ownedEnd xmi:type="uml:Property" xmi:id="_nXywQjkOEeiWMf5FLWfdLA" name="_vnfd" type="_aaEZADOREeiHat9KcP8uWA" association="_nXtQsDkOEeiWMf5FLWfdLA"/>
       </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_j97TUDWeEei9Ia34RXjpEg" name="VduHasVduCpd" memberEnd="_j9-9sDWeEei9Ia34RXjpEg _j-D2MDWeEei9Ia34RXjpEg">
+      <packagedElement xmi:type="uml:Association" xmi:id="_j97TUDWeEei9Ia34RXjpEg" name="VduHasInternalVduCpd" memberEnd="_j9-9sDWeEei9Ia34RXjpEg _j-D2MDWeEei9Ia34RXjpEg">
         <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_j99vkDWeEei9Ia34RXjpEg" source="org.eclipse.papyrus">
           <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_j9-WoDWeEei9Ia34RXjpEg" key="nature" value="UML_Nature"/>
         </eAnnotations>
@@ -145,24 +126,11 @@ NOTE: More software images can be attached to the virtualisation container using
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_7U2r0DdyEeiIfPeSAqyGdQ" value="*"/>
         </ownedEnd>
       </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_abF4IDeAEeiIfPeSAqyGdQ" name="VirtualLinkHasVLFlavour" memberEnd="_abGfMjeAEeiIfPeSAqyGdQ _abHGQDeAEeiIfPeSAqyGdQ">
-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_abGfMDeAEeiIfPeSAqyGdQ" source="org.eclipse.papyrus">
-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_abGfMTeAEeiIfPeSAqyGdQ" key="nature" value="UML_Nature"/>
-        </eAnnotations>
-        <ownedComment xmi:type="uml:Comment" xmi:id="_u-dOgDeAEeiIfPeSAqyGdQ" annotatedElement="_abF4IDeAEeiIfPeSAqyGdQ">
-          <body>Describes a specific flavour of the VL with specific bitrate requirements.</body>
-        </ownedComment>
-        <ownedEnd xmi:type="uml:Property" xmi:id="_abGfMjeAEeiIfPeSAqyGdQ" name="virtuallinkdescflavour" type="_oFQM8Dd-EeiIfPeSAqyGdQ" association="_abF4IDeAEeiIfPeSAqyGdQ">
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_l4dTUDeAEeiIfPeSAqyGdQ" value="1"/>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_l4gWoDeAEeiIfPeSAqyGdQ" value="*"/>
-        </ownedEnd>
-        <ownedEnd xmi:type="uml:Property" xmi:id="_abHGQDeAEeiIfPeSAqyGdQ" name="virtuallinkdesc (vnfvirtuallinkdesc)" type="_AC2eIDQUEeixv_sLOod4lQ" association="_abF4IDeAEeiIfPeSAqyGdQ"/>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_ufxV8DdVEeiIfPeSAqyGdQ" name="intCpd" memberEnd="_uf0ZQDdVEeiIfPeSAqyGdQ _uf1nYDdVEeiIfPeSAqyGdQ">
+      <packagedElement xmi:type="uml:Association" xmi:id="_ufxV8DdVEeiIfPeSAqyGdQ" name="VnfExtCpdMapstoVduCpd" memberEnd="_uf0ZQDdVEeiIfPeSAqyGdQ _uf1nYDdVEeiIfPeSAqyGdQ">
         <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ufzyMDdVEeiIfPeSAqyGdQ" source="org.eclipse.papyrus">
           <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ufzyMTdVEeiIfPeSAqyGdQ" key="nature" value="UML_Nature"/>
         </eAnnotations>
-        <ownedEnd xmi:type="uml:Property" xmi:id="_uf1nYDdVEeiIfPeSAqyGdQ" name="vnfextcpd" type="_AmzWYDQtEeixv_sLOod4lQ" association="_ufxV8DdVEeiIfPeSAqyGdQ">
+        <ownedEnd xmi:type="uml:Property" xmi:id="_uf1nYDdVEeiIfPeSAqyGdQ" name="_vnfExtCpd" type="_AmzWYDQtEeixv_sLOod4lQ" association="_ufxV8DdVEeiIfPeSAqyGdQ">
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_8yFlADdVEeiIfPeSAqyGdQ"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8yIBQDdVEeiIfPeSAqyGdQ" value="1"/>
         </ownedEnd>
@@ -177,12 +145,6 @@ NOTE: More software images can be attached to the virtualisation container using
         </ownedComment>
         <ownedEnd xmi:type="uml:Property" xmi:id="_uok7UDgTEeiOYfGHew0BGg" name="virtuallinkprofile" type="_0lvvQDgREeiOYfGHew0BGg" association="_uogp4DgTEeiOYfGHew0BGg"/>
       </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_e_oF8DgSEeiOYfGHew0BGg" name="VLDescHasVLProfile" memberEnd="_e_qiMDgSEeiOYfGHew0BGg _e_tlgDgSEeiOYfGHew0BGg">
-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_e_p7IDgSEeiOYfGHew0BGg" source="org.eclipse.papyrus">
-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_e_p7ITgSEeiOYfGHew0BGg" key="nature" value="UML_Nature"/>
-        </eAnnotations>
-        <ownedEnd xmi:type="uml:Property" xmi:id="_e_tlgDgSEeiOYfGHew0BGg" name="virtuallinkprofile" type="_0lvvQDgREeiOYfGHew0BGg" association="_e_oF8DgSEeiOYfGHew0BGg"/>
-      </packagedElement>
       <packagedElement xmi:type="uml:Association" xmi:id="_gt50cDm5EeiWMf5FLWfdLA" name="VduCpdHasVNIR" memberEnd="_guTdEjm5EeiWMf5FLWfdLA _guVSQTm5EeiWMf5FLWfdLA">
         <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_guTdEDm5EeiWMf5FLWfdLA" source="org.eclipse.papyrus">
           <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_guTdETm5EeiWMf5FLWfdLA" key="nature" value="UML_Nature"/>
@@ -245,24 +207,12 @@ NOTE 2: virtualLinkProfile needs to be provided for all VLs that the CPs of the
         </eAnnotations>
         <ownedEnd xmi:type="uml:Property" xmi:id="_mpmbQDkTEeiWMf5FLWfdLA" name="_vnfd" type="_aaEZADOREeiHat9KcP8uWA" association="_mpiw4DkTEeiWMf5FLWfdLA"/>
       </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_yfiZYDkREeiWMf5FLWfdLA" name="VnfdHasVnfVLDesc" memberEnd="_yfk1oDkREeiWMf5FLWfdLA _yfnR4DkREeiWMf5FLWfdLA">
-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yfkOkDkREeiWMf5FLWfdLA" source="org.eclipse.papyrus">
-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yfkOkTkREeiWMf5FLWfdLA" key="nature" value="UML_Nature"/>
-        </eAnnotations>
-        <ownedEnd xmi:type="uml:Property" xmi:id="_yfnR4DkREeiWMf5FLWfdLA" name="_vnfd" type="_aaEZADOREeiHat9KcP8uWA" association="_yfiZYDkREeiWMf5FLWfdLA"/>
-      </packagedElement>
       <packagedElement xmi:type="uml:Association" xmi:id="_hzDMsDm7EeiWMf5FLWfdLA" name="VnfExtCdpHasVNIR" memberEnd="_hzG3ETm7EeiWMf5FLWfdLA _hz7WcDm7EeiWMf5FLWfdLA">
         <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_hzFo8Dm7EeiWMf5FLWfdLA" source="org.eclipse.papyrus">
           <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hzG3EDm7EeiWMf5FLWfdLA" key="nature" value="UML_Nature"/>
         </eAnnotations>
         <ownedEnd xmi:type="uml:Property" xmi:id="_hz7WcDm7EeiWMf5FLWfdLA" name="_vnfExtCpd " type="_AmzWYDQtEeixv_sLOod4lQ" association="_hzDMsDm7EeiWMf5FLWfdLA"/>
       </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_oUgnMDm-EeiWMf5FLWfdLA" name="VLDescHasVLDescFlavour" memberEnd="_oUh1Ujm-EeiWMf5FLWfdLA _oUjqgTm-EeiWMf5FLWfdLA">
-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_oUh1UDm-EeiWMf5FLWfdLA" source="org.eclipse.papyrus">
-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_oUh1UTm-EeiWMf5FLWfdLA" key="nature" value="UML_Nature"/>
-        </eAnnotations>
-        <ownedEnd xmi:type="uml:Property" xmi:id="_oUjqgTm-EeiWMf5FLWfdLA" name="_vnfVirtualLinkdesc " type="_AC2eIDQUEeixv_sLOod4lQ" association="_oUgnMDm-EeiWMf5FLWfdLA"/>
-      </packagedElement>
       <packagedElement xmi:type="uml:Association" xmi:id="_PJjEgDnHEeiWMf5FLWfdLA" name="ILHasVduLevel" memberEnd="_PJk5sjnHEeiWMf5FLWfdLA _PJmu4jnHEeiWMf5FLWfdLA">
         <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PJk5sDnHEeiWMf5FLWfdLA" source="org.eclipse.papyrus">
           <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PJk5sTnHEeiWMf5FLWfdLA" key="nature" value="UML_Nature"/>
@@ -326,15 +276,6 @@ NOTE 2: virtualLinkProfile needs to be provided for all VLs that the CPs of the
         </eAnnotations>
         <ownedEnd xmi:type="uml:Property" xmi:id="_h7PhQEKAEeiwbqJBYHKltg" name="vnfdf " type="_p0UVsDQvEeixv_sLOod4lQ" association="_h7IMgEKAEeiwbqJBYHKltg"/>
       </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_mcaXQFqmEeiTzriVSbKglg" name="VirtualLinkProfileHasAffinityorAAGroup" memberEnd="_mcgd4FqmEeiTzriVSbKglg _mciTEFqmEeiTzriVSbKglg">
-        <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" 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">
         <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_KOQ18EJ9EeiwbqJBYHKltg" source="org.eclipse.papyrus">
           <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_KORdAEJ9EeiwbqJBYHKltg" key="nature" value="UML_Nature"/>
@@ -459,8 +400,104 @@ NOTE 2: virtualLinkProfile needs to be provided for all VLs that the CPs of the
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_P7vGYD2sEeiu6I5JfRTxxQ" value="*"/>
         </ownedEnd>
       </packagedElement>
+      <packagedElement xmi:type="uml:Association" xmi:id="_-JxnoCovEemZ-7haRVvogQ" name="VnfdHasSwImageDesc" memberEnd="_-KR98CovEemZ-7haRVvogQ _-KYroCovEemZ-7haRVvogQ">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-KNFcCovEemZ-7haRVvogQ" source="org.eclipse.papyrus">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-KOTkCovEemZ-7haRVvogQ" key="nature" value="UML_Nature"/>
+        </eAnnotations>
+        <ownedEnd xmi:type="uml:Property" xmi:id="_-KYroCovEemZ-7haRVvogQ" name="_vnfd" type="_aaEZADOREeiHat9KcP8uWA" association="_-JxnoCovEemZ-7haRVvogQ"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Association" xmi:id="_iGbbMCo7EemS0_wZSU3sbA" name="SwImageDescHasSwImage" memberEnd="_iGrS0Co7EemS0_wZSU3sbA _iGwLUCo7EemS0_wZSU3sbA">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iGnocCo7EemS0_wZSU3sbA" source="org.eclipse.papyrus">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iGoPgCo7EemS0_wZSU3sbA" key="nature" value="UML_Nature"/>
+        </eAnnotations>
+        <ownedEnd xmi:type="uml:Property" xmi:id="_iGwLUCo7EemS0_wZSU3sbA" name="_swImageDesc" type="_J0Zx0DOSEeiHat9KcP8uWA" association="_iGbbMCo7EemS0_wZSU3sbA"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Association" xmi:id="_gmOFUCo-EemS0_wZSU3sbA" name="VCDHasLNRequirements" memberEnd="_gmSWwCo-EemS0_wZSU3sbA _gmVaESo-EemS0_wZSU3sbA">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_gmRIoCo-EemS0_wZSU3sbA" source="org.eclipse.papyrus">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_gmRvsCo-EemS0_wZSU3sbA" key="nature" value="UML_Nature"/>
+        </eAnnotations>
+        <ownedEnd xmi:type="uml:Property" xmi:id="_gmVaESo-EemS0_wZSU3sbA" name="_virtualComputeDesc" type="_-gDvwDOREeiHat9KcP8uWA" association="_gmOFUCo-EemS0_wZSU3sbA"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Association" xmi:id="_245kgCr_EemS0_wZSU3sbA" name="VnfdHasInternalVnfVLDesc" memberEnd="_248n0Cr_EemS0_wZSU3sbA _24-dASr_EemS0_wZSU3sbA">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_248AwCr_EemS0_wZSU3sbA" source="org.eclipse.papyrus">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_248AwSr_EemS0_wZSU3sbA" key="nature" value="UML_Nature"/>
+        </eAnnotations>
+        <ownedEnd xmi:type="uml:Property" xmi:id="_24-dASr_EemS0_wZSU3sbA" name="_vnfd" type="_aaEZADOREeiHat9KcP8uWA" association="_245kgCr_EemS0_wZSU3sbA"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Association" xmi:id="_GWbNACsBEemS0_wZSU3sbA" name="VirtualLinkProfileHasDescId" memberEnd="_GWe3YSsBEemS0_wZSU3sbA _GWh6sCsBEemS0_wZSU3sbA">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GWeQUCsBEemS0_wZSU3sbA" source="org.eclipse.papyrus">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GWe3YCsBEemS0_wZSU3sbA" key="nature" value="UML_Nature"/>
+        </eAnnotations>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_YvyxACsBEemS0_wZSU3sbA" annotatedElement="_GWbNACsBEemS0_wZSU3sbA">
+          <body>Uniquely references a VLD.</body>
+        </ownedComment>
+        <ownedEnd xmi:type="uml:Property" xmi:id="_GWh6sCsBEemS0_wZSU3sbA" name="_virtualLinkProfile" type="_0lvvQDgREeiOYfGHew0BGg" association="_GWbNACsBEemS0_wZSU3sbA"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Association" xmi:id="_6rs10CsBEemS0_wZSU3sbA" name="VduCpdHasInternvalVnfVLDesc" memberEnd="_6rvSESsBEemS0_wZSU3sbA _6rxuUCsBEemS0_wZSU3sbA">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6rurACsBEemS0_wZSU3sbA" source="org.eclipse.papyrus">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6rvSECsBEemS0_wZSU3sbA" key="nature" value="UML_Nature"/>
+        </eAnnotations>
+        <ownedEnd xmi:type="uml:Property" xmi:id="_6rxuUCsBEemS0_wZSU3sbA" name="_vduCpd " type="_zOfv8DQVEeixv_sLOod4lQ" association="_6rs10CsBEemS0_wZSU3sbA"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Association" xmi:id="_qCk1gCsDEemS0_wZSU3sbA" name="VnfVLDescHasVLDescFlavour" memberEnd="_qCsKQisDEemS0_wZSU3sbA _qCumgSsDEemS0_wZSU3sbA">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_qCsKQCsDEemS0_wZSU3sbA" source="org.eclipse.papyrus">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_qCsKQSsDEemS0_wZSU3sbA" key="nature" value="UML_Nature"/>
+        </eAnnotations>
+        <ownedEnd xmi:type="uml:Property" xmi:id="_qCumgSsDEemS0_wZSU3sbA" name="_vnfVirtualLinkDesc" type="_-5-w8Cr9EemS0_wZSU3sbA" association="_qCk1gCsDEemS0_wZSU3sbA"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Association" xmi:id="_lZYx8CsFEemS0_wZSU3sbA" name="VnfExtCpdHasVLDesc" memberEnd="_lZbOMCsFEemS0_wZSU3sbA _lZ69cCsFEemS0_wZSU3sbA">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lZanICsFEemS0_wZSU3sbA" source="org.eclipse.papyrus">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_lZanISsFEemS0_wZSU3sbA" key="nature" value="UML_Nature"/>
+        </eAnnotations>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_3ghWcCsFEemS0_wZSU3sbA" annotatedElement="_lZYx8CsFEemS0_wZSU3sbA">
+          <body>Reference to the internal Virtual Link Descriptor (VLD) to which CPs instantiated from this external CP Descriptor (CPD) connect.</body>
+        </ownedComment>
+        <ownedEnd xmi:type="uml:Property" xmi:id="_lZ69cCsFEemS0_wZSU3sbA" name="_vnfExtCpd" type="_AmzWYDQtEeixv_sLOod4lQ" association="_lZYx8CsFEemS0_wZSU3sbA"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Association" xmi:id="_6rsAACsHEemS0_wZSU3sbA" name="VduProfileReferencesVdu" memberEnd="_6rucQCsHEemS0_wZSU3sbA _6rw4gCsHEemS0_wZSU3sbA">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6rt1MCsHEemS0_wZSU3sbA" source="org.eclipse.papyrus">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6rt1MSsHEemS0_wZSU3sbA" key="nature" value="UML_Nature"/>
+        </eAnnotations>
+        <ownedEnd xmi:type="uml:Property" xmi:id="_6rw4gCsHEemS0_wZSU3sbA" name="_vduProfile" type="_ISONYDOSEeiHat9KcP8uWA" association="_6rsAACsHEemS0_wZSU3sbA">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ul2b8CsIEemS0_wZSU3sbA"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_UmDQQCsIEemS0_wZSU3sbA" value="*"/>
+        </ownedEnd>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Association" xmi:id="_ZqPJkCsNEemS0_wZSU3sbA" name="VnfDfHasVnfIndicator" memberEnd="_ZqRl0isNEemS0_wZSU3sbA _ZqUCESsNEemS0_wZSU3sbA">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ZqRl0CsNEemS0_wZSU3sbA" source="org.eclipse.papyrus">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZqRl0SsNEemS0_wZSU3sbA" key="nature" value="UML_Nature"/>
+        </eAnnotations>
+        <ownedEnd xmi:type="uml:Property" xmi:id="_ZqUCESsNEemS0_wZSU3sbA" name="_vnfDf" type="_p0UVsDQvEeixv_sLOod4lQ" association="_ZqPJkCsNEemS0_wZSU3sbA"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Association" xmi:id="_ix6i8CsREemS0_wZSU3sbA" name="VlProfileHasAffOrAntiAffGroup" memberEnd="_ix8YIisREemS0_wZSU3sbA _ix-0YCsREemS0_wZSU3sbA">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ix8YICsREemS0_wZSU3sbA" source="org.eclipse.papyrus">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ix8YISsREemS0_wZSU3sbA" key="nature" value="UML_Nature"/>
+        </eAnnotations>
+        <ownedEnd xmi:type="uml:Property" xmi:id="_ix-0YCsREemS0_wZSU3sbA" name="virtuallinkprofile" type="_0lvvQDgREeiOYfGHew0BGg" association="_ix6i8CsREemS0_wZSU3sbA">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_AcumACsSEemS0_wZSU3sbA"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ac5lICsSEemS0_wZSU3sbA" value="*"/>
+        </ownedEnd>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Association" xmi:id="_lIaH4CvPEemS0_wZSU3sbA" name="VduLevelHasVdu" memberEnd="_lIdLMivPEemS0_wZSU3sbA _lIfncCvPEemS0_wZSU3sbA">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lIdLMCvPEemS0_wZSU3sbA" source="org.eclipse.papyrus">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_lIdLMSvPEemS0_wZSU3sbA" key="nature" value="UML_Nature"/>
+        </eAnnotations>
+        <ownedEnd xmi:type="uml:Property" xmi:id="_lIfncCvPEemS0_wZSU3sbA" name="vdulevel" type="_DZsyMDnHEeiWMf5FLWfdLA" association="_lIaH4CvPEemS0_wZSU3sbA"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Association" xmi:id="_7N9SABiwEemU7tpKjNcB0w" name="VduHasDependOnVdu" memberEnd="_7OI4MBiwEemU7tpKjNcB0w _7ONwsBiwEemU7tpKjNcB0w">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_7OHDABiwEemU7tpKjNcB0w" source="org.eclipse.papyrus">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_7OHqEBiwEemU7tpKjNcB0w" key="nature" value="UML_Nature"/>
+        </eAnnotations>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_v1zPEBlBEem_VM0Ij2_uSw" annotatedElement="_7N9SABiwEemU7tpKjNcB0w">
+          <body>Specify instantiation priority and dependencies of VDU.</body>
+        </ownedComment>
+        <ownedEnd xmi:type="uml:Property" xmi:id="_7ONwsBiwEemU7tpKjNcB0w" name="_vdu" type="_e5WnwDOREeiHat9KcP8uWA" association="_7N9SABiwEemU7tpKjNcB0w">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_-3nXgBk4Eem_VM0Ij2_uSw"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_-3nXgRk4Eem_VM0Ij2_uSw" value="*"/>
+        </ownedEnd>
+      </packagedElement>
     </packagedElement>
-    <packagedElement xmi:type="uml:Package" xmi:id="_zPN5MDOHEei5Af8DcjrhIQ" name="Diagrams">
+    <packagedElement xmi:type="uml:Package" xmi:id="_zPN5MDOHEei5Af8DcjrhIQ" name="Diagrams" URI="">
       <ownedComment xmi:type="uml:Comment" xmi:id="_bphG0DTSEeiwQ6KPLHcy4g" annotatedElement="_zPN5MDOHEei5Af8DcjrhIQ">
         <body>Describes the associated elements of a VNFD for a certain purpose during VNF lifecycle management.</body>
       </ownedComment>
@@ -472,12 +509,8 @@ NOTE 2: virtualLinkProfile needs to be provided for all VLs that the CPs of the
 4.   Is monitoring param a class or a data type?  Jessie: It is a datatype.  Due to it's relationship to event, maybe a class??&#xD;
 5.  Class versus datatype??</body>
       </ownedComment>
-      <ownedComment xmi:type="uml:Comment" xmi:id="_fAb24Dz3Eeiuk5pWzMOpfA" annotatedElement="_DlOpkDnDEeiWMf5FLWfdLA">
-        <body>Not Defined in Clean</body>
-      </ownedComment>
       <ownedComment xmi:type="uml:Comment" xmi:id="_FYOMsEKAEeiwbqJBYHKltg">
         <annotatedElement xmi:type="uml:Class" href="Service.uml#_7SrB0D0VEeiWMf5FLWfdLA"/>
-        <annotatedElement xmi:type="uml:Class" href="#_aaEZADOREeiHat9KcP8uWA"/>
         <body>ResourceDesc???</body>
       </ownedComment>
       <ownedComment xmi:type="uml:Comment" xmi:id="_ZbAZAJWXEeiBQt0DCQoFTw">
@@ -517,103 +550,6 @@ This will probably need to move to common</body>
       <ownedComment xmi:type="uml:Comment" xmi:id="_qrs4IL_xEeisMMIUeH4UGw">
         <body>Attributes in beige - added or changed</body>
       </ownedComment>
-      <packagedElement xmi:type="uml:Enumeration" xmi:id="_MevNkJddEei-sOl6ywWHlg" name="AddressType">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_zYqPEJdeEei-sOl6ywWHlg" annotatedElement="_MevNkJddEei-sOl6ywWHlg">
-          <body>Type of address</body>
-        </ownedComment>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_TXtQgJddEei-sOl6ywWHlg" name="MAC"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_UVFewJddEei-sOl6ywWHlg" name="IP"/>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_mcXjILIKEeid-vjMcczUWA" name="AllottedLink">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_hNCywLeVEeiq7vtzCAMDQQ" annotatedElement="_mcXjILIKEeid-vjMcczUWA">
-          <body>An AllottedLink is a link provided (or allotted) by some service instance.   The Allottedlink may be incorporated into the topology of some consuming service like other links. &#xD;
-</body>
-        </ownedComment>
-        <generalization xmi:type="uml:Generalization" xmi:id="_lFpyYLILEeid-vjMcczUWA" general="_AC2eIDQUEeixv_sLOod4lQ"/>
-      </packagedElement>
-      <packagedElement xmi:type="uml:DataType" xmi:id="_hzvvUPxSEeijjKJn7OxwuQ" name="StorageQos">
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_tMfJMPxSEeijjKJn7OxwuQ" name="qosId">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_C1n00PxTEeijjKJn7OxwuQ" annotatedElement="_tMfJMPxSEeijjKJn7OxwuQ">
-            <body>Unique identifier of the storage Qos in VNFD.</body>
-          </ownedComment>
-          <type xmi:type="uml:DataType" href="Common.uml#_AuYtcDkBEeiWMf5FLWfdLA"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_tlqeMPxSEeijjKJn7OxwuQ" name="qosName">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_uD6rAPxTEeijjKJn7OxwuQ" annotatedElement="_tlqeMPxSEeijjKJn7OxwuQ">
-            <body>Name of storage QoS.</body>
-          </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_nUxZ8BDBEemFz_A_9-IJMQ" name="consumer" type="_yPciUBDCEemFz_A_9-IJMQ">
-          <ownedComment xmi:type="uml:Comment" xmi:id="__2h_kBl0Eem_VM0Ij2_uSw" annotatedElement="_nUxZ8BDBEemFz_A_9-IJMQ">
-            <body>Consumer type.</body>
-          </ownedComment>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_43vsABDCEemFz_A_9-IJMQ" name="qos_specs">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_LFiSIBDDEemFz_A_9-IJMQ" annotatedElement="_43vsABDCEemFz_A_9-IJMQ">
-            <body>Describe qualities of Qos：total_bytes_sec、total_iops_sec. </body>
-          </ownedComment>
-          <type xmi:type="uml:DataType" href="Common.uml#_vxJ9ADafEei23_xWdimG9w"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_EONN8BDDEemFz_A_9-IJMQ"/>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EONN8RDDEemFz_A_9-IJMQ" value="*"/>
-        </ownedAttribute>
-      </packagedElement>
-      <packagedElement xmi:type="uml:DataType" xmi:id="_cyGIcPxUEeijjKJn7OxwuQ" name="VolumeType">
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_qvf3cPxUEeijjKJn7OxwuQ" name="volumeTypeId">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_yWO_UPxUEeijjKJn7OxwuQ" annotatedElement="_qvf3cPxUEeijjKJn7OxwuQ">
-            <body>Unique identifier of volume type in VNFD.</body>
-          </ownedComment>
-          <type xmi:type="uml:DataType" href="Common.uml#_AuYtcDkBEeiWMf5FLWfdLA"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_rBniMPxUEeijjKJn7OxwuQ" name="volumeTypeName">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_Zwh_cPxVEeijjKJn7OxwuQ" annotatedElement="_rBniMPxUEeijjKJn7OxwuQ">
-            <body>Name of volume type.</body>
-          </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_rVW9kPxUEeijjKJn7OxwuQ" name="backendName">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_yb08ABDDEemFz_A_9-IJMQ" annotatedElement="_rVW9kPxUEeijjKJn7OxwuQ">
-            <body>Backend volume name of cinder.</body>
-          </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-        </ownedAttribute>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_7N9SABiwEemU7tpKjNcB0w" name="VduHasDependOnVdu" memberEnd="_7OI4MBiwEemU7tpKjNcB0w _7ONwsBiwEemU7tpKjNcB0w">
-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_7OHDABiwEemU7tpKjNcB0w" source="org.eclipse.papyrus">
-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_7OHqEBiwEemU7tpKjNcB0w" key="nature" value="UML_Nature"/>
-        </eAnnotations>
-        <ownedComment xmi:type="uml:Comment" xmi:id="_v1zPEBlBEem_VM0Ij2_uSw" annotatedElement="_7N9SABiwEemU7tpKjNcB0w">
-          <body>Specify instantiation priority and dependencies of VDU.</body>
-        </ownedComment>
-        <ownedEnd xmi:type="uml:Property" xmi:id="_7ONwsBiwEemU7tpKjNcB0w" name="_vdu" type="_e5WnwDOREeiHat9KcP8uWA" association="_7N9SABiwEemU7tpKjNcB0w">
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_-3nXgBk4Eem_VM0Ij2_uSw"/>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_-3nXgRk4Eem_VM0Ij2_uSw" value="*"/>
-        </ownedEnd>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Enumeration" xmi:id="_GkdUYBsbEem5EIL2nWKfdQ" name="Enumeration17"/>
-      <packagedElement xmi:type="uml:DataType" xmi:id="_BAt7gBx6Eemit6R65X1VNQ" name="VirtualLinkProtocolData">
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_gKzRkBx9Eemit6R65X1VNQ" name="associatedLayerProtocol"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_geJEUBx9Eemit6R65X1VNQ" name="l2ProtocolData">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_sD2twBx-Eemit6R65X1VNQ" annotatedElement="_geJEUBx9Eemit6R65X1VNQ">
-            <body>Specifies the L2 protocol data for this virtual link. Shall be present when the associatedLayerProtocol attribute indicates a L2 protocol and shall be absent otherwise.</body>
-          </ownedComment>
-          <type xmi:type="uml:DataType" href="Common.uml#_zxlckB8-EemJTaeYhZuDRA"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_HiTcYBx-Eemit6R65X1VNQ"/>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_HidNYBx-Eemit6R65X1VNQ" value="1"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_gy064Bx9Eemit6R65X1VNQ" name="l3ProtocolData">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_uZ0fkBx-Eemit6R65X1VNQ" annotatedElement="_gy064Bx9Eemit6R65X1VNQ">
-            <body>Specifies the L3 protocol data for this virtual link. Shall be present when the associatedLayerProtocol attribute indicates a L3 protocol and shall be absent otherwise.</body>
-          </ownedComment>
-          <type xmi:type="uml:DataType" href="Common.uml#_4DfhMB8_EemJTaeYhZuDRA"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_j1pWMBx-Eemit6R65X1VNQ"/>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_j1pWMRx-Eemit6R65X1VNQ" value="1"/>
-        </ownedAttribute>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Enumeration" xmi:id="_1DEVYByHEemVVe_wt-ZCGw" name="NetworkType">
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="__oFMQByHEemVVe_wt-ZCGw" name="VLAN"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_CP_psByIEemVVe_wt-ZCGw" name="VXLAN"/>
-      </packagedElement>
     </packagedElement>
     <packagedElement xmi:type="uml:Package" xmi:id="_zPN5MTOHEei5Af8DcjrhIQ" name="Interfaces"/>
     <packagedElement xmi:type="uml:Package" xmi:id="_zPN5MjOHEei5Af8DcjrhIQ" name="ObjectClasses">
@@ -625,9 +561,7 @@ A VNFC instance created based on the VDU maps to a single virtualisation contain
 &#xD;
 A VNFC will only be in one VNFDesc.   If a vendor wants to use the VNFC in mupliple VNFDesc (their product) they can do so, but it will be 'repeated'.&#xD;
 &#xD;
-References:&#xD;
-tosca-nfv-YAML-v1.0-wd05-rev02&#xD;
-ETSI GS NFV-IFA 011 V2.1.3&#xD;
+ &#xD;
 &#xD;
 </body>
         </ownedComment>
@@ -652,7 +586,7 @@ ETSI GS NFV-IFA 011 V2.1.3&#xD;
         </ownedAttribute>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_mq0DkDafEei23_xWdimG9w" name="bootOrder">
           <ownedComment xmi:type="uml:Comment" xmi:id="_EtlToDagEei23_xWdimG9w" annotatedElement="_mq0DkDafEei23_xWdimG9w">
-            <body>Boot order of valid boot devices.&#xD;
+            <body>Boot order of valid boot devices.  &quot;key/name&quot; indicates the the boot index &quot;value&quot; references a descriptor from which a valid boot device is created e.g. VirtualStorageDesc from which a VirtualStorage instance is created.&#xD;
 &#xD;
 NOTE: If no boot order is defined the default boot order defined in the VIM or NFVI shall be used.&#xD;
 </body>
@@ -663,7 +597,7 @@ NOTE: If no boot order is defined the default boot order defined in the VIM or N
         </ownedAttribute>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_1yX4kDafEei23_xWdimG9w" name="nfviConstraint">
           <ownedComment xmi:type="uml:Comment" xmi:id="_NkiQwDahEei23_xWdimG9w" annotatedElement="_1yX4kDafEei23_xWdimG9w">
-            <body>Describes constraints on the NFVI for the VNFC instance(s) created from this Vdu. For example, aspects of a secure hosting environment for the VNFC instance that involve additional entities or processes.&#xD;
+            <body>Describes constraints on the NFVI for the VNFC instance(s) created from this Vdu. For example, aspects of a secure hosting environment for the VNFC instance that involve additional entities or processes. &quot;key/name&quot; includes &quot;AvailabilityZone&quot;, &quot;HostAggregates&quot;.&#xD;
 &#xD;
 NOTE: These are constraints other than stipulating that a VNFC instance has access to a certain resource, as a prerequisite to instantiation. The attributes virtualComputeDesc and virtualStorageDesc define the resources required for instantiation of the VNFC instance.&#xD;
 </body>
@@ -692,9 +626,30 @@ NOTE: These are constraints other than stipulating that a VNFC instance has acce
             <body>Describes the configurable properties of all VNFC instances based on this VDU.	</body>
           </ownedComment>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_j9-9sDWeEei9Ia34RXjpEg" name="_vduCpd" type="_zOfv8DQVEeixv_sLOod4lQ" aggregation="shared" association="_j97TUDWeEei9Ia34RXjpEg">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_NQ3eYCo3EemZ-7haRVvogQ" name="bootData" visibility="public">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_15QpUCo3EemZ-7haRVvogQ" annotatedElement="_NQ3eYCo3EemZ-7haRVvogQ">
+            <body>Contains a string or a URL to a file contained in the VNF package used to customize a virtualised compute resource at boot time. The bootData may contain variable parts that are replaced by deployment specific values before being sent to the VIM.&#xD;
+NOTE:   The parameters of each variable part shall be declared in the VnfLcmOperationsConfiguration information element  as &quot;volatile&quot; parameters available to the bootData template during the respective VNF lifecycle management operation execution and/or in the extension attribute of the VnfInfoModifiableAttributes information element as &quot;persistent&quot; parameters available to the bootData template during the lifetime of the VNF instance. For VNF lifecycle management operations resulting in multiple VNFC instantiations, the VNFM supports the means to provide the appropriate parameters to appropriate VNFC instances	Experimental&#xD;
+ &#xD;
+&#xD;
+ &#xD;
+</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_kl9gECo4EemZ-7haRVvogQ">
+            <body>Contains a string or a URL to a file contained in the VNF package used to customize a virtualised compute resource at boot time. The bootData may contain variable parts that are replaced by deployment specific values before being sent to the VIM.&#xD;
+NOTE:   The parameters of each variable part shall be declared in the VnfLcmOperationsConfiguration information element  as &quot;volatile&quot; parameters available to the bootData template during the respective VNF lifecycle management operation execution and/or in the extension attribute of the VnfInfoModifiableAttributes information element as &quot;persistent&quot; parameters available to the bootData template during the lifetime of the VNF instance. For VNF lifecycle management operations resulting in multiple VNFC instantiations, the VNFM supports the means to provide the appropriate parameters to appropriate VNFC instances	Experimental&#xD;
+ &#xD;
+&#xD;
+ &#xD;
+</body>
+          </ownedComment>
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Vlb8oCo3EemZ-7haRVvogQ"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_VmBygCo3EemZ-7haRVvogQ" value="1"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_j9-9sDWeEei9Ia34RXjpEg" name="_intCpd" type="_zOfv8DQVEeixv_sLOod4lQ" aggregation="shared" association="_j97TUDWeEei9Ia34RXjpEg">
           <ownedComment xmi:type="uml:Comment" xmi:id="_5laYgFqSEeiTzriVSbKglg" annotatedElement="_j9-9sDWeEei9Ia34RXjpEg">
-            <body>Describes network connectivity between a VNFC instance (based on this Vdu) and an Virtual Link (VL).</body>
+            <body>Describes network connectivity between a VNFC instance (based on this Vdu) and an internal Virtual Link (VL).</body>
           </ownedComment>
         </ownedAttribute>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_345dADabEei23_xWdimG9w" name="_virtualComputeDesc" type="_-gDvwDOREeiHat9KcP8uWA" aggregation="shared" association="_343n0DabEei23_xWdimG9w">
@@ -730,9 +685,7 @@ NOTE: More software images can be attached to the virtualisation container using
         <ownedComment xmi:type="uml:Comment" xmi:id="_g6pCsDOUEeiHat9KcP8uWA" annotatedElement="_aaEZADOREeiHat9KcP8uWA">
           <body>A Vnfd, or VNF Descriptor, is template which describes a VNF in terms of deployment and operational behaviour requirements. It also contains connectivity, interface and virtualised resource requirements.&#xD;
 &#xD;
-References:&#xD;
-tosca-nfv-YAML-v1.0-wd05-rev02 (tosca.nodes.nfv.vnfd, but node details are not defined)&#xD;
-ETSI GS NFV-IFA 011 V2.1.3 (VNFD)</body>
+</body>
         </ownedComment>
         <generalization xmi:type="uml:Generalization" xmi:id="_JDHAgJpYEeidy9iGT_F5-w">
           <general xmi:type="uml:Class" href="Nf.uml#_O385oJssEeiPBvbfaqSLYg"/>
@@ -753,13 +706,13 @@ ETSI GS NFV-IFA 011 V2.1.3 (VNFD)</body>
           <ownedComment xmi:type="uml:Comment" xmi:id="_gdAnUEcjEei7eo5RdnNiBQ" annotatedElement="_Psi3oDOXEeiHat9KcP8uWA">
             <body>Software version of the VNF. This is changed when there is any change to the software that is included in the VNF Package.</body>
           </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+          <type xmi:type="uml:PrimitiveType" href="Common.uml#_oXexoD2uEeiu6I5JfRTxxQ"/>
         </ownedAttribute>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_Txwn0DQLEeixv_sLOod4lQ" name="vnfdVersion">
           <ownedComment xmi:type="uml:Comment" xmi:id="_bI9e4DQLEeixv_sLOod4lQ" annotatedElement="_Txwn0DQLEeixv_sLOod4lQ">
             <body>Identifies the version of the VNFD.</body>
           </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+          <type xmi:type="uml:PrimitiveType" href="Common.uml#_oXexoD2uEeiu6I5JfRTxxQ"/>
         </ownedAttribute>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_d9nX0DQLEeixv_sLOod4lQ" name="vnfProductInfoName">
           <ownedComment xmi:type="uml:Comment" xmi:id="_lY1zQDQLEeixv_sLOod4lQ" annotatedElement="_d9nX0DQLEeixv_sLOod4lQ">
@@ -779,7 +732,7 @@ ETSI GS NFV-IFA 011 V2.1.3 (VNFD)</body>
         </ownedAttribute>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_zS9kwDQLEeixv_sLOod4lQ" name="vnfmInfo">
           <ownedComment xmi:type="uml:Comment" xmi:id="_30VeMDQLEeixv_sLOod4lQ" annotatedElement="_zS9kwDQLEeixv_sLOod4lQ">
-            <body>Identifies VNFM(s) compatible with the VNF described in this version of the VNFD.</body>
+            <body>Identifies VNFM(s) compatible with the VNF described in this version of the VNFD. Use the name of micro-service of the vnfm drive. For vendor specific VNFM, the value composes of &quot;vendorname&quot; and &quot;vnfmdriver&quot;, e.g. &quot;mycompanyvnfmdriver&quot;; for generic VNFM, the value is &quot;gvnfmdriver&quot;.</body>
           </ownedComment>
           <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5i-xUDQLEeixv_sLOod4lQ"/>
@@ -787,7 +740,7 @@ ETSI GS NFV-IFA 011 V2.1.3 (VNFD)</body>
         </ownedAttribute>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_-WAbcDQLEeixv_sLOod4lQ" name="localizationLanguage">
           <ownedComment xmi:type="uml:Comment" xmi:id="_FHUXMDQMEeixv_sLOod4lQ" annotatedElement="_-WAbcDQLEeixv_sLOod4lQ">
-            <body>Information about localization languages of the VNF (includes e.g. strings in the VNFD).&#xD;
+            <body>Information about localization languages of the VNF (includes e.g. strings in the VNFD). Refer to ISO936 https://www.iso.org/iso-639-language-codes.html&#xD;
 &#xD;
 NOTE: This allows to provide one or more localization languages to support selecting a specific localization language at VNF instantiation time.&#xD;
 </body>
@@ -815,7 +768,7 @@ Any modification of the content of the VNFD or the VNF Package shall result in a
         </ownedAttribute>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_IW__QDQMEeixv_sLOod4lQ" name="defaultLocalizationLanguage">
           <ownedComment xmi:type="uml:Comment" xmi:id="_PQ2zADQMEeixv_sLOod4lQ" annotatedElement="_IW__QDQMEeixv_sLOod4lQ">
-            <body>Information about localization languages of the VNF (includes e.g. strings in the VNFD).&#xD;
+            <body>Information about localization languages of the VNF (includes e.g. strings in the VNFD). Refer to ISO936 https://www.iso.org/iso-639-language-codes.html&#xD;
 &#xD;
 NOTE: This allows to provide one or more localization languages to support selecting a specific localization language at VNF instantiation time.&#xD;
 </body>
@@ -896,13 +849,6 @@ NOTE: This allows to provide one or more localization languages to support selec
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_nXywQDkOEeiWMf5FLWfdLA"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_nXywQTkOEeiWMf5FLWfdLA" value="*"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_yfk1oDkREeiWMf5FLWfdLA" name="_intVirtuallinkdesc " type="_AC2eIDQUEeixv_sLOod4lQ" aggregation="shared" association="_yfiZYDkREeiWMf5FLWfdLA">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_2fd9MDkSEeiWMf5FLWfdLA" annotatedElement="_yfk1oDkREeiWMf5FLWfdLA">
-            <body>Represents the type of network connectivity mandated by the VNF provider between two or more CPs which includes at least one internal CP.</body>
-          </ownedComment>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yfmDwDkREeiWMf5FLWfdLA"/>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yfmq0DkREeiWMf5FLWfdLA" value="*"/>
-        </ownedAttribute>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_mpkmEDkTEeiWMf5FLWfdLA" name="_vnfReservedCpd" type="_zOfv8DQVEeixv_sLOod4lQ" aggregation="composite" association="_mpiw4DkTEeiWMf5FLWfdLA">
           <ownedComment xmi:type="uml:Comment" xmi:id="_AtdwUDkVEeiWMf5FLWfdLA" annotatedElement="_mpkmEDkTEeiWMf5FLWfdLA">
             <body>Reserved IP Address for VNF which is not bounded to any specific VNFC, but assigned manually from outside and potentially shared as a floating IP among VNFCs.</body>
@@ -917,14 +863,28 @@ NOTE: This allows to provide one or more localization languages to support selec
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_OcqD8DTSEeiwQ6KPLHcy4g"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OctuUDTSEeiwQ6KPLHcy4g" value="*"/>
         </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_-KR98CovEemZ-7haRVvogQ" name="_swImageDesc" type="_J0Zx0DOSEeiHat9KcP8uWA" aggregation="composite" association="_-JxnoCovEemZ-7haRVvogQ">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_y8UbQCowEemZ-7haRVvogQ" annotatedElement="_-KR98CovEemZ-7haRVvogQ">
+            <body>Defines descriptors of software images to be used by the VNF.&#xD;
+NOTE:   This shall be used to describe both the software image loaded on the virtualization container used to realize a VDU and the software images to be stored on VirtualStorage resources (e.g., volumes) attached to a virtualization container.&#xD;
+</body>
+          </ownedComment>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_-KW2cCovEemZ-7haRVvogQ"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_-KYEkCovEemZ-7haRVvogQ" value="*"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_248n0Cr_EemS0_wZSU3sbA" name="_intVirtualLinkDesc" type="_-5-w8Cr9EemS0_wZSU3sbA" association="_245kgCr_EemS0_wZSU3sbA">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_iYkekCsAEemS0_wZSU3sbA" annotatedElement="_248n0Cr_EemS0_wZSU3sbA">
+            <body>Represents the type of network connectivity mandated by the VNF provider between two or more CPs which includes at least one internal CP.</body>
+          </ownedComment>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_24918Cr_EemS0_wZSU3sbA"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_24-dACr_EemS0_wZSU3sbA" value="*"/>
+        </ownedAttribute>
       </packagedElement>
       <packagedElement xmi:type="uml:Class" xmi:id="_J0Zx0DOSEeiHat9KcP8uWA" name="SwImageDesc">
         <ownedComment xmi:type="uml:Comment" xmi:id="_8Nl8oDasEei23_xWdimG9w" annotatedElement="_J0Zx0DOSEeiHat9KcP8uWA">
           <body>The SwImageDesc information element describes requested additional capability for a particular VDU. Such a capability may be for acceleration or specific tasks.   Storage not necessarily related to the compute, may be Network Attached Storage (NAS)&#xD;
 &#xD;
-References:&#xD;
-tosca-nfv-YAML-v1.0-wd05-rev02&#xD;
-ETSI GS NFV-IFA 011 V2.1.3&#xD;
+&#xD;
 </body>
         </ownedComment>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_lDoCUDaqEei23_xWdimG9w" name="id">
@@ -943,7 +903,7 @@ ETSI GS NFV-IFA 011 V2.1.3&#xD;
           <ownedComment xmi:type="uml:Comment" xmi:id="_St4koDarEei23_xWdimG9w" annotatedElement="_OYLvsDarEei23_xWdimG9w">
             <body>The version of this software image.</body>
           </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+          <type xmi:type="uml:PrimitiveType" href="Common.uml#_oXexoD2uEeiu6I5JfRTxxQ"/>
         </ownedAttribute>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_WJJxoDarEei23_xWdimG9w" name="checksum">
           <ownedComment xmi:type="uml:Comment" xmi:id="_PyhEIEccEei7eo5RdnNiBQ" annotatedElement="_WJJxoDarEei23_xWdimG9w">
@@ -986,7 +946,7 @@ ETSI GS NFV-IFA 011 V2.1.3&#xD;
         <ownedAttribute xmi:type="uml:Property" xmi:id="_DhvVIDasEei23_xWdimG9w" name="operatingSystem">
           <ownedComment xmi:type="uml:Comment" xmi:id="_KKX2ADasEei23_xWdimG9w" annotatedElement="_DhvVIDasEei23_xWdimG9w">
             <body>Identifies the operating system used in the software image. This attribute may also identify if a 32 bit or 64 bit software image is used.&#xD;
- support:  </body>
+</body>
           </ownedComment>
           <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_HX5HUDasEei23_xWdimG9w"/>
@@ -1000,42 +960,36 @@ ETSI GS NFV-IFA 011 V2.1.3&#xD;
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Xw1rsDasEei23_xWdimG9w"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Xw-1oDasEei23_xWdimG9w" value="*"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_43h1MDarEei23_xWdimG9w" name="swImage">
-          <ownedComment xmi:type="uml:Comment" xmi:id="__sZbQDarEei23_xWdimG9w" annotatedElement="_43h1MDarEei23_xWdimG9w">
-            <body>The minimal disk size requirement for this software image. The value of the &quot;size of storage&quot; attribute of the VirtualStorageDesc referencing this SwImageDesc shall not be smaller than the value of minDisk.</body>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_iGrS0Co7EemS0_wZSU3sbA" name="_swImage" type="_u4EXICo6EemS0_wZSU3sbA" association="_iGbbMCo7EemS0_wZSU3sbA">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_6D454Co7EemS0_wZSU3sbA" annotatedElement="_iGrS0Co7EemS0_wZSU3sbA">
+            <body>This is a reference to the actual software image. The reference can be relative to the root of the VNF Package or can be a URL</body>
           </ownedComment>
-          <type xmi:type="uml:DataType" href="Common.uml#_AuYtcDkBEeiWMf5FLWfdLA"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_iGuWICo7EemS0_wZSU3sbA" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_iGvkQCo7EemS0_wZSU3sbA" value="1"/>
         </ownedAttribute>
       </packagedElement>
       <packagedElement xmi:type="uml:Class" xmi:id="_ISONYDOSEeiHat9KcP8uWA" name="VduProfile">
         <ownedComment xmi:type="uml:Comment" xmi:id="_7TLoQFqaEeiTzriVSbKglg" annotatedElement="_ISONYDOSEeiHat9KcP8uWA">
           <body>The VduProfile describes additional instantiation data for a given VDU used in a DF.</body>
         </ownedComment>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_aikFADdzEeiIfPeSAqyGdQ" name="vdudId">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_ENWhEDd0EeiIfPeSAqyGdQ" annotatedElement="_aikFADdzEeiIfPeSAqyGdQ">
-            <body>Uniquely identifies a VDU.&#xD;
-</body>
-          </ownedComment>
-          <type xmi:type="uml:DataType" href="Common.uml#_AuYtcDkBEeiWMf5FLWfdLA"/>
-        </ownedAttribute>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_bEqsgDdzEeiIfPeSAqyGdQ" name="minNumberOfInstances">
           <ownedComment xmi:type="uml:Comment" xmi:id="_Jlr3sDd0EeiIfPeSAqyGdQ" annotatedElement="_bEqsgDdzEeiIfPeSAqyGdQ">
-            <body>Minimum number of instances of the VNFC based on this VDU that is permitted to exist for this flavour.&#xD;
+            <body>Minimum number of instances of the VNFC based on this VDU that is permitted to exist for this flavour. Shall be zero or greater.&#xD;
 </body>
           </ownedComment>
           <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
         </ownedAttribute>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_cCrM4DdzEeiIfPeSAqyGdQ" name="maxNumberOfInstances">
           <ownedComment xmi:type="uml:Comment" xmi:id="_RiJigDd1EeiIfPeSAqyGdQ" annotatedElement="_cCrM4DdzEeiIfPeSAqyGdQ">
-            <body>Maximum number of instances of the VNFC based on this VDU that is permitted to exist for this flavour.&#xD;
+            <body>Maximum number of instances of the VNFC based on this VDU that is permitted to exist for this flavour. Shall be zero or greater.&#xD;
 </body>
           </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">
           <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>
+            <body>Specifies affinity or anti-affinity rules applicable between the virtualization containers (e.g. virtual machines) to be created based on this VDU. When the cardinality is greater than 1, both affinity rule(s) and anti-affinity rule(s) with different scopes (e.g. &quot;Affinity with the scope resource zone and anti-affinity with the scope NFVI node&quot;) are applicable to the virtualization containers (e.g. virtual machines) to be created based on this VDU.&#xD;
+When the cardinality is greater than 1, both affinity rule(s) and anti-affinity rule(s) with different scopes (e.g. &quot;Affinity with the scope resource zone and anti-affinity with the scope NFVI node&quot;) are applicable to the virtualization containers (e.g. virtual machines) to be created based on this VDU.</body>
           </ownedComment>
           <type xmi:type="uml:DataType" href="Common.uml#_7hn1IDd1EeiIfPeSAqyGdQ"/>
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_hw0hYJmdEeibE8EgApNciA"/>
@@ -1084,6 +1038,10 @@ NOTE: Each identifier references an affinity or anti-affinity group which expres
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_WHasYA5sEemrJqq3q9vf6g"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_WHioMA5sEemrJqq3q9vf6g" value="*"/>
         </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_6rucQCsHEemS0_wZSU3sbA" name="_vduId" type="_e5WnwDOREeiHat9KcP8uWA" aggregation="shared" association="_6rsAACsHEemS0_wZSU3sbA">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_6rwRcCsHEemS0_wZSU3sbA" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_6rwRcSsHEemS0_wZSU3sbA" value="1"/>
+        </ownedAttribute>
       </packagedElement>
       <packagedElement xmi:type="uml:Class" xmi:id="_-gDvwDOREeiHat9KcP8uWA" name="VirtualComputeDesc ">
         <ownedComment xmi:type="uml:Comment" xmi:id="_JozqAFqbEeiTzriVSbKglg" annotatedElement="_-gDvwDOREeiHat9KcP8uWA">
@@ -1095,13 +1053,6 @@ NOTE: Each identifier references an affinity or anti-affinity group which expres
           </ownedComment>
           <type xmi:type="uml:DataType" href="Common.uml#_AuYtcDkBEeiWMf5FLWfdLA"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_Z9PKcDavEei23_xWdimG9w" name="logicalNode" type="_lp6e4DatEei23_xWdimG9w">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_kPju0DavEei23_xWdimG9w" annotatedElement="_Z9PKcDavEei23_xWdimG9w">
-            <body>The logical Node requirements.</body>
-          </ownedComment>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_gkl48DavEei23_xWdimG9w" value="1"/>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_gkvp8DavEei23_xWdimG9w" value="*"/>
-        </ownedAttribute>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_S4W1oDazEei23_xWdimG9w" name="requestAdditionalCapabilities" type="_dSO64DawEei23_xWdimG9w">
           <ownedComment xmi:type="uml:Comment" xmi:id="_FuKi8EcfEei7eo5RdnNiBQ" annotatedElement="_S4W1oDazEei23_xWdimG9w">
             <body>Specifies requirements for additional capabilities. These may be for a range of purposes. One example is acceleration related capabilities.</body>
@@ -1127,8 +1078,25 @@ NOTE: Each identifier references an affinity or anti-affinity group which expres
             <body>The virtual CPU(s) of the virtualised compute.</body>
           </ownedComment>
         </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_gmSWwCo-EemS0_wZSU3sbA" name="_logicalNodeRequirements" type="_Lpu5wCo9EemS0_wZSU3sbA" aggregation="composite" association="_gmOFUCo-EemS0_wZSU3sbA">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_Ovzn8Co_EemS0_wZSU3sbA" annotatedElement="_gmSWwCo-EemS0_wZSU3sbA">
+            <body>The associated logical node requirements.</body>
+          </ownedComment>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_gmUL8Co-EemS0_wZSU3sbA"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_gmVaECo-EemS0_wZSU3sbA" value="*"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_BecYMCpCEemS0_wZSU3sbA" name="virtualDisk" visibility="public" type="_iunqUCpAEemS0_wZSU3sbA">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_Okb-ECpCEemS0_wZSU3sbA" annotatedElement="_BecYMCpCEemS0_wZSU3sbA">
+            <body>The local or ephemeral disk(s) of the virtualised compute.</body>
+          </ownedComment>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_L5v5cCpCEemS0_wZSU3sbA"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_L6MlYCpCEemS0_wZSU3sbA" value="*"/>
+        </ownedAttribute>
       </packagedElement>
       <packagedElement xmi:type="uml:Class" xmi:id="_K_9mADOSEeiHat9KcP8uWA" name="VirtualStorageDesc">
+        <ownedComment xmi:type="uml:Comment" xmi:id="__z8IwCpCEemS0_wZSU3sbA" annotatedElement="_K_9mADOSEeiHat9KcP8uWA">
+          <body>The VirtualStorageDesc information element supports the specifications of requirements related to persistent virtual storage resources. Ephemeral virtual storage is specified in VirtualComputeDesc information element.</body>
+        </ownedComment>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_4y_6QDdKEeiIfPeSAqyGdQ" name="id">
           <ownedComment xmi:type="uml:Comment" xmi:id="_IC7BEDdLEeiIfPeSAqyGdQ" annotatedElement="_4y_6QDdKEeiIfPeSAqyGdQ">
             <body>Unique identifier of this VirtualStorageDesc in the VNFD.&#xD;
@@ -1138,8 +1106,7 @@ NOTE: Each identifier references an affinity or anti-affinity group which expres
         </ownedAttribute>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_6sJ0QDdKEeiIfPeSAqyGdQ" name="typeOfStorage">
           <ownedComment xmi:type="uml:Comment" xmi:id="_NbjSoDdLEeiIfPeSAqyGdQ" annotatedElement="_6sJ0QDdKEeiIfPeSAqyGdQ">
-            <body>Type of virtualised storage resource &#xD;
-(e.g. volume, object).&#xD;
+            <body> Type of virtualised storage resource (BLOCK, OBJECT, FILE).&#xD;
 </body>
           </ownedComment>
           <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
@@ -1152,32 +1119,26 @@ NOTE: Each identifier references an affinity or anti-affinity group which expres
           </ownedComment>
           <type xmi:type="uml:PrimitiveType" href="Common.uml#_p3EKoDm0EeiWMf5FLWfdLA"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_8OQgMDdKEeiIfPeSAqyGdQ" name="vduStorageRequirements">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_ZlJhsDdLEeiIfPeSAqyGdQ" annotatedElement="_8OQgMDdKEeiIfPeSAqyGdQ">
-            <body>An array of key-value pairs that articulate the storage deployment requirements.&#xD;
-</body>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_nb_4ECpDEemS0_wZSU3sbA" name="blockStorageData" visibility="public" type="_iunqUCpAEemS0_wZSU3sbA">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_xEKsMCpDEemS0_wZSU3sbA" annotatedElement="_nb_4ECpDEemS0_wZSU3sbA">
+            <body>Specifies the details of block storage. It shall be present when the &quot;typeOfStorage&quot; attribute is set to &quot;BLOCK&quot;. It shall be absent otherwise.</body>
           </ownedComment>
-          <type xmi:type="uml:DataType" href="Common.uml#_vxJ9ADafEei23_xWdimG9w"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_X7h4gDdLEeiIfPeSAqyGdQ"/>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_X7xJEDdLEeiIfPeSAqyGdQ" value="*"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_uN5psCpDEemS0_wZSU3sbA"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_uOYK0CpDEemS0_wZSU3sbA" value="1"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_86kMkDdKEeiIfPeSAqyGdQ" name="rdmaEnabled">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_gRCx8DdLEeiIfPeSAqyGdQ" annotatedElement="_86kMkDdKEeiIfPeSAqyGdQ">
-            <body>Indicate if the storage support RDMA.&#xD;
-</body>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_WPIG8CpEEemS0_wZSU3sbA" name="objectStorageData" visibility="public" type="_5p1FACpEEemS0_wZSU3sbA">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_eix_MCpEEemS0_wZSU3sbA" annotatedElement="_WPIG8CpEEemS0_wZSU3sbA">
+            <body>Specifies the details of object storage. It shall be present when the &quot;typeOfStorage&quot; attribute is set to &quot;OBJECT&quot;. It shall be absent </body>
           </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_eWi0IDdLEeiIfPeSAqyGdQ"/>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_eWph0DdLEeiIfPeSAqyGdQ" value="1"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_cQLqcCpEEemS0_wZSU3sbA"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_cQfMcCpEEemS0_wZSU3sbA" value="1"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_9jZuMDdKEeiIfPeSAqyGdQ" name="swImageDesc">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_o2N4ADdLEeiIfPeSAqyGdQ" annotatedElement="_9jZuMDdKEeiIfPeSAqyGdQ">
-            <body>Software image to be loaded on the VirtualStorage resource created based on this VirtualStorageDesc.&#xD;
-</body>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_orvzQCpEEemS0_wZSU3sbA" name="fileStorageData" visibility="public" type="_OCLeMCpFEemS0_wZSU3sbA">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_toWQICpEEemS0_wZSU3sbA" annotatedElement="_orvzQCpEEemS0_wZSU3sbA">
+            <body>Specifies the details of file storage. It shall be present when the &quot;typeOfStorage&quot; attribute is set to &quot;FILE&quot;. It shall be absent otherwise.</body>
           </ownedComment>
-          <type xmi:type="uml:DataType" href="Common.uml#_AuYtcDkBEeiWMf5FLWfdLA"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_aOwRoDm3EeiWMf5FLWfdLA"/>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_aPEasDm3EeiWMf5FLWfdLA" value="1"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_r0MK4CpEEemS0_wZSU3sbA"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_r0g7ACpEEemS0_wZSU3sbA" value="1"/>
         </ownedAttribute>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_QOpoEPwqEeijjKJn7OxwuQ" name="multiAttach">
           <ownedComment xmi:type="uml:Comment" xmi:id="_axvMUPwqEeijjKJn7OxwuQ" annotatedElement="_QOpoEPwqEeijjKJn7OxwuQ">
@@ -1202,7 +1163,7 @@ NOTE: Each identifier references an affinity or anti-affinity group which expres
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_HcFyAPxFEeijjKJn7OxwuQ" value="1"/>
         </ownedAttribute>
       </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_AC2eIDQUEeixv_sLOod4lQ" name="LinkDesc " isAbstract="true">
+      <packagedElement xmi:type="uml:Class" xmi:id="_AC2eIDQUEeixv_sLOod4lQ" name="VirtualLinkDesc " isAbstract="true">
         <ownedComment xmi:type="uml:Comment" xmi:id="_Ey004LeVEeiq7vtzCAMDQQ" annotatedElement="_AC2eIDQUEeixv_sLOod4lQ">
           <body>A communication channel that connects two or more devices, nodes, or entities.</body>
         </ownedComment>
@@ -1238,20 +1199,6 @@ NOTE: Each identifier references an affinity or anti-affinity group which expres
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5ttxEDeBEeiIfPeSAqyGdQ"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5t5XQDeBEeiIfPeSAqyGdQ" value="1"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_2FzMADd9EeiIfPeSAqyGdQ" name="monitoringParameter" type="_HlF2kDmxEeiWMf5FLWfdLA">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_aFr44EcjEei7eo5RdnNiBQ" annotatedElement="_2FzMADd9EeiIfPeSAqyGdQ">
-            <body>Defines the virtualised resources monitoring parameters on VLD level. </body>
-          </ownedComment>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_07bg4Dm9EeiWMf5FLWfdLA"/>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_073lwDm9EeiWMf5FLWfdLA" value="*"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_oUh1Ujm-EeiWMf5FLWfdLA" name="_virtuaLlinkDescFlavour" type="_oFQM8Dd-EeiIfPeSAqyGdQ" aggregation="composite" association="_oUgnMDm-EeiWMf5FLWfdLA">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_pGbbQGNeEeio9amveq0yWQ" annotatedElement="_oUh1Ujm-EeiWMf5FLWfdLA">
-            <body>Describes a specific flavour of the VL with specific bitrate requirements.</body>
-          </ownedComment>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_oUjDcDm-EeiWMf5FLWfdLA" value="1"/>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_oUjqgDm-EeiWMf5FLWfdLA" value="*"/>
-        </ownedAttribute>
       </packagedElement>
       <packagedElement xmi:type="uml:Class" xmi:id="_zOfv8DQVEeixv_sLOod4lQ" name="VduCpd ">
         <ownedComment xmi:type="uml:Comment" xmi:id="_-4XYgFqVEeiTzriVSbKglg" annotatedElement="_zOfv8DQVEeixv_sLOod4lQ">
@@ -1333,6 +1280,13 @@ NOTE: Each identifier references an affinity or anti-affinity group which expres
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ux4cgBlYEem_VM0Ij2_uSw"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ux-jIBlYEem_VM0Ij2_uSw" value="1"/>
         </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_6rvSESsBEemS0_wZSU3sbA" name="_intVirtualLinkDesc" type="_-5-w8Cr9EemS0_wZSU3sbA" association="_6rs10CsBEemS0_wZSU3sbA">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_YmvtQCsCEemS0_wZSU3sbA" annotatedElement="_6rvSESsBEemS0_wZSU3sbA">
+            <body>Reference(s) of the Virtual Link Descriptor to which this Connection Point Descriptor(s) connects.</body>
+          </ownedComment>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_6rxHQCsBEemS0_wZSU3sbA"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_6rxHQSsBEemS0_wZSU3sbA" value="1"/>
+        </ownedAttribute>
       </packagedElement>
       <packagedElement xmi:type="uml:Class" xmi:id="_p0UVsDQvEeixv_sLOod4lQ" name="VnfDf ">
         <ownedComment xmi:type="uml:Comment" xmi:id="_l0ZY4GNVEeio9amveq0yWQ" annotatedElement="_p0UVsDQvEeixv_sLOod4lQ">
@@ -1351,6 +1305,21 @@ NOTE: Each identifier references an affinity or anti-affinity group which expres
           </ownedComment>
           <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
         </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_oGtFECsLEemS0_wZSU3sbA" name="defaultInstantiationLevel" visibility="public">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_zJzmICsLEemS0_wZSU3sbA" annotatedElement="_oGtFECsLEemS0_wZSU3sbA">
+            <body>This attribute references the &quot;instantiationLevel&quot; entry which defines the default instantiation level for this DF. It shall be present if there are multiple &quot;instantiationLevel&quot; entries.</body>
+          </ownedComment>
+          <type xmi:type="uml:DataType" href="Common.uml#_AuYtcDkBEeiWMf5FLWfdLA"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_wkFhECsLEemS0_wZSU3sbA"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_wkd7kCsLEemS0_wZSU3sbA" value="1"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_J48QgCsMEemS0_wZSU3sbA" name="monitoringParameter" visibility="public" type="_HlF2kDmxEeiWMf5FLWfdLA">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_RRGw4CsMEemS0_wZSU3sbA" annotatedElement="_J48QgCsMEemS0_wZSU3sbA">
+            <body>Specifies the virtualised resource related performance metrics to be tracked by the VNFM.</body>
+          </ownedComment>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ogm_MCsMEemS0_wZSU3sbA"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OhAAwCsMEemS0_wZSU3sbA" value="*"/>
+        </ownedAttribute>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_KN9YcTnAEeiWMf5FLWfdLA" name="_virtuaLlinkProfile" type="_0lvvQDgREeiOYfGHew0BGg" aggregation="shared" association="_KN7jQDnAEeiWMf5FLWfdLA">
           <ownedComment xmi:type="uml:Comment" xmi:id="_GIMQYGNWEeio9amveq0yWQ" annotatedElement="_KN9YcTnAEeiWMf5FLWfdLA">
             <body>Defines the internal VLD along with additional data which is used in this DF.&#xD;
@@ -1429,6 +1398,13 @@ BaseConfigGroup may establish internal networks such as OAM (VNF Mgmt) or MNS (M
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_FMJ3MGNcEeio9amveq0yWQ"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_FMQk4GNcEeio9amveq0yWQ" value="*"/>
         </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_ZqRl0isNEemS0_wZSU3sbA" name="_vnfIndicator" type="_tEnEsDTSEeiwQ6KPLHcy4g" association="_ZqPJkCsNEemS0_wZSU3sbA">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_sXkLYCsNEemS0_wZSU3sbA" annotatedElement="_ZqRl0isNEemS0_wZSU3sbA">
+            <body>Declares the VNF indicators that are supported by this VNF (specific to this DF).</body>
+          </ownedComment>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ZqTbACsNEemS0_wZSU3sbA"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ZqUCECsNEemS0_wZSU3sbA" value="*"/>
+        </ownedAttribute>
       </packagedElement>
       <packagedElement xmi:type="uml:Class" xmi:id="_AmzWYDQtEeixv_sLOod4lQ" name="VnfExtCpd ">
         <ownedAttribute xmi:type="uml:Property" xmi:id="_hzG3ETm7EeiWMf5FLWfdLA" name="_virtualNetworkInterfaceRequirements" type="_8BUXwDm4EeiWMf5FLWfdLA" aggregation="composite" association="_hzDMsDm7EeiWMf5FLWfdLA">
@@ -1441,13 +1417,19 @@ NOTE: In case of referencing an intCpd via its identifier, the virtualNetworkInt
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_hzobgDm7EeiWMf5FLWfdLA"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_hzyMgDm7EeiWMf5FLWfdLA" value="*"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_uf0ZQDdVEeiIfPeSAqyGdQ" name="_vduCpd" type="_zOfv8DQVEeixv_sLOod4lQ" association="_ufxV8DdVEeiIfPeSAqyGdQ">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_uf0ZQDdVEeiIfPeSAqyGdQ" name="_intCpd" type="_zOfv8DQVEeixv_sLOod4lQ" association="_ufxV8DdVEeiIfPeSAqyGdQ">
           <ownedComment xmi:type="uml:Comment" xmi:id="_8z1zEJwfEeiPD5fN_oRNAg" annotatedElement="_uf0ZQDdVEeiIfPeSAqyGdQ">
-            <body>Reference to the internal VDU CPD which is used to instantiate internal CPs. These internal CPs are, in turn, exposed as external CPs defined by this external CPD.</body>
+            <body>A VnfExtCpd is a type of Cpd and describes an external interface, a.k.a external CP, exposed by this VNF enabling connection with a VL.&#xD;
+When the VnfExtCpd is mapped to a VduCpd, the values for the attributes type, subType and description shall be identical for both elements.&#xD;
+</body>
           </ownedComment>
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_7fXY4DdVEeiIfPeSAqyGdQ"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_7facMDdVEeiIfPeSAqyGdQ" value="1"/>
         </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_lZbOMCsFEemS0_wZSU3sbA" name="_intVirtualLinkDesc" type="_-5-w8Cr9EemS0_wZSU3sbA" association="_lZYx8CsFEemS0_wZSU3sbA">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_lZhU0CsFEemS0_wZSU3sbA"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_lZuJICsFEemS0_wZSU3sbA" value="1"/>
+        </ownedAttribute>
       </packagedElement>
       <packagedElement xmi:type="uml:Class" xmi:id="_X3eqgDTQEeiwQ6KPLHcy4g" name="VnfdElementGroup">
         <ownedComment xmi:type="uml:Comment" xmi:id="_uOZFUDTUEeiwQ6KPLHcy4g" annotatedElement="_X3eqgDTQEeiwQ6KPLHcy4g">
@@ -1629,18 +1611,19 @@ NOTE: If not present, it is assumed that the bitrate requirements can be derived
         <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>
         </ownedComment>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_7vMSsDnIEeiWMf5FLWfdLA" name="vduId" visibility="public">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_B2Y6cDnJEeiWMf5FLWfdLA" annotatedElement="_7vMSsDnIEeiWMf5FLWfdLA">
-            <body>Uniquely identifies a VDU.</body>
-          </ownedComment>
-          <type xmi:type="uml:DataType" href="Common.uml#_AuYtcDkBEeiWMf5FLWfdLA"/>
-        </ownedAttribute>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_Eu3jcDnJEeiWMf5FLWfdLA" name="numberOfInstances" visibility="public">
           <ownedComment xmi:type="uml:Comment" xmi:id="_Lc1QQDnJEeiWMf5FLWfdLA" annotatedElement="_Eu3jcDnJEeiWMf5FLWfdLA">
             <body>Number of instances of VNFC based on this VDU to deploy for an instantiation level or for a scaling delta.</body>
           </ownedComment>
           <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
         </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_lIdLMivPEemS0_wZSU3sbA" name="_vduId" type="_e5WnwDOREeiHat9KcP8uWA" association="_lIaH4CvPEemS0_wZSU3sbA">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_G5Cw0CvQEemS0_wZSU3sbA" annotatedElement="_lIdLMivPEemS0_wZSU3sbA">
+            <body>Uniquely identifies a VDU.</body>
+          </ownedComment>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_lIfAYCvPEemS0_wZSU3sbA" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_lIfAYSvPEemS0_wZSU3sbA" value="1"/>
+        </ownedAttribute>
       </packagedElement>
       <packagedElement xmi:type="uml:Class" xmi:id="_IYL40D0REeiuk5pWzMOpfA" name="BaseConfigGroup">
         <ownedComment xmi:type="uml:Comment" xmi:id="_x174wD5hEeijbdkIlrq2uQ" annotatedElement="_IYL40D0REeiuk5pWzMOpfA">
@@ -2052,6 +2035,12 @@ Diversity - Resources are geo-diverse ( cannot be co-located).&#xD;
         <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="_PYj-ECsQEemS0_wZSU3sbA" name="virtualLinkProfileId" visibility="public">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_XZRFICsQEemS0_wZSU3sbA" annotatedElement="_PYj-ECsQEemS0_wZSU3sbA">
+            <body>Uniquely identifies this VirtualLinkProfile class</body>
+          </ownedComment>
+          <type xmi:type="uml:DataType" href="Common.uml#_AuYtcDkBEeiWMf5FLWfdLA"/>
+        </ownedAttribute>
         <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;
@@ -2063,17 +2052,6 @@ When the cardinality is greater than 1, both affinity rule(s) and anti-affinity
           <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;
@@ -2088,47 +2066,27 @@ NOTE: Each identifier references an affinity or anti-affinity group which expres
           </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">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_uohQ8jgTEeiOYfGHew0BGg" name="_flavourId" 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>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_ix8YIisREemS0_wZSU3sbA" name="_affinityOrAntiAffinityGroupId" association="_ix6i8CsREemS0_wZSU3sbA">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_W37AsCsSEemS0_wZSU3sbA" annotatedElement="_ix8YIisREemS0_wZSU3sbA">
+            <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.&#xD;
+</body>
+          </ownedComment>
+          <type xmi:type="uml:Class" href="Common.uml#_0AbUYDnBEeiWMf5FLWfdLA"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ix9mQCsREemS0_wZSU3sbA"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ix-NUCsREemS0_wZSU3sbA" value="*"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_GWe3YSsBEemS0_wZSU3sbA" name="_vnfVirtualLinkDescId" type="_-5-w8Cr9EemS0_wZSU3sbA" association="_GWbNACsBEemS0_wZSU3sbA">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_l5RIsCsBEemS0_wZSU3sbA" annotatedElement="_GWe3YSsBEemS0_wZSU3sbA">
+            <body>Uniquely references a VLD.</body>
           </ownedComment>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_GWgskCsBEemS0_wZSU3sbA" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_GWhToCsBEemS0_wZSU3sbA" value="1"/>
         </ownedAttribute>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_DQCY4A57EemrJqq3q9vf6g" name="segmentationId">
           <ownedComment xmi:type="uml:Comment" xmi:id="_uPeTsA57EemrJqq3q9vf6g" annotatedElement="_DQCY4A57EemrJqq3q9vf6g">
@@ -2163,6 +2121,24 @@ NOTE: Each identifier references an affinity or anti-affinity group which expres
         <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>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_O35QACvLEemS0_wZSU3sbA" name="id" visibility="public">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_XtuBMCvLEemS0_wZSU3sbA" annotatedElement="_O35QACvLEemS0_wZSU3sbA">
+            <body>Unique identifier of this aspect in the VNFD.</body>
+          </ownedComment>
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_ZpVZUCvLEemS0_wZSU3sbA" name="name" visibility="public">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_gEHEYCvLEemS0_wZSU3sbA" annotatedElement="_ZpVZUCvLEemS0_wZSU3sbA">
+            <body>Human readable name of the aspect.</body>
+          </ownedComment>
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_hig8ECvLEemS0_wZSU3sbA" name="description" visibility="public">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_ojqDkCvLEemS0_wZSU3sbA" annotatedElement="_hig8ECvLEemS0_wZSU3sbA">
+            <body>Human readable description of the aspect.</body>
+          </ownedComment>
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+        </ownedAttribute>
       </packagedElement>
       <packagedElement xmi:type="uml:Class" xmi:id="_M45q8D0REeiuk5pWzMOpfA" name="ScalingGroup">
         <ownedComment xmi:type="uml:Comment" xmi:id="_2o0Y8D5hEeijbdkIlrq2uQ" annotatedElement="_M45q8D0REeiuk5pWzMOpfA">
@@ -2324,9 +2300,62 @@ NOTE: It indicates an exhaustive list of all the CP instances and SAP instances
           </ownedComment>
         </ownedAttribute>
       </packagedElement>
+      <packagedElement xmi:type="uml:Class" xmi:id="_u4EXICo6EemS0_wZSU3sbA" name="SwImage">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_3769QCo6EemS0_wZSU3sbA" annotatedElement="_u4EXICo6EemS0_wZSU3sbA">
+          <body>A software image</body>
+        </ownedComment>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Class" xmi:id="_Lpu5wCo9EemS0_wZSU3sbA" name="LogicalNodeRequirements">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_TZVpwCo9EemS0_wZSU3sbA" annotatedElement="_Lpu5wCo9EemS0_wZSU3sbA">
+          <body>This information element describes compute, memory and I/O requirements that are to be associated with the logical node of infrastructure. The logical node requirements are a sub-component of the VDU level requirements. As an example for illustration purposes, a logical node correlates to the concept of a NUMA cell in libvirt terminology.</body>
+        </ownedComment>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_qPKK8Co9EemS0_wZSU3sbA" name="id" visibility="public">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_13bOkCo9EemS0_wZSU3sbA" annotatedElement="_qPKK8Co9EemS0_wZSU3sbA">
+            <body>Identifies this set of logical node requirements.</body>
+          </ownedComment>
+          <type xmi:type="uml:DataType" href="Common.uml#_AuYtcDkBEeiWMf5FLWfdLA"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_7P3S4Co9EemS0_wZSU3sbA" name="logicalNodeRequirementDetail" visibility="public">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_Iyi0wCo-EemS0_wZSU3sbA" annotatedElement="_7P3S4Co9EemS0_wZSU3sbA">
+            <body>The logical node-level compute, memory and I/O requirements. An array of key-value pairs that articulate the deployment requirements.&#xD;
+This could include the number of CPU cores on this logical node, a memory configuration specific to a logical node (e.g. such as available in the Linux kernel via the libnuma library) or a requirement related to the association of an I/O device with the logical node.&#xD;
+</body>
+          </ownedComment>
+          <type xmi:type="uml:DataType" href="Common.uml#_vxJ9ADafEei23_xWdimG9w"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_C7uLUCo-EemS0_wZSU3sbA" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_C8IbACo-EemS0_wZSU3sbA" value="*"/>
+        </ownedAttribute>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Class" xmi:id="_-5-w8Cr9EemS0_wZSU3sbA" name="VnfVirtualLinkDesc">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_g1eIkCsKEemS0_wZSU3sbA" annotatedElement="_-5-w8Cr9EemS0_wZSU3sbA">
+          <body>Represents the type of network connectivity mandated by the VNF vendor between two or more Connection Points which includes at least one Internal Connection Point.</body>
+        </ownedComment>
+        <generalization xmi:type="uml:Generalization" xmi:id="_LKhVgCr-EemS0_wZSU3sbA" general="_AC2eIDQUEeixv_sLOod4lQ"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_ZuR54Cr-EemS0_wZSU3sbA" name="monitoringParameter" visibility="public" type="_HlF2kDmxEeiWMf5FLWfdLA">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_mt7AICr-EemS0_wZSU3sbA" annotatedElement="_ZuR54Cr-EemS0_wZSU3sbA">
+            <body>Specifies the virtualised resource related performance metrics on VLD level to be tracked by the VNFM.</body>
+          </ownedComment>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_i_MroCr-EemS0_wZSU3sbA"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_i_gNoCr-EemS0_wZSU3sbA" value="*"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_qCsKQisDEemS0_wZSU3sbA" name="_virtualLinkDescFlavour" type="_oFQM8Dd-EeiIfPeSAqyGdQ" aggregation="composite" association="_qCk1gCsDEemS0_wZSU3sbA">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_HAhLgCsEEemS0_wZSU3sbA" annotatedElement="_qCsKQisDEemS0_wZSU3sbA">
+            <body>Describes a specific flavour of the VL with specific bitrate requirements.</body>
+          </ownedComment>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_qCt_cCsDEemS0_wZSU3sbA" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_qCumgCsDEemS0_wZSU3sbA" value="*"/>
+        </ownedAttribute>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Class" xmi:id="_mcXjILIKEeid-vjMcczUWA" name="AllottedLink">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_hNCywLeVEeiq7vtzCAMDQQ" annotatedElement="_mcXjILIKEeid-vjMcczUWA">
+          <body>An AllottedLink is a link provided (or allotted) by some service instance.   The Allottedlink may be incorporated into the topology of some consuming service like other links. &#xD;
+</body>
+        </ownedComment>
+        <generalization xmi:type="uml:Generalization" xmi:id="_lFpyYLILEeid-vjMcczUWA" general="_AC2eIDQUEeixv_sLOod4lQ"/>
+      </packagedElement>
     </packagedElement>
     <packagedElement xmi:type="uml:Package" xmi:id="_zPN5MzOHEei5Af8DcjrhIQ" name="TypeDefinitions">
-      <packagedElement xmi:type="uml:DataType" xmi:id="_lp6e4DatEei23_xWdimG9w" name="LogicalNodeData ">
+      <packagedElement xmi:type="uml:DataType" xmi:id="_lp6e4DatEei23_xWdimG9w" name="LogicalNodeRequirements ">
         <ownedComment xmi:type="uml:Comment" xmi:id="_9EwVcGNfEeio9amveq0yWQ" annotatedElement="_lp6e4DatEei23_xWdimG9w">
           <body>This information element describes compute, memory and I/O requirements that are to be associated with the logical node of infrastructure. The logical node requirements are a sub-component of the VDU level requirements. As an example for illustration purposes, a logical node correlates to the concept of a NUMA cell in libvirt terminology. </body>
         </ownedComment>
@@ -2586,7 +2615,7 @@ NOTE: A cardinality of &quot;0&quot; indicates that configuring this present VNF
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_vYsd4zkJEeiWMf5FLWfdLA" value="*"/>
         </ownedAttribute>
       </packagedElement>
-      <packagedElement xmi:type="uml:DataType" xmi:id="_1HQGsDkKEeiWMf5FLWfdLA" name="LifecycleManagementScript">
+      <packagedElement xmi:type="uml:DataType" xmi:id="_1HQGsDkKEeiWMf5FLWfdLA" name="VnfLifecycleManagementScript">
         <ownedAttribute xmi:type="uml:Property" xmi:id="_9xGRYDkKEeiWMf5FLWfdLA" name="event" type="_nJzw0DnNEeiWMf5FLWfdLA">
           <ownedComment xmi:type="uml:Comment" xmi:id="_9xGRYTkKEeiWMf5FLWfdLA" annotatedElement="_9xGRYDkKEeiWMf5FLWfdLA">
             <body>Describes VNF lifecycle event(s) or an external stimulus detected on a VNFM reference point.</body>
@@ -2631,7 +2660,7 @@ NOTE: The scriptInput values are passed to the scripts in addition to the parame
       </packagedElement>
       <packagedElement xmi:type="uml:DataType" xmi:id="_HlF2kDmxEeiWMf5FLWfdLA" name="MonitoringParameter">
         <ownedComment xmi:type="uml:Comment" xmi:id="_Vv0P4DmxEeiWMf5FLWfdLA" annotatedElement="_HlF2kDmxEeiWMf5FLWfdLA">
-          <body>Specifies the virtualised resource related performance metric to be tracked by the VNFM, e.g. for auto-scaling purposes. The VNFM collects the values of performance metrics identified by this information element from the VIM(s) using one or more locally initiated PM Jobs. These values can be used as inputs to auto-scaling rules.</body>
+          <body>Specifies the virtualized resource related performance metric to be tracked by the VNFM, e.g. for auto-scaling purposes. The VNFM collects the values of performance metrics identified by this information element from the VIM(s) using one or more locally initiated PM Jobs. These values can be used as inputs to auto-scaling rules.</body>
         </ownedComment>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_ZccSoDmxEeiWMf5FLWfdLA" name="id">
           <ownedComment xmi:type="uml:Comment" xmi:id="_ZccSoTmxEeiWMf5FLWfdLA" annotatedElement="_ZccSoDmxEeiWMf5FLWfdLA">
@@ -2648,9 +2677,12 @@ NOTE: The scriptInput values are passed to the scripts in addition to the parame
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ZcmqszmxEeiWMf5FLWfdLA" value="1"/>
         </ownedAttribute>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_Zcn40DmxEeiWMf5FLWfdLA" name="performanceMetric">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_hoXy0CvTEemS0_wZSU3sbA" annotatedElement="_Zcn40DmxEeiWMf5FLWfdLA">
+            <body>Identifies the virtualized resource performance metric.</body>
+          </ownedComment>
           <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_ZcpG8DmxEeiWMf5FLWfdLA" name="collectionPeriod">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_ZcpG8DmxEeiWMf5FLWfdLA" name="collectionPeriod" type="_pRh10DnOEeiWMf5FLWfdLA">
           <ownedComment xmi:type="uml:Comment" xmi:id="_ZcpG8TmxEeiWMf5FLWfdLA" annotatedElement="_ZcpG8DmxEeiWMf5FLWfdLA">
             <body>An attribute that describes the recommended periodicity at which to collect the performance information.&#xD;
 &#xD;
@@ -2698,11 +2730,10 @@ NOTE: The MANO or NFVI may not support the recommended collectionPeriod based on
         <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>
         </ownedComment>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_KFKIIDnIEeiWMf5FLWfdLA" name="aspectId" visibility="public">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_KFKIIDnIEeiWMf5FLWfdLA" name="aspectId" visibility="public" type="_DlOpkDnDEeiWMf5FLWfdLA">
           <ownedComment xmi:type="uml:Comment" xmi:id="_O1cnUDnIEeiWMf5FLWfdLA" annotatedElement="_KFKIIDnIEeiWMf5FLWfdLA">
             <body>Reference to the scaling aspect.</body>
           </ownedComment>
-          <type xmi:type="uml:DataType" href="Common.uml#_AuYtcDkBEeiWMf5FLWfdLA"/>
         </ownedAttribute>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_SHb8gDnIEeiWMf5FLWfdLA" name="scaleLevel" visibility="public">
           <ownedComment xmi:type="uml:Comment" xmi:id="_aWpZoDnIEeiWMf5FLWfdLA" annotatedElement="_SHb8gDnIEeiWMf5FLWfdLA">
@@ -2831,6 +2862,158 @@ NOTE 3: 	When the corresponding NS level is used in the context of NS scaling, t
           <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
         </ownedAttribute>
       </packagedElement>
+      <packagedElement xmi:type="uml:DataType" xmi:id="_iunqUCpAEemS0_wZSU3sbA" name="BlockStorageData">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_2quzcCpAEemS0_wZSU3sbA" annotatedElement="_iunqUCpAEemS0_wZSU3sbA">
+          <body>Specifies the details of the block storage resource.</body>
+        </ownedComment>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_4oVvoCpAEemS0_wZSU3sbA" name="sizeOfStorage" visibility="public">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_Ah1bcCpBEemS0_wZSU3sbA" annotatedElement="_4oVvoCpAEemS0_wZSU3sbA">
+            <body>Size of virtualised storage resource in GB.</body>
+          </ownedComment>
+          <type xmi:type="uml:PrimitiveType" href="Common.uml#_p3EKoDm0EeiWMf5FLWfdLA"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_FFksYCpBEemS0_wZSU3sbA" name="vduStorageRequirements" visibility="public">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_WRe-wCpBEemS0_wZSU3sbA" annotatedElement="_FFksYCpBEemS0_wZSU3sbA">
+            <body>An array of key-value pairs that articulate the storage deployment requirements.</body>
+          </ownedComment>
+          <type xmi:type="uml:DataType" href="Common.uml#_vxJ9ADafEei23_xWdimG9w"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_RXvooCpBEemS0_wZSU3sbA"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_RYMUkCpBEemS0_wZSU3sbA" value="*"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_aQl4oCpBEemS0_wZSU3sbA" name="rdmaEnabled" visibility="public">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_l59vgCpBEemS0_wZSU3sbA" annotatedElement="_aQl4oCpBEemS0_wZSU3sbA">
+            <body>Indicates if the storage supports rdma.</body>
+          </ownedComment>
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_fA3wwCpBEemS0_wZSU3sbA"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_fBKrsCpBEemS0_wZSU3sbA" value="1"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_p2pAcCpBEemS0_wZSU3sbA" name="swImageDesc" visibility="public" type="_J0Zx0DOSEeiHat9KcP8uWA">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_3hCT4CpBEemS0_wZSU3sbA" annotatedElement="_p2pAcCpBEemS0_wZSU3sbA">
+            <body>Software image to be loaded on the VirtualStorage resource created based on this VirtualStorageDesc.&#xD;
+Shall be absent when used for virtual disks.&#xD;
+</body>
+          </ownedComment>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yPY0ECpBEemS0_wZSU3sbA"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yPh-ACpBEemS0_wZSU3sbA" value="1"/>
+        </ownedAttribute>
+      </packagedElement>
+      <packagedElement xmi:type="uml:DataType" xmi:id="_5p1FACpEEemS0_wZSU3sbA" name="ObjectStorageData">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_CB48ICpFEemS0_wZSU3sbA" annotatedElement="_5p1FACpEEemS0_wZSU3sbA">
+          <body>The ObjectStorageData information element specifies the details of object storage resource.</body>
+        </ownedComment>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_DVD0MCpFEemS0_wZSU3sbA" name="maxSizeOfStorage" visibility="public">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_MOZMYCpFEemS0_wZSU3sbA" annotatedElement="_DVD0MCpFEemS0_wZSU3sbA">
+            <body>Max size of virtualised storage resource in GB.</body>
+          </ownedComment>
+          <type xmi:type="uml:PrimitiveType" href="Common.uml#_p3EKoDm0EeiWMf5FLWfdLA"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_KbC_cCpFEemS0_wZSU3sbA"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KbXvkCpFEemS0_wZSU3sbA" value="1"/>
+        </ownedAttribute>
+      </packagedElement>
+      <packagedElement xmi:type="uml:DataType" xmi:id="_OCLeMCpFEemS0_wZSU3sbA" name="FileStorageData">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_TJwcACpFEemS0_wZSU3sbA" annotatedElement="_OCLeMCpFEemS0_wZSU3sbA">
+          <body>The FileStorageData information element specifies the details of file storage resource.</body>
+        </ownedComment>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_Xbog4CpFEemS0_wZSU3sbA" name="sizeOfStorage" visibility="public">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_cCA2ICpFEemS0_wZSU3sbA" annotatedElement="_Xbog4CpFEemS0_wZSU3sbA">
+            <body>Size of virtualised storage resource in GB.</body>
+          </ownedComment>
+          <type xmi:type="uml:PrimitiveType" href="Common.uml#_p3EKoDm0EeiWMf5FLWfdLA"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_fcJasCpFEemS0_wZSU3sbA" name="fileSystemProtocol" visibility="public">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_klw_4CpFEemS0_wZSU3sbA" annotatedElement="_fcJasCpFEemS0_wZSU3sbA">
+            <body>The shared file system protocol (e.g. NFS, CIFS).</body>
+          </ownedComment>
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_pEem4CpFEemS0_wZSU3sbA" name="intVirtualLinkDesc" visibility="public" type="_AC2eIDQUEeixv_sLOod4lQ">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_06i18CpFEemS0_wZSU3sbA" annotatedElement="_pEem4CpFEemS0_wZSU3sbA">
+            <body>Reference of the internal VLD which this file storage connects to.&#xD;
+The attached VDUs shall connect to the same internal VLD.&#xD;
+</body>
+          </ownedComment>
+        </ownedAttribute>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Enumeration" xmi:id="_MevNkJddEei-sOl6ywWHlg" name="AddressType">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_zYqPEJdeEei-sOl6ywWHlg" annotatedElement="_MevNkJddEei-sOl6ywWHlg">
+          <body>Type of address</body>
+        </ownedComment>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_TXtQgJddEei-sOl6ywWHlg" name="MAC"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_UVFewJddEei-sOl6ywWHlg" name="IP"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:DataType" xmi:id="_hzvvUPxSEeijjKJn7OxwuQ" name="StorageQos">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_tMfJMPxSEeijjKJn7OxwuQ" name="qosId">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_C1n00PxTEeijjKJn7OxwuQ" annotatedElement="_tMfJMPxSEeijjKJn7OxwuQ">
+            <body>Unique identifier of the storage Qos in VNFD.</body>
+          </ownedComment>
+          <type xmi:type="uml:DataType" href="Common.uml#_AuYtcDkBEeiWMf5FLWfdLA"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_tlqeMPxSEeijjKJn7OxwuQ" name="qosName">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_uD6rAPxTEeijjKJn7OxwuQ" annotatedElement="_tlqeMPxSEeijjKJn7OxwuQ">
+            <body>Name of storage QoS.</body>
+          </ownedComment>
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_nUxZ8BDBEemFz_A_9-IJMQ" name="consumer" type="_yPciUBDCEemFz_A_9-IJMQ">
+          <ownedComment xmi:type="uml:Comment" xmi:id="__2h_kBl0Eem_VM0Ij2_uSw" annotatedElement="_nUxZ8BDBEemFz_A_9-IJMQ">
+            <body>Consumer type.</body>
+          </ownedComment>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_43vsABDCEemFz_A_9-IJMQ" name="qos_specs">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_LFiSIBDDEemFz_A_9-IJMQ" annotatedElement="_43vsABDCEemFz_A_9-IJMQ">
+            <body>Describe qualities of Qos：total_bytes_sec、total_iops_sec. </body>
+          </ownedComment>
+          <type xmi:type="uml:DataType" href="Common.uml#_vxJ9ADafEei23_xWdimG9w"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_EONN8BDDEemFz_A_9-IJMQ"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EONN8RDDEemFz_A_9-IJMQ" value="*"/>
+        </ownedAttribute>
+      </packagedElement>
+      <packagedElement xmi:type="uml:DataType" xmi:id="_cyGIcPxUEeijjKJn7OxwuQ" name="VolumeType">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_qvf3cPxUEeijjKJn7OxwuQ" name="volumeTypeId">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yWO_UPxUEeijjKJn7OxwuQ" annotatedElement="_qvf3cPxUEeijjKJn7OxwuQ">
+            <body>Unique identifier of volume type in VNFD.</body>
+          </ownedComment>
+          <type xmi:type="uml:DataType" href="Common.uml#_AuYtcDkBEeiWMf5FLWfdLA"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_rBniMPxUEeijjKJn7OxwuQ" name="volumeTypeName">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_Zwh_cPxVEeijjKJn7OxwuQ" annotatedElement="_rBniMPxUEeijjKJn7OxwuQ">
+            <body>Name of volume type.</body>
+          </ownedComment>
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_rVW9kPxUEeijjKJn7OxwuQ" name="backendName">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yb08ABDDEemFz_A_9-IJMQ" annotatedElement="_rVW9kPxUEeijjKJn7OxwuQ">
+            <body>Backend volume name of cinder.</body>
+          </ownedComment>
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+        </ownedAttribute>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Enumeration" xmi:id="_1DEVYByHEemVVe_wt-ZCGw" name="NetworkType">
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="__oFMQByHEemVVe_wt-ZCGw" name="VLAN"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_CP_psByIEemVVe_wt-ZCGw" name="VXLAN"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:DataType" xmi:id="_BAt7gBx6Eemit6R65X1VNQ" name="VirtualLinkProtocolData">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_gKzRkBx9Eemit6R65X1VNQ" name="associatedLayerProtocol">
+          <type xmi:type="uml:Enumeration" href="Common.uml#_tFQGcDnLEeiWMf5FLWfdLA"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_geJEUBx9Eemit6R65X1VNQ" name="l2ProtocolData">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_sD2twBx-Eemit6R65X1VNQ" annotatedElement="_geJEUBx9Eemit6R65X1VNQ">
+            <body>Specifies the L2 protocol data for this virtual link. Shall be present when the associatedLayerProtocol attribute indicates a L2 protocol and shall be absent otherwise.</body>
+          </ownedComment>
+          <type xmi:type="uml:DataType" href="Common.uml#_zxlckB8-EemJTaeYhZuDRA"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_HiTcYBx-Eemit6R65X1VNQ"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_HidNYBx-Eemit6R65X1VNQ" value="1"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_gy064Bx9Eemit6R65X1VNQ" name="l3ProtocolData">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_uZ0fkBx-Eemit6R65X1VNQ" annotatedElement="_gy064Bx9Eemit6R65X1VNQ">
+            <body>Specifies the L3 protocol data for this virtual link. Shall be present when the associatedLayerProtocol attribute indicates a L3 protocol and shall be absent otherwise.</body>
+          </ownedComment>
+          <type xmi:type="uml:DataType" href="Common.uml#_4DfhMB8_EemJTaeYhZuDRA"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_j1pWMBx-Eemit6R65X1VNQ"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_j1pWMRx-Eemit6R65X1VNQ" value="1"/>
+        </ownedAttribute>
+      </packagedElement>
     </packagedElement>
     <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_0Mc-4D2KEeiFiY3bcpqGkg">
       <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EesFsKVyEeikF6xsfT18UA" source="PapyrusVersion">
@@ -2848,8 +3031,6 @@ NOTE 3: 	When the corresponding NS level is used in the context of NS scaling, t
   </uml:Package>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_ONpBgzaIEei23_xWdimG9w" base_StructuralFeature="_u3j0EDOVEeiHat9KcP8uWA"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_ONpokTaIEei23_xWdimG9w" base_StructuralFeature="_vRy4kDQPEeixv_sLOod4lQ"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_ONpolDaIEei23_xWdimG9w" base_StructuralFeature="_R8RWwjQUEeixv_sLOod4lQ"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_ONqPoDaIEei23_xWdimG9w" base_StructuralFeature="_R8R90DQUEeixv_sLOod4lQ"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_ONqPojaIEei23_xWdimG9w" base_StructuralFeature="_zxbfEDQvEeixv_sLOod4lQ"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_ONq2sDaIEei23_xWdimG9w" base_StructuralFeature="_LOOoEjQtEeixv_sLOod4lQ"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_ONrdwDaIEei23_xWdimG9w" base_StructuralFeature="_7QN84jTUEeiwQ6KPLHcy4g"/>
@@ -2862,14 +3043,10 @@ NOTE 3: 	When the corresponding NS level is used in the context of NS scaling, t
   <OpenModel_Profile:OpenModelAttribute xmi:id="_Mx024TagEei23_xWdimG9w" base_StructuralFeature="_Mx024DagEei23_xWdimG9w"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_xRw2QzdyEeiIfPeSAqyGdQ" base_StructuralFeature="_xRw2QjdyEeiIfPeSAqyGdQ"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_xR4LATdyEeiIfPeSAqyGdQ" base_StructuralFeature="_xR4LADdyEeiIfPeSAqyGdQ"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_abGfMzeAEeiIfPeSAqyGdQ" base_StructuralFeature="_abGfMjeAEeiIfPeSAqyGdQ"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_abHGQTeAEeiIfPeSAqyGdQ" base_StructuralFeature="_abHGQDeAEeiIfPeSAqyGdQ"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_uf1AUDdVEeiIfPeSAqyGdQ" base_StructuralFeature="_uf0ZQDdVEeiIfPeSAqyGdQ"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_uf1AUDdVEeiIfPeSAqyGdQ" base_StructuralFeature="_uf0ZQDdVEeiIfPeSAqyGdQ" support="CONDITIONAL_MANDATORY" condition="Either intVirtualLinkDesc or intCpd shall be present."/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_uf1nYTdVEeiIfPeSAqyGdQ" base_StructuralFeature="_uf1nYDdVEeiIfPeSAqyGdQ"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_uohQ8zgTEeiOYfGHew0BGg" base_StructuralFeature="_uohQ8jgTEeiOYfGHew0BGg"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_uok7UTgTEeiOYfGHew0BGg" base_StructuralFeature="_uok7UDgTEeiOYfGHew0BGg"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_e_qiMTgSEeiOYfGHew0BGg" base_StructuralFeature="_e_qiMDgSEeiOYfGHew0BGg"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_e_tlgTgSEeiOYfGHew0BGg" base_StructuralFeature="_e_tlgDgSEeiOYfGHew0BGg"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_guVSQjm5EeiWMf5FLWfdLA" base_StructuralFeature="_guVSQTm5EeiWMf5FLWfdLA"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_XihA8DnPEeiWMf5FLWfdLA" base_StructuralFeature="_XigZ4DnPEeiWMf5FLWfdLA"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_Y8jB4TnCEeiWMf5FLWfdLA" base_StructuralFeature="_Y8jB4DnCEeiWMf5FLWfdLA"/>
@@ -2877,9 +3054,7 @@ NOTE 3: 	When the corresponding NS level is used in the context of NS scaling, t
   <OpenModel_Profile:OpenModelAttribute xmi:id="_UZScojnDEeiWMf5FLWfdLA" base_StructuralFeature="_UZScoTnDEeiWMf5FLWfdLA"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_KN_NojnAEeiWMf5FLWfdLA" base_StructuralFeature="_KN_NoTnAEeiWMf5FLWfdLA"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_mpmbQTkTEeiWMf5FLWfdLA" base_StructuralFeature="_mpmbQDkTEeiWMf5FLWfdLA"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_yfnR4TkREeiWMf5FLWfdLA" base_StructuralFeature="_yfnR4DkREeiWMf5FLWfdLA"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_hz7WcTm7EeiWMf5FLWfdLA" base_StructuralFeature="_hz7WcDm7EeiWMf5FLWfdLA"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_oUjqgjm-EeiWMf5FLWfdLA" base_StructuralFeature="_oUjqgTm-EeiWMf5FLWfdLA"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_PJnV8DnHEeiWMf5FLWfdLA" base_StructuralFeature="_PJmu4jnHEeiWMf5FLWfdLA"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_8qIn4j5xEeijbdkIlrq2uQ" base_StructuralFeature="_8qIn4T5xEeijbdkIlrq2uQ"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_KOSrIEJ9EeiwbqJBYHKltg" base_StructuralFeature="_KOSEEEJ9EeiwbqJBYHKltg"/>
@@ -2896,7 +3071,7 @@ NOTE 3: 	When the corresponding NS level is used in the context of NS scaling, t
   <OpenModel_Profile:OpenModelAttribute xmi:id="_h7Izk0KAEeiwbqJBYHKltg" base_StructuralFeature="_h7IzkkKAEeiwbqJBYHKltg"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_h7PhQUKAEeiwbqJBYHKltg" base_StructuralFeature="_h7PhQEKAEeiwbqJBYHKltg"/>
   <OpenModel_Profile:OpenModelClass xmi:id="_ONsE0DaIEei23_xWdimG9w" base_Class="_e5WnwDOREeiHat9KcP8uWA"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_ONsE0TaIEei23_xWdimG9w" base_StructuralFeature="_l8PhgDWbEei9Ia34RXjpEg"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_ONsE0TaIEei23_xWdimG9w" base_StructuralFeature="_l8PhgDWbEei9Ia34RXjpEg" isInvariant="true"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_ONsE0jaIEei23_xWdimG9w" base_StructuralFeature="_wWU6wDWbEei9Ia34RXjpEg"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_ONsE0zaIEei23_xWdimG9w" base_StructuralFeature="_2-9boDWbEei9Ia34RXjpEg"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_mq0DkTafEei23_xWdimG9w" base_StructuralFeature="_mq0DkDafEei23_xWdimG9w"/>
@@ -2910,7 +3085,7 @@ NOTE 3: 	When the corresponding NS level is used in the context of NS scaling, t
   <OpenModel_Profile:OpenModelAttribute xmi:id="_Mx0P0DagEei23_xWdimG9w" base_StructuralFeature="_MxzowjagEei23_xWdimG9w"/>
   <OpenModel_Profile:OpenModelClass xmi:id="_ONsr4DaIEei23_xWdimG9w" base_Class="_aaEZADOREeiHat9KcP8uWA"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_ONsr4jaIEei23_xWdimG9w" base_StructuralFeature="_Sz6jIDOVEeiHat9KcP8uWA"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_ONsr4zaIEei23_xWdimG9w" base_StructuralFeature="_hUYi8DOVEeiHat9KcP8uWA"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_ONsr4zaIEei23_xWdimG9w" base_StructuralFeature="_hUYi8DOVEeiHat9KcP8uWA" isInvariant="true"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_ONsr5DaIEei23_xWdimG9w" base_StructuralFeature="_Psi3oDOXEeiHat9KcP8uWA"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_ONtS8DaIEei23_xWdimG9w" base_StructuralFeature="_Txwn0DQLEeixv_sLOod4lQ"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_ONtS8TaIEei23_xWdimG9w" base_StructuralFeature="_d9nX0DQLEeixv_sLOod4lQ"/>
@@ -2918,8 +3093,8 @@ NOTE 3: 	When the corresponding NS level is used in the context of NS scaling, t
   <OpenModel_Profile:OpenModelAttribute xmi:id="_ONtS8zaIEei23_xWdimG9w" base_StructuralFeature="_zS9kwDQLEeixv_sLOod4lQ"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_ONtS9DaIEei23_xWdimG9w" base_StructuralFeature="_-WAbcDQLEeixv_sLOod4lQ"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_CnvFoTkKEeiWMf5FLWfdLA" base_StructuralFeature="_CnvFoDkKEeiWMf5FLWfdLA"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_ONsr4TaIEei23_xWdimG9w" base_StructuralFeature="_qFisADOUEeiHat9KcP8uWA"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_ONt6ADaIEei23_xWdimG9w" base_StructuralFeature="_IW__QDQMEeixv_sLOod4lQ"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_ONsr4TaIEei23_xWdimG9w" base_StructuralFeature="_qFisADOUEeiHat9KcP8uWA" isInvariant="true"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_ONt6ADaIEei23_xWdimG9w" base_StructuralFeature="_IW__QDQMEeixv_sLOod4lQ" support="CONDITIONAL_MANDATORY" condition="Shall be present if &quot;localizationLanguage&quot; is present and shall be absent otherwise."/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_zr_UgDkIEeiWMf5FLWfdLA" base_StructuralFeature="_zr-tcDkIEeiWMf5FLWfdLA"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_HkmLwDkLEeiWMf5FLWfdLA" base_StructuralFeature="_HklksDkLEeiWMf5FLWfdLA"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_ONt6ATaIEei23_xWdimG9w" base_StructuralFeature="_LgNf8DTdEeiwQ6KPLHcy4g"/>
@@ -2931,7 +3106,6 @@ NOTE 3: 	When the corresponding NS level is used in the context of NS scaling, t
   <OpenModel_Profile:OpenModelAttribute xmi:id="_ONoacDaIEei23_xWdimG9w" base_StructuralFeature="_ET6SUDTSEeiwQ6KPLHcy4g"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_ONpBgjaIEei23_xWdimG9w" base_StructuralFeature="_u3gwwDOVEeiHat9KcP8uWA"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_nXw7EDkOEeiWMf5FLWfdLA" base_StructuralFeature="_nXwUATkOEeiWMf5FLWfdLA"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_yflcsDkREeiWMf5FLWfdLA" base_StructuralFeature="_yfk1oDkREeiWMf5FLWfdLA"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_mpkmETkTEeiWMf5FLWfdLA" base_StructuralFeature="_mpkmEDkTEeiWMf5FLWfdLA"/>
   <OpenModel_Profile:OpenModelClass xmi:id="_ONt6BDaIEei23_xWdimG9w" base_Class="_J0Zx0DOSEeiHat9KcP8uWA"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_lDoCUTaqEei23_xWdimG9w" base_StructuralFeature="_lDoCUDaqEei23_xWdimG9w"/>
@@ -2945,9 +3119,7 @@ NOTE 3: 	When the corresponding NS level is used in the context of NS scaling, t
   <OpenModel_Profile:OpenModelAttribute xmi:id="_SW1lEDm1EeiWMf5FLWfdLA" base_StructuralFeature="_SW0-ADm1EeiWMf5FLWfdLA"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_DhvVITasEei23_xWdimG9w" base_StructuralFeature="_DhvVIDasEei23_xWdimG9w"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_QAAzsTasEei23_xWdimG9w" base_StructuralFeature="_QAAzsDasEei23_xWdimG9w"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_43icQDarEei23_xWdimG9w" base_StructuralFeature="_43h1MDarEei23_xWdimG9w"/>
   <OpenModel_Profile:OpenModelClass xmi:id="_ONt6BTaIEei23_xWdimG9w" base_Class="_ISONYDOSEeiHat9KcP8uWA"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_aikFATdzEeiIfPeSAqyGdQ" base_StructuralFeature="_aikFADdzEeiIfPeSAqyGdQ"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_bEqsgTdzEeiIfPeSAqyGdQ" base_StructuralFeature="_bEqsgDdzEeiIfPeSAqyGdQ"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_cCrM4TdzEeiIfPeSAqyGdQ" base_StructuralFeature="_cCrM4DdzEeiIfPeSAqyGdQ"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_dFetsTdzEeiIfPeSAqyGdQ" base_StructuralFeature="_dFetsDdzEeiIfPeSAqyGdQ"/>
@@ -2956,7 +3128,6 @@ NOTE 3: 	When the corresponding NS level is used in the context of NS scaling, t
   <OpenModel_Profile:OpenModelAttribute xmi:id="_fXB5kTdzEeiIfPeSAqyGdQ" base_StructuralFeature="_fXB5kDdzEeiIfPeSAqyGdQ"/>
   <OpenModel_Profile:OpenModelClass xmi:id="_ONuhEDaIEei23_xWdimG9w" base_Class="_-gDvwDOREeiHat9KcP8uWA"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_CEEAwDatEei23_xWdimG9w" base_StructuralFeature="_CEDZsDatEei23_xWdimG9w"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_Z9PKcTavEei23_xWdimG9w" base_StructuralFeature="_Z9PKcDavEei23_xWdimG9w"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_S4W1oTazEei23_xWdimG9w" base_StructuralFeature="_S4W1oDazEei23_xWdimG9w"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_cn9ugTazEei23_xWdimG9w" base_StructuralFeature="_cn9ugDazEei23_xWdimG9w"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_6gNwoDazEei23_xWdimG9w" base_StructuralFeature="_6gNJkDazEei23_xWdimG9w"/>
@@ -2965,16 +3136,11 @@ NOTE 3: 	When the corresponding NS level is used in the context of NS scaling, t
   <OpenModel_Profile:OpenModelAttribute xmi:id="_4zAhUDdKEeiIfPeSAqyGdQ" base_StructuralFeature="_4y_6QDdKEeiIfPeSAqyGdQ"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_6sJ0QTdKEeiIfPeSAqyGdQ" base_StructuralFeature="_6sJ0QDdKEeiIfPeSAqyGdQ"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_7J5gMDdKEeiIfPeSAqyGdQ" base_StructuralFeature="_7J45IDdKEeiIfPeSAqyGdQ"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_8OQgMTdKEeiIfPeSAqyGdQ" base_StructuralFeature="_8OQgMDdKEeiIfPeSAqyGdQ"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_86kzoDdKEeiIfPeSAqyGdQ" base_StructuralFeature="_86kMkDdKEeiIfPeSAqyGdQ"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_9jaVQDdKEeiIfPeSAqyGdQ" base_StructuralFeature="_9jZuMDdKEeiIfPeSAqyGdQ"/>
   <OpenModel_Profile:OpenModelClass xmi:id="_ONuhFDaIEei23_xWdimG9w" base_Class="_AC2eIDQUEeixv_sLOod4lQ"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_pszPATd9EeiIfPeSAqyGdQ" base_StructuralFeature="_pszPADd9EeiIfPeSAqyGdQ"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_pszPATd9EeiIfPeSAqyGdQ" base_StructuralFeature="_pszPADd9EeiIfPeSAqyGdQ" isInvariant="true"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_qgZ2MDd9EeiIfPeSAqyGdQ" base_StructuralFeature="_qgZPIDd9EeiIfPeSAqyGdQ"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_rY7ZoTd9EeiIfPeSAqyGdQ" base_StructuralFeature="_rY7ZoDd9EeiIfPeSAqyGdQ"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_1X3vATd9EeiIfPeSAqyGdQ" base_StructuralFeature="_1X3vADd9EeiIfPeSAqyGdQ"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_2FzMATd9EeiIfPeSAqyGdQ" base_StructuralFeature="_2FzMADd9EeiIfPeSAqyGdQ"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_oUicYDm-EeiWMf5FLWfdLA" base_StructuralFeature="_oUh1Ujm-EeiWMf5FLWfdLA"/>
   <OpenModel_Profile:OpenModelClass xmi:id="_ONvIIDaIEei23_xWdimG9w" base_Class="_zOfv8DQVEeixv_sLOod4lQ"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_7nJYsTdREeiIfPeSAqyGdQ" base_StructuralFeature="_7nJYsDdREeiIfPeSAqyGdQ"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_7dX8MTdSEeiIfPeSAqyGdQ" base_StructuralFeature="_7dX8MDdSEeiIfPeSAqyGdQ"/>
@@ -2982,7 +3148,7 @@ NOTE 3: 	When the corresponding NS level is used in the context of NS scaling, t
   <OpenModel_Profile:OpenModelAttribute xmi:id="_875IoTdSEeiIfPeSAqyGdQ" base_StructuralFeature="_875IoDdSEeiIfPeSAqyGdQ"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_guUEIDm5EeiWMf5FLWfdLA" base_StructuralFeature="_guTdEjm5EeiWMf5FLWfdLA"/>
   <OpenModel_Profile:OpenModelClass xmi:id="_ONvvMTaIEei23_xWdimG9w" base_Class="_p0UVsDQvEeixv_sLOod4lQ"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_vbvVgTeCEeiIfPeSAqyGdQ" base_StructuralFeature="_vbvVgDeCEeiIfPeSAqyGdQ"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_vbvVgTeCEeiIfPeSAqyGdQ" base_StructuralFeature="_vbvVgDeCEeiIfPeSAqyGdQ" isInvariant="true"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_2cgCgTeCEeiIfPeSAqyGdQ" base_StructuralFeature="_2cgCgDeCEeiIfPeSAqyGdQ"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_KN9YcjnAEeiWMf5FLWfdLA" base_StructuralFeature="_KN9YcTnAEeiWMf5FLWfdLA"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_OCdvYjnBEeiWMf5FLWfdLA" base_StructuralFeature="_OCdvYTnBEeiWMf5FLWfdLA"/>
@@ -2997,7 +3163,7 @@ NOTE 3: 	When the corresponding NS level is used in the context of NS scaling, t
   <OpenModel_Profile:OpenModelAttribute xmi:id="__lSg8DkMEeiWMf5FLWfdLA" base_StructuralFeature="__lR54DkMEeiWMf5FLWfdLA"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_Xh4HwTnPEeiWMf5FLWfdLA" base_StructuralFeature="_Xh4HwDnPEeiWMf5FLWfdLA"/>
   <OpenModel_Profile:OpenModelClass xmi:id="_ONwWQjaIEei23_xWdimG9w" base_Class="_tEnEsDTSEeiwQ6KPLHcy4g"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_a5biQTg2EeiOYfGHew0BGg" base_StructuralFeature="_a5biQDg2EeiOYfGHew0BGg"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_a5biQTg2EeiOYfGHew0BGg" base_StructuralFeature="_a5biQDg2EeiOYfGHew0BGg" isInvariant="true"/>
   <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"/>
@@ -3006,13 +3172,8 @@ NOTE 3: 	When the corresponding NS level is used in the context of NS scaling, t
   <OpenModel_Profile:OpenModelAttribute xmi:id="_uXG-oDnFEeiWMf5FLWfdLA" base_StructuralFeature="_uXGXkDnFEeiWMf5FLWfdLA"/>
   <OpenModel_Profile:OpenModelClass xmi:id="_0lwWUDgREeiOYfGHew0BGg" base_Class="_0lvvQDgREeiOYfGHew0BGg"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_uA9sQDgUEeiOYfGHew0BGg" base_StructuralFeature="_uA9FMDgUEeiOYfGHew0BGg"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_DgtLUTgVEeiOYfGHew0BGg" base_StructuralFeature="_DgtLUDgVEeiOYfGHew0BGg"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_2_AI0DgVEeiOYfGHew0BGg" base_StructuralFeature="_2-_hwDgVEeiOYfGHew0BGg"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_s7WyQTgYEeiOYfGHew0BGg" base_StructuralFeature="_s7WyQDgYEeiOYfGHew0BGg"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_-SvU0DgYEeiOYfGHew0BGg" base_StructuralFeature="_-SutwDgYEeiOYfGHew0BGg"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="__S0RwTgYEeiOYfGHew0BGg" base_StructuralFeature="__S0RwDgYEeiOYfGHew0BGg"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_AApoITgZEeiOYfGHew0BGg" base_StructuralFeature="_AApoIDgZEeiOYfGHew0BGg"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_BYBDsTgZEeiOYfGHew0BGg" base_StructuralFeature="_BYBDsDgZEeiOYfGHew0BGg"/>
   <OpenModel_Profile:OpenModelClass xmi:id="_8BU-0Dm4EeiWMf5FLWfdLA" base_Class="_8BUXwDm4EeiWMf5FLWfdLA"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_H9PXMTm5EeiWMf5FLWfdLA" base_StructuralFeature="_H9PXMDm5EeiWMf5FLWfdLA"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_H9RMYTm5EeiWMf5FLWfdLA" base_StructuralFeature="_H9RMYDm5EeiWMf5FLWfdLA"/>
@@ -3020,13 +3181,12 @@ NOTE 3: 	When the corresponding NS level is used in the context of NS scaling, t
   <OpenModel_Profile:OpenModelAttribute xmi:id="_H9UPsDm5EeiWMf5FLWfdLA" base_StructuralFeature="_H9TooDm5EeiWMf5FLWfdLA"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_H9Vd0Tm5EeiWMf5FLWfdLA" base_StructuralFeature="_H9Vd0Dm5EeiWMf5FLWfdLA"/>
   <OpenModel_Profile:OpenModelClass xmi:id="_6C8s8DnAEeiWMf5FLWfdLA" base_Class="_6C8F4DnAEeiWMf5FLWfdLA"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_Y6HcIDnGEeiWMf5FLWfdLA" base_StructuralFeature="_Y6Fm8DnGEeiWMf5FLWfdLA"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_Y6HcIDnGEeiWMf5FLWfdLA" base_StructuralFeature="_Y6Fm8DnGEeiWMf5FLWfdLA" isInvariant="true"/>
   <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="_DlPQoDnDEeiWMf5FLWfdLA" base_Class="_DlOpkDnDEeiWMf5FLWfdLA"/>
   <OpenModel_Profile:OpenModelClass xmi:id="_DZsyMTnHEeiWMf5FLWfdLA" base_Class="_DZsyMDnHEeiWMf5FLWfdLA"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_7vM5wDnIEeiWMf5FLWfdLA" base_StructuralFeature="_7vMSsDnIEeiWMf5FLWfdLA"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_Eu4KgDnJEeiWMf5FLWfdLA" base_StructuralFeature="_Eu3jcDnJEeiWMf5FLWfdLA"/>
   <OpenModel_Profile:OpenModelClass xmi:id="_IYMf4D0REeiuk5pWzMOpfA" base_Class="_IYL40D0REeiuk5pWzMOpfA"/>
   <OpenModel_Profile:Experimental xmi:id="_VYV60EJTEeiDS9blpN8EJw" base_Element="_IYL40D0REeiuk5pWzMOpfA"/>
@@ -3068,7 +3228,7 @@ NOTE 3: 	When the corresponding NS level is used in the context of NS scaling, t
   <OpenModel_Profile:OpenModelAttribute xmi:id="_pxdlEzkIEeiWMf5FLWfdLA" base_StructuralFeature="_pxdlEDkIEeiWMf5FLWfdLA"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_vYozgDkJEeiWMf5FLWfdLA" base_StructuralFeature="_vYoMcDkJEeiWMf5FLWfdLA"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_vYtE8DkJEeiWMf5FLWfdLA" base_StructuralFeature="_vYsd4DkJEeiWMf5FLWfdLA"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_9xG4cDkKEeiWMf5FLWfdLA" base_StructuralFeature="_9xGRYDkKEeiWMf5FLWfdLA"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_9xG4cDkKEeiWMf5FLWfdLA" base_StructuralFeature="_9xGRYDkKEeiWMf5FLWfdLA" support="CONDITIONAL_MANDATORY" condition="At least one of the 2 attributes event or lcmTransitionEvent shall be included"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_9xO0RDkKEeiWMf5FLWfdLA" base_StructuralFeature="_9xO0QDkKEeiWMf5FLWfdLA"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_9xRQgDkKEeiWMf5FLWfdLA" base_StructuralFeature="_9xQpcDkKEeiWMf5FLWfdLA"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_9xWJADkKEeiWMf5FLWfdLA" base_StructuralFeature="_9xU64DkKEeiWMf5FLWfdLA"/>
@@ -3080,8 +3240,6 @@ NOTE 3: 	When the corresponding NS level is used in the context of NS scaling, t
   <OpenModel_Profile:OpenModelAttribute xmi:id="_aws6YDmyEeiWMf5FLWfdLA" base_StructuralFeature="_awsTUDmyEeiWMf5FLWfdLA"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_KFKvMDnIEeiWMf5FLWfdLA" base_StructuralFeature="_KFKIIDnIEeiWMf5FLWfdLA"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_SHcjkDnIEeiWMf5FLWfdLA" base_StructuralFeature="_SHb8gDnIEeiWMf5FLWfdLA"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_mchsAFqmEeiTzriVSbKglg" base_StructuralFeature="_mcgd4FqmEeiTzriVSbKglg"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_mci6IVqmEeiTzriVSbKglg" base_StructuralFeature="_mciTEFqmEeiTzriVSbKglg"/>
   <OpenModel_Profile:OpenModelClass xmi:id="_jKtzYF3PEeiwL5tPgFMcjQ" base_Class="_jH_PgF3PEeiwL5tPgFMcjQ"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_xJpMYF3PEeiwL5tPgFMcjQ" base_StructuralFeature="_xJolUF3PEeiwL5tPgFMcjQ"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_OD8jEV3REeiwL5tPgFMcjQ" base_StructuralFeature="_OD8jEF3REeiwL5tPgFMcjQ"/>
@@ -3142,7 +3300,6 @@ NOTE 3: 	When the corresponding NS level is used in the context of NS scaling, t
   <OpenModel_Profile:Obsolete xmi:id="_Rur0UJTYEeiYXO5wr78TUw" base_Element="_3WU1QDa4EeivvI-m1BaAbA"/>
   <OpenModel_Profile:Obsolete xmi:id="_VfRxEJTYEeiYXO5wr78TUw" base_Element="_TXQisDa0Eei23_xWdimG9w"/>
   <OpenModel_Profile:Obsolete xmi:id="_XetSMJTYEeiYXO5wr78TUw" base_Element="_mxsiIDa0Eei23_xWdimG9w"/>
-  <OpenModel_Profile:Obsolete xmi:id="_cq-iwJTYEeiYXO5wr78TUw" base_Element="_86kMkDdKEeiIfPeSAqyGdQ"/>
   <OpenModel_Profile:Obsolete xmi:id="_kKQXwJTYEeiYXO5wr78TUw" base_Element="_DpVfADa5EeivvI-m1BaAbA"/>
   <OpenModel_Profile:Obsolete xmi:id="_nXoSsJTYEeiYXO5wr78TUw" base_Element="_gv2iMDa5EeivvI-m1BaAbA"/>
   <OpenModel_Profile:Obsolete xmi:id="_oh9-4JTYEeiYXO5wr78TUw" base_Element="_heqI8Da5EeivvI-m1BaAbA"/>
@@ -3156,7 +3313,6 @@ NOTE 3: 	When the corresponding NS level is used in the context of NS scaling, t
   <OpenModel_Profile:Preliminary xmi:id="_2jFfgJT0EeiYXO5wr78TUw" base_Element="_H9PXMDm5EeiWMf5FLWfdLA"/>
   <OpenModel_Profile:Preliminary xmi:id="_PZVAUJT1EeiYXO5wr78TUw" base_Element="_H9RMYDm5EeiWMf5FLWfdLA"/>
   <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="_VFbyEJT2EeiYXO5wr78TUw" base_Element="_zOfv8DQVEeixv_sLOod4lQ"/>
   <OpenModel_Profile:Preliminary xmi:id="_WExIIJT2EeiYXO5wr78TUw" base_Element="_7nJYsDdREeiIfPeSAqyGdQ"/>
@@ -3181,13 +3337,8 @@ NOTE 3: 	When the corresponding NS level is used in the context of NS scaling, t
   <OpenModel_Profile:Preliminary xmi:id="_p35UYJT2EeiYXO5wr78TUw" base_Element="_HklksDkLEeiWMf5FLWfdLA"/>
   <OpenModel_Profile:Preliminary xmi:id="_0deL8JT2EeiYXO5wr78TUw" base_Element="_0lvvQDgREeiOYfGHew0BGg"/>
   <OpenModel_Profile:Preliminary xmi:id="_1cGXYJT2EeiYXO5wr78TUw" base_Element="_uA9FMDgUEeiOYfGHew0BGg"/>
-  <OpenModel_Profile:Preliminary xmi:id="_2YGFkJT2EeiYXO5wr78TUw" base_Element="_DgtLUDgVEeiOYfGHew0BGg"/>
   <OpenModel_Profile:Preliminary xmi:id="_3WCUgJT2EeiYXO5wr78TUw" base_Element="_2-_hwDgVEeiOYfGHew0BGg"/>
   <OpenModel_Profile:Preliminary xmi:id="_4T-jcJT2EeiYXO5wr78TUw" base_Element="_s7WyQDgYEeiOYfGHew0BGg"/>
-  <OpenModel_Profile:Preliminary xmi:id="_5KR5UJT2EeiYXO5wr78TUw" base_Element="_-SutwDgYEeiOYfGHew0BGg"/>
-  <OpenModel_Profile:Preliminary xmi:id="_6D5B4JT2EeiYXO5wr78TUw" base_Element="__S0RwDgYEeiOYfGHew0BGg"/>
-  <OpenModel_Profile:Preliminary xmi:id="_7RbzEJT2EeiYXO5wr78TUw" base_Element="_AApoIDgZEeiOYfGHew0BGg"/>
-  <OpenModel_Profile:Preliminary xmi:id="_-cahUJT2EeiYXO5wr78TUw" base_Element="_BYBDsDgZEeiOYfGHew0BGg"/>
   <OpenModel_Profile:Preliminary xmi:id="_HjFx8JT3EeiYXO5wr78TUw" base_Element="_oFQM8Dd-EeiIfPeSAqyGdQ"/>
   <OpenModel_Profile:Preliminary xmi:id="_IrN3oJT3EeiYXO5wr78TUw" base_Element="_v0nsYDd-EeiIfPeSAqyGdQ"/>
   <OpenModel_Profile:Preliminary xmi:id="_zuNAQJT4EeiYXO5wr78TUw" base_Element="_AC2eIDQUEeixv_sLOod4lQ"/>
@@ -3195,7 +3346,6 @@ NOTE 3: 	When the corresponding NS level is used in the context of NS scaling, t
   <OpenModel_Profile:Preliminary xmi:id="_2KjG4JT4EeiYXO5wr78TUw" base_Element="_qgZPIDd9EeiIfPeSAqyGdQ"/>
   <OpenModel_Profile:Preliminary xmi:id="_3eA54JT4EeiYXO5wr78TUw" base_Element="_rY7ZoDd9EeiIfPeSAqyGdQ"/>
   <OpenModel_Profile:Preliminary xmi:id="_4brcAJT4EeiYXO5wr78TUw" base_Element="_1X3vADd9EeiIfPeSAqyGdQ"/>
-  <OpenModel_Profile:Preliminary xmi:id="_5l2wIJT4EeiYXO5wr78TUw" base_Element="_2FzMADd9EeiIfPeSAqyGdQ"/>
   <OpenModel_Profile:Preliminary xmi:id="_-2rJgJT4EeiYXO5wr78TUw" base_Element="_AmzWYDQtEeixv_sLOod4lQ"/>
   <OpenModel_Profile:Preliminary xmi:id="_DQS1IJT5EeiYXO5wr78TUw" base_Element="_e5WnwDOREeiHat9KcP8uWA"/>
   <OpenModel_Profile:Preliminary xmi:id="_ETQG8JT5EeiYXO5wr78TUw" base_Element="_l8PhgDWbEei9Ia34RXjpEg"/>
@@ -3215,7 +3365,6 @@ NOTE 3: 	When the corresponding NS level is used in the context of NS scaling, t
   <OpenModel_Profile:Preliminary xmi:id="_2OIJ4JT5EeiYXO5wr78TUw" base_Element="_dP31MDg2EeiOYfGHew0BGg"/>
   <OpenModel_Profile:Preliminary xmi:id="_KwokoJT6EeiYXO5wr78TUw" base_Element="_-gDvwDOREeiHat9KcP8uWA"/>
   <OpenModel_Profile:Preliminary xmi:id="_LvyUgJT6EeiYXO5wr78TUw" base_Element="_CEDZsDatEei23_xWdimG9w"/>
-  <OpenModel_Profile:Preliminary xmi:id="_MnfYkJT6EeiYXO5wr78TUw" base_Element="_Z9PKcDavEei23_xWdimG9w"/>
   <OpenModel_Profile:Preliminary xmi:id="_NpAf8JT6EeiYXO5wr78TUw" base_Element="_cn9ugDazEei23_xWdimG9w"/>
   <OpenModel_Profile:Preliminary xmi:id="_PgxS0JT6EeiYXO5wr78TUw" base_Element="_6gNJkDazEei23_xWdimG9w"/>
   <OpenModel_Profile:Preliminary xmi:id="_RGLxcJT6EeiYXO5wr78TUw" base_Element="_1iyicDa1Eei23_xWdimG9w"/>
@@ -3233,19 +3382,14 @@ NOTE 3: 	When the corresponding NS level is used in the context of NS scaling, t
   <OpenModel_Profile:Preliminary xmi:id="_f7M9kJT9EeiYXO5wr78TUw" base_Element="_bcG5ADarEei23_xWdimG9w"/>
   <OpenModel_Profile:Preliminary xmi:id="_gzc0MJT9EeiYXO5wr78TUw" base_Element="_k5xGQDarEei23_xWdimG9w"/>
   <OpenModel_Profile:Preliminary xmi:id="_hk9wsJT9EeiYXO5wr78TUw" base_Element="_svqrgDarEei23_xWdimG9w"/>
-  <OpenModel_Profile:Preliminary xmi:id="_iYv-EJT9EeiYXO5wr78TUw" base_Element="_43h1MDarEei23_xWdimG9w"/>
   <OpenModel_Profile:Preliminary xmi:id="_jPJakJT9EeiYXO5wr78TUw" base_Element="_DhvVIDasEei23_xWdimG9w"/>
   <OpenModel_Profile:Preliminary xmi:id="_kF4OQJT9EeiYXO5wr78TUw" base_Element="_QAAzsDasEei23_xWdimG9w"/>
   <OpenModel_Profile:Preliminary xmi:id="_k24NYJT9EeiYXO5wr78TUw" base_Element="_9W_HADm0EeiWMf5FLWfdLA"/>
   <OpenModel_Profile:Preliminary xmi:id="_okUIcJT9EeiYXO5wr78TUw" base_Element="_SW0-ADm1EeiWMf5FLWfdLA"/>
   <OpenModel_Profile:Preliminary xmi:id="_wwBloJT9EeiYXO5wr78TUw" base_Element="_4y_6QDdKEeiIfPeSAqyGdQ"/>
-  <OpenModel_Profile:Preliminary xmi:id="_xmy1kJT9EeiYXO5wr78TUw" base_Element="_6sJ0QDdKEeiIfPeSAqyGdQ"/>
   <OpenModel_Profile:Preliminary xmi:id="_yaOdoJT9EeiYXO5wr78TUw" base_Element="_7J45IDdKEeiIfPeSAqyGdQ"/>
-  <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="_dvFHcJUBEeiYXO5wr78TUw" base_Element="_ISONYDOSEeiHat9KcP8uWA"/>
-  <OpenModel_Profile:Preliminary xmi:id="_eoLSoJUBEeiYXO5wr78TUw" base_Element="_aikFADdzEeiIfPeSAqyGdQ"/>
   <OpenModel_Profile:Preliminary xmi:id="_fhlm4JUBEeiYXO5wr78TUw" base_Element="_bEqsgDdzEeiIfPeSAqyGdQ"/>
   <OpenModel_Profile:Preliminary xmi:id="_gUAiUJUBEeiYXO5wr78TUw" base_Element="_dFetsDdzEeiIfPeSAqyGdQ"/>
   <OpenModel_Profile:Preliminary xmi:id="_hMMukJUBEeiYXO5wr78TUw" base_Element="_cCrM4DdzEeiIfPeSAqyGdQ"/>
@@ -3258,7 +3402,6 @@ NOTE 3: 	When the corresponding NS level is used in the context of NS scaling, t
   <OpenModel_Profile:Preliminary xmi:id="_1-YuoJUCEeiYXO5wr78TUw" base_Element="_f1tDUDnIEeiWMf5FLWfdLA"/>
   <OpenModel_Profile:Preliminary xmi:id="_3CVe8JUCEeiYXO5wr78TUw" base_Element="_PJk5sjnHEeiWMf5FLWfdLA"/>
   <OpenModel_Profile:Preliminary xmi:id="_BPOwwJUDEeiYXO5wr78TUw" base_Element="_DZsyMDnHEeiWMf5FLWfdLA"/>
-  <OpenModel_Profile:Preliminary xmi:id="_CdZ0EJUDEeiYXO5wr78TUw" base_Element="_7vMSsDnIEeiWMf5FLWfdLA"/>
   <OpenModel_Profile:Preliminary xmi:id="_DYdHEJUDEeiYXO5wr78TUw" base_Element="_Eu3jcDnJEeiWMf5FLWfdLA"/>
   <OpenModel_Profile:Experimental xmi:id="_sbe_kJUDEeiYXO5wr78TUw" base_Element="_jH_PgF3PEeiwL5tPgFMcjQ"/>
   <OpenModel_Profile:Experimental xmi:id="_trhEEJUDEeiYXO5wr78TUw" base_Element="_xJolUF3PEeiwL5tPgFMcjQ"/>
@@ -3368,8 +3511,6 @@ NOTE 3: 	When the corresponding NS level is used in the context of NS scaling, t
   <OpenModel_Profile:OpenModelAttribute xmi:id="_etn7YJs4EeiPBvbfaqSLYg" base_StructuralFeature="_etnUUJs4EeiPBvbfaqSLYg"/>
   <OpenModel_Profile:Preliminary xmi:id="_XJr_EJwYEeiPD5fN_oRNAg" base_Element="__lR54DkMEeiWMf5FLWfdLA"/>
   <OpenModel_Profile:Preliminary xmi:id="_aIbBEJwYEeiPD5fN_oRNAg" base_Element="_zxa4AzQvEeixv_sLOod4lQ"/>
-  <OpenModel_Profile:Preliminary xmi:id="_bydhAJwYEeiPD5fN_oRNAg" base_Element="_ET6SUDTSEeiwQ6KPLHcy4g"/>
-  <OpenModel_Profile:Preliminary xmi:id="_dfylgJwYEeiPD5fN_oRNAg" base_Element="_yfk1oDkREeiWMf5FLWfdLA"/>
   <OpenModel_Profile:Preliminary xmi:id="_gJ6pcJwYEeiPD5fN_oRNAg" base_Element="_vRv1QDQPEeixv_sLOod4lQ"/>
   <OpenModel_Profile:Preliminary xmi:id="_hGY4wJwYEeiPD5fN_oRNAg" base_Element="_u3gwwDOVEeiHat9KcP8uWA"/>
   <OpenModel_Profile:Preliminary xmi:id="_iAtzAJwYEeiPD5fN_oRNAg" base_Element="_nXwUATkOEeiWMf5FLWfdLA"/>
@@ -3384,7 +3525,6 @@ NOTE 3: 	When the corresponding NS level is used in the context of NS scaling, t
   <OpenModel_Profile:Preliminary xmi:id="_E2paoJwaEeiPD5fN_oRNAg" base_Element="_345dADabEei23_xWdimG9w"/>
   <OpenModel_Profile:Preliminary xmi:id="_Fu54UJwaEeiPD5fN_oRNAg" base_Element="_uwHosDadEei23_xWdimG9w"/>
   <OpenModel_Profile:Preliminary xmi:id="_LHLkkJwaEeiPD5fN_oRNAg" base_Element="_guTdEjm5EeiWMf5FLWfdLA"/>
-  <OpenModel_Profile:Preliminary xmi:id="_QXm8YJwaEeiPD5fN_oRNAg" base_Element="_e_qiMDgSEeiOYfGHew0BGg"/>
   <OpenModel_Profile:Preliminary xmi:id="_RjrG4JwaEeiPD5fN_oRNAg" base_Element="_uohQ8jgTEeiOYfGHew0BGg"/>
   <OpenModel_Profile:Preliminary xmi:id="_ZIMoQJwaEeiPD5fN_oRNAg" base_Element="_Y7jjYTnCEeiWMf5FLWfdLA"/>
   <OpenModel_Profile:Preliminary xmi:id="_aobE4JwaEeiPD5fN_oRNAg" base_Element="_dlMuEkKAEeiwbqJBYHKltg"/>
@@ -3397,7 +3537,6 @@ NOTE 3: 	When the corresponding NS level is used in the context of NS scaling, t
   <OpenModel_Profile:Preliminary xmi:id="_iBQ6sJwaEeiPD5fN_oRNAg" base_Element="_KN9YcTnAEeiWMf5FLWfdLA"/>
   <OpenModel_Profile:Preliminary xmi:id="_lGtBoJwaEeiPD5fN_oRNAg" base_Element="_uf0ZQDdVEeiIfPeSAqyGdQ"/>
   <OpenModel_Profile:Preliminary xmi:id="_mUbZAJwaEeiPD5fN_oRNAg" base_Element="_hzG3ETm7EeiWMf5FLWfdLA"/>
-  <OpenModel_Profile:Preliminary xmi:id="_n0WToJwaEeiPD5fN_oRNAg" base_Element="_oUh1Ujm-EeiWMf5FLWfdLA"/>
   <OpenModel_Profile:Experimental xmi:id="_x5OR4JwaEeiPD5fN_oRNAg" base_Element="_HAitoF-FEeiaLPXj8My4aQ"/>
   <OpenModel_Profile:Experimental xmi:id="_zAqbEJwaEeiPD5fN_oRNAg" base_Element="_PG3MwGkCEeip9umi7zNprw"/>
   <OpenModel_Profile:Experimental xmi:id="_0gpnIJwaEeiPD5fN_oRNAg" base_Element="_inPiUH7eEei4v5WRHqfM1Q"/>
@@ -3498,4 +3637,152 @@ NOTE 3: 	When the corresponding NS level is used in the context of NS scaling, t
   <OpenModel_Profile:Future xmi:id="_DhzH0KewEeixw5Ke5QD1pQ" base_Element="_45XE4DzEEeiWMf5FLWfdLA"/>
   <OpenModel_Profile:Future xmi:id="_caI6YKewEeixw5Ke5QD1pQ" base_Element="_1WdwcDzFEeiWMf5FLWfdLA"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_0kRp0bxOEeiMnLuHd6ALAg" base_StructuralFeature="_0kRp0LxOEeiMnLuHd6ALAg"/>
+  <OpenModel_Profile:Reference xmi:id="_X0ARgCotEemZ-7haRVvogQ" base_Element="_aaEZADOREeiHat9KcP8uWA" reference="IFA011 v2.5.1"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_-KSlACovEemZ-7haRVvogQ" base_StructuralFeature="_-KR98CovEemZ-7haRVvogQ"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_-KZSsCovEemZ-7haRVvogQ" base_StructuralFeature="_-KYroCovEemZ-7haRVvogQ"/>
+  <OpenModel_Profile:Preliminary xmi:id="_pc1pECowEemZ-7haRVvogQ" base_Element="_-KR98CovEemZ-7haRVvogQ"/>
+  <OpenModel_Profile:Obsolete xmi:id="_dg_lUCo0EemZ-7haRVvogQ" base_Element="_ET6SUDTSEeiwQ6KPLHcy4g"/>
+  <OpenModel_Profile:Obsolete xmi:id="_091DMCo0EemZ-7haRVvogQ" base_Element="_ETpMkDTSEeiwQ6KPLHcy4g"/>
+  <OpenModel_Profile:Reference xmi:id="_RkW-wCo1EemZ-7haRVvogQ" base_Element="_e5WnwDOREeiHat9KcP8uWA" reference="IFA011 v2.5.1"/>
+  <OpenModel_Profile:PassedByReference xmi:id="_O33G0Co2EemZ-7haRVvogQ" base_Property="_345dADabEei23_xWdimG9w"/>
+  <OpenModel_Profile:PassedByReference xmi:id="_SESmkCo2EemZ-7haRVvogQ" base_Property="_uwHosDadEei23_xWdimG9w"/>
+  <OpenModel_Profile:PassedByReference xmi:id="_hPlFACo2EemZ-7haRVvogQ" base_Property="_MxzowjagEei23_xWdimG9w"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_NQ4FcCo3EemZ-7haRVvogQ" base_StructuralFeature="_NQ3eYCo3EemZ-7haRVvogQ"/>
+  <OpenModel_Profile:Experimental xmi:id="_QfLYACo4EemZ-7haRVvogQ" base_Element="_NQ3eYCo3EemZ-7haRVvogQ"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_kmLigCo4EemZ-7haRVvogQ" base_Comment="_kl9gECo4EemZ-7haRVvogQ" language="org.eclipse.papyrus.uml.textedit.property.xtext.UmlProperty"/>
+  <OpenModel_Profile:Reference xmi:id="_8uslMCo5EemS0_wZSU3sbA" base_Element="_J0Zx0DOSEeiHat9KcP8uWA" reference="IFA011 v2.5.1"/>
+  <OpenModel_Profile:OpenModelClass xmi:id="_u4E-MCo6EemS0_wZSU3sbA" base_Class="_u4EXICo6EemS0_wZSU3sbA"/>
+  <OpenModel_Profile:Preliminary xmi:id="_6WjzsCo6EemS0_wZSU3sbA" base_Element="_u4EXICo6EemS0_wZSU3sbA"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_iGr54Co7EemS0_wZSU3sbA" base_StructuralFeature="_iGrS0Co7EemS0_wZSU3sbA"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_iGwyYCo7EemS0_wZSU3sbA" base_StructuralFeature="_iGwLUCo7EemS0_wZSU3sbA"/>
+  <OpenModel_Profile:Preliminary xmi:id="_2flFoCo7EemS0_wZSU3sbA" base_Element="_iGrS0Co7EemS0_wZSU3sbA"/>
+  <OpenModel_Profile:PassedByReference xmi:id="_2gbaMCo7EemS0_wZSU3sbA" base_Property="_iGrS0Co7EemS0_wZSU3sbA"/>
+  <OpenModel_Profile:Reference xmi:id="_S1lR4Co8EemS0_wZSU3sbA" base_Element="_-gDvwDOREeiHat9KcP8uWA" reference="IFA011 v2.5.1"/>
+  <OpenModel_Profile:OpenModelClass xmi:id="_Lpvg0Co9EemS0_wZSU3sbA" base_Class="_Lpu5wCo9EemS0_wZSU3sbA"/>
+  <OpenModel_Profile:Experimental xmi:id="_U_TiACo9EemS0_wZSU3sbA" base_Element="_Lpu5wCo9EemS0_wZSU3sbA"/>
+  <OpenModel_Profile:Reference xmi:id="_XAFG8Co9EemS0_wZSU3sbA" base_Element="_Lpu5wCo9EemS0_wZSU3sbA" reference="IFA011 v2.5.1"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_qPKyACo9EemS0_wZSU3sbA" base_StructuralFeature="_qPKK8Co9EemS0_wZSU3sbA" isInvariant="true"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_7P6WMCo9EemS0_wZSU3sbA" base_StructuralFeature="_7P3S4Co9EemS0_wZSU3sbA"/>
+  <OpenModel_Profile:Experimental xmi:id="_ZxykICo-EemS0_wZSU3sbA" base_Element="_qPKK8Co9EemS0_wZSU3sbA"/>
+  <OpenModel_Profile:Experimental xmi:id="_bZTUgCo-EemS0_wZSU3sbA" base_Element="_7P3S4Co9EemS0_wZSU3sbA"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_gmS90Co-EemS0_wZSU3sbA" base_StructuralFeature="_gmSWwCo-EemS0_wZSU3sbA"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_gmWBICo-EemS0_wZSU3sbA" base_StructuralFeature="_gmVaESo-EemS0_wZSU3sbA"/>
+  <OpenModel_Profile:Experimental xmi:id="_IiUK8Co_EemS0_wZSU3sbA" base_Element="_gmSWwCo-EemS0_wZSU3sbA"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_4oVvoSpAEemS0_wZSU3sbA" base_StructuralFeature="_4oVvoCpAEemS0_wZSU3sbA"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_FFksYSpBEemS0_wZSU3sbA" base_StructuralFeature="_FFksYCpBEemS0_wZSU3sbA"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_aQl4oSpBEemS0_wZSU3sbA" base_StructuralFeature="_aQl4oCpBEemS0_wZSU3sbA"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_p2pAcSpBEemS0_wZSU3sbA" base_StructuralFeature="_p2pAcCpBEemS0_wZSU3sbA"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_BecYMSpCEemS0_wZSU3sbA" base_StructuralFeature="_BecYMCpCEemS0_wZSU3sbA"/>
+  <OpenModel_Profile:Experimental xmi:id="_QP1I4CpCEemS0_wZSU3sbA" base_Element="_BecYMCpCEemS0_wZSU3sbA"/>
+  <OpenModel_Profile:Reference xmi:id="_CfmdwCpDEemS0_wZSU3sbA" base_Element="_K_9mADOSEeiHat9KcP8uWA" reference="IFA011 v2.5.1"/>
+  <OpenModel_Profile:Experimental xmi:id="_Vny2oCpDEemS0_wZSU3sbA" base_Element="_6sJ0QDdKEeiIfPeSAqyGdQ"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_nb_4ESpDEemS0_wZSU3sbA" base_StructuralFeature="_nb_4ECpDEemS0_wZSU3sbA"/>
+  <OpenModel_Profile:Experimental xmi:id="_RS7SsCpEEemS0_wZSU3sbA" base_Element="_nb_4ECpDEemS0_wZSU3sbA"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_WPIuACpEEemS0_wZSU3sbA" base_StructuralFeature="_WPIG8CpEEemS0_wZSU3sbA"/>
+  <OpenModel_Profile:Experimental xmi:id="_gX-mQCpEEemS0_wZSU3sbA" base_Element="_WPIG8CpEEemS0_wZSU3sbA"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_orwaUCpEEemS0_wZSU3sbA" base_StructuralFeature="_orvzQCpEEemS0_wZSU3sbA"/>
+  <OpenModel_Profile:Experimental xmi:id="_v8utkCpEEemS0_wZSU3sbA" base_Element="_orvzQCpEEemS0_wZSU3sbA"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_DVD0MSpFEemS0_wZSU3sbA" base_StructuralFeature="_DVD0MCpFEemS0_wZSU3sbA"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_Xbog4SpFEemS0_wZSU3sbA" base_StructuralFeature="_Xbog4CpFEemS0_wZSU3sbA"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_fcJasSpFEemS0_wZSU3sbA" base_StructuralFeature="_fcJasCpFEemS0_wZSU3sbA"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_pEfN8CpFEemS0_wZSU3sbA" base_StructuralFeature="_pEem4CpFEemS0_wZSU3sbA"/>
+  <OpenModel_Profile:PassedByReference xmi:id="_2kTpECpFEemS0_wZSU3sbA" base_Property="_pEem4CpFEemS0_wZSU3sbA"/>
+  <OpenModel_Profile:Reference xmi:id="_nEaXICpGEemS0_wZSU3sbA" base_Element="_AC2eIDQUEeixv_sLOod4lQ" reference="IFA011 v2.5.1"/>
+  <OpenModel_Profile:Obsolete xmi:id="_yh6VMCpGEemS0_wZSU3sbA" base_Element="_aQl4oCpBEemS0_wZSU3sbA"/>
+  <OpenModel_Profile:Experimental xmi:id="_3AyUQCpGEemS0_wZSU3sbA" base_Element="_iunqUCpAEemS0_wZSU3sbA"/>
+  <OpenModel_Profile:Experimental xmi:id="_8rXRcCpGEemS0_wZSU3sbA" base_Element="_4oVvoCpAEemS0_wZSU3sbA"/>
+  <OpenModel_Profile:Experimental xmi:id="_99K3kCpGEemS0_wZSU3sbA" base_Element="_FFksYCpBEemS0_wZSU3sbA"/>
+  <OpenModel_Profile:Experimental xmi:id="__m0V8CpGEemS0_wZSU3sbA" base_Element="_p2pAcCpBEemS0_wZSU3sbA"/>
+  <OpenModel_Profile:Experimental xmi:id="_BNFwMCpHEemS0_wZSU3sbA" base_Element="_5p1FACpEEemS0_wZSU3sbA"/>
+  <OpenModel_Profile:Experimental xmi:id="_C3dAQCpHEemS0_wZSU3sbA" base_Element="_DVD0MCpFEemS0_wZSU3sbA"/>
+  <OpenModel_Profile:Experimental xmi:id="_FMAc0CpHEemS0_wZSU3sbA" base_Element="_OCLeMCpFEemS0_wZSU3sbA"/>
+  <OpenModel_Profile:Experimental xmi:id="_ImltUCpHEemS0_wZSU3sbA" base_Element="_Xbog4CpFEemS0_wZSU3sbA"/>
+  <OpenModel_Profile:Experimental xmi:id="_KAgtoCpHEemS0_wZSU3sbA" base_Element="_fcJasCpFEemS0_wZSU3sbA"/>
+  <OpenModel_Profile:Experimental xmi:id="_Lw9-oCpHEemS0_wZSU3sbA" base_Element="_pEem4CpFEemS0_wZSU3sbA"/>
+  <OpenModel_Profile:OpenModelClass xmi:id="_-5__ECr9EemS0_wZSU3sbA" base_Class="_-5-w8Cr9EemS0_wZSU3sbA"/>
+  <OpenModel_Profile:Experimental xmi:id="_GsfD8Cr-EemS0_wZSU3sbA" base_Element="_-5-w8Cr9EemS0_wZSU3sbA"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_ZuR54Sr-EemS0_wZSU3sbA" base_StructuralFeature="_ZuR54Cr-EemS0_wZSU3sbA"/>
+  <OpenModel_Profile:Experimental xmi:id="_a8hZMCr_EemS0_wZSU3sbA" base_Element="_ZuR54Cr-EemS0_wZSU3sbA"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_248n0Sr_EemS0_wZSU3sbA" base_StructuralFeature="_248n0Cr_EemS0_wZSU3sbA"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_24_EECr_EemS0_wZSU3sbA" base_StructuralFeature="_24-dASr_EemS0_wZSU3sbA"/>
+  <OpenModel_Profile:Preliminary xmi:id="_gagPYCsAEemS0_wZSU3sbA" base_Element="_248n0Cr_EemS0_wZSU3sbA"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_GWfecCsBEemS0_wZSU3sbA" base_StructuralFeature="_GWe3YSsBEemS0_wZSU3sbA"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_GWh6sSsBEemS0_wZSU3sbA" base_StructuralFeature="_GWh6sCsBEemS0_wZSU3sbA"/>
+  <OpenModel_Profile:Preliminary xmi:id="_jjlqwCsBEemS0_wZSU3sbA" base_Element="_GWe3YSsBEemS0_wZSU3sbA"/>
+  <OpenModel_Profile:PassedByReference xmi:id="_nVYhYCsBEemS0_wZSU3sbA" base_Property="_GWe3YSsBEemS0_wZSU3sbA"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_6rv5ICsBEemS0_wZSU3sbA" base_StructuralFeature="_6rvSESsBEemS0_wZSU3sbA"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_6rxuUSsBEemS0_wZSU3sbA" base_StructuralFeature="_6rxuUCsBEemS0_wZSU3sbA"/>
+  <OpenModel_Profile:Experimental xmi:id="_SjqwgCsCEemS0_wZSU3sbA" base_Element="_6rvSESsBEemS0_wZSU3sbA"/>
+  <OpenModel_Profile:PassedByReference xmi:id="_ajNZ8CsCEemS0_wZSU3sbA" base_Property="_6rvSESsBEemS0_wZSU3sbA"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_qCsxUCsDEemS0_wZSU3sbA" base_StructuralFeature="_qCsKQisDEemS0_wZSU3sbA"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_qCumgisDEemS0_wZSU3sbA" base_StructuralFeature="_qCumgSsDEemS0_wZSU3sbA"/>
+  <OpenModel_Profile:Preliminary xmi:id="_Jk5z0CsEEemS0_wZSU3sbA" base_Element="_qCsKQisDEemS0_wZSU3sbA"/>
+  <OpenModel_Profile:Reference xmi:id="_OOhqUCsEEemS0_wZSU3sbA" base_Element="_-5-w8Cr9EemS0_wZSU3sbA" reference="IFA011 v2.5.1"/>
+  <OpenModel_Profile:Reference xmi:id="_XxQk0CsEEemS0_wZSU3sbA" base_Element="_zOfv8DQVEeixv_sLOod4lQ" reference="IFA011 v2.5.1"/>
+  <OpenModel_Profile:Reference xmi:id="_0uXNUCsEEemS0_wZSU3sbA" base_Element="_AmzWYDQtEeixv_sLOod4lQ" reference="IFA011 v2.5.1"/>
+  <OpenModel_Profile:PassedByReference xmi:id="_UGGsQCsFEemS0_wZSU3sbA" base_Property="_uf0ZQDdVEeiIfPeSAqyGdQ"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_lZbOMSsFEemS0_wZSU3sbA" base_StructuralFeature="_lZbOMCsFEemS0_wZSU3sbA" support="CONDITIONAL_MANDATORY" condition="Either intVirtualLinkDesc or intCpd shall be present."/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_lZ69cSsFEemS0_wZSU3sbA" base_StructuralFeature="_lZ69cCsFEemS0_wZSU3sbA"/>
+  <OpenModel_Profile:Experimental xmi:id="_gX9C8CsGEemS0_wZSU3sbA" base_Element="_lZbOMCsFEemS0_wZSU3sbA"/>
+  <OpenModel_Profile:PassedByReference xmi:id="_km5voCsGEemS0_wZSU3sbA" base_Property="_lZbOMCsFEemS0_wZSU3sbA"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_6rucQSsHEemS0_wZSU3sbA" base_StructuralFeature="_6rucQCsHEemS0_wZSU3sbA"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_6rw4gSsHEemS0_wZSU3sbA" base_StructuralFeature="_6rw4gCsHEemS0_wZSU3sbA"/>
+  <OpenModel_Profile:Reference xmi:id="_m7XasCsIEemS0_wZSU3sbA" base_Element="_ISONYDOSEeiHat9KcP8uWA" reference="IFA011 v2.5.1"/>
+  <OpenModel_Profile:Preliminary xmi:id="_88WloCsIEemS0_wZSU3sbA" base_Element="_6rucQCsHEemS0_wZSU3sbA"/>
+  <OpenModel_Profile:PassedByReference xmi:id="_89X5UCsIEemS0_wZSU3sbA" base_Property="_6rucQCsHEemS0_wZSU3sbA"/>
+  <OpenModel_Profile:Experimental xmi:id="_E26L8CsKEemS0_wZSU3sbA" base_Element="_H9Vd0Dm5EeiWMf5FLWfdLA"/>
+  <OpenModel_Profile:PassedByReference xmi:id="_ZIkHQCsKEemS0_wZSU3sbA" base_Property="_H9Vd0Dm5EeiWMf5FLWfdLA"/>
+  <OpenModel_Profile:Reference xmi:id="_5JnB4CsKEemS0_wZSU3sbA" base_Element="_0lvvQDgREeiOYfGHew0BGg" reference="IFA011 v2.5.1"/>
+  <OpenModel_Profile:Reference xmi:id="_RWmKUCsLEemS0_wZSU3sbA" base_Element="_p0UVsDQvEeixv_sLOod4lQ" reference="IFA011 v2.5.1"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_oGtFESsLEemS0_wZSU3sbA" base_StructuralFeature="_oGtFECsLEemS0_wZSU3sbA"/>
+  <OpenModel_Profile:Experimental xmi:id="_2DESQCsLEemS0_wZSU3sbA" base_Element="_oGtFECsLEemS0_wZSU3sbA"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_J483kCsMEemS0_wZSU3sbA" base_StructuralFeature="_J48QgCsMEemS0_wZSU3sbA"/>
+  <OpenModel_Profile:Experimental xmi:id="_UM5zoCsMEemS0_wZSU3sbA" base_Element="_J48QgCsMEemS0_wZSU3sbA"/>
+  <OpenModel_Profile:Reference xmi:id="_I2AXYCsNEemS0_wZSU3sbA" base_Element="_tEnEsDTSEeiwQ6KPLHcy4g" reference="IFA011 v2.5.1"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_ZqSM4CsNEemS0_wZSU3sbA" base_StructuralFeature="_ZqRl0isNEemS0_wZSU3sbA"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_ZqUCEisNEemS0_wZSU3sbA" base_StructuralFeature="_ZqUCESsNEemS0_wZSU3sbA"/>
+  <OpenModel_Profile:Experimental xmi:id="_qqY34CsNEemS0_wZSU3sbA" base_Element="_ZqRl0isNEemS0_wZSU3sbA"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_PYklICsQEemS0_wZSU3sbA" base_StructuralFeature="_PYj-ECsQEemS0_wZSU3sbA" isInvariant="true"/>
+  <OpenModel_Profile:Experimental xmi:id="_Yq328CsQEemS0_wZSU3sbA" base_Element="_PYj-ECsQEemS0_wZSU3sbA"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_ix8_MCsREemS0_wZSU3sbA" base_StructuralFeature="_ix8YIisREemS0_wZSU3sbA"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_ix-0YSsREemS0_wZSU3sbA" base_StructuralFeature="_ix-0YCsREemS0_wZSU3sbA"/>
+  <OpenModel_Profile:Experimental xmi:id="_Y1jLACsSEemS0_wZSU3sbA" base_Element="_ix8YIisREemS0_wZSU3sbA"/>
+  <OpenModel_Profile:PassedByReference xmi:id="_Y29gQCsSEemS0_wZSU3sbA" base_Property="_ix8YIisREemS0_wZSU3sbA"/>
+  <OpenModel_Profile:Experimental xmi:id="_EoLdUCsTEemS0_wZSU3sbA" base_Element="_5LWhwBx5Eemit6R65X1VNQ"/>
+  <OpenModel_Profile:Reference xmi:id="_BP2F8CvLEemS0_wZSU3sbA" base_Element="_6C8F4DnAEeiWMf5FLWfdLA" reference="IFA011 v2.5.1"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_O353ECvLEemS0_wZSU3sbA" base_StructuralFeature="_O35QACvLEemS0_wZSU3sbA" isInvariant="true"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_ZpVZUSvLEemS0_wZSU3sbA" base_StructuralFeature="_ZpVZUCvLEemS0_wZSU3sbA"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_hiiKMCvLEemS0_wZSU3sbA" base_StructuralFeature="_hig8ECvLEemS0_wZSU3sbA"/>
+  <OpenModel_Profile:Experimental xmi:id="_rkuA0CvLEemS0_wZSU3sbA" base_Element="_O35QACvLEemS0_wZSU3sbA"/>
+  <OpenModel_Profile:Experimental xmi:id="_tJg0YCvLEemS0_wZSU3sbA" base_Element="_ZpVZUCvLEemS0_wZSU3sbA"/>
+  <OpenModel_Profile:Experimental xmi:id="_u0qHkCvLEemS0_wZSU3sbA" base_Element="_hig8ECvLEemS0_wZSU3sbA"/>
+  <OpenModel_Profile:Reference xmi:id="_yVHWkCvLEemS0_wZSU3sbA" base_Element="_DlOpkDnDEeiWMf5FLWfdLA" reference="IFA011 v2.5.1"/>
+  <OpenModel_Profile:PassedByReference xmi:id="_DdW0cCvNEemS0_wZSU3sbA" base_Property="_KFKIIDnIEeiWMf5FLWfdLA"/>
+  <OpenModel_Profile:Reference xmi:id="_P06nACvNEemS0_wZSU3sbA" base_Element="_u4EXICo6EemS0_wZSU3sbA" reference="IFA011 v2.5.1"/>
+  <OpenModel_Profile:Reference xmi:id="_UdjmECvNEemS0_wZSU3sbA" base_Element="_M45q8D0REeiuk5pWzMOpfA" reference="IFA011 v2.5.1"/>
+  <OpenModel_Profile:Reference xmi:id="_dqLtsCvNEemS0_wZSU3sbA" base_Element="_8BUXwDm4EeiWMf5FLWfdLA" reference="IFA011 v2.5.1"/>
+  <OpenModel_Profile:Reference xmi:id="_hK4NQCvNEemS0_wZSU3sbA" base_Element="_oFQM8Dd-EeiIfPeSAqyGdQ" reference="IFA011 v2.5.1"/>
+  <OpenModel_Profile:Reference xmi:id="_o5LVsCvNEemS0_wZSU3sbA" base_Element="_lp6e4DatEei23_xWdimG9w" reference="IFA011 v2.5.1"/>
+  <OpenModel_Profile:Reference xmi:id="_srGIICvNEemS0_wZSU3sbA" base_Element="_AJK9MDa0Eei23_xWdimG9w" reference="IFA011 v2.5.1"/>
+  <OpenModel_Profile:Reference xmi:id="_xq1YkCvNEemS0_wZSU3sbA" base_Element="_tIZ6oDa2Eei23_xWdimG9w" reference="IFA011 v2.5.1"/>
+  <OpenModel_Profile:Reference xmi:id="_2s5kQCvNEemS0_wZSU3sbA" base_Element="_B1G2UDd_EeiIfPeSAqyGdQ" reference="IFA011 v2.5.1"/>
+  <OpenModel_Profile:Reference xmi:id="_5dZV8CvNEemS0_wZSU3sbA" base_Element="_ZqQQ8DkIEeiWMf5FLWfdLA" reference="IFA011 v2.5.1"/>
+  <OpenModel_Profile:Reference xmi:id="_8Si-ICvNEemS0_wZSU3sbA" base_Element="_iZQzADkJEeiWMf5FLWfdLA" reference="IFA011 v2.5.1"/>
+  <OpenModel_Profile:Reference xmi:id="_AI0FECvOEemS0_wZSU3sbA" base_Element="_1HQGsDkKEeiWMf5FLWfdLA" reference="IFA011 v2.5.1"/>
+  <OpenModel_Profile:Reference xmi:id="_DALTwCvOEemS0_wZSU3sbA" base_Element="_HlF2kDmxEeiWMf5FLWfdLA" reference="IFA011 v2.5.1"/>
+  <OpenModel_Profile:Reference xmi:id="_H4JIQCvOEemS0_wZSU3sbA" base_Element="_MRthQDmyEeiWMf5FLWfdLA" reference="IFA011 v2.5.1"/>
+  <OpenModel_Profile:Reference xmi:id="_L05RsCvOEemS0_wZSU3sbA" base_Element="_EYaAsDnIEeiWMf5FLWfdLA" reference="IFA011 v2.5.1"/>
+  <OpenModel_Profile:Reference xmi:id="_cLtvICvOEemS0_wZSU3sbA" base_Element="_0RG8kEcmEei7eo5RdnNiBQ" reference="IFA011 v2.5.1"/>
+  <OpenModel_Profile:Reference xmi:id="_hAvkYCvOEemS0_wZSU3sbA" base_Element="_ZQtesOzlEei7-e9MrPJW7Q" reference="IFA011 v2.5.1"/>
+  <OpenModel_Profile:Experimental xmi:id="_r1WWcCvOEemS0_wZSU3sbA" base_Element="_kEZoUjzEEeiWMf5FLWfdLA"/>
+  <OpenModel_Profile:Reference xmi:id="_r2aGYCvOEemS0_wZSU3sbA" base_Element="_kEZoUjzEEeiWMf5FLWfdLA" reference="IFA011 v2.5.1"/>
+  <OpenModel_Profile:Reference xmi:id="_vPvZsCvOEemS0_wZSU3sbA" base_Element="_iunqUCpAEemS0_wZSU3sbA" reference="IFA011 v2.5.1"/>
+  <OpenModel_Profile:Reference xmi:id="_yURhsCvOEemS0_wZSU3sbA" base_Element="_5p1FACpEEemS0_wZSU3sbA" reference="IFA011 v2.5.1"/>
+  <OpenModel_Profile:Reference xmi:id="_2DdwQCvOEemS0_wZSU3sbA" base_Element="_OCLeMCpFEemS0_wZSU3sbA" reference="IFA011 v2.5.1"/>
+  <OpenModel_Profile:Reference xmi:id="_ZRmR8CvPEemS0_wZSU3sbA" base_Element="_DZsyMDnHEeiWMf5FLWfdLA" reference="IFA011 v2.5.1"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_lIdyQCvPEemS0_wZSU3sbA" base_StructuralFeature="_lIdLMivPEemS0_wZSU3sbA"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_lIfncSvPEemS0_wZSU3sbA" base_StructuralFeature="_lIfncCvPEemS0_wZSU3sbA"/>
+  <OpenModel_Profile:Experimental xmi:id="_AsiyUCvQEemS0_wZSU3sbA" base_Element="_lIdLMivPEemS0_wZSU3sbA"/>
+  <OpenModel_Profile:PassedByReference xmi:id="_DCFGUCvQEemS0_wZSU3sbA" base_Property="_lIdLMivPEemS0_wZSU3sbA"/>
+  <OpenModel_Profile:Obsolete xmi:id="_GA4c8CvUEemS0_wZSU3sbA" base_Element="_X3eqgDTQEeiwQ6KPLHcy4g"/>
 </xmi:XMI>
author	Hui Deng <denghui12@huawei.com>	2019-02-11 06:31:45 +0000
committer	Gerrit Code Review <gerrit@onap.org>	2019-02-11 06:31:45 +0000
commit	9d00d57bfa1a8b3ac071e0842008c4db6b38d6ba (patch)
tree	96c43f53ff8b59f1e59eeeca3cb6dc789dd83015
parent	abe7c39bcad806d8c23d0ed6f9128c7a23ef8b07 (diff)
parent	d1902a5f7d52c92abae2f3d1585250d1875eab45 (diff)