Merge "Create association between VNIR and LNR"

2 files changed, 106 insertions, 18 deletions

diff --git a/ONAP Information Model/Vnf.notation b/ONAP Information Model/Vnf.notation
index de5df3c..7cd78f9 100644
--- a/ONAP Information Model/Vnf.notation
+++ b/ONAP Information Model/Vnf.notation
@@ -2739,15 +2739,6 @@
           <element xmi:type="uml:Property" href="Vnf.uml#_H9TooDm5EeiWMf5FLWfdLA"/>

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

         </children>

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

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

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

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

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

-          </children>

-          <element xmi:type="uml:Property" href="Vnf.uml#_H9Vd0Dm5EeiWMf5FLWfdLA"/>

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

-        </children>

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

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

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

@@ -2962,6 +2953,63 @@
       <element xsi:nil="true"/>

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

     </children>

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

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

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

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

+      </children>

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

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

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

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

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

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

+          </children>

+          <element xmi:type="uml:Property" href="Vnf.uml#_qPKK8Co9EemS0_wZSU3sbA"/>

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

+        </children>

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

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

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

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

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

+          </children>

+          <element xmi:type="uml:Property" href="Vnf.uml#_7P3S4Co9EemS0_wZSU3sbA"/>

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

+        </children>

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

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

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

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

+      </children>

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

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

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

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

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

+      </children>

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

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

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

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

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

+      </children>

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

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

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

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

+      </children>

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

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qFPtsUdMEemb9YiEz89e4g" x="80" y="-120" width="221" height="81"/>

+    </children>

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

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

+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_qGJFkEdMEemb9YiEz89e4g" 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="_qGIegkdMEemb9YiEz89e4g" x="200"/>

+    </children>

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

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

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

@@ -3553,6 +3601,41 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6zjikCsHEemS0_wZSU3sbA" id="(1.0,0.09569377990430622)"/>

       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6zkJoCsHEemS0_wZSU3sbA" id="(0.0,0.5970149253731343)"/>

     </edges>

+    <edges xmi:type="notation:Connector" xmi:id="_qGJsoEdMEemb9YiEz89e4g" type="StereotypeCommentLink" source="_qFPtsEdMEemb9YiEz89e4g" target="_qGIegEdMEemb9YiEz89e4g">

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

+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_qGMI4EdMEemb9YiEz89e4g" 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="_qGJsokdMEemb9YiEz89e4g" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

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

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

+    </edges>

+    <edges xmi:type="notation:Connector" xmi:id="_53SqIEdMEemb9YiEz89e4g" type="Association_Edge" source="_MUJtEDm5EeiWMf5FLWfdLA" target="_qFPtsEdMEemb9YiEz89e4g">

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

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_53TRMUdMEemb9YiEz89e4g" y="-20"/>

+      </children>

+      <children xmi:type="notation:DecorationNode" xmi:id="_53TRMkdMEemb9YiEz89e4g" type="Association_NameLabel">

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_53TRM0dMEemb9YiEz89e4g" x="3" y="74"/>

+      </children>

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

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_53TRNUdMEemb9YiEz89e4g" y="-20"/>

+      </children>

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

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_53T4QUdMEemb9YiEz89e4g" y="20"/>

+      </children>

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

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_53T4Q0dMEemb9YiEz89e4g" y="20"/>

+      </children>

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

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_53T4RUdMEemb9YiEz89e4g" y="-20"/>

+      </children>

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

+      <element xmi:type="uml:Association" href="Vnf.uml#_5zfvQEdMEemb9YiEz89e4g"/>

+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_53SqIkdMEemb9YiEz89e4g" points="[180, 20, -643984, -643984]$[180, -39, -643984, -643984]"/>

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

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

+    </edges>

   </notation:Diagram>

   <notation:Diagram xmi:id="_BbL9MDzfEeiuk5pWzMOpfA" type="PapyrusUMLClassDiagram" name="Vnf Deployment Flavor" measurementUnit="Pixel">

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

diff --git a/ONAP Information Model/Vnf.uml b/ONAP Information Model/Vnf.uml
index 6b037c8..bc0bfee 100644
--- a/ONAP Information Model/Vnf.uml
+++ b/ONAP Information Model/Vnf.uml
@@ -576,6 +576,12 @@ This will probably need to move to common</body>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_YFPBADwsEemSHu2qGsweWg" value="*"/>

         </ownedEnd>

       </packagedElement>

+      <packagedElement xmi:type="uml:Association" xmi:id="_5zfvQEdMEemb9YiEz89e4g" name="VNIRHasLNR" memberEnd="_5zqHUEdMEemb9YiEz89e4g _5zvm4EdMEemb9YiEz89e4g">

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

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

+        </eAnnotations>

+        <ownedEnd xmi:type="uml:Property" xmi:id="_5zvm4EdMEemb9YiEz89e4g" name="_virtualNetworkInterfaceRequirements" type="_8BUXwDm4EeiWMf5FLWfdLA" association="_5zfvQEdMEemb9YiEz89e4g"/>

+      </packagedElement>

     </packagedElement>

     <packagedElement xmi:type="uml:Package" xmi:id="_zPN5MTOHEei5Af8DcjrhIQ" name="Interfaces"/>

     <packagedElement xmi:type="uml:Package" xmi:id="_zPN5MjOHEei5Af8DcjrhIQ" name="ObjectClasses">

@@ -1530,13 +1536,12 @@ When the VnfExtCpd is mapped to a VduCpd, the values for the attributes type, su
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VYZ_ADm9EeiWMf5FLWfdLA"/>

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

         </ownedAttribute>

-        <ownedAttribute xmi:type="uml:Property" xmi:id="_H9Vd0Dm5EeiWMf5FLWfdLA" name="nicIoRequirements" type="_Lpu5wCo9EemS0_wZSU3sbA">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_1kSgsEbvEei7eo5RdnNiBQ" annotatedElement="_H9Vd0Dm5EeiWMf5FLWfdLA">

-            <body>This references (couples) the CPD with any logical node I/O requirements (for network devices) that may have been created. Linking these attributes is necessary so that so that I/O requirements that need to be articulated at the logical node level can be associated with the network interface requirements associated with the CPD.&#xD;

-</body>

+        <ownedAttribute xmi:type="uml:Property" xmi:id="_5zqHUEdMEemb9YiEz89e4g" name="_nicIoRequirements" type="_Lpu5wCo9EemS0_wZSU3sbA" association="_5zfvQEdMEemb9YiEz89e4g">

+          <ownedComment xmi:type="uml:Comment" xmi:id="_Pvj98EdNEemb9YiEz89e4g" annotatedElement="_5zqHUEdMEemb9YiEz89e4g">

+            <body>This references (couples) the CPD with any logical node I/O requirements (for network devices) that may have been created. Linking these attributes is necessary so that so that I/O requirements that need to be articulated at the logical node level can be associated with the network interface requirements associated with the CPD.</body>

           </ownedComment>

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

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

+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5ztKoEdMEemb9YiEz89e4g"/>

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

         </ownedAttribute>

       </packagedElement>

       <packagedElement xmi:type="uml:Class" xmi:id="_6C8F4DnAEeiWMf5FLWfdLA" name="InstantiationLevel">

@@ -3139,7 +3144,6 @@ The attached VDUs shall connect to the same internal VLD.&#xD;
   <OpenModel_Profile:OpenModelAttribute xmi:id="_H9RMYTm5EeiWMf5FLWfdLA" base_StructuralFeature="_H9RMYDm5EeiWMf5FLWfdLA"/>

   <OpenModel_Profile:OpenModelAttribute xmi:id="_H9SagTm5EeiWMf5FLWfdLA" base_StructuralFeature="_H9SagDm5EeiWMf5FLWfdLA"/>

   <OpenModel_Profile:OpenModelAttribute xmi:id="_H9UPsDm5EeiWMf5FLWfdLA" base_StructuralFeature="_H9TooDm5EeiWMf5FLWfdLA"/>

-  <OpenModel_Profile:OpenModelAttribute xmi:id="_H9Vd0Tm5EeiWMf5FLWfdLA" base_StructuralFeature="_H9Vd0Dm5EeiWMf5FLWfdLA"/>

   <OpenModel_Profile:OpenModelClass xmi:id="_6C8s8DnAEeiWMf5FLWfdLA" base_Class="_6C8F4DnAEeiWMf5FLWfdLA"/>

   <OpenModel_Profile:OpenModelAttribute xmi:id="_Y6HcIDnGEeiWMf5FLWfdLA" base_StructuralFeature="_Y6Fm8DnGEeiWMf5FLWfdLA" isInvariant="true"/>

   <OpenModel_Profile:OpenModelAttribute xmi:id="_jVi5MDnGEeiWMf5FLWfdLA" base_StructuralFeature="_jViSIDnGEeiWMf5FLWfdLA"/>

@@ -3625,8 +3629,6 @@ The attached VDUs shall connect to the same internal VLD.&#xD;
   <OpenModel_Profile:Reference xmi:id="_m7XasCsIEemS0_wZSU3sbA" base_Element="_ISONYDOSEeiHat9KcP8uWA" reference="IFA011 v2.5.1"/>

   <OpenModel_Profile:Preliminary xmi:id="_88WloCsIEemS0_wZSU3sbA" base_Element="_6rucQCsHEemS0_wZSU3sbA"/>

   <OpenModel_Profile:PassedByReference xmi:id="_89X5UCsIEemS0_wZSU3sbA" base_Property="_6rucQCsHEemS0_wZSU3sbA"/>

-  <OpenModel_Profile:Experimental xmi:id="_E26L8CsKEemS0_wZSU3sbA" base_Element="_H9Vd0Dm5EeiWMf5FLWfdLA"/>

-  <OpenModel_Profile:PassedByReference xmi:id="_ZIkHQCsKEemS0_wZSU3sbA" base_Property="_H9Vd0Dm5EeiWMf5FLWfdLA"/>

   <OpenModel_Profile:Reference xmi:id="_5JnB4CsKEemS0_wZSU3sbA" base_Element="_0lvvQDgREeiOYfGHew0BGg" reference="IFA011 v2.5.1"/>

   <OpenModel_Profile:Reference xmi:id="_RWmKUCsLEemS0_wZSU3sbA" base_Element="_p0UVsDQvEeixv_sLOod4lQ" reference="IFA011 v2.5.1"/>

   <OpenModel_Profile:OpenModelAttribute xmi:id="_oGtFESsLEemS0_wZSU3sbA" base_StructuralFeature="_oGtFECsLEemS0_wZSU3sbA"/>

@@ -3753,4 +3755,7 @@ The attached VDUs shall connect to the same internal VLD.&#xD;
   <OpenModel_Profile:OpenModelAttribute xmi:id="_wHxGcUT_EemWRYeHGX88Yw" base_StructuralFeature="_wHxGcET_EemWRYeHGX88Yw"/>

   <OpenModel_Profile:Experimental xmi:id="_IA5ewEUAEemWRYeHGX88Yw" base_Element="_wHuqMET_EemWRYeHGX88Yw"/>

   <OpenModel_Profile:PassedByReference xmi:id="_kux4IEUDEemWRYeHGX88Yw" base_Property="_PG3MwGkCEeip9umi7zNprw"/>

+  <OpenModel_Profile:OpenModelAttribute xmi:id="_5zquYEdMEemb9YiEz89e4g" base_StructuralFeature="_5zqHUEdMEemb9YiEz89e4g"/>

+  <OpenModel_Profile:OpenModelAttribute xmi:id="_5zwN8EdMEemb9YiEz89e4g" base_StructuralFeature="_5zvm4EdMEemb9YiEz89e4g"/>

+  <OpenModel_Profile:PassedByReference xmi:id="_R8H8IEdNEemb9YiEz89e4g" base_Property="_5zqHUEdMEemb9YiEz89e4g"/>

 </xmi:XMI>