Changed the Vdu.OsContainerDesc and Vdu.VirtualComputeDesc comment to be per VDU instead of per VNFD

Issue-ID: ONAPMODEL-33
Signed-off-by: Fernando Oliveira <fernando.oliveira@verizon.com>
Change-Id: I574c2033bc660da64c1513c261e4e1cb0c5a11a5

2 files changed, 191 insertions, 191 deletions

diff --git a/ONAP_Information_Model/Vnf.notation b/ONAP_Information_Model/Vnf.notation
index 302b88e..940b015 100644
--- a/ONAP_Information_Model/Vnf.notation
+++ b/ONAP_Information_Model/Vnf.notation
@@ -1427,157 +1427,157 @@
       <element xmi:type="uml:Class" href="Vnf.uml#_ULe1IFBOEeu9q4B_TIiAOQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kwccQVBOEeu9q4B_TIiAOQ" x="1200"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_3WMv0FDlEeur9pJ-DyTLKw" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_3WMv0VDlEeur9pJ-DyTLKw"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_3WMv01DlEeur9pJ-DyTLKw" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_Hub4YFjPEeuqjcP2ukVqPA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_Hub4YVjPEeuqjcP2ukVqPA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_HucfcFjPEeuqjcP2ukVqPA" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="Vnf.uml#_aaEZADOREeiHat9KcP8uWA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3WMv0lDlEeur9pJ-DyTLKw" x="260" y="200"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Hub4YljPEeuqjcP2ukVqPA" x="260" y="200"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_3ZyPUFDlEeur9pJ-DyTLKw" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_3ZyPUVDlEeur9pJ-DyTLKw"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_3ZyPU1DlEeur9pJ-DyTLKw" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_HwOoIFjPEeuqjcP2ukVqPA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_HwOoIVjPEeuqjcP2ukVqPA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_HwOoI1jPEeuqjcP2ukVqPA" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="Vnf.uml#_e5WnwDOREeiHat9KcP8uWA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3ZyPUlDlEeur9pJ-DyTLKw" x="380" y="580"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HwOoIljPEeuqjcP2ukVqPA" x="380" y="580"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_3bxMUFDlEeur9pJ-DyTLKw" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_3bxMUVDlEeur9pJ-DyTLKw"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_3bxMU1DlEeur9pJ-DyTLKw" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_Hw7ywFjPEeuqjcP2ukVqPA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_Hw7ywVjPEeuqjcP2ukVqPA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Hw7yw1jPEeuqjcP2ukVqPA" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="Vnf.uml#_-gDvwDOREeiHat9KcP8uWA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3bxMUlDlEeur9pJ-DyTLKw" x="740" y="360"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Hw7ywljPEeuqjcP2ukVqPA" x="740" y="360"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_3cgMIFDlEeur9pJ-DyTLKw" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_3cgMIVDlEeur9pJ-DyTLKw"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_3cgMI1DlEeur9pJ-DyTLKw" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_Hxa68FjPEeuqjcP2ukVqPA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_Hxa68VjPEeuqjcP2ukVqPA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Hxa681jPEeuqjcP2ukVqPA" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="Vnf.uml#_J0Zx0DOSEeiHat9KcP8uWA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3cgMIlDlEeur9pJ-DyTLKw" x="1080" y="580"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Hxa68ljPEeuqjcP2ukVqPA" x="1080" y="580"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_3djVAFDlEeur9pJ-DyTLKw" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_3djVAVDlEeur9pJ-DyTLKw"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_3djVA1DlEeur9pJ-DyTLKw" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_HyG3cFjPEeuqjcP2ukVqPA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_HyG3cVjPEeuqjcP2ukVqPA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_HyG3c1jPEeuqjcP2ukVqPA" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="Vnf.uml#_K_9mADOSEeiHat9KcP8uWA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3djVAlDlEeur9pJ-DyTLKw" x="1180" y="340"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HyG3cljPEeuqjcP2ukVqPA" x="1180" y="340"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_3fhq8FDlEeur9pJ-DyTLKw" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_3fhq8VDlEeur9pJ-DyTLKw"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_3fl8YFDlEeur9pJ-DyTLKw" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_HyvJkFjPEeuqjcP2ukVqPA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_HyvJkVjPEeuqjcP2ukVqPA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_HyvJk1jPEeuqjcP2ukVqPA" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="Vnf.uml#_p0UVsDQvEeixv_sLOod4lQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3fhq8lDlEeur9pJ-DyTLKw" x="980" y="-20"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HyvJkljPEeuqjcP2ukVqPA" x="980" y="-20"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_3gZ0sFDlEeur9pJ-DyTLKw" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_3gZ0sVDlEeur9pJ-DyTLKw"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_3gabwFDlEeur9pJ-DyTLKw" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_HzdiUFjPEeuqjcP2ukVqPA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_HzdiUVjPEeuqjcP2ukVqPA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_HzdiU1jPEeuqjcP2ukVqPA" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="Vnf.uml#_tEnEsDTSEeiwQ6KPLHcy4g"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3gZ0slDlEeur9pJ-DyTLKw" x="-20" y="220"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HzdiUljPEeuqjcP2ukVqPA" x="-20" y="220"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_3g91YFDlEeur9pJ-DyTLKw" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_3g91YVDlEeur9pJ-DyTLKw"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_3g91Y1DlEeur9pJ-DyTLKw" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_Hz5nMFjPEeuqjcP2ukVqPA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_Hz5nMVjPEeuqjcP2ukVqPA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Hz5nM1jPEeuqjcP2ukVqPA" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="Vnf.uml#_oFQM8Dd-EeiIfPeSAqyGdQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3g91YlDlEeur9pJ-DyTLKw" x="700" y="16"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Hz5nMljPEeuqjcP2ukVqPA" x="700" y="16"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_3hTzoFDlEeur9pJ-DyTLKw" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_3hTzoVDlEeur9pJ-DyTLKw"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_3hTzo1DlEeur9pJ-DyTLKw" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_H0HCkFjPEeuqjcP2ukVqPA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_H0HCkVjPEeuqjcP2ukVqPA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_H0HCk1jPEeuqjcP2ukVqPA" 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="_3hTzolDlEeur9pJ-DyTLKw" x="1440" y="620"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H0HCkljPEeuqjcP2ukVqPA" x="1440" y="620"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_3hpx4FDlEeur9pJ-DyTLKw" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_3hpx4VDlEeur9pJ-DyTLKw"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_3hpx41DlEeur9pJ-DyTLKw" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_H0RaoFjPEeuqjcP2ukVqPA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_H0RaoVjPEeuqjcP2ukVqPA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_H0Rao1jPEeuqjcP2ukVqPA" 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="_3hpx4lDlEeur9pJ-DyTLKw" x="980" y="236"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H0RaoljPEeuqjcP2ukVqPA" x="980" y="236"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_3jWbAFDlEeur9pJ-DyTLKw" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_3jWbAVDlEeur9pJ-DyTLKw"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_3jascFDlEeur9pJ-DyTLKw" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_H0e2AFjPEeuqjcP2ukVqPA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_H0e2AVjPEeuqjcP2ukVqPA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_H0e2A1jPEeuqjcP2ukVqPA" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="Vnf.uml#_DZsyMDnHEeiWMf5FLWfdLA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3jWbAlDlEeur9pJ-DyTLKw" x="780" y="740"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H0e2AljPEeuqjcP2ukVqPA" x="780" y="740"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_3kit01DlEeur9pJ-DyTLKw" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_3kit1FDlEeur9pJ-DyTLKw"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_3kjU4FDlEeur9pJ-DyTLKw" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_H0xJ4FjPEeuqjcP2ukVqPA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_H0xJ4VjPEeuqjcP2ukVqPA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_H0xJ41jPEeuqjcP2ukVqPA" 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="_3kit1VDlEeur9pJ-DyTLKw" x="340"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H0xJ4ljPEeuqjcP2ukVqPA" x="340"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_3lkBgFDlEeur9pJ-DyTLKw" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_3lkBgVDlEeur9pJ-DyTLKw"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_3lkBg1DlEeur9pJ-DyTLKw" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_H1MAoFjPEeuqjcP2ukVqPA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_H1MAoVjPEeuqjcP2ukVqPA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_H1MAo1jPEeuqjcP2ukVqPA" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="Vnf.uml#_pQg3kET7EemWRYeHGX88Yw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3lkBglDlEeur9pJ-DyTLKw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H1MAoljPEeuqjcP2ukVqPA"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_3nG5oFDlEeur9pJ-DyTLKw" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_3nG5oVDlEeur9pJ-DyTLKw"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_3nHgsFDlEeur9pJ-DyTLKw" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_H1oFgFjPEeuqjcP2ukVqPA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_H1oFgVjPEeuqjcP2ukVqPA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_H1oFg1jPEeuqjcP2ukVqPA" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="Vnf.uml#_vfWakMbIEeqGwZoAtvAq1A"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3nG5olDlEeur9pJ-DyTLKw" x="1320" y="160"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H1oFgljPEeuqjcP2ukVqPA" x="1320" y="160"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_3oARgFDlEeur9pJ-DyTLKw" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_3oARgVDlEeur9pJ-DyTLKw"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_3oARg1DlEeur9pJ-DyTLKw" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_H15LQFjPEeuqjcP2ukVqPA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_H15LQVjPEeuqjcP2ukVqPA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_H15LQ1jPEeuqjcP2ukVqPA" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="Vnf.uml#_yyh4AMbHEeqGwZoAtvAq1A"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3oARglDlEeur9pJ-DyTLKw" x="1340" y="840"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H15LQljPEeuqjcP2ukVqPA" x="1340" y="840"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_3oW20FDlEeur9pJ-DyTLKw" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_3oW20VDlEeur9pJ-DyTLKw"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_3oW201DlEeur9pJ-DyTLKw" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_H2Ib0FjPEeuqjcP2ukVqPA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_H2Ib0VjPEeuqjcP2ukVqPA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_H2Ib01jPEeuqjcP2ukVqPA" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="Vnf.uml#_ownWsPdlEeq0Kr0QR-lqNw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3oW20lDlEeur9pJ-DyTLKw" x="20" y="440"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H2Ib0ljPEeuqjcP2ukVqPA" x="20" y="440"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_3oq_4FDlEeur9pJ-DyTLKw" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_3oq_4VDlEeur9pJ-DyTLKw"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_3orm8FDlEeur9pJ-DyTLKw" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_H2XFUFjPEeuqjcP2ukVqPA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_H2XFUVjPEeuqjcP2ukVqPA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_H2XFU1jPEeuqjcP2ukVqPA" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="Vnf.uml#_f2Mj8PdmEeq0Kr0QR-lqNw"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3oq_4lDlEeur9pJ-DyTLKw" x="20" y="580"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H2XFUljPEeuqjcP2ukVqPA" x="20" y="580"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_3pA-IFDlEeur9pJ-DyTLKw" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_3pA-IVDlEeur9pJ-DyTLKw"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_3pA-I1DlEeur9pJ-DyTLKw" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_H2m88FjPEeuqjcP2ukVqPA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_H2m88VjPEeuqjcP2ukVqPA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_H2m881jPEeuqjcP2ukVqPA" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="Vnf.uml#_SYZyIFBHEeu9q4B_TIiAOQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3pA-IlDlEeur9pJ-DyTLKw" y="740"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H2m88ljPEeuqjcP2ukVqPA" y="740"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_3r22wFDlEeur9pJ-DyTLKw" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_3r22wVDlEeur9pJ-DyTLKw"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_3r22w1DlEeur9pJ-DyTLKw" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_H3KWkFjPEeuqjcP2ukVqPA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_H3KWkVjPEeuqjcP2ukVqPA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_H3KWk1jPEeuqjcP2ukVqPA" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="Vnf.uml#_ULe1IFBOEeu9q4B_TIiAOQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3r22wlDlEeur9pJ-DyTLKw" x="1400"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H3KWkljPEeuqjcP2ukVqPA" x="1400"/>
     </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"/>
@@ -2310,195 +2310,195 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7CjrEB0XEeuefrxxkEb1lQ" id="(0.0,0.5970149253731343)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7CjrER0XEeuefrxxkEb1lQ" id="(0.6434316353887399,0.0)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_3WNW4FDlEeur9pJ-DyTLKw" type="StereotypeCommentLink" source="_aaUQoDOREeiHat9KcP8uWA" target="_3WMv0FDlEeur9pJ-DyTLKw">
-      <styles xmi:type="notation:FontStyle" xmi:id="_3WNW4VDlEeur9pJ-DyTLKw"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_3WN98FDlEeur9pJ-DyTLKw" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_HudGgFjPEeuqjcP2ukVqPA" type="StereotypeCommentLink" source="_aaUQoDOREeiHat9KcP8uWA" target="_Hub4YFjPEeuqjcP2ukVqPA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_HudGgVjPEeuqjcP2ukVqPA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_HudGhVjPEeuqjcP2ukVqPA" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="Vnf.uml#_aaEZADOREeiHat9KcP8uWA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3WNW4lDlEeur9pJ-DyTLKw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3WNW41DlEeur9pJ-DyTLKw"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3WNW5FDlEeur9pJ-DyTLKw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_HudGgljPEeuqjcP2ukVqPA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HudGg1jPEeuqjcP2ukVqPA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HudGhFjPEeuqjcP2ukVqPA"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_3ZyPVFDlEeur9pJ-DyTLKw" type="StereotypeCommentLink" source="_e5ZEADOREeiHat9KcP8uWA" target="_3ZyPUFDlEeur9pJ-DyTLKw">
-      <styles xmi:type="notation:FontStyle" xmi:id="_3ZyPVVDlEeur9pJ-DyTLKw"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_3ZyPWVDlEeur9pJ-DyTLKw" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_HwOoJFjPEeuqjcP2ukVqPA" type="StereotypeCommentLink" source="_e5ZEADOREeiHat9KcP8uWA" target="_HwOoIFjPEeuqjcP2ukVqPA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_HwOoJVjPEeuqjcP2ukVqPA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_HwOoKVjPEeuqjcP2ukVqPA" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="Vnf.uml#_e5WnwDOREeiHat9KcP8uWA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3ZyPVlDlEeur9pJ-DyTLKw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3ZyPV1DlEeur9pJ-DyTLKw"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3ZyPWFDlEeur9pJ-DyTLKw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_HwOoJljPEeuqjcP2ukVqPA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HwOoJ1jPEeuqjcP2ukVqPA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HwOoKFjPEeuqjcP2ukVqPA"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_3bxMVFDlEeur9pJ-DyTLKw" type="StereotypeCommentLink" source="_-gFk8DOREeiHat9KcP8uWA" target="_3bxMUFDlEeur9pJ-DyTLKw">
-      <styles xmi:type="notation:FontStyle" xmi:id="_3bxMVVDlEeur9pJ-DyTLKw"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_3bxzYVDlEeur9pJ-DyTLKw" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_Hw7yxFjPEeuqjcP2ukVqPA" type="StereotypeCommentLink" source="_-gFk8DOREeiHat9KcP8uWA" target="_Hw7ywFjPEeuqjcP2ukVqPA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_Hw7yxVjPEeuqjcP2ukVqPA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Hw7yyVjPEeuqjcP2ukVqPA" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="Vnf.uml#_-gDvwDOREeiHat9KcP8uWA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3bxMVlDlEeur9pJ-DyTLKw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3bxMV1DlEeur9pJ-DyTLKw"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3bxzYFDlEeur9pJ-DyTLKw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Hw7yxljPEeuqjcP2ukVqPA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Hw7yx1jPEeuqjcP2ukVqPA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Hw7yyFjPEeuqjcP2ukVqPA"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_3cgMJFDlEeur9pJ-DyTLKw" type="StereotypeCommentLink" source="_J0bnADOSEeiHat9KcP8uWA" target="_3cgMIFDlEeur9pJ-DyTLKw">
-      <styles xmi:type="notation:FontStyle" xmi:id="_3cgMJVDlEeur9pJ-DyTLKw"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_3cgMKVDlEeur9pJ-DyTLKw" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_Hxa69FjPEeuqjcP2ukVqPA" type="StereotypeCommentLink" source="_J0bnADOSEeiHat9KcP8uWA" target="_Hxa68FjPEeuqjcP2ukVqPA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_Hxa69VjPEeuqjcP2ukVqPA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Hxa6-VjPEeuqjcP2ukVqPA" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="Vnf.uml#_J0Zx0DOSEeiHat9KcP8uWA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3cgMJlDlEeur9pJ-DyTLKw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3cgMJ1DlEeur9pJ-DyTLKw"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3cgMKFDlEeur9pJ-DyTLKw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Hxa69ljPEeuqjcP2ukVqPA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Hxa691jPEeuqjcP2ukVqPA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Hxa6-FjPEeuqjcP2ukVqPA"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_3djVBFDlEeur9pJ-DyTLKw" type="StereotypeCommentLink" source="_K__bMDOSEeiHat9KcP8uWA" target="_3djVAFDlEeur9pJ-DyTLKw">
-      <styles xmi:type="notation:FontStyle" xmi:id="_3djVBVDlEeur9pJ-DyTLKw"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_3djVCVDlEeur9pJ-DyTLKw" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_HyG3dFjPEeuqjcP2ukVqPA" type="StereotypeCommentLink" source="_K__bMDOSEeiHat9KcP8uWA" target="_HyG3cFjPEeuqjcP2ukVqPA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_HyG3dVjPEeuqjcP2ukVqPA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_HyG3eVjPEeuqjcP2ukVqPA" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="Vnf.uml#_K_9mADOSEeiHat9KcP8uWA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3djVBlDlEeur9pJ-DyTLKw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3djVB1DlEeur9pJ-DyTLKw"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3djVCFDlEeur9pJ-DyTLKw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_HyG3dljPEeuqjcP2ukVqPA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HyG3d1jPEeuqjcP2ukVqPA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HyG3eFjPEeuqjcP2ukVqPA"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_3fl8YVDlEeur9pJ-DyTLKw" type="StereotypeCommentLink" source="_p0Vj0DQvEeixv_sLOod4lQ" target="_3fhq8FDlEeur9pJ-DyTLKw">
-      <styles xmi:type="notation:FontStyle" xmi:id="_3fl8YlDlEeur9pJ-DyTLKw"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_3fmjclDlEeur9pJ-DyTLKw" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_HyvJlFjPEeuqjcP2ukVqPA" type="StereotypeCommentLink" source="_p0Vj0DQvEeixv_sLOod4lQ" target="_HyvJkFjPEeuqjcP2ukVqPA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_HyvJlVjPEeuqjcP2ukVqPA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_HyvJmVjPEeuqjcP2ukVqPA" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="Vnf.uml#_p0UVsDQvEeixv_sLOod4lQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3fl8Y1DlEeur9pJ-DyTLKw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3fmjcFDlEeur9pJ-DyTLKw"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3fmjcVDlEeur9pJ-DyTLKw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_HyvJlljPEeuqjcP2ukVqPA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HyvJl1jPEeuqjcP2ukVqPA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HyvJmFjPEeuqjcP2ukVqPA"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_3gabwVDlEeur9pJ-DyTLKw" type="StereotypeCommentLink" source="_tEo54DTSEeiwQ6KPLHcy4g" target="_3gZ0sFDlEeur9pJ-DyTLKw">
-      <styles xmi:type="notation:FontStyle" xmi:id="_3gabwlDlEeur9pJ-DyTLKw"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_3gabxlDlEeur9pJ-DyTLKw" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_HzdiVFjPEeuqjcP2ukVqPA" type="StereotypeCommentLink" source="_tEo54DTSEeiwQ6KPLHcy4g" target="_HzdiUFjPEeuqjcP2ukVqPA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_HzdiVVjPEeuqjcP2ukVqPA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_HzdiWVjPEeuqjcP2ukVqPA" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="Vnf.uml#_tEnEsDTSEeiwQ6KPLHcy4g"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3gabw1DlEeur9pJ-DyTLKw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3gabxFDlEeur9pJ-DyTLKw"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3gabxVDlEeur9pJ-DyTLKw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_HzdiVljPEeuqjcP2ukVqPA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HzdiV1jPEeuqjcP2ukVqPA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HzdiWFjPEeuqjcP2ukVqPA"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_3g91ZFDlEeur9pJ-DyTLKw" type="StereotypeCommentLink" source="_XVHG0Dm-EeiWMf5FLWfdLA" target="_3g91YFDlEeur9pJ-DyTLKw">
-      <styles xmi:type="notation:FontStyle" xmi:id="_3g91ZVDlEeur9pJ-DyTLKw"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_3g-cclDlEeur9pJ-DyTLKw" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_Hz5nNFjPEeuqjcP2ukVqPA" type="StereotypeCommentLink" source="_XVHG0Dm-EeiWMf5FLWfdLA" target="_Hz5nMFjPEeuqjcP2ukVqPA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_Hz5nNVjPEeuqjcP2ukVqPA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Hz5nOVjPEeuqjcP2ukVqPA" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="Vnf.uml#_oFQM8Dd-EeiIfPeSAqyGdQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3g91ZlDlEeur9pJ-DyTLKw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3g-ccFDlEeur9pJ-DyTLKw"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3g-ccVDlEeur9pJ-DyTLKw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Hz5nNljPEeuqjcP2ukVqPA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Hz5nN1jPEeuqjcP2ukVqPA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Hz5nOFjPEeuqjcP2ukVqPA"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_3hTzpFDlEeur9pJ-DyTLKw" type="StereotypeCommentLink" source="_ahbYsCo7EemS0_wZSU3sbA" target="_3hTzoFDlEeur9pJ-DyTLKw">
-      <styles xmi:type="notation:FontStyle" xmi:id="_3hTzpVDlEeur9pJ-DyTLKw"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_3hUasFDlEeur9pJ-DyTLKw" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_H0HClFjPEeuqjcP2ukVqPA" type="StereotypeCommentLink" source="_ahbYsCo7EemS0_wZSU3sbA" target="_H0HCkFjPEeuqjcP2ukVqPA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_H0HClVjPEeuqjcP2ukVqPA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_H0HCmVjPEeuqjcP2ukVqPA" 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="_3hTzplDlEeur9pJ-DyTLKw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3hTzp1DlEeur9pJ-DyTLKw"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3hTzqFDlEeur9pJ-DyTLKw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_H0HClljPEeuqjcP2ukVqPA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_H0HCl1jPEeuqjcP2ukVqPA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_H0HCmFjPEeuqjcP2ukVqPA"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_3hpx5FDlEeur9pJ-DyTLKw" type="StereotypeCommentLink" source="_LPszsCo-EemS0_wZSU3sbA" target="_3hpx4FDlEeur9pJ-DyTLKw">
-      <styles xmi:type="notation:FontStyle" xmi:id="_3hpx5VDlEeur9pJ-DyTLKw"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_3hqY8FDlEeur9pJ-DyTLKw" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_H0RapFjPEeuqjcP2ukVqPA" type="StereotypeCommentLink" source="_LPszsCo-EemS0_wZSU3sbA" target="_H0RaoFjPEeuqjcP2ukVqPA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_H0RapVjPEeuqjcP2ukVqPA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_H0RaqVjPEeuqjcP2ukVqPA" 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="_3hpx5lDlEeur9pJ-DyTLKw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3hpx51DlEeur9pJ-DyTLKw"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3hpx6FDlEeur9pJ-DyTLKw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_H0RapljPEeuqjcP2ukVqPA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_H0Rap1jPEeuqjcP2ukVqPA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_H0RaqFjPEeuqjcP2ukVqPA"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_3jbTgFDlEeur9pJ-DyTLKw" type="StereotypeCommentLink" source="_WshGECvPEemS0_wZSU3sbA" target="_3jWbAFDlEeur9pJ-DyTLKw">
-      <styles xmi:type="notation:FontStyle" xmi:id="_3jbTgVDlEeur9pJ-DyTLKw"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_3jbThVDlEeur9pJ-DyTLKw" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_H0e2BFjPEeuqjcP2ukVqPA" type="StereotypeCommentLink" source="_WshGECvPEemS0_wZSU3sbA" target="_H0e2AFjPEeuqjcP2ukVqPA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_H0e2BVjPEeuqjcP2ukVqPA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_H0e2CVjPEeuqjcP2ukVqPA" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="Vnf.uml#_DZsyMDnHEeiWMf5FLWfdLA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3jbTglDlEeur9pJ-DyTLKw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3jbTg1DlEeur9pJ-DyTLKw"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3jbThFDlEeur9pJ-DyTLKw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_H0e2BljPEeuqjcP2ukVqPA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_H0e2B1jPEeuqjcP2ukVqPA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_H0e2CFjPEeuqjcP2ukVqPA"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_3kjU4VDlEeur9pJ-DyTLKw" type="StereotypeCommentLink" source="_-FD-8DRwEem2n8bBHelJyw" target="_3kit01DlEeur9pJ-DyTLKw">
-      <styles xmi:type="notation:FontStyle" xmi:id="_3kjU4lDlEeur9pJ-DyTLKw"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_3kjU5lDlEeur9pJ-DyTLKw" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_H0xJ5FjPEeuqjcP2ukVqPA" type="StereotypeCommentLink" source="_-FD-8DRwEem2n8bBHelJyw" target="_H0xJ4FjPEeuqjcP2ukVqPA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_H0xJ5VjPEeuqjcP2ukVqPA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_H0xJ6VjPEeuqjcP2ukVqPA" 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="_3kjU41DlEeur9pJ-DyTLKw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3kjU5FDlEeur9pJ-DyTLKw"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3kjU5VDlEeur9pJ-DyTLKw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_H0xJ5ljPEeuqjcP2ukVqPA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_H0xJ51jPEeuqjcP2ukVqPA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_H0xJ6FjPEeuqjcP2ukVqPA"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_3lkBhFDlEeur9pJ-DyTLKw" type="StereotypeCommentLink" source="_ZzlSsET_EemWRYeHGX88Yw" target="_3lkBgFDlEeur9pJ-DyTLKw">
-      <styles xmi:type="notation:FontStyle" xmi:id="_3lkBhVDlEeur9pJ-DyTLKw"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_3lkoklDlEeur9pJ-DyTLKw" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_H1MApFjPEeuqjcP2ukVqPA" type="StereotypeCommentLink" source="_ZzlSsET_EemWRYeHGX88Yw" target="_H1MAoFjPEeuqjcP2ukVqPA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_H1MApVjPEeuqjcP2ukVqPA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_H1MAqVjPEeuqjcP2ukVqPA" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="Vnf.uml#_pQg3kET7EemWRYeHGX88Yw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3lkBhlDlEeur9pJ-DyTLKw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3lkokFDlEeur9pJ-DyTLKw"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3lkokVDlEeur9pJ-DyTLKw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_H1MApljPEeuqjcP2ukVqPA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_H1MAp1jPEeuqjcP2ukVqPA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_H1MAqFjPEeuqjcP2ukVqPA"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_3nHgsVDlEeur9pJ-DyTLKw" type="StereotypeCommentLink" source="_FzLcoNgaEeq7hYQNMy9zpg" target="_3nG5oFDlEeur9pJ-DyTLKw">
-      <styles xmi:type="notation:FontStyle" xmi:id="_3nHgslDlEeur9pJ-DyTLKw"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_3nHgtlDlEeur9pJ-DyTLKw" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_H1oFhFjPEeuqjcP2ukVqPA" type="StereotypeCommentLink" source="_FzLcoNgaEeq7hYQNMy9zpg" target="_H1oFgFjPEeuqjcP2ukVqPA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_H1oFhVjPEeuqjcP2ukVqPA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_H1oFiVjPEeuqjcP2ukVqPA" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="Vnf.uml#_vfWakMbIEeqGwZoAtvAq1A"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3nHgs1DlEeur9pJ-DyTLKw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3nHgtFDlEeur9pJ-DyTLKw"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3nHgtVDlEeur9pJ-DyTLKw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_H1oFhljPEeuqjcP2ukVqPA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_H1oFh1jPEeuqjcP2ukVqPA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_H1oFiFjPEeuqjcP2ukVqPA"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_3oARhFDlEeur9pJ-DyTLKw" type="StereotypeCommentLink" source="_HfkcENqCEeqc48iFXy8U7A" target="_3oARgFDlEeur9pJ-DyTLKw">
-      <styles xmi:type="notation:FontStyle" xmi:id="_3oARhVDlEeur9pJ-DyTLKw"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_3oARiVDlEeur9pJ-DyTLKw" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_H15LRFjPEeuqjcP2ukVqPA" type="StereotypeCommentLink" source="_HfkcENqCEeqc48iFXy8U7A" target="_H15LQFjPEeuqjcP2ukVqPA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_H15LRVjPEeuqjcP2ukVqPA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_H15LSVjPEeuqjcP2ukVqPA" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="Vnf.uml#_yyh4AMbHEeqGwZoAtvAq1A"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3oARhlDlEeur9pJ-DyTLKw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3oARh1DlEeur9pJ-DyTLKw"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3oARiFDlEeur9pJ-DyTLKw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_H15LRljPEeuqjcP2ukVqPA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_H15LR1jPEeuqjcP2ukVqPA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_H15LSFjPEeuqjcP2ukVqPA"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_3oW21FDlEeur9pJ-DyTLKw" type="StereotypeCommentLink" source="_nIwKsPhaEeqImeFkB-PnTA" target="_3oW20FDlEeur9pJ-DyTLKw">
-      <styles xmi:type="notation:FontStyle" xmi:id="_3oW21VDlEeur9pJ-DyTLKw"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_3oXd4FDlEeur9pJ-DyTLKw" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_H2Ib1FjPEeuqjcP2ukVqPA" type="StereotypeCommentLink" source="_nIwKsPhaEeqImeFkB-PnTA" target="_H2Ib0FjPEeuqjcP2ukVqPA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_H2Ib1VjPEeuqjcP2ukVqPA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_H2Ib2VjPEeuqjcP2ukVqPA" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="Vnf.uml#_ownWsPdlEeq0Kr0QR-lqNw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3oW21lDlEeur9pJ-DyTLKw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3oW211DlEeur9pJ-DyTLKw"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3oW22FDlEeur9pJ-DyTLKw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_H2Ib1ljPEeuqjcP2ukVqPA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_H2Ib11jPEeuqjcP2ukVqPA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_H2Ib2FjPEeuqjcP2ukVqPA"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_3orm8VDlEeur9pJ-DyTLKw" type="StereotypeCommentLink" source="_hzvtgPhdEeqImeFkB-PnTA" target="_3oq_4FDlEeur9pJ-DyTLKw">
-      <styles xmi:type="notation:FontStyle" xmi:id="_3orm8lDlEeur9pJ-DyTLKw"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_3orm9lDlEeur9pJ-DyTLKw" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_H2XsYFjPEeuqjcP2ukVqPA" type="StereotypeCommentLink" source="_hzvtgPhdEeqImeFkB-PnTA" target="_H2XFUFjPEeuqjcP2ukVqPA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_H2XsYVjPEeuqjcP2ukVqPA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_H2XsZVjPEeuqjcP2ukVqPA" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="Vnf.uml#_f2Mj8PdmEeq0Kr0QR-lqNw"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3orm81DlEeur9pJ-DyTLKw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3orm9FDlEeur9pJ-DyTLKw"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3orm9VDlEeur9pJ-DyTLKw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_H2XsYljPEeuqjcP2ukVqPA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_H2XsY1jPEeuqjcP2ukVqPA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_H2XsZFjPEeuqjcP2ukVqPA"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_3pA-JFDlEeur9pJ-DyTLKw" type="StereotypeCommentLink" source="_MqiJAFBKEeu9q4B_TIiAOQ" target="_3pA-IFDlEeur9pJ-DyTLKw">
-      <styles xmi:type="notation:FontStyle" xmi:id="_3pA-JVDlEeur9pJ-DyTLKw"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_3pA-KVDlEeur9pJ-DyTLKw" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_H2m89FjPEeuqjcP2ukVqPA" type="StereotypeCommentLink" source="_MqiJAFBKEeu9q4B_TIiAOQ" target="_H2m88FjPEeuqjcP2ukVqPA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_H2m89VjPEeuqjcP2ukVqPA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_H2m8-VjPEeuqjcP2ukVqPA" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="Vnf.uml#_SYZyIFBHEeu9q4B_TIiAOQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3pA-JlDlEeur9pJ-DyTLKw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3pA-J1DlEeur9pJ-DyTLKw"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3pA-KFDlEeur9pJ-DyTLKw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_H2m89ljPEeuqjcP2ukVqPA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_H2m891jPEeuqjcP2ukVqPA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_H2m8-FjPEeuqjcP2ukVqPA"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_3r22xFDlEeur9pJ-DyTLKw" type="StereotypeCommentLink" source="_kwccQFBOEeu9q4B_TIiAOQ" target="_3r22wFDlEeur9pJ-DyTLKw">
-      <styles xmi:type="notation:FontStyle" xmi:id="_3r22xVDlEeur9pJ-DyTLKw"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_3r3d0FDlEeur9pJ-DyTLKw" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_H3K9oFjPEeuqjcP2ukVqPA" type="StereotypeCommentLink" source="_kwccQFBOEeu9q4B_TIiAOQ" target="_H3KWkFjPEeuqjcP2ukVqPA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_H3K9oVjPEeuqjcP2ukVqPA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_H3K9pVjPEeuqjcP2ukVqPA" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="Vnf.uml#_ULe1IFBOEeu9q4B_TIiAOQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3r22xlDlEeur9pJ-DyTLKw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3r22x1DlEeur9pJ-DyTLKw"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3r22yFDlEeur9pJ-DyTLKw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_H3K9oljPEeuqjcP2ukVqPA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_H3K9o1jPEeuqjcP2ukVqPA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_H3K9pFjPEeuqjcP2ukVqPA"/>
     </edges>
   </notation:Diagram>
   <notation:Diagram xmi:id="_tsOFEDQTEeixv_sLOod4lQ" type="PapyrusUMLClassDiagram" name="ONAP Vnfd - Topology View" measurementUnit="Pixel">
diff --git a/ONAP_Information_Model/Vnf.uml b/ONAP_Information_Model/Vnf.uml
index e3dfb67..3d57580 100644
--- a/ONAP_Information_Model/Vnf.uml
+++ b/ONAP_Information_Model/Vnf.uml
@@ -521,7 +521,7 @@ The Uses relationship is covered by the service instance expressing the sharable
 - Pnfs cannot run on Pnfs, etc.</body>
       </ownedComment>
       <ownedComment xmi:type="uml:Comment" xmi:id="_cbI10B0XEeuefrxxkEb1lQ">
-        <body>Only one of OsContainerDesc or VirtualComputeDesc per VNFD
+        <body>Only one of OsContainerDesc or VirtualComputeDesc per VDU
 </body>
       </ownedComment>
     </packagedElement>