Updates to common and vnf submodels

Common updates are primarily VES related.  Minor Vnf updates related to
allotted resource

Issue-ID: MODELING-104

Change-Id: Ia9a5192657724e300706acdbb9c936f5a312eb1c
Signed-off-by: Kevin Scaggs <ks0567@att.com>

1 files changed, 13 insertions, 43 deletions

diff --git a/papyrus/ONAP Information Model/Vnf.notation b/papyrus/ONAP Information Model/Vnf.notation
index c1815ad..f1e0753 100644
--- a/papyrus/ONAP Information Model/Vnf.notation
+++ b/papyrus/ONAP Information Model/Vnf.notation
@@ -9656,11 +9656,6 @@
         <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>

         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nQ8jAppWEeidy9iGT_F5-w"/>

       </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_nQ9KGJpWEeidy9iGT_F5-w" visible="false" type="StereotypeLabel">

-        <styles xmi:type="notation:StringValueStyle" xmi:id="_nQ9KGZpWEeidy9iGT_F5-w" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>

-        <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nQ9KGppWEeidy9iGT_F5-w"/>

-      </children>

       <element xmi:type="uml:Class" href="Vnf.uml#_nQZJYJpWEeidy9iGT_F5-w"/>

       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nQsEUZpWEeidy9iGT_F5-w" x="260" y="540" width="141" height="81"/>

     </children>

@@ -9700,11 +9695,6 @@
         <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>

         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HMjkAppXEeidy9iGT_F5-w"/>

       </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_HMkLEppXEeidy9iGT_F5-w" visible="false" type="StereotypeLabel">

-        <styles xmi:type="notation:StringValueStyle" xmi:id="_HMkLE5pXEeidy9iGT_F5-w" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>

-        <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HMkLFJpXEeidy9iGT_F5-w"/>

-      </children>

       <element xmi:type="uml:Class" href="Vnf.uml#_DAQisJpXEeidy9iGT_F5-w"/>

       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HMZzAZpXEeidy9iGT_F5-w" x="400" y="380" width="241" height="80"/>

     </children>

@@ -9744,11 +9734,6 @@
         <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>

         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-uCDEppXEeidy9iGT_F5-w"/>

       </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_-uCqJZpXEeidy9iGT_F5-w" visible="false" type="StereotypeLabel">

-        <styles xmi:type="notation:StringValueStyle" xmi:id="_-uCqJppXEeidy9iGT_F5-w" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>

-        <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-uCqJ5pXEeidy9iGT_F5-w"/>

-      </children>

       <element xmi:type="uml:Class" href="Vnf.uml#_aaEZADOREeiHat9KcP8uWA"/>

       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-t78cZpXEeidy9iGT_F5-w" x="460" y="680" width="121" height="81"/>

     </children>

@@ -9791,11 +9776,6 @@
         <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>

         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mkhP8ppYEeidy9iGT_F5-w"/>

       </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_mkh3AppYEeidy9iGT_F5-w" visible="false" type="StereotypeLabel">

-        <styles xmi:type="notation:StringValueStyle" xmi:id="_mkh3A5pYEeidy9iGT_F5-w" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>

-        <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mkh3BJpYEeidy9iGT_F5-w"/>

-      </children>

       <element xmi:type="uml:Class" href="Service.uml#_iQkugJpYEeidy9iGT_F5-w"/>

       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mkZUIZpYEeidy9iGT_F5-w" x="440" y="220" width="162" height="80"/>

     </children>

@@ -9838,11 +9818,6 @@
         <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>

         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EMOUoppZEeidy9iGT_F5-w"/>

       </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_EMO7tJpZEeidy9iGT_F5-w" visible="false" type="StereotypeLabel">

-        <styles xmi:type="notation:StringValueStyle" xmi:id="_EMO7tZpZEeidy9iGT_F5-w" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>

-        <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EMO7tppZEeidy9iGT_F5-w"/>

-      </children>

       <element xmi:type="uml:Class" href="Service.uml#_BQaDwJpZEeidy9iGT_F5-w"/>

       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EMFKsZpZEeidy9iGT_F5-w" x="720" y="220" width="161" height="81"/>

     </children>

@@ -9877,11 +9852,6 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_O4EOb5ssEeiPBvbfaqSLYg"/>

         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_O4EOcJssEeiPBvbfaqSLYg"/>

       </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_O5DF0JssEeiPBvbfaqSLYg" visible="false" type="StereotypeLabel">

-        <styles xmi:type="notation:StringValueStyle" xmi:id="_O5DF0ZssEeiPBvbfaqSLYg" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>

-        <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_O5DF0pssEeiPBvbfaqSLYg"/>

-      </children>

       <children xmi:type="notation:DecorationNode" xmi:id="_O5Ds4pssEeiPBvbfaqSLYg" visible="false" type="StereotypeLabel">

         <styles xmi:type="notation:StringValueStyle" xmi:id="_O5Ds45ssEeiPBvbfaqSLYg" name="stereotype" stringValue="OpenModel_Profile::OpenModelClass"/>

         <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>

@@ -9926,11 +9896,6 @@
         <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>

         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Y8jyIpssEeiPBvbfaqSLYg"/>

       </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_Y8kZOJssEeiPBvbfaqSLYg" visible="false" type="StereotypeLabel">

-        <styles xmi:type="notation:StringValueStyle" xmi:id="_Y8kZOZssEeiPBvbfaqSLYg" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>

-        <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Y8kZOpssEeiPBvbfaqSLYg"/>

-      </children>

       <element xmi:type="uml:Class" href="Vnf.uml#_AC2eIDQUEeixv_sLOod4lQ"/>

       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Y8dEcZssEeiPBvbfaqSLYg" x="640" y="540" height="81"/>

     </children>

@@ -9945,7 +9910,7 @@
     <children xmi:type="notation:Shape" xmi:id="_X5Q9kJs2EeiPBvbfaqSLYg" type="Comment_Shape">

       <children xmi:type="notation:DecorationNode" xmi:id="_X5RkoJs2EeiPBvbfaqSLYg" type="Comment_BodyLabel"/>

       <element xmi:type="uml:Comment" href="Vnf.uml#_X5PIYJs2EeiPBvbfaqSLYg"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_X5Q9kZs2EeiPBvbfaqSLYg" x="1000" y="180" width="201" height="81"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_X5Q9kZs2EeiPBvbfaqSLYg" x="1120" y="180" width="201" height="81"/>

     </children>

     <children xmi:type="notation:Shape" xmi:id="_RiDucJs3EeiPBvbfaqSLYg" type="Class_Shape">

       <children xmi:type="notation:DecorationNode" xmi:id="_RiEVgJs3EeiPBvbfaqSLYg" type="Class_NameLabel"/>

@@ -9970,6 +9935,11 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_RiEVkJs3EeiPBvbfaqSLYg"/>

         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RiEVkZs3EeiPBvbfaqSLYg"/>

       </children>

+      <children xmi:type="notation:DecorationNode" xmi:id="_NDfGUKY4Eeily5uFlujj3Q" visible="false" type="StereotypeLabel">

+        <styles xmi:type="notation:StringValueStyle" xmi:id="_NDfGUaY4Eeily5uFlujj3Q" name="stereotype" stringValue="OpenModel_Profile::OpenModelClass"/>

+        <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NDfGUqY4Eeily5uFlujj3Q"/>

+      </children>

       <element xmi:type="uml:Class" href="Vnf.uml#_RiB5QJs3EeiPBvbfaqSLYg"/>

       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RiDucZs3EeiPBvbfaqSLYg" x="660" y="680" width="121" height="80"/>

     </children>

@@ -10004,6 +9974,11 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_xVcnops3EeiPBvbfaqSLYg"/>

         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xVcno5s3EeiPBvbfaqSLYg"/>

       </children>

+      <children xmi:type="notation:DecorationNode" xmi:id="_NDj-0KY4Eeily5uFlujj3Q" visible="false" type="StereotypeLabel">

+        <styles xmi:type="notation:StringValueStyle" xmi:id="_NDj-0aY4Eeily5uFlujj3Q" name="stereotype" stringValue="OpenModel_Profile::OpenModelClass"/>

+        <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NDj-0qY4Eeily5uFlujj3Q"/>

+      </children>

       <element xmi:type="uml:Class" href="Vnf.uml#_xVaLUJs3EeiPBvbfaqSLYg"/>

       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xVcnkZs3EeiPBvbfaqSLYg" x="300" y="680" width="121" height="81"/>

     </children>

@@ -10018,12 +9993,12 @@
     <children xmi:type="notation:Shape" xmi:id="_9zSy4Js4EeiPBvbfaqSLYg" type="Comment_Shape">

       <children xmi:type="notation:DecorationNode" xmi:id="_9zTZ8Js4EeiPBvbfaqSLYg" type="Comment_BodyLabel"/>

       <element xmi:type="uml:Comment" href="Vnf.uml#_9zRkwJs4EeiPBvbfaqSLYg"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9zSy4Zs4EeiPBvbfaqSLYg" x="940" y="540"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9zSy4Zs4EeiPBvbfaqSLYg" x="1120" y="400" width="201"/>

     </children>

     <children xmi:type="notation:Shape" xmi:id="_V37bIJs6EeiPBvbfaqSLYg" type="Comment_Shape">

       <children xmi:type="notation:DecorationNode" xmi:id="_V37bIps6EeiPBvbfaqSLYg" type="Comment_BodyLabel"/>

       <element xmi:type="uml:Comment" href="Vnf.uml#_V35l8Js6EeiPBvbfaqSLYg"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_V37bIZs6EeiPBvbfaqSLYg" x="980" y="420" width="239"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_V37bIZs6EeiPBvbfaqSLYg" x="1120" y="320" width="199"/>

     </children>

     <children xmi:type="notation:Shape" xmi:id="_r77iYKLQEeiz_K9hWIugxQ" type="Class_Shape" fillColor="14538691">

       <children xmi:type="notation:DecorationNode" xmi:id="_r7_z0KLQEeiz_K9hWIugxQ" type="Class_NameLabel"/>

@@ -10053,11 +10028,6 @@
         <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>

         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_r8NPMqLQEeiz_K9hWIugxQ"/>

       </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_r8N2RKLQEeiz_K9hWIugxQ" visible="false" type="StereotypeLabel">

-        <styles xmi:type="notation:StringValueStyle" xmi:id="_r8N2RaLQEeiz_K9hWIugxQ" name="stereotype" stringValue="Onap_Profile::OnapModelLifecycle"/>

-        <element xmi:type="uml:Stereotype" href="Onap_Profile.profile.uml#_lXkBcEMgEeisT-sjhttBCA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_r8N2RqLQEeiz_K9hWIugxQ"/>

-      </children>

       <element xmi:type="uml:Class" href="Service.uml#_Jvy-QD0MEeiWMf5FLWfdLA"/>

       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_r77iYaLQEeiz_K9hWIugxQ" x="580" y="60" width="161" height="80"/>

     </children>