Merge "Changes to the resource model corresponding to IFA011 v2.7.1 Added vipcpd, checksumData and vnfinterfacedetails classes Other Changes: VDU::configurableProperties - Cardinality changed to 0..1; cardinatlity 0 when the VNFCs do not have configurable properties CPD::cpProtocol & CPD::trunkMode - Cardinality changed to allow 0 VduCpd::vnicType: Added SMART-NIC as an allowable value SwImageDesc:Provider - New attribute of type string with cardinality 0..1 which describes the provider of the software image. VnfDf:supportedVnfInterface - New attribute of type VnfInterfaceDetails with cardinality 0..N which indicates which interfaces the VNF produces and provides additional details on how to access the interface endpoints. VnfConfigurableProperties::vnfminterfaceinfo - New attribute with cardinality 0..1 which contains info enabling access to the NFV-MANO interfaces produced by the VNFM VnfConfigurableProperties::vnfmOauthServerinfo - New attribute with cardinality 0..1 which contains info to enable discovery of the authorization server protecting access to the VNFM interfaces VnfConfigurableProperties::vnfOauthServerinfo - New attribute with cardinality 0..1 which contains info to enable discoveryof the authorization server to validate the access tokens provided by the VNFM when the VNFM accesses the VNF interfaces Other changes Corrected a number of errors in the model, mostly with uninitialized strings. Changed the 2.5.1 references to 2.7.1"

1 files changed, 72 insertions, 72 deletions

diff --git a/ONAP_Information_Model/Nf.notation b/ONAP_Information_Model/Nf.notation
index 892ab77..18176c6 100644
--- a/ONAP_Information_Model/Nf.notation
+++ b/ONAP_Information_Model/Nf.notation
@@ -49,14 +49,6 @@
     <element xmi:type="uml:Class" href="Nf.uml#_VtzSoESyEeiVGPeZpaYNtQ"/>
     <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"/>
-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_G8ndoEUIEemWRYeHGX88Yw" name="BASE_ELEMENT">
-      <eObjectValue xmi:type="uml:Class" href="Nf.uml#_VtzSoESyEeiVGPeZpaYNtQ"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_G8m2lUUIEemWRYeHGX88Yw" x="200"/>
-  </children>
   <children xmi:type="notation:Shape" xmi:id="_kmrSwEUIEemWRYeHGX88Yw" type="Class_Shape">
     <children xmi:type="notation:DecorationNode" xmi:id="_kmr50EUIEemWRYeHGX88Yw" type="Class_NameLabel"/>
     <children xmi:type="notation:DecorationNode" xmi:id="_kmr50UUIEemWRYeHGX88Yw" type="Class_FloatingNameLabel">
@@ -83,14 +75,6 @@
     <element xmi:type="uml:Class" href="Vnf.uml#_jH_PgF3PEeiwL5tPgFMcjQ"/>
     <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"/>
-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_knHXo0UIEemWRYeHGX88Yw" name="BASE_ELEMENT">
-      <eObjectValue xmi:type="uml:Class" href="Vnf.uml#_jH_PgF3PEeiwL5tPgFMcjQ"/>
-    </styles>
-    <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">
@@ -126,14 +110,6 @@
     <element xmi:type="uml:Class" href="Nf.uml#_O385oJssEeiPBvbfaqSLYg"/>
     <layoutConstraint xmi:type="notation:Bounds" xmi:id="_m6q3gcKwEemUeulSIk5Pkg" x="60" y="300"/>
   </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>
   <children xmi:type="notation:Shape" xmi:id="_P-kK8BCKEeqONNoHH0FhYQ" type="Class_Shape">
     <children xmi:type="notation:DecorationNode" xmi:id="_P-kyABCKEeqONNoHH0FhYQ" type="Class_NameLabel"/>
     <children xmi:type="notation:DecorationNode" xmi:id="_P-kyARCKEeqONNoHH0FhYQ" type="Class_FloatingNameLabel">
@@ -160,45 +136,49 @@
     <element xmi:type="uml:Class" href="Resource.uml#_DAQisJpXEeidy9iGT_F5-w"/>
     <layoutConstraint xmi:type="notation:Bounds" xmi:id="_P-kK8RCKEeqONNoHH0FhYQ" x="60" y="80"/>
   </children>
-  <children xmi:type="notation:Shape" xmi:id="_P-t78BCKEeqONNoHH0FhYQ" type="StereotypeComment">
-    <styles xmi:type="notation:TitleStyle" xmi:id="_P-t78RCKEeqONNoHH0FhYQ"/>
-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_P-t78xCKEeqONNoHH0FhYQ" name="BASE_ELEMENT">
-      <eObjectValue xmi:type="uml:Class" href="Resource.uml#_DAQisJpXEeidy9iGT_F5-w"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_P-t78hCKEeqONNoHH0FhYQ" x="200"/>
-  </children>
   <children xmi:type="notation:Shape" xmi:id="_qVgzAD1MEeqiP64oaDnqZQ" type="Comment_Shape">
     <children xmi:type="notation:DecorationNode" xmi:id="_qVmSkD1MEeqiP64oaDnqZQ" type="Comment_BodyLabel"/>
     <element xmi:type="uml:Comment" href="Nf.uml#_qVVz4D1MEeqiP64oaDnqZQ"/>
     <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qVgzAT1MEeqiP64oaDnqZQ" x="660" y="80" width="161" height="121"/>
   </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">
-    <owner xmi:type="uml:Package" href="Nf.uml#_Ntu14Bg2EembeqMx64UEWQ"/>
-  </styles>
-  <element xmi:type="uml:Package" href="Nf.uml#_Ntu14Bg2EembeqMx64UEWQ"/>
-  <edges xmi:type="notation:Connector" xmi:id="_G8ndoUUIEemWRYeHGX88Yw" type="StereotypeCommentLink" source="_G8AZoEUIEemWRYeHGX88Yw" target="_G8m2k0UIEemWRYeHGX88Yw">
-    <styles xmi:type="notation:FontStyle" xmi:id="_G8ndokUIEemWRYeHGX88Yw"/>
-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_G8oEskUIEemWRYeHGX88Yw" name="BASE_ELEMENT">
+  <children xmi:type="notation:Shape" xmi:id="_MxWcsOxzEeq6Qqo0IZjEkQ" type="StereotypeComment">
+    <styles xmi:type="notation:TitleStyle" xmi:id="_MxWcsexzEeq6Qqo0IZjEkQ"/>
+    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MxWcs-xzEeq6Qqo0IZjEkQ" name="BASE_ELEMENT">
       <eObjectValue xmi:type="uml:Class" href="Nf.uml#_VtzSoESyEeiVGPeZpaYNtQ"/>
     </styles>
     <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_G8ndo0UIEemWRYeHGX88Yw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_G8oEsEUIEemWRYeHGX88Yw"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_G8oEsUUIEemWRYeHGX88Yw"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_knHXpEUIEemWRYeHGX88Yw" type="StereotypeCommentLink" source="_kmrSwEUIEemWRYeHGX88Yw" target="_knHXoEUIEemWRYeHGX88Yw">
-    <styles xmi:type="notation:FontStyle" xmi:id="_knHXpUUIEemWRYeHGX88Yw"/>
-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_knH-skUIEemWRYeHGX88Yw" name="BASE_ELEMENT">
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MxWcsuxzEeq6Qqo0IZjEkQ" x="580" y="80"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_MxuQIOxzEeq6Qqo0IZjEkQ" type="StereotypeComment">
+    <styles xmi:type="notation:TitleStyle" xmi:id="_MxuQIexzEeq6Qqo0IZjEkQ"/>
+    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MxuQI-xzEeq6Qqo0IZjEkQ" name="BASE_ELEMENT">
       <eObjectValue xmi:type="uml:Class" href="Vnf.uml#_jH_PgF3PEeiwL5tPgFMcjQ"/>
     </styles>
     <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_knHXpkUIEemWRYeHGX88Yw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_knH-sEUIEemWRYeHGX88Yw"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_knH-sUUIEemWRYeHGX88Yw"/>
-  </edges>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MxuQIuxzEeq6Qqo0IZjEkQ" x="620" y="300"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_Mx85oOxzEeq6Qqo0IZjEkQ" type="StereotypeComment">
+    <styles xmi:type="notation:TitleStyle" xmi:id="_Mx85oexzEeq6Qqo0IZjEkQ"/>
+    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Mx85o-xzEeq6Qqo0IZjEkQ" name="BASE_ELEMENT">
+      <eObjectValue xmi:type="uml:Class" href="Nf.uml#_O385oJssEeiPBvbfaqSLYg"/>
+    </styles>
+    <element xsi:nil="true"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Mx85ouxzEeq6Qqo0IZjEkQ" x="260" y="300"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_MyMxQOxzEeq6Qqo0IZjEkQ" type="StereotypeComment">
+    <styles xmi:type="notation:TitleStyle" xmi:id="_MyMxQexzEeq6Qqo0IZjEkQ"/>
+    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MyMxQ-xzEeq6Qqo0IZjEkQ" name="BASE_ELEMENT">
+      <eObjectValue xmi:type="uml:Class" href="Resource.uml#_DAQisJpXEeidy9iGT_F5-w"/>
+    </styles>
+    <element xsi:nil="true"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MyMxQuxzEeq6Qqo0IZjEkQ" x="260" y="80"/>
+  </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">
+    <owner xmi:type="uml:Package" href="Nf.uml#_Ntu14Bg2EembeqMx64UEWQ"/>
+  </styles>
+  <element xmi:type="uml:Package" href="Nf.uml#_Ntu14Bg2EembeqMx64UEWQ"/>
   <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"/>
@@ -210,26 +190,6 @@
     <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>
-  <edges xmi:type="notation:Connector" xmi:id="_P-t79BCKEeqONNoHH0FhYQ" type="StereotypeCommentLink" source="_P-kK8BCKEeqONNoHH0FhYQ" target="_P-t78BCKEeqONNoHH0FhYQ">
-    <styles xmi:type="notation:FontStyle" xmi:id="_P-t79RCKEeqONNoHH0FhYQ"/>
-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_P-t7-RCKEeqONNoHH0FhYQ" name="BASE_ELEMENT">
-      <eObjectValue xmi:type="uml:Class" href="Resource.uml#_DAQisJpXEeidy9iGT_F5-w"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_P-t79hCKEeqONNoHH0FhYQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_P-t79xCKEeqONNoHH0FhYQ"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_P-t7-BCKEeqONNoHH0FhYQ"/>
-  </edges>
   <edges xmi:type="notation:Connector" xmi:id="_X2-4sBCKEeqONNoHH0FhYQ" type="Generalization_Edge" source="_m6q3gMKwEemUeulSIk5Pkg" target="_P-kK8BCKEeqONNoHH0FhYQ">
     <children xmi:type="notation:DecorationNode" xmi:id="_X2_fwBCKEeqONNoHH0FhYQ" type="Generalization_StereotypeLabel">
       <layoutConstraint xmi:type="notation:Location" xmi:id="_X2_fwRCKEeqONNoHH0FhYQ" y="40"/>
@@ -240,4 +200,44 @@
     <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_X3XTMBCKEeqONNoHH0FhYQ" id="(0.5714285714285714,0.0)"/>
     <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_X3XTMRCKEeqONNoHH0FhYQ" id="(0.5194805194805194,1.0)"/>
   </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_MxXDwOxzEeq6Qqo0IZjEkQ" type="StereotypeCommentLink" source="_G8AZoEUIEemWRYeHGX88Yw" target="_MxWcsOxzEeq6Qqo0IZjEkQ">
+    <styles xmi:type="notation:FontStyle" xmi:id="_MxXDwexzEeq6Qqo0IZjEkQ"/>
+    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MxXDxexzEeq6Qqo0IZjEkQ" name="BASE_ELEMENT">
+      <eObjectValue xmi:type="uml:Class" href="Nf.uml#_VtzSoESyEeiVGPeZpaYNtQ"/>
+    </styles>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MxXDwuxzEeq6Qqo0IZjEkQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MxXDw-xzEeq6Qqo0IZjEkQ"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MxXDxOxzEeq6Qqo0IZjEkQ"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_MxuQJOxzEeq6Qqo0IZjEkQ" type="StereotypeCommentLink" source="_kmrSwEUIEemWRYeHGX88Yw" target="_MxuQIOxzEeq6Qqo0IZjEkQ">
+    <styles xmi:type="notation:FontStyle" xmi:id="_MxuQJexzEeq6Qqo0IZjEkQ"/>
+    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MxuQKexzEeq6Qqo0IZjEkQ" name="BASE_ELEMENT">
+      <eObjectValue xmi:type="uml:Class" href="Vnf.uml#_jH_PgF3PEeiwL5tPgFMcjQ"/>
+    </styles>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MxuQJuxzEeq6Qqo0IZjEkQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MxuQJ-xzEeq6Qqo0IZjEkQ"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MxuQKOxzEeq6Qqo0IZjEkQ"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_Mx85pOxzEeq6Qqo0IZjEkQ" type="StereotypeCommentLink" source="_m6q3gMKwEemUeulSIk5Pkg" target="_Mx85oOxzEeq6Qqo0IZjEkQ">
+    <styles xmi:type="notation:FontStyle" xmi:id="_Mx85pexzEeq6Qqo0IZjEkQ"/>
+    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Mx85qexzEeq6Qqo0IZjEkQ" name="BASE_ELEMENT">
+      <eObjectValue xmi:type="uml:Class" href="Nf.uml#_O385oJssEeiPBvbfaqSLYg"/>
+    </styles>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Mx85puxzEeq6Qqo0IZjEkQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Mx85p-xzEeq6Qqo0IZjEkQ"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Mx85qOxzEeq6Qqo0IZjEkQ"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_MyMxROxzEeq6Qqo0IZjEkQ" type="StereotypeCommentLink" source="_P-kK8BCKEeqONNoHH0FhYQ" target="_MyMxQOxzEeq6Qqo0IZjEkQ">
+    <styles xmi:type="notation:FontStyle" xmi:id="_MyMxRexzEeq6Qqo0IZjEkQ"/>
+    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MyNYUuxzEeq6Qqo0IZjEkQ" name="BASE_ELEMENT">
+      <eObjectValue xmi:type="uml:Class" href="Resource.uml#_DAQisJpXEeidy9iGT_F5-w"/>
+    </styles>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MyMxRuxzEeq6Qqo0IZjEkQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MyNYUOxzEeq6Qqo0IZjEkQ"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MyNYUexzEeq6Qqo0IZjEkQ"/>
+  </edges>
 </notation:Diagram>