Align the VNFD model with IFA011 2.5.1

Issue-ID: MODELING-104


Change-Id: I8ccb0d2e91f02e8a7747bf6b6611ce91b4860605

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

1 files changed, 0 insertions, 112 deletions

diff --git a/ONAP Information Model/Common.notation b/ONAP Information Model/Common.notation
index 5cbf59e..ff02f7a 100644
--- a/ONAP Information Model/Common.notation
+++ b/ONAP Information Model/Common.notation
@@ -2490,82 +2490,6 @@
       <element xmi:type="uml:DataType" href="Common.uml#_W7iKYJaeEeiGg_moIHe9Sw"/>

       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7SBnUaGLEeinsNXClcPPiQ" x="620" y="20"/>

     </children>

-    <children xmi:type="notation:Shape" xmi:id="_8AGOQKGLEeinsNXClcPPiQ" type="DataType_Shape">

-      <children xmi:type="notation:DecorationNode" xmi:id="_8AGOQqGLEeinsNXClcPPiQ" type="DataType_NameLabel"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_8AGOQ6GLEeinsNXClcPPiQ" type="DataType_FloatingNameLabel">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_8AGORKGLEeinsNXClcPPiQ" y="15"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_8AGORaGLEeinsNXClcPPiQ" type="DataType_AttributeCompartment">

-        <children xmi:type="notation:Shape" xmi:id="_smv-UKGOEeinsNXClcPPiQ" type="Property_DataTypeAttributeLabel">

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

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

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

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

-          </children>

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

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

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_smwlYKGOEeinsNXClcPPiQ" type="Property_DataTypeAttributeLabel">

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

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

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

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

-          </children>

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

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

-        </children>

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

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

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

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

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_8AGOSqGLEeinsNXClcPPiQ" visible="false" type="DataType_OperationCompartment">

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

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

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

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

-      </children>

-      <element xmi:type="uml:DataType" href="Common.uml#_nPNHsD2-Eeiu6I5JfRTxxQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8AGOQaGLEeinsNXClcPPiQ" x="820" y="20"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_8AX7EKGLEeinsNXClcPPiQ" type="DataType_Shape">

-      <children xmi:type="notation:DecorationNode" xmi:id="_8AYiIKGLEeinsNXClcPPiQ" type="DataType_NameLabel"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_8AYiIaGLEeinsNXClcPPiQ" type="DataType_FloatingNameLabel">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_8AYiIqGLEeinsNXClcPPiQ" y="15"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_8AYiI6GLEeinsNXClcPPiQ" type="DataType_AttributeCompartment">

-        <children xmi:type="notation:Shape" xmi:id="_smwlYqGOEeinsNXClcPPiQ" type="Property_DataTypeAttributeLabel">

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

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

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

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

-          </children>

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

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

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_smxMcKGOEeinsNXClcPPiQ" type="Property_DataTypeAttributeLabel">

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

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

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

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

-          </children>

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

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

-        </children>

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

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

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

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

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_8AYiKKGLEeinsNXClcPPiQ" visible="false" type="DataType_OperationCompartment">

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

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

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

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

-      </children>

-      <element xmi:type="uml:DataType" href="Common.uml#_RVZi0D2-Eeiu6I5JfRTxxQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8AX7EaGLEeinsNXClcPPiQ" x="820" y="160"/>

-    </children>

     <children xmi:type="notation:Shape" xmi:id="_99M0IKGLEeinsNXClcPPiQ" type="DataType_Shape">

       <children xmi:type="notation:DecorationNode" xmi:id="_99M0IqGLEeinsNXClcPPiQ" type="DataType_NameLabel"/>

       <children xmi:type="notation:DecorationNode" xmi:id="_99M0I6GLEeinsNXClcPPiQ" type="DataType_FloatingNameLabel">

@@ -2944,22 +2868,6 @@
       <element xsi:nil="true"/>

       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9ONJss2JEeieTchE0MWKmw" x="820" y="20"/>

     </children>

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

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

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_9OW6s82JEeieTchE0MWKmw" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:DataType" href="Common.uml#_nPNHsD2-Eeiu6I5JfRTxxQ"/>

-      </styles>

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

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9OW6ss2JEeieTchE0MWKmw" x="1020" y="20"/>

-    </children>

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

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

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_9OdoY82JEeieTchE0MWKmw" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:DataType" href="Common.uml#_RVZi0D2-Eeiu6I5JfRTxxQ"/>

-      </styles>

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

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9OdoYs2JEeieTchE0MWKmw" x="1020" y="160"/>

-    </children>

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

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

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

@@ -3419,26 +3327,6 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9ONJt82JEeieTchE0MWKmw"/>

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

     </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_9OW6tM2JEeieTchE0MWKmw" type="StereotypeCommentLink" source="_8AGOQKGLEeinsNXClcPPiQ" target="_9OW6sM2JEeieTchE0MWKmw">

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

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_9OW6uc2JEeieTchE0MWKmw" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:DataType" href="Common.uml#_nPNHsD2-Eeiu6I5JfRTxxQ"/>

-      </styles>

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

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

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9OW6t82JEeieTchE0MWKmw"/>

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

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_9OdoZM2JEeieTchE0MWKmw" type="StereotypeCommentLink" source="_8AX7EKGLEeinsNXClcPPiQ" target="_9OdoYM2JEeieTchE0MWKmw">

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

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_9Odoac2JEeieTchE0MWKmw" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:DataType" href="Common.uml#_RVZi0D2-Eeiu6I5JfRTxxQ"/>

-      </styles>

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

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

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9OdoZ82JEeieTchE0MWKmw"/>

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

-    </edges>

     <edges xmi:type="notation:Connector" xmi:id="_9Ok9JM2JEeieTchE0MWKmw" type="StereotypeCommentLink" source="_99M0IKGLEeinsNXClcPPiQ" target="_9Ok9IM2JEeieTchE0MWKmw">

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

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