Update PNFD model based on review

Issue-ID: MODELING-104

Change-Id: I8a807e62aedd85f86c7eb243131ec6e785ad7c4e
Signed-off-by: jjewitt58 <jessie.jewitt@oamtechnologies.com>

2 files changed, 94 insertions, 104 deletions

diff --git a/papyrus/ONAP Information Model/Resource.notation b/papyrus/ONAP Information Model/Resource.notation
index 8abde78..0c229b7 100644
--- a/papyrus/ONAP Information Model/Resource.notation
+++ b/papyrus/ONAP Information Model/Resource.notation
@@ -623,6 +623,15 @@
           <element xmi:type="uml:Property" href="Resource.uml#_le5Q4Ow3EeiDiIttoROOIw"/>

           <layoutConstraint xmi:type="notation:Location" xmi:id="__GFtgew3EeiDiIttoROOIw"/>

         </children>

+        <children xmi:type="notation:Shape" xmi:id="_CbHSEP4fEeirJOiRiTRpBw" type="Property_ClassAttributeLabel">

+          <children xmi:type="notation:DecorationNode" xmi:id="_CcH-sP4fEeirJOiRiTRpBw" visible="false" type="StereotypeLabel">

+            <styles xmi:type="notation:StringValueStyle" xmi:id="_CcH-sf4fEeirJOiRiTRpBw" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>

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

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CcH-sv4fEeirJOiRiTRpBw"/>

+          </children>

+          <element xmi:type="uml:Property" href="Resource.uml#_EFTyYPGPEeiSnciiH95D-g"/>

+          <layoutConstraint xmi:type="notation:Location" xmi:id="_CbHSEf4fEeirJOiRiTRpBw"/>

+        </children>

         <styles xmi:type="notation:TitleStyle" xmi:id="_PJL7L-w0EeiDiIttoROOIw"/>

         <styles xmi:type="notation:SortingStyle" xmi:id="_PJL7MOw0EeiDiIttoROOIw"/>

         <styles xmi:type="notation:FilteringStyle" xmi:id="_PJL7Mew0EeiDiIttoROOIw"/>

@@ -646,7 +655,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PJL7P-w0EeiDiIttoROOIw"/>

       </children>

       <element xmi:type="uml:Class" href="Resource.uml#_13TCEDzEEeiWMf5FLWfdLA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PJL7Xuw0EeiDiIttoROOIw" x="560" y="320"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PJL7Xuw0EeiDiIttoROOIw" x="580" y="340"/>

     </children>

     <children xmi:type="notation:Shape" xmi:id="_PJL7X-w0EeiDiIttoROOIw" type="StereotypeComment">

       <styles xmi:type="notation:TitleStyle" xmi:id="_PJL7YOw0EeiDiIttoROOIw"/>

@@ -662,84 +671,59 @@
         <layoutConstraint xmi:type="notation:Location" xmi:id="_5l_pYuw0EeiDiIttoROOIw" y="15"/>

       </children>

       <children xmi:type="notation:BasicCompartment" xmi:id="_5mAQcOw0EeiDiIttoROOIw" type="Class_AttributeCompartment">

-        <children xmi:type="notation:Shape" xmi:id="_D-pCwOw2EeiDiIttoROOIw" type="Property_ClassAttributeLabel">

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

-            <styles xmi:type="notation:StringValueStyle" xmi:id="_D_TKEew2EeiDiIttoROOIw" name="stereotype" stringValue="OpenModel_Profile::Preliminary"/>

-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_LEgJwJ2EEeSk-dMsN-xZbw"/>

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

+        <children xmi:type="notation:Shape" xmi:id="_XYRzEP4gEeirJOiRiTRpBw" type="Property_ClassAttributeLabel">

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

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

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

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

           </children>

           <element xmi:type="uml:Property" href="Common.uml#_knSmcDa8EeivvI-m1BaAbA"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_D-pCwew2EeiDiIttoROOIw"/>

+          <layoutConstraint xmi:type="notation:Location" xmi:id="_XYRzEf4gEeirJOiRiTRpBw"/>

         </children>

-        <children xmi:type="notation:Shape" xmi:id="_D-qQ4Ow2EeiDiIttoROOIw" type="Property_ClassAttributeLabel">

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

-            <styles xmi:type="notation:StringValueStyle" xmi:id="_D_bF4Ow2EeiDiIttoROOIw" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>

+        <children xmi:type="notation:Shape" xmi:id="_XYTBMP4gEeirJOiRiTRpBw" type="Property_ClassAttributeLabel">

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

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

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

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

-          </children>

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

-            <styles xmi:type="notation:StringValueStyle" xmi:id="_D_eJM-w2EeiDiIttoROOIw" name="stereotype" stringValue="OpenModel_Profile::Preliminary"/>

-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_LEgJwJ2EEeSk-dMsN-xZbw"/>

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

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

           </children>

           <element xmi:type="uml:Property" href="Common.uml#_lRLQ8Da8EeivvI-m1BaAbA"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_D-qQ4ew2EeiDiIttoROOIw"/>

+          <layoutConstraint xmi:type="notation:Location" xmi:id="_XYTBMf4gEeirJOiRiTRpBw"/>

         </children>

-        <children xmi:type="notation:Shape" xmi:id="_D-q38Ow2EeiDiIttoROOIw" type="Property_ClassAttributeLabel">

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

-            <styles xmi:type="notation:StringValueStyle" xmi:id="_D_msEew2EeiDiIttoROOIw" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>

+        <children xmi:type="notation:Shape" xmi:id="_XYToQP4gEeirJOiRiTRpBw" type="Property_ClassAttributeLabel">

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

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

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

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

-          </children>

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

-            <styles xmi:type="notation:StringValueStyle" xmi:id="_D_pIV-w2EeiDiIttoROOIw" name="stereotype" stringValue="OpenModel_Profile::Preliminary"/>

-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_LEgJwJ2EEeSk-dMsN-xZbw"/>

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

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

           </children>

           <element xmi:type="uml:Property" href="Common.uml#_luvWsDa8EeivvI-m1BaAbA"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_D-q38ew2EeiDiIttoROOIw"/>

+          <layoutConstraint xmi:type="notation:Location" xmi:id="_XYToQf4gEeirJOiRiTRpBw"/>

         </children>

-        <children xmi:type="notation:Shape" xmi:id="_D-rfAOw2EeiDiIttoROOIw" type="Property_ClassAttributeLabel">

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

-            <styles xmi:type="notation:StringValueStyle" xmi:id="_D_v2Aew2EeiDiIttoROOIw" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>

+        <children xmi:type="notation:Shape" xmi:id="_XYUPUP4gEeirJOiRiTRpBw" type="Property_ClassAttributeLabel">

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

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

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

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

-          </children>

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

-            <styles xmi:type="notation:StringValueStyle" xmi:id="_D_0Hcew2EeiDiIttoROOIw" name="stereotype" stringValue="OpenModel_Profile::Preliminary"/>

-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_LEgJwJ2EEeSk-dMsN-xZbw"/>

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

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

           </children>

           <element xmi:type="uml:Property" href="Common.uml#_oWHBkDa8EeivvI-m1BaAbA"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_D-rfAew2EeiDiIttoROOIw"/>

+          <layoutConstraint xmi:type="notation:Location" xmi:id="_XYUPUf4gEeirJOiRiTRpBw"/>

         </children>

-        <children xmi:type="notation:Shape" xmi:id="_D-sGEOw2EeiDiIttoROOIw" type="Property_ClassAttributeLabel">

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

-            <styles xmi:type="notation:StringValueStyle" xmi:id="_D_9RYew2EeiDiIttoROOIw" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>

+        <children xmi:type="notation:Shape" xmi:id="_XYU2YP4gEeirJOiRiTRpBw" type="Property_ClassAttributeLabel">

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

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

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

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

-          </children>

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

-            <styles xmi:type="notation:StringValueStyle" xmi:id="_EACJ4ew2EeiDiIttoROOIw" name="stereotype" stringValue="OpenModel_Profile::Preliminary"/>

-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_LEgJwJ2EEeSk-dMsN-xZbw"/>

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

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

           </children>

           <element xmi:type="uml:Property" href="Common.uml#_pJTZEDa8EeivvI-m1BaAbA"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_D-sGEew2EeiDiIttoROOIw"/>

+          <layoutConstraint xmi:type="notation:Location" xmi:id="_XYU2Yf4gEeirJOiRiTRpBw"/>

         </children>

-        <children xmi:type="notation:Shape" xmi:id="_D-stIOw2EeiDiIttoROOIw" type="Property_ClassAttributeLabel">

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

-            <styles xmi:type="notation:StringValueStyle" xmi:id="_EAKswew2EeiDiIttoROOIw" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>

+        <children xmi:type="notation:Shape" xmi:id="_XYVdcP4gEeirJOiRiTRpBw" type="Property_ClassAttributeLabel">

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

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

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

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

-          </children>

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

-            <styles xmi:type="notation:StringValueStyle" xmi:id="_EAOXI-w2EeiDiIttoROOIw" name="stereotype" stringValue="OpenModel_Profile::Preliminary"/>

-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_LEgJwJ2EEeSk-dMsN-xZbw"/>

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

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

           </children>

           <element xmi:type="uml:Property" href="Common.uml#_p8meQDa8EeivvI-m1BaAbA"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_D-stIew2EeiDiIttoROOIw"/>

+          <layoutConstraint xmi:type="notation:Location" xmi:id="_XYVdcf4gEeirJOiRiTRpBw"/>

         </children>

         <styles xmi:type="notation:TitleStyle" xmi:id="_5mAQcew0EeiDiIttoROOIw"/>

         <styles xmi:type="notation:SortingStyle" xmi:id="_5mAQcuw0EeiDiIttoROOIw"/>

@@ -764,7 +748,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5mQIEuw0EeiDiIttoROOIw"/>

       </children>

       <element xmi:type="uml:Class" href="Resource.uml#_bd53ADzFEeiWMf5FLWfdLA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5l-bQew0EeiDiIttoROOIw" x="540" y="620"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5l-bQew0EeiDiIttoROOIw" x="560" y="640"/>

     </children>

     <children xmi:type="notation:Shape" xmi:id="_5mbuQOw0EeiDiIttoROOIw" type="StereotypeComment">

       <styles xmi:type="notation:TitleStyle" xmi:id="_5mbuQew0EeiDiIttoROOIw"/>

@@ -807,7 +791,7 @@
       </children>

       <children xmi:type="notation:DecorationNode" xmi:id="_PJMh6-w0EeiDiIttoROOIw" type="Association_NameLabel">

         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_PJMh7Ow0EeiDiIttoROOIw" name="IS_UPDATED_POSITION" booleanValue="true"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_PJMh7ew0EeiDiIttoROOIw" x="-31" y="-68"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_PJMh7ew0EeiDiIttoROOIw" x="-14" y="68"/>

       </children>

       <children xmi:type="notation:DecorationNode" xmi:id="_PJMh7uw0EeiDiIttoROOIw" visible="false" type="Association_TargetRoleLabel">

         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_PJMh7-w0EeiDiIttoROOIw" name="IS_UPDATED_POSITION" booleanValue="true"/>

@@ -827,9 +811,9 @@
       </children>

       <styles xmi:type="notation:FontStyle" xmi:id="_PJMh-uw0EeiDiIttoROOIw"/>

       <element xmi:type="uml:Association" href="Resource.uml#_wc9LUD2rEeiu6I5JfRTxxQ"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_PJMh--w0EeiDiIttoROOIw" points="[640, 181, -643984, -643984]$[640, 320, -643984, -643984]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PJMh_Ow0EeiDiIttoROOIw" id="(0.42704626334519574,1.0)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PJMh_ew0EeiDiIttoROOIw" id="(0.36363636363636365,0.0)"/>

+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_PJMh--w0EeiDiIttoROOIw" points="[660, 181, -643984, -643984]$[660, 340, -643984, -643984]"/>

+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PJMh_Ow0EeiDiIttoROOIw" id="(0.498220640569395,1.0)"/>

+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PJMh_ew0EeiDiIttoROOIw" id="(0.3389830508474576,0.0)"/>

     </edges>

     <edges xmi:type="notation:Connector" xmi:id="_5mcVUew0EeiDiIttoROOIw" type="StereotypeCommentLink" source="_5l-bQOw0EeiDiIttoROOIw" target="_5mbuQOw0EeiDiIttoROOIw">

       <styles xmi:type="notation:FontStyle" xmi:id="_5mcVUuw0EeiDiIttoROOIw"/>

@@ -841,36 +825,36 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_5mcVVOw0EeiDiIttoROOIw"/>

       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_5mc8YOw0EeiDiIttoROOIw"/>

     </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_quQjoOw1EeiDiIttoROOIw" type="Association_Edge" source="_PJL7Kuw0EeiDiIttoROOIw" target="_5l-bQOw0EeiDiIttoROOIw" routing="Rectilinear">

-      <children xmi:type="notation:DecorationNode" xmi:id="_quQjo-w1EeiDiIttoROOIw" type="Association_StereotypeLabel">

-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_E7K8cOw2EeiDiIttoROOIw" name="IS_UPDATED_POSITION" booleanValue="true"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_quQjpOw1EeiDiIttoROOIw" x="1" y="-18"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_quRKsOw1EeiDiIttoROOIw" type="Association_NameLabel">

-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_E72R4Ow2EeiDiIttoROOIw" name="IS_UPDATED_POSITION" booleanValue="true"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_quRKsew1EeiDiIttoROOIw" x="4" y="69"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_quRKsuw1EeiDiIttoROOIw" visible="false" type="Association_TargetRoleLabel">

-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_E8o8EOw2EeiDiIttoROOIw" name="IS_UPDATED_POSITION" booleanValue="true"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_quRKs-w1EeiDiIttoROOIw" x="23" y="-18"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_quRKtOw1EeiDiIttoROOIw" visible="false" type="Association_SourceRoleLabel">

-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_E9ZxEOw2EeiDiIttoROOIw" name="IS_UPDATED_POSITION" booleanValue="true"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_quRKtew1EeiDiIttoROOIw" x="-23" y="19"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_quRKtuw1EeiDiIttoROOIw" type="Association_SourceMultiplicityLabel">

-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_E-JX8Ow2EeiDiIttoROOIw" name="IS_UPDATED_POSITION" booleanValue="true"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_quRKt-w1EeiDiIttoROOIw" x="23" y="19"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_quRKuOw1EeiDiIttoROOIw" type="Association_TargetMultiplicityLabel">

-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_E-xDAOw2EeiDiIttoROOIw" name="IS_UPDATED_POSITION" booleanValue="true"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_quRKuew1EeiDiIttoROOIw" x="-24" y="-18"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_quQjoew1EeiDiIttoROOIw"/>

-      <element xmi:type="uml:Association" href="Service.uml#_qsAg4Ow1EeiDiIttoROOIw"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_quQjouw1EeiDiIttoROOIw" points="[660, 513, -643984, -643984]$[660, 620, -643984, -643984]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_qvt8MOw1EeiDiIttoROOIw" id="(0.45454545454545453,1.0)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_qvujQOw1EeiDiIttoROOIw" id="(0.5042016806722689,0.0)"/>

+    <edges xmi:type="notation:Connector" xmi:id="_kix68P4fEeirJOiRiTRpBw" type="Association_Edge" source="_PJL7Kuw0EeiDiIttoROOIw" target="_5l-bQOw0EeiDiIttoROOIw" routing="Rectilinear">

+      <children xmi:type="notation:DecorationNode" xmi:id="_ki0XMP4fEeirJOiRiTRpBw" type="Association_StereotypeLabel">

+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_USuXYP4gEeirJOiRiTRpBw" name="IS_UPDATED_POSITION" booleanValue="true"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ki0XMf4fEeirJOiRiTRpBw" x="-1" y="-19"/>

+      </children>

+      <children xmi:type="notation:DecorationNode" xmi:id="_ki0-QP4fEeirJOiRiTRpBw" type="Association_NameLabel">

+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UTMRcP4gEeirJOiRiTRpBw" name="IS_UPDATED_POSITION" booleanValue="true"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ki0-Qf4fEeirJOiRiTRpBw" x="-8" y="90"/>

+      </children>

+      <children xmi:type="notation:DecorationNode" xmi:id="_ki0-Qv4fEeirJOiRiTRpBw" visible="false" type="Association_TargetRoleLabel">

+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UTt14P4gEeirJOiRiTRpBw" name="IS_UPDATED_POSITION" booleanValue="true"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ki0-Q_4fEeirJOiRiTRpBw" x="15" y="-19"/>

+      </children>

+      <children xmi:type="notation:DecorationNode" xmi:id="_ki1lUP4fEeirJOiRiTRpBw" visible="false" type="Association_SourceRoleLabel">

+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UUZyYP4gEeirJOiRiTRpBw" name="IS_UPDATED_POSITION" booleanValue="true"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ki1lUf4fEeirJOiRiTRpBw" x="-15" y="18"/>

+      </children>

+      <children xmi:type="notation:DecorationNode" xmi:id="_ki2MYP4fEeirJOiRiTRpBw" type="Association_SourceMultiplicityLabel">

+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UVAPUP4gEeirJOiRiTRpBw" name="IS_UPDATED_POSITION" booleanValue="true"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ki2MYf4fEeirJOiRiTRpBw" x="16" y="16"/>

+      </children>

+      <children xmi:type="notation:DecorationNode" xmi:id="_ki2MYv4fEeirJOiRiTRpBw" type="Association_TargetMultiplicityLabel">

+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UVkQAP4gEeirJOiRiTRpBw" name="IS_UPDATED_POSITION" booleanValue="true"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ki2zcP4fEeirJOiRiTRpBw" x="-16" y="-17"/>

+      </children>

+      <styles xmi:type="notation:FontStyle" xmi:id="_kix68f4fEeirJOiRiTRpBw"/>

+      <element xmi:type="uml:Association" href="Resource.uml#_kf17sP4fEeirJOiRiTRpBw"/>

+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_kix68v4fEeirJOiRiTRpBw" points="[740, 549, -643984, -643984]$[740, 640, -643984, -643984]"/>

+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_kmbE0P4fEeirJOiRiTRpBw" id="(0.6779661016949152,1.0)"/>

+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_kmbr4P4fEeirJOiRiTRpBw" id="(0.5750798722044729,0.0)"/>

     </edges>

   </notation:Diagram>

 </xmi:XMI>

diff --git a/papyrus/ONAP Information Model/Resource.uml b/papyrus/ONAP Information Model/Resource.uml
index cdda5a4..c6d8540 100644
--- a/papyrus/ONAP Information Model/Resource.uml
+++ b/papyrus/ONAP Information Model/Resource.uml
@@ -35,6 +35,12 @@
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_P7vGYD2sEeiu6I5JfRTxxQ" value="*"/>

         </ownedEnd>

       </packagedElement>

+      <packagedElement xmi:type="uml:Association" xmi:id="_kf17sP4fEeirJOiRiTRpBw" name="PnfdHasPnfExtCpd" memberEnd="_kgLS4P4fEeirJOiRiTRpBw _kgUc0P4fEeirJOiRiTRpBw">

+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kgHBcP4fEeirJOiRiTRpBw" source="org.eclipse.papyrus">

+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kgHogP4fEeirJOiRiTRpBw" key="nature" value="UML_Nature"/>

+        </eAnnotations>

+        <ownedEnd xmi:type="uml:Property" xmi:id="_kgUc0P4fEeirJOiRiTRpBw" name="_pnfd" type="_13TCEDzEEeiWMf5FLWfdLA" association="_kf17sP4fEeirJOiRiTRpBw"/>

+      </packagedElement>

     </packagedElement>

     <packagedElement xmi:type="uml:Package" xmi:id="_lK-iYDOHEei5Af8DcjrhIQ" name="Diagrams"/>

     <packagedElement xmi:type="uml:Package" xmi:id="_lK-iYTOHEei5Af8DcjrhIQ" name="Interfaces"/>

@@ -371,21 +377,13 @@ NOTE: 	The provider of the PNFD might be different from the provider of the PNF.
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_13TCGjzEEeiWMf5FLWfdLA"/>

           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_13TCGzzEEeiWMf5FLWfdLA" value="1"/>

         </ownedAttribute>

-        <ownedAttribute xmi:type="uml:Property" xmi:id="_qsDkMOw1EeiDiIttoROOIw" name="_pnfExtCpd " type="_bd53ADzFEeiWMf5FLWfdLA" aggregation="composite">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_8YF2MOw3EeiDiIttoROOIw" annotatedElement="_qsDkMOw1EeiDiIttoROOIw">

-            <body>Specifies the characteristics of one or more connection points where to connect the PNF to a VL.</body>

-          </ownedComment>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_qsEyUOw1EeiDiIttoROOIw" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_qsEyUew1EeiDiIttoROOIw" value="*"/>

-          <association xmi:type="uml:Association" href="Service.uml#_qsAg4Ow1EeiDiIttoROOIw"/>

-        </ownedAttribute>

         <ownedAttribute xmi:type="uml:Property" xmi:id="_x8ZI0Ow2EeiDiIttoROOIw" name="functionDescription" visibility="public">

           <ownedComment xmi:type="uml:Comment" xmi:id="_-VZF0Ow2EeiDiIttoROOIw" annotatedElement="_x8ZI0Ow2EeiDiIttoROOIw">

             <body>Describes the PNF function.</body>

           </ownedComment>

           <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>

         </ownedAttribute>

-        <ownedAttribute xmi:type="uml:Property" xmi:id="_WDCm4Ow3EeiDiIttoROOIw" name="pnfdInvarientId" visibility="public">

+        <ownedAttribute xmi:type="uml:Property" xmi:id="_WDCm4Ow3EeiDiIttoROOIw" name="pnfdInvariantId" visibility="public">

           <ownedComment xmi:type="uml:Comment" xmi:id="_fgMd0Ow3EeiDiIttoROOIw" annotatedElement="_WDCm4Ow3EeiDiIttoROOIw">

             <body>Identifies a PNFD in a version independent manner. This attribute is invariant across versions of PNFD.</body>

           </ownedComment>

@@ -403,17 +401,25 @@ NOTE: 	The provider of the PNFD might be different from the provider of the PNF.
 coordinates or address of the building, etc.) of the PNF. The cardinality 0 is used when the location is unknown.&#xD;

 </body>

           </ownedComment>

+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>

           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_MLyxUPGPEeiSnciiH95D-g"/>

           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_MM6LoPGPEeiSnciiH95D-g" value="1"/>

         </ownedAttribute>

+        <ownedAttribute xmi:type="uml:Property" xmi:id="_kgLS4P4fEeirJOiRiTRpBw" name="_pnfExtCpd " type="_bd53ADzFEeiWMf5FLWfdLA" aggregation="composite" association="_kf17sP4fEeirJOiRiTRpBw">

+          <ownedComment xmi:type="uml:Comment" xmi:id="_3bGPUP4gEeirJOiRiTRpBw" annotatedElement="_kgLS4P4fEeirJOiRiTRpBw">

+            <body>Specifies the characteristics of one or more connection points where to connect the PNF to a VL.</body>

+          </ownedComment>

+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_kgSAkP4fEeirJOiRiTRpBw" value="1"/>

+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_kgTOsP4fEeirJOiRiTRpBw" value="*"/>

+        </ownedAttribute>

       </packagedElement>

       <packagedElement xmi:type="uml:Class" xmi:id="_bd53ADzFEeiWMf5FLWfdLA" name="PnfExtCpd ">

         <ownedComment xmi:type="uml:Comment" xmi:id="_bd53ATzFEeiWMf5FLWfdLA" annotatedElement="_bd53ADzFEeiWMf5FLWfdLA">

           <body>A PnfExtCpd is a type of Cpd and describes the characteristics of an external interface, a.k.a external CP, where to connect the PNF to a VL. &#xD;

 A PnfExtCpd inherits from the Cpd Class.</body>

         </ownedComment>

-        <generalization xmi:type="uml:Generalization" xmi:id="_wyByMEPnEeiVGPeZpaYNtQ">

-          <general xmi:type="uml:Class" href="Common.uml#_7pUNEDa7EeivvI-m1BaAbA"/>

+        <generalization xmi:type="uml:Generalization" xmi:id="_QFTUsP4gEeirJOiRiTRpBw">

+          <general xmi:type="uml:Class" href="Common.uml#_rmDCkNxjEei0G_d67y10Rg"/>

         </generalization>

       </packagedElement>

     </packagedElement>

@@ -529,9 +535,9 @@ NOTE 2:	A minimum set of external stimulus includes: the receipt of request mess
     <base_StructuralFeature xmi:type="uml:Property" href="Service.uml#_yKYPgMhdEeiSA51ssKbbgA"/>

   </OpenModel_Profile:OpenModelAttribute>

   <OpenModel_Profile:Experimental xmi:id="_cz9zAOw1EeiDiIttoROOIw" base_Element="_bd53ADzFEeiWMf5FLWfdLA"/>

-  <OpenModel_Profile:OpenModelAttribute xmi:id="_qsDkMew1EeiDiIttoROOIw" base_StructuralFeature="_qsDkMOw1EeiDiIttoROOIw"/>

   <OpenModel_Profile:OpenModelAttribute xmi:id="_x8Zv4Ow2EeiDiIttoROOIw" base_StructuralFeature="_x8ZI0Ow2EeiDiIttoROOIw"/>

   <OpenModel_Profile:OpenModelAttribute xmi:id="_WDCm4ew3EeiDiIttoROOIw" base_StructuralFeature="_WDCm4Ow3EeiDiIttoROOIw" isInvariant="true"/>

   <OpenModel_Profile:OpenModelAttribute xmi:id="_le538Ow3EeiDiIttoROOIw" base_StructuralFeature="_le5Q4Ow3EeiDiIttoROOIw"/>

   <OpenModel_Profile:OpenModelAttribute xmi:id="_EF5oQPGPEeiSnciiH95D-g" base_StructuralFeature="_EFTyYPGPEeiSnciiH95D-g"/>

+  <OpenModel_Profile:OpenModelAttribute xmi:id="_kgMhAP4fEeirJOiRiTRpBw" base_StructuralFeature="_kgLS4P4fEeirJOiRiTRpBw"/>

 </xmi:XMI>