Updated VNF UML model to ETSI IFA011 v4.1.1

 - New osContainer type
 - New mciopProfile type
 - New VirtualCpd type
Added osContainer descriptors and mciop from IFA011 4.1.1 to the VNF model.

Issue-ID: MODELING-334

Signed-off-by: Fernando Oliveira <fernando.oliveira@verizon.com>
Change-Id: I960198cb01b47a20c8bb036ae0491ae16be5c98a

1 files changed, 50 insertions, 50 deletions

diff --git a/ONAP_Information_Model/Common.notation b/ONAP_Information_Model/Common.notation
index 0097b88..a92e14b 100644
--- a/ONAP_Information_Model/Common.notation
+++ b/ONAP_Information_Model/Common.notation
@@ -156,45 +156,45 @@
       <element xmi:type="uml:Class" href="Common.uml#_7pUNEDa7EeivvI-m1BaAbA"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cGaRUfS4EeiGPpKdxajt7g" x="740" y="100" width="120"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_rwIkgPhlEeqImeFkB-PnTA" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_rwIkgfhlEeqImeFkB-PnTA"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_rwIkg_hlEeqImeFkB-PnTA" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_aYcL4w2NEeuBquWJMTL0qg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_aYcL5A2NEeuBquWJMTL0qg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_aYcL5g2NEeuBquWJMTL0qg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="Common.uml#_Tw5PIES0EeiVGPeZpaYNtQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rwIkgvhlEeqImeFkB-PnTA" x="482" y="56"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aYcL5Q2NEeuBquWJMTL0qg" x="482" y="56"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_rwRHYPhlEeqImeFkB-PnTA" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_rwRHYfhlEeqImeFkB-PnTA"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_rwRHY_hlEeqImeFkB-PnTA" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_aYkuwA2NEeuBquWJMTL0qg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_aYkuwQ2NEeuBquWJMTL0qg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_aYkuww2NEeuBquWJMTL0qg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="Common.uml#_il0cAES0EeiVGPeZpaYNtQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rwRHYvhlEeqImeFkB-PnTA" x="740" y="180"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aYkuwg2NEeuBquWJMTL0qg" x="740" y="180"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_rwZqQPhlEeqImeFkB-PnTA" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_rwZqQfhlEeqImeFkB-PnTA"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_rwZqQ_hlEeqImeFkB-PnTA" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_aYsqkw2NEeuBquWJMTL0qg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_aYsqlA2NEeuBquWJMTL0qg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_aYsqlg2NEeuBquWJMTL0qg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="Common.uml#_8naVoES0EeiVGPeZpaYNtQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rwZqQvhlEeqImeFkB-PnTA" x="460" y="280"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aYsqlQ2NEeuBquWJMTL0qg" x="460" y="280"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_rwfJ0_hlEeqImeFkB-PnTA" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_rwfJ1PhlEeqImeFkB-PnTA"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_rwfJ1vhlEeqImeFkB-PnTA" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_aY3psw2NEeuBquWJMTL0qg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_aY3ptA2NEeuBquWJMTL0qg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_aY3ptg2NEeuBquWJMTL0qg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="Common.uml#_rmDCkNxjEei0G_d67y10Rg"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rwfJ1fhlEeqImeFkB-PnTA" x="940" y="280"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aY3ptQ2NEeuBquWJMTL0qg" x="940" y="280"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_rwl3g_hlEeqImeFkB-PnTA" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_rwl3hPhlEeqImeFkB-PnTA"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_rwl3hvhlEeqImeFkB-PnTA" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_aY--cA2NEeuBquWJMTL0qg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_aY--cQ2NEeuBquWJMTL0qg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_aY--cw2NEeuBquWJMTL0qg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="Common.uml#_7pUNEDa7EeivvI-m1BaAbA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rwl3hfhlEeqImeFkB-PnTA" x="940" y="100"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aY--cg2NEeuBquWJMTL0qg" x="940" y="100"/>
     </children>
     <styles xmi:type="notation:StringValueStyle" xmi:id="_RtraMUS0EeiVGPeZpaYNtQ" name="diagram_compatibility_version" stringValue="1.4.0"/>
     <styles xmi:type="notation:DiagramStyle" xmi:id="_RtraMkS0EeiVGPeZpaYNtQ"/>
@@ -274,55 +274,55 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hrFa0PS4EeiGPpKdxajt7g" id="(0.5,0.0)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hrFa0fS4EeiGPpKdxajt7g" id="(0.5,1.0)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_rwIkhPhlEeqImeFkB-PnTA" type="StereotypeCommentLink" source="_aJJKoES0EeiVGPeZpaYNtQ" target="_rwIkgPhlEeqImeFkB-PnTA">
-      <styles xmi:type="notation:FontStyle" xmi:id="_rwIkhfhlEeqImeFkB-PnTA"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_rwIkifhlEeqImeFkB-PnTA" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_aYcL5w2NEeuBquWJMTL0qg" type="StereotypeCommentLink" source="_aJJKoES0EeiVGPeZpaYNtQ" target="_aYcL4w2NEeuBquWJMTL0qg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_aYcL6A2NEeuBquWJMTL0qg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_aYcL7A2NEeuBquWJMTL0qg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="Common.uml#_Tw5PIES0EeiVGPeZpaYNtQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_rwIkhvhlEeqImeFkB-PnTA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rwIkh_hlEeqImeFkB-PnTA"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rwIkiPhlEeqImeFkB-PnTA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_aYcL6Q2NEeuBquWJMTL0qg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aYcL6g2NEeuBquWJMTL0qg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aYcL6w2NEeuBquWJMTL0qg"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_rwRHZPhlEeqImeFkB-PnTA" type="StereotypeCommentLink" source="_p0S04ES0EeiVGPeZpaYNtQ" target="_rwRHYPhlEeqImeFkB-PnTA">
-      <styles xmi:type="notation:FontStyle" xmi:id="_rwRHZfhlEeqImeFkB-PnTA"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_rwRHafhlEeqImeFkB-PnTA" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_aYkuxA2NEeuBquWJMTL0qg" type="StereotypeCommentLink" source="_p0S04ES0EeiVGPeZpaYNtQ" target="_aYkuwA2NEeuBquWJMTL0qg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_aYkuxQ2NEeuBquWJMTL0qg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_aYkuyQ2NEeuBquWJMTL0qg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="Common.uml#_il0cAES0EeiVGPeZpaYNtQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_rwRHZvhlEeqImeFkB-PnTA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rwRHZ_hlEeqImeFkB-PnTA"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rwRHaPhlEeqImeFkB-PnTA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_aYkuxg2NEeuBquWJMTL0qg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aYkuxw2NEeuBquWJMTL0qg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aYkuyA2NEeuBquWJMTL0qg"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_rwZqRPhlEeqImeFkB-PnTA" type="StereotypeCommentLink" source="_CaHUEES1EeiVGPeZpaYNtQ" target="_rwZqQPhlEeqImeFkB-PnTA">
-      <styles xmi:type="notation:FontStyle" xmi:id="_rwZqRfhlEeqImeFkB-PnTA"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_rwZqSfhlEeqImeFkB-PnTA" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_aYsqlw2NEeuBquWJMTL0qg" type="StereotypeCommentLink" source="_CaHUEES1EeiVGPeZpaYNtQ" target="_aYsqkw2NEeuBquWJMTL0qg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_aYsqmA2NEeuBquWJMTL0qg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_aYsqnA2NEeuBquWJMTL0qg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="Common.uml#_8naVoES0EeiVGPeZpaYNtQ"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_rwZqRvhlEeqImeFkB-PnTA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rwZqR_hlEeqImeFkB-PnTA"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rwZqSPhlEeqImeFkB-PnTA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_aYsqmQ2NEeuBquWJMTL0qg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aYsqmg2NEeuBquWJMTL0qg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aYsqmw2NEeuBquWJMTL0qg"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_rwfJ1_hlEeqImeFkB-PnTA" type="StereotypeCommentLink" source="_I_HQUPS4EeiGPpKdxajt7g" target="_rwfJ0_hlEeqImeFkB-PnTA">
-      <styles xmi:type="notation:FontStyle" xmi:id="_rwfJ2PhlEeqImeFkB-PnTA"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_rwfJ3PhlEeqImeFkB-PnTA" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_aY3ptw2NEeuBquWJMTL0qg" type="StereotypeCommentLink" source="_I_HQUPS4EeiGPpKdxajt7g" target="_aY3psw2NEeuBquWJMTL0qg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_aY3puA2NEeuBquWJMTL0qg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_aY4QwA2NEeuBquWJMTL0qg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="Common.uml#_rmDCkNxjEei0G_d67y10Rg"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_rwfJ2fhlEeqImeFkB-PnTA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rwfJ2vhlEeqImeFkB-PnTA"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rwfJ2_hlEeqImeFkB-PnTA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_aY3puQ2NEeuBquWJMTL0qg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aY3pug2NEeuBquWJMTL0qg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aY3puw2NEeuBquWJMTL0qg"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_rwl3h_hlEeqImeFkB-PnTA" type="StereotypeCommentLink" source="_cGaRUPS4EeiGPpKdxajt7g" target="_rwl3g_hlEeqImeFkB-PnTA">
-      <styles xmi:type="notation:FontStyle" xmi:id="_rwl3iPhlEeqImeFkB-PnTA"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_rwl3jPhlEeqImeFkB-PnTA" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_aY--dA2NEeuBquWJMTL0qg" type="StereotypeCommentLink" source="_cGaRUPS4EeiGPpKdxajt7g" target="_aY--cA2NEeuBquWJMTL0qg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_aY--dQ2NEeuBquWJMTL0qg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_aY--eQ2NEeuBquWJMTL0qg" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="Common.uml#_7pUNEDa7EeivvI-m1BaAbA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_rwl3ifhlEeqImeFkB-PnTA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rwl3ivhlEeqImeFkB-PnTA"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rwl3i_hlEeqImeFkB-PnTA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_aY--dg2NEeuBquWJMTL0qg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aY--dw2NEeuBquWJMTL0qg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aY--eA2NEeuBquWJMTL0qg"/>
     </edges>
   </notation:Diagram>
   <notation:Diagram xmi:id="_2lMEwKGLEeinsNXClcPPiQ" type="PapyrusUMLClassDiagram" name="Network Datatypes" measurementUnit="Pixel">