Slight update to Nf

Added IsShared attribute to NfDesc and renamed Nf to NfInstance.

Issue-ID: MODELING-104

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

2 files changed, 74 insertions, 12 deletions

diff --git a/ONAP Information Model/Nf.notation b/ONAP Information Model/Nf.notation
index fc2cc27..ba5b18a 100644
--- a/ONAP Information Model/Nf.notation
+++ b/ONAP Information Model/Nf.notation
@@ -74,7 +74,7 @@
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_G8dsokUIEemWRYeHGX88Yw"/>

     </children>

     <element xmi:type="uml:Class" href="Nf.uml#_VtzSoESyEeiVGPeZpaYNtQ"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_G8AZoUUIEemWRYeHGX88Yw" x="374" y="73"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_G8AZoUUIEemWRYeHGX88Yw" x="380" y="80" width="261"/>

   </children>

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

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

@@ -108,7 +108,7 @@
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kmsg6UUIEemWRYeHGX88Yw"/>

     </children>

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

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kmrSwUUIEemWRYeHGX88Yw" x="420" y="300"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kmrSwUUIEemWRYeHGX88Yw" x="420" y="300" width="201"/>

   </children>

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

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

@@ -118,6 +118,49 @@
     <element xsi:nil="true"/>

     <layoutConstraint xmi:type="notation:Bounds" xmi:id="_knHXokUIEemWRYeHGX88Yw" x="200"/>

   </children>

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

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

+    <children xmi:type="notation:DecorationNode" xmi:id="_m6rekcKwEemUeulSIk5Pkg" type="Class_FloatingNameLabel">

+      <layoutConstraint xmi:type="notation:Location" xmi:id="_m6reksKwEemUeulSIk5Pkg" y="15"/>

+    </children>

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

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

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

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

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

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

+        </children>

+        <element xmi:type="uml:Property" href="Nf.uml#_oqdaIMKwEemUeulSIk5Pkg"/>

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

+      </children>

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

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

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

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

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_m6remMKwEemUeulSIk5Pkg" visible="false" type="Class_OperationCompartment">

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

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

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

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

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_m6rencKwEemUeulSIk5Pkg" visible="false" type="Class_NestedClassifierCompartment">

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

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

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

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

+    </children>

+    <element xmi:type="uml:Class" href="Nf.uml#_O385oJssEeiPBvbfaqSLYg"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_m6q3gcKwEemUeulSIk5Pkg" x="40" y="80"/>

+  </children>

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

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

+    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_m62ds8KwEemUeulSIk5Pkg" name="BASE_ELEMENT">

+      <eObjectValue xmi:type="uml:Class" href="Nf.uml#_O385oJssEeiPBvbfaqSLYg"/>

+    </styles>

+    <element xsi:nil="true"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_m62dssKwEemUeulSIk5Pkg" x="200"/>

+  </children>

   <styles xmi:type="notation:StringValueStyle" xmi:id="_GDOXgUUIEemWRYeHGX88Yw" name="diagram_compatibility_version" stringValue="1.4.0"/>

   <styles xmi:type="notation:DiagramStyle" xmi:id="_GDOXgkUIEemWRYeHGX88Yw"/>

   <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_GDOXg0UIEemWRYeHGX88Yw" diagramKindId="org.eclipse.papyrus.uml.diagram.class">

@@ -146,12 +189,23 @@
   </edges>

   <edges xmi:type="notation:Connector" xmi:id="_pA0i0EUIEemWRYeHGX88Yw" type="Generalization_Edge" source="_kmrSwEUIEemWRYeHGX88Yw" target="_G8AZoEUIEemWRYeHGX88Yw">

     <children xmi:type="notation:DecorationNode" xmi:id="_pA1J4EUIEemWRYeHGX88Yw" type="Generalization_StereotypeLabel">

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

       <layoutConstraint xmi:type="notation:Location" xmi:id="_pA1J4UUIEemWRYeHGX88Yw" y="40"/>

     </children>

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

     <element xmi:type="uml:Generalization" href="Vnf.uml#_pAekkEUIEemWRYeHGX88Yw"/>

     <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_pA0i0kUIEemWRYeHGX88Yw" points="[500, 300, -643984, -643984]$[500, 234, -643984, -643984]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pBn0EEUIEemWRYeHGX88Yw" id="(0.44692737430167595,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pBn0EUUIEemWRYeHGX88Yw" id="(0.50199203187251,1.0)"/>

+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pBn0EEUIEemWRYeHGX88Yw" id="(0.4975124378109453,0.0)"/>

+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pBn0EUUIEemWRYeHGX88Yw" id="(0.5363984674329502,1.0)"/>

+  </edges>

+  <edges xmi:type="notation:Connector" xmi:id="_m63EwMKwEemUeulSIk5Pkg" type="StereotypeCommentLink" source="_m6q3gMKwEemUeulSIk5Pkg" target="_m62dsMKwEemUeulSIk5Pkg">

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

+    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_m63ExcKwEemUeulSIk5Pkg" name="BASE_ELEMENT">

+      <eObjectValue xmi:type="uml:Class" href="Nf.uml#_O385oJssEeiPBvbfaqSLYg"/>

+    </styles>

+    <element xsi:nil="true"/>

+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_m63EwsKwEemUeulSIk5Pkg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_m63Ew8KwEemUeulSIk5Pkg"/>

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

   </edges>

 </notation:Diagram>

diff --git a/ONAP Information Model/Nf.uml b/ONAP Information Model/Nf.uml
index 4f922ff..b1ad342 100644
--- a/ONAP Information Model/Nf.uml
+++ b/ONAP Information Model/Nf.uml
@@ -11,11 +11,20 @@
         <generalization xmi:type="uml:Generalization" xmi:id="_ujjIsJssEeiPBvbfaqSLYg">

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

         </generalization>

+        <ownedAttribute xmi:type="uml:Property" xmi:id="_oqdaIMKwEemUeulSIk5Pkg" name="isSharable">

+          <ownedComment xmi:type="uml:Comment" xmi:id="_7tUFIMNiEemImq9HquDN-w" annotatedElement="_oqdaIMKwEemUeulSIk5Pkg">

+            <body>Indicates whether the NetworkFunction can be shared (only applies to Pnfs or Vnfs).</body>

+          </ownedComment>

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

+        </ownedAttribute>

       </packagedElement>

-      <packagedElement xmi:type="uml:Class" xmi:id="_VtzSoESyEeiVGPeZpaYNtQ" name="NetworkFunction" isAbstract="true">

+      <packagedElement xmi:type="uml:Class" xmi:id="_VtzSoESyEeiVGPeZpaYNtQ" name="NetworkFunctionInstance" isAbstract="true">

         <ownedComment xmi:type="uml:Comment" xmi:id="_VtzSoUSyEeiVGPeZpaYNtQ" annotatedElement="_VtzSoESyEeiVGPeZpaYNtQ">

           <body>A functional block within a network infrastructure that has well-defined external interfaces and well-defined functional behaviour. NOTE: In practical terms, a Network Function is today often a network node or physical appliance</body>

         </ownedComment>

+        <generalization xmi:type="uml:Generalization" xmi:id="_Sy-KsL-VEemqDYUsJ60dmQ">

+          <general xmi:type="uml:Class" href="Resource.uml#_hZfC0DEkEemRSoIWRX3jNw"/>

+        </generalization>

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

           <ownedComment xmi:type="uml:Comment" xmi:id="_SqMUgEUHEemWRYeHGX88Yw" annotatedElement="_LlLZoEUHEemWRYeHGX88Yw">

             <body>Identifier of the network function</body>

@@ -138,13 +147,12 @@ This tells the consumer where to send the subscription request.&#xD;
   <OpenModel_Profile:Experimental xmi:id="_S99voEUIEemWRYeHGX88Yw" base_Element="_ZqGs8EUHEemWRYeHGX88Yw"/>

   <OpenModel_Profile:Experimental xmi:id="_UfyHsEUIEemWRYeHGX88Yw" base_Element="_srFqkEUHEemWRYeHGX88Yw"/>

   <OpenModel_Profile:Experimental xmi:id="_XveW0EUIEemWRYeHGX88Yw" base_Element="_6o6QUEUHEemWRYeHGX88Yw"/>

-  <OpenModel_Profile:OpenModelAttribute xmi:id="_8Q7XUE_ZEemeaek-m0jmOA">

-    <base_StructuralFeature xmi:type="uml:Property" href="Vnf.uml#_8Q6wQE_ZEemeaek-m0jmOA"/>

-  </OpenModel_Profile:OpenModelAttribute>

-  <OpenModel_Profile:OpenModelAttribute xmi:id="_0Cbns0_gEemeaek-m0jmOA">

-    <base_StructuralFeature xmi:type="uml:Property" href="Vnf.uml#_0Cbnsk_gEemeaek-m0jmOA"/>

+  <OpenModel_Profile:OpenModelAttribute xmi:id="_42d3Ub-SEemqDYUsJ60dmQ">

+    <base_StructuralFeature xmi:type="uml:Property" href="Vnf.uml#_42d3UL-SEemqDYUsJ60dmQ"/>

   </OpenModel_Profile:OpenModelAttribute>

-  <OpenModel_Profile:OpenModelAttribute xmi:id="_0Cc10U_gEemeaek-m0jmOA">

-    <base_StructuralFeature xmi:type="uml:Property" href="Vnf.uml#_0Cc10E_gEemeaek-m0jmOA"/>

+  <OpenModel_Profile:OpenModelAttribute xmi:id="_nWocAb-VEemqDYUsJ60dmQ">

+    <base_StructuralFeature xmi:type="uml:Property" href="Vnf.uml#_nWocAL-VEemqDYUsJ60dmQ"/>

   </OpenModel_Profile:OpenModelAttribute>

+  <OpenModel_Profile:OpenModelAttribute xmi:id="_oqeBMMKwEemUeulSIk5Pkg" base_StructuralFeature="_oqdaIMKwEemUeulSIk5Pkg"/>

+  <OpenModel_Profile:Experimental xmi:id="_2OSQoMNiEemImq9HquDN-w" base_Element="_oqdaIMKwEemUeulSIk5Pkg"/>

 </xmi:XMI>