Changes to Common, Nf, and Vnf

Issue-ID: MODELING-104 Change-Id: I1ca39153aa452d25a206400efe5263e31d7fe78e Signed-off-by: jjewitt58 <jessie.jewitt@oamtechnologies.com>
author: jjewitt58 <jessie.jewitt@oamtechnologies.com> 2019-03-12 14:03:30 -0700
committer: jjewitt58 <jessie.jewitt@oamtechnologies.com> 2019-03-12 14:03:30 -0700
commit: 03991d6387401327cf17b3389521262ec2c89dea (patch)
tree: f7351a2b290698649288e0b2eb296f561df4cbb9
parent: d50470f7adcf3f2f8e49b7adb886763f898910d0 (diff)
5 files changed, 550 insertions, 335 deletions
diff --git a/ONAP Information Model/Common.uml b/ONAP Information Model/Common.uml
index 9fb5124..44ffcf0 100644
--- a/ONAP Information Model/Common.uml
+++ b/ONAP Information Model/Common.uml
@@ -234,9 +234,7 @@ White - Not Ready for Review</body>
           <ownedComment xmi:type="uml:Comment" xmi:id="_Tw79sT2pEeiu6I5JfRTxxQ" annotatedElement="_Tw79sD2pEeiu6I5JfRTxxQ">
             <body>Common part of the various VLDs.</body>
           </ownedComment>
-          <generalization xmi:type="uml:Generalization" xmi:id="_uKiJwDxkEemSdYSKacDoqQ">
-            <general xmi:type="uml:Class" href="Vnf.uml#_jJ_NcDxkEemSdYSKacDoqQ"/>
-          </generalization>
+          <generalization xmi:type="uml:Generalization" xmi:id="_uKiJwDxkEemSdYSKacDoqQ" general="_jJ_NcDxkEemSdYSKacDoqQ"/>
           <ownedAttribute xmi:type="uml:Property" xmi:id="_Tw79sj2pEeiu6I5JfRTxxQ" name="virtualLinkDescId" type="_AuYtcDkBEeiWMf5FLWfdLA">
             <ownedComment xmi:type="uml:Comment" xmi:id="_Tw79sz2pEeiu6I5JfRTxxQ" annotatedElement="_Tw79sj2pEeiu6I5JfRTxxQ">
               <body>Uniquely identifies a VLD in the parent descriptor.&#xD;
@@ -537,6 +535,13 @@ Editor's note: the attribute &quot;layerProtocol&quot; still needs further discu
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_TUOAcC4zEemS0_wZSU3sbA" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_TUg7YC4zEemS0_wZSU3sbA" value="*"/>
           </ownedAttribute>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_BUajMEUBEemWRYeHGX88Yw" name="securityGroupRuleId" visibility="public" type="_AuYtcDkBEeiWMf5FLWfdLA">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_MzcyUEUBEemWRYeHGX88Yw" annotatedElement="_BUajMEUBEemWRYeHGX88Yw">
+              <body>Reference of the security group rules bound to this CPD.</body>
+            </ownedComment>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_H32bAEUBEemWRYeHGX88Yw"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_H4NnYEUBEemWRYeHGX88Yw" value="*"/>
+          </ownedAttribute>
         </packagedElement>
         <packagedElement xmi:type="uml:Class" xmi:id="_0AbUYDnBEeiWMf5FLWfdLA" name="AffinityOrAntiAffinityGroup">
           <ownedComment xmi:type="uml:Comment" xmi:id="_L_HiIDnCEeiWMf5FLWfdLA" annotatedElement="_0AbUYDnBEeiWMf5FLWfdLA">
@@ -783,6 +788,11 @@ NOTE: 	These attributes are used to control scaling boundaries.</body>
             </ownedComment>
           </ownedAttribute>
         </packagedElement>
+        <packagedElement xmi:type="uml:Class" xmi:id="_jJ_NcDxkEemSdYSKacDoqQ" name="LinkDesc">
+          <generalization xmi:type="uml:Generalization" xmi:id="_0sPjQDxkEemSdYSKacDoqQ">
+            <general xmi:type="uml:Class" href="Resource.uml#_DAQisJpXEeidy9iGT_F5-w"/>
+          </generalization>
+        </packagedElement>
       </packagedElement>
       <packagedElement xmi:type="uml:Package" xmi:id="_QVhWcDOHEei5Af8DcjrhIQ" name="Associations">
         <packagedElement xmi:type="uml:Association" xmi:id="_vV0jwES0EeiVGPeZpaYNtQ" name="VirtualLinkHasLinkPort" memberEnd="_vV1x4kS0EeiVGPeZpaYNtQ _vWZykES0EeiVGPeZpaYNtQ">
@@ -4921,4 +4931,8 @@ Permitted Values:&#xD;
   <OpenModel_Profile:Experimental xmi:id="_2KE3YDxdEemSHu2qGsweWg" base_Element="_upuWQDxbEemSHu2qGsweWg"/>
   <OpenModel_Profile:Experimental xmi:id="_25KyADxdEemSHu2qGsweWg" base_Element="_yfwzsDxbEemSHu2qGsweWg"/>
   <OpenModel_Profile:Experimental xmi:id="_33CvgDxdEemSHu2qGsweWg" base_Element="_3gr6cDxcEemSHu2qGsweWg"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_BUbKQEUBEemWRYeHGX88Yw" base_StructuralFeature="_BUajMEUBEemWRYeHGX88Yw"/>
+  <OpenModel_Profile:Experimental xmi:id="_O-o3gEUBEemWRYeHGX88Yw" base_Element="_BUajMEUBEemWRYeHGX88Yw"/>
+  <OpenModel_Profile:OpenModelClass xmi:id="_jJ_0gDxkEemSdYSKacDoqQ" base_Class="_jJ_NcDxkEemSdYSKacDoqQ"/>
+  <OpenModel_Profile:Experimental xmi:id="_oiRO0DxmEemL36iV0V0qOA" base_Element="_jJ_NcDxkEemSdYSKacDoqQ"/>
 </xmi:XMI>
diff --git a/ONAP Information Model/Nf.notation b/ONAP Information Model/Nf.notation
index bfa443b..fc2cc27 100644
--- a/ONAP Information Model/Nf.notation
+++ b/ONAP Information Model/Nf.notation
@@ -1,2 +1,157 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
-\ No newline at end of file
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/gmfdiag/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_GDOXgEUIEemWRYeHGX88Yw" type="PapyrusUMLClassDiagram" name="NetworkFunction" measurementUnit="Pixel">
+  <children xmi:type="notation:Shape" xmi:id="_G8AZoEUIEemWRYeHGX88Yw" type="Class_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_G8C14EUIEemWRYeHGX88Yw" type="Class_NameLabel"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_G8C14UUIEemWRYeHGX88Yw" type="Class_FloatingNameLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_G8C14kUIEemWRYeHGX88Yw" y="15"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_G8C140UIEemWRYeHGX88Yw" type="Class_AttributeCompartment">
+      <children xmi:type="notation:Shape" xmi:id="_MRoagEUIEemWRYeHGX88Yw" type="Property_ClassAttributeLabel">
+        <children xmi:type="notation:DecorationNode" xmi:id="_MR3EAEUIEemWRYeHGX88Yw" visible="false" type="StereotypeLabel">
+          <styles xmi:type="notation:StringValueStyle" xmi:id="_MR3EAUUIEemWRYeHGX88Yw" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+          <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MR3EAkUIEemWRYeHGX88Yw"/>
+        </children>
+        <element xmi:type="uml:Property" href="Nf.uml#_LlLZoEUHEemWRYeHGX88Yw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_MRoagUUIEemWRYeHGX88Yw"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_MRqPsEUIEemWRYeHGX88Yw" type="Property_ClassAttributeLabel">
+        <children xmi:type="notation:DecorationNode" xmi:id="_MR9xsEUIEemWRYeHGX88Yw" visible="false" type="StereotypeLabel">
+          <styles xmi:type="notation:StringValueStyle" xmi:id="_MR9xsUUIEemWRYeHGX88Yw" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+          <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MR9xskUIEemWRYeHGX88Yw"/>
+        </children>
+        <element xmi:type="uml:Property" href="Nf.uml#_UVcVYEUHEemWRYeHGX88Yw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_MRqPsUUIEemWRYeHGX88Yw"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_MRq2wEUIEemWRYeHGX88Yw" type="Property_ClassAttributeLabel">
+        <children xmi:type="notation:DecorationNode" xmi:id="_MSGUkEUIEemWRYeHGX88Yw" visible="false" type="StereotypeLabel">
+          <styles xmi:type="notation:StringValueStyle" xmi:id="_MSGUkUUIEemWRYeHGX88Yw" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+          <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MSGUkkUIEemWRYeHGX88Yw"/>
+        </children>
+        <element xmi:type="uml:Property" href="Nf.uml#_ZqGs8EUHEemWRYeHGX88Yw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_MRq2wUUIEemWRYeHGX88Yw"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_MRrd0EUIEemWRYeHGX88Yw" type="Property_ClassAttributeLabel">
+        <children xmi:type="notation:DecorationNode" xmi:id="_MSNCQEUIEemWRYeHGX88Yw" visible="false" type="StereotypeLabel">
+          <styles xmi:type="notation:StringValueStyle" xmi:id="_MSNCQUUIEemWRYeHGX88Yw" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+          <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MSNCQkUIEemWRYeHGX88Yw"/>
+        </children>
+        <element xmi:type="uml:Property" href="Nf.uml#_srFqkEUHEemWRYeHGX88Yw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_MRrd0UUIEemWRYeHGX88Yw"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_MRsE4EUIEemWRYeHGX88Yw" type="Property_ClassAttributeLabel">
+        <children xmi:type="notation:DecorationNode" xmi:id="_MSVlIEUIEemWRYeHGX88Yw" visible="false" type="StereotypeLabel">
+          <styles xmi:type="notation:StringValueStyle" xmi:id="_MSVlIUUIEemWRYeHGX88Yw" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+          <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MSVlIkUIEemWRYeHGX88Yw"/>
+        </children>
+        <element xmi:type="uml:Property" href="Nf.uml#_6o6QUEUHEemWRYeHGX88Yw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_MRsE4UUIEemWRYeHGX88Yw"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_G8Dc8EUIEemWRYeHGX88Yw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_G8Dc8UUIEemWRYeHGX88Yw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_G8Dc8kUIEemWRYeHGX88Yw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_G8Dc80UIEemWRYeHGX88Yw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_G8Dc9EUIEemWRYeHGX88Yw" visible="false" type="Class_OperationCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_G8Dc9UUIEemWRYeHGX88Yw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_G8Dc9kUIEemWRYeHGX88Yw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_G8Dc90UIEemWRYeHGX88Yw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_G8Dc-EUIEemWRYeHGX88Yw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_G8Dc-UUIEemWRYeHGX88Yw" visible="false" type="Class_NestedClassifierCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_G8Dc-kUIEemWRYeHGX88Yw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_G8Dc-0UIEemWRYeHGX88Yw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_G8Dc_EUIEemWRYeHGX88Yw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_G8Dc_UUIEemWRYeHGX88Yw"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_G8dsoEUIEemWRYeHGX88Yw" visible="false" type="StereotypeLabel">
+      <styles xmi:type="notation:StringValueStyle" xmi:id="_G8dsoUUIEemWRYeHGX88Yw" name="stereotype" stringValue="OpenModel_Profile::OpenModelClass"/>
+      <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
+      <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"/>
+  </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">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_kmr50kUIEemWRYeHGX88Yw" y="15"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_kmr500UIEemWRYeHGX88Yw" type="Class_AttributeCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_kmr51EUIEemWRYeHGX88Yw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_kmr51UUIEemWRYeHGX88Yw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_kmr51kUIEemWRYeHGX88Yw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kmr510UIEemWRYeHGX88Yw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_kmsg4EUIEemWRYeHGX88Yw" visible="false" type="Class_OperationCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_kmsg4UUIEemWRYeHGX88Yw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_kmsg4kUIEemWRYeHGX88Yw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_kmsg40UIEemWRYeHGX88Yw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kmsg5EUIEemWRYeHGX88Yw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_kmsg5UUIEemWRYeHGX88Yw" visible="false" type="Class_NestedClassifierCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_kmsg5kUIEemWRYeHGX88Yw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_kmsg50UIEemWRYeHGX88Yw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_kmsg6EUIEemWRYeHGX88Yw"/>
+      <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"/>
+  </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>
+  <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">
+      <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">
+      <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>
+  <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">
+      <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)"/>
+  </edges>
+</notation:Diagram>
diff --git a/ONAP Information Model/Nf.uml b/ONAP Information Model/Nf.uml
index a463037..1c053c3 100644
--- a/ONAP Information Model/Nf.uml
+++ b/ONAP Information Model/Nf.uml
@@ -16,6 +16,37 @@
         <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>
+        <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>
+          </ownedComment>
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_UVcVYEUHEemWRYeHGX88Yw" name="name" visibility="public">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_YWCdAEUHEemWRYeHGX88Yw"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_YWa3gEUHEemWRYeHGX88Yw" value="1"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_ZqGs8EUHEemWRYeHGX88Yw" name="type" visibility="public">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_iOehwEUHEemWRYeHGX88Yw" annotatedElement="_ZqGs8EUHEemWRYeHGX88Yw">
+            <body>Description of the type of network function</body>
+          </ownedComment>
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_srFqkEUHEemWRYeHGX88Yw" name="description" visibility="public">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_zvYMsEUHEemWRYeHGX88Yw" annotatedElement="_srFqkEUHEemWRYeHGX88Yw">
+            <body>Description of the network function</body>
+          </ownedComment>
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_xL7YgEUHEemWRYeHGX88Yw"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xMMeQEUHEemWRYeHGX88Yw" value="1"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_6o6QUEUHEemWRYeHGX88Yw" name="role" visibility="public">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_AiB_0EUIEemWRYeHGX88Yw" annotatedElement="_6o6QUEUHEemWRYeHGX88Yw">
+            <body>Role the network function will be providing.</body>
+          </ownedComment>
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+        </ownedAttribute>
       </packagedElement>
       <packagedElement xmi:type="uml:Class" xmi:id="__ez0YNxxEei0G_d67y10Rg" name="NfDf"/>
       <packagedElement xmi:type="uml:Class" xmi:id="_KEN2IN0dEeiRzJu73dYz2w" name="NfIndicator">
@@ -97,4 +128,14 @@ This tells the consumer where to send the subscription request.&#xD;
   <OpenModel_Profile:Experimental xmi:id="_hsh1IN0mEeiRzJu73dYz2w" base_Element="_KEN2IN0dEeiRzJu73dYz2w"/>
   <OpenModel_Profile:OpenModelClass xmi:id="_O385opssEeiPBvbfaqSLYg" base_Class="_O385oJssEeiPBvbfaqSLYg"/>
   <OpenModel_Profile:Experimental xmi:id="_HV6qEKY5Eeily5uFlujj3Q" base_Element="_O385oJssEeiPBvbfaqSLYg"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_LlMnwEUHEemWRYeHGX88Yw" base_StructuralFeature="_LlLZoEUHEemWRYeHGX88Yw"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_UVc8cEUHEemWRYeHGX88Yw" base_StructuralFeature="_UVcVYEUHEemWRYeHGX88Yw"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_ZqHUAEUHEemWRYeHGX88Yw" base_StructuralFeature="_ZqGs8EUHEemWRYeHGX88Yw"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_srFqkUUHEemWRYeHGX88Yw" base_StructuralFeature="_srFqkEUHEemWRYeHGX88Yw"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_6o6QUUUHEemWRYeHGX88Yw" base_StructuralFeature="_6o6QUEUHEemWRYeHGX88Yw"/>
+  <OpenModel_Profile:Experimental xmi:id="_P5G3gEUIEemWRYeHGX88Yw" base_Element="_LlLZoEUHEemWRYeHGX88Yw"/>
+  <OpenModel_Profile:Experimental xmi:id="_Rqsw8EUIEemWRYeHGX88Yw" base_Element="_UVcVYEUHEemWRYeHGX88Yw"/>
+  <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"/>
 </xmi:XMI>
diff --git a/ONAP Information Model/Vnf.notation b/ONAP Information Model/Vnf.notation
index 70475db..e58f0b0 100644
--- a/ONAP Information Model/Vnf.notation
+++ b/ONAP Information Model/Vnf.notation
@@ -1161,6 +1161,108 @@
       <element xsi:nil="true"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-GErkjRwEem2n8bBHelJyw" x="200"/>
     </children>
+    <children xmi:type="notation:Shape" xmi:id="_ZzlSsET_EemWRYeHGX88Yw" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_ZzrZUET_EemWRYeHGX88Yw" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_ZzrZUUT_EemWRYeHGX88Yw" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ZzrZUkT_EemWRYeHGX88Yw" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_ZzsAYET_EemWRYeHGX88Yw" type="Class_AttributeCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_inrlkET_EemWRYeHGX88Yw" type="Property_ClassAttributeLabel">
+          <children xmi:type="notation:DecorationNode" xmi:id="_irV9kET_EemWRYeHGX88Yw" visible="false" type="StereotypeLabel">
+            <styles xmi:type="notation:StringValueStyle" xmi:id="_irV9kUT_EemWRYeHGX88Yw" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_irV9kkT_EemWRYeHGX88Yw"/>
+          </children>
+          <element xmi:type="uml:Property" href="Vnf.uml#_2tGYgET7EemWRYeHGX88Yw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_inrlkUT_EemWRYeHGX88Yw"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_inuB0ET_EemWRYeHGX88Yw" type="Property_ClassAttributeLabel">
+          <children xmi:type="notation:DecorationNode" xmi:id="_irnqYET_EemWRYeHGX88Yw" visible="false" type="StereotypeLabel">
+            <styles xmi:type="notation:StringValueStyle" xmi:id="_irnqYUT_EemWRYeHGX88Yw" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_irnqYkT_EemWRYeHGX88Yw"/>
+          </children>
+          <element xmi:type="uml:Property" href="Vnf.uml#_GBV-oET8EemWRYeHGX88Yw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_inuB0UT_EemWRYeHGX88Yw"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_inweEET_EemWRYeHGX88Yw" type="Property_ClassAttributeLabel">
+          <children xmi:type="notation:DecorationNode" xmi:id="_ir1FwET_EemWRYeHGX88Yw" visible="false" type="StereotypeLabel">
+            <styles xmi:type="notation:StringValueStyle" xmi:id="_ir1FwUT_EemWRYeHGX88Yw" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ir1FwkT_EemWRYeHGX88Yw"/>
+          </children>
+          <element xmi:type="uml:Property" href="Vnf.uml#_nFlboET8EemWRYeHGX88Yw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_inweEUT_EemWRYeHGX88Yw"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_inxsMET_EemWRYeHGX88Yw" type="Property_ClassAttributeLabel">
+          <children xmi:type="notation:DecorationNode" xmi:id="_isAr8ET_EemWRYeHGX88Yw" visible="false" type="StereotypeLabel">
+            <styles xmi:type="notation:StringValueStyle" xmi:id="_isAr8UT_EemWRYeHGX88Yw" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_isAr8kT_EemWRYeHGX88Yw"/>
+          </children>
+          <element xmi:type="uml:Property" href="Vnf.uml#_ZFaQAET9EemWRYeHGX88Yw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_inxsMUT_EemWRYeHGX88Yw"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_inyTQET_EemWRYeHGX88Yw" type="Property_ClassAttributeLabel">
+          <children xmi:type="notation:DecorationNode" xmi:id="_isPVcET_EemWRYeHGX88Yw" visible="false" type="StereotypeLabel">
+            <styles xmi:type="notation:StringValueStyle" xmi:id="_isPVcUT_EemWRYeHGX88Yw" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_isPVckT_EemWRYeHGX88Yw"/>
+          </children>
+          <element xmi:type="uml:Property" href="Vnf.uml#_vyMxAET9EemWRYeHGX88Yw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_inyTQUT_EemWRYeHGX88Yw"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_inzhYET_EemWRYeHGX88Yw" type="Property_ClassAttributeLabel">
+          <children xmi:type="notation:DecorationNode" xmi:id="_isbisET_EemWRYeHGX88Yw" visible="false" type="StereotypeLabel">
+            <styles xmi:type="notation:StringValueStyle" xmi:id="_isbisUT_EemWRYeHGX88Yw" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_isbiskT_EemWRYeHGX88Yw"/>
+          </children>
+          <element xmi:type="uml:Property" href="Vnf.uml#_SagBwET-EemWRYeHGX88Yw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_inzhYUT_EemWRYeHGX88Yw"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_in0IcET_EemWRYeHGX88Yw" type="Property_ClassAttributeLabel">
+          <children xmi:type="notation:DecorationNode" xmi:id="_isqMMET_EemWRYeHGX88Yw" visible="false" type="StereotypeLabel">
+            <styles xmi:type="notation:StringValueStyle" xmi:id="_isqMMUT_EemWRYeHGX88Yw" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_isqMMkT_EemWRYeHGX88Yw"/>
+          </children>
+          <element xmi:type="uml:Property" href="Vnf.uml#_qbWLoET-EemWRYeHGX88Yw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_in0IcUT_EemWRYeHGX88Yw"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_ZzsAYUT_EemWRYeHGX88Yw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_ZzsAYkT_EemWRYeHGX88Yw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_ZzsAY0T_EemWRYeHGX88Yw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZzsAZET_EemWRYeHGX88Yw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_ZzsncET_EemWRYeHGX88Yw" visible="false" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_ZzsncUT_EemWRYeHGX88Yw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_ZzsnckT_EemWRYeHGX88Yw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Zzsnc0T_EemWRYeHGX88Yw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZzsndET_EemWRYeHGX88Yw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_ZzsndUT_EemWRYeHGX88Yw" visible="false" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_ZzsndkT_EemWRYeHGX88Yw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Zzsnd0T_EemWRYeHGX88Yw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_ZzsneET_EemWRYeHGX88Yw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZzsneUT_EemWRYeHGX88Yw"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Z0DMwET_EemWRYeHGX88Yw" visible="false" type="StereotypeLabel">
+        <styles xmi:type="notation:StringValueStyle" xmi:id="_Z0DMwUT_EemWRYeHGX88Yw" name="stereotype" stringValue="OpenModel_Profile::OpenModelClass"/>
+        <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z0DMwkT_EemWRYeHGX88Yw"/>
+      </children>
+      <element xmi:type="uml:Class" href="Vnf.uml#_pQg3kET7EemWRYeHGX88Yw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZzlSsUT_EemWRYeHGX88Yw" x="-240" y="-200" height="181"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_Z0ZLAET_EemWRYeHGX88Yw" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_Z0ZLAUT_EemWRYeHGX88Yw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Z0ZyEET_EemWRYeHGX88Yw" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="Vnf.uml#_pQg3kET7EemWRYeHGX88Yw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z0ZLAkT_EemWRYeHGX88Yw" x="200"/>
+    </children>
     <styles xmi:type="notation:StringValueStyle" xmi:id="_ZmiqUTOREeiHat9KcP8uWA" name="diagram_compatibility_version" stringValue="1.4.0"/>
     <styles xmi:type="notation:DiagramStyle" xmi:id="_ZmiqUjOREeiHat9KcP8uWA"/>
     <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_ZmiqUzOREeiHat9KcP8uWA" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
@@ -1848,6 +1950,47 @@
       <element xmi:type="uml:Association" href="Vnf.uml#_qCk1gCsDEemS0_wZSU3sbA"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_-9hbgjRxEem2n8bBHelJyw" points="[576, 49, -643984, -643984]$[620, 47, -643984, -643984]"/>
     </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_Z0cOUET_EemWRYeHGX88Yw" type="StereotypeCommentLink" source="_ZzlSsET_EemWRYeHGX88Yw" target="_Z0ZLAET_EemWRYeHGX88Yw">
+      <styles xmi:type="notation:FontStyle" xmi:id="_Z0cOUUT_EemWRYeHGX88Yw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Z0dccET_EemWRYeHGX88Yw" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="Vnf.uml#_pQg3kET7EemWRYeHGX88Yw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Z0cOUkT_EemWRYeHGX88Yw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Z0c1YET_EemWRYeHGX88Yw"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Z0c1YUT_EemWRYeHGX88Yw"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_wNFEQET_EemWRYeHGX88Yw" type="Association_Edge" source="_aaUQoDOREeiHat9KcP8uWA" target="_ZzlSsET_EemWRYeHGX88Yw" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_wNFrUET_EemWRYeHGX88Yw" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Aw6qAEUAEemWRYeHGX88Yw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_wNFrUUT_EemWRYeHGX88Yw" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_wNFrUkT_EemWRYeHGX88Yw" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_A0pTcEUAEemWRYeHGX88Yw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_wNGSYET_EemWRYeHGX88Yw" x="64" y="101"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_wNGSYUT_EemWRYeHGX88Yw" visible="false" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_A4sF8EUAEemWRYeHGX88Yw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_wNGSYkT_EemWRYeHGX88Yw" x="57" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_wNGSY0T_EemWRYeHGX88Yw" visible="false" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_A9UuUEUAEemWRYeHGX88Yw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_wNGSZET_EemWRYeHGX88Yw" x="-58" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_wNGSZUT_EemWRYeHGX88Yw" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_BB9WsEUAEemWRYeHGX88Yw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_wNGSZkT_EemWRYeHGX88Yw" x="57" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_wNGSZ0T_EemWRYeHGX88Yw" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_BFnusEUAEemWRYeHGX88Yw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_wNGSaET_EemWRYeHGX88Yw" x="-58" y="-20"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_wNFEQUT_EemWRYeHGX88Yw"/>
+      <element xmi:type="uml:Association" href="Vnf.uml#_wHic8ET_EemWRYeHGX88Yw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wNFEQkT_EemWRYeHGX88Yw" points="[180, 200, -643984, -643984]$[180, -60, -643984, -643984]$[63, -60, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wXUlYET_EemWRYeHGX88Yw" id="(0.272108843537415,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wXUlYUT_EemWRYeHGX88Yw" id="(1.0,0.7734806629834254)"/>
+    </edges>
   </notation:Diagram>
   <notation:Diagram xmi:id="_tsOFEDQTEeixv_sLOod4lQ" type="PapyrusUMLClassDiagram" name="ONAP Vnfd - Topology View" measurementUnit="Pixel">
     <children xmi:type="notation:Shape" xmi:id="_6Mhj8DQTEeixv_sLOod4lQ" type="Class_Shape">
@@ -5225,27 +5368,6 @@
         <layoutConstraint xmi:type="notation:Location" xmi:id="_jLaW8l3PEeiwL5tPgFMcjQ" y="15"/>
       </children>
       <children xmi:type="notation:BasicCompartment" xmi:id="_jLaW813PEeiwL5tPgFMcjQ" type="Class_AttributeCompartment">
-        <children xmi:type="notation:Shape" xmi:id="_xJxIMF3PEeiwL5tPgFMcjQ" type="Property_ClassAttributeLabel">
-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lSeL8GkFEeip9umi7zNprw" source="PapyrusCSSForceValue">
-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_lSeL8WkFEeip9umi7zNprw" key="fontColor" value="true"/>
-          </eAnnotations>
-          <children xmi:type="notation:DecorationNode" xmi:id="_xJ2AsF3PEeiwL5tPgFMcjQ" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_xJ2AsV3PEeiwL5tPgFMcjQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xJ2Asl3PEeiwL5tPgFMcjQ"/>
-          </children>
-          <element xmi:type="uml:Property" href="Vnf.uml#_xJolUF3PEeiwL5tPgFMcjQ"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_xJxIMV3PEeiwL5tPgFMcjQ"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_OEIwUF3REeiwL5tPgFMcjQ" type="Property_ClassAttributeLabel">
-          <children xmi:type="notation:DecorationNode" xmi:id="_OENo0F3REeiwL5tPgFMcjQ" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_OENo0V3REeiwL5tPgFMcjQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OENo0l3REeiwL5tPgFMcjQ"/>
-          </children>
-          <element xmi:type="uml:Property" href="Vnf.uml#_OD8jEF3REeiwL5tPgFMcjQ"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_OEIwUV3REeiwL5tPgFMcjQ"/>
-        </children>
         <children xmi:type="notation:Shape" xmi:id="_xXut4F3eEeiwL5tPgFMcjQ" type="Property_ClassAttributeLabel" fontColor="16711935">
           <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_svrXgL_wEeisMMIUeH4UGw" source="PapyrusCSSForceValue">
             <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_svrXgb_wEeisMMIUeH4UGw" key="fillColor" value="true"/>
@@ -5258,18 +5380,6 @@
           <element xmi:type="uml:Property" href="Vnf.uml#_xSnkYF3eEeiwL5tPgFMcjQ"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_xXut4V3eEeiwL5tPgFMcjQ"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_jxDAUF3fEeiwL5tPgFMcjQ" type="Property_ClassAttributeLabel" fontColor="16711935">
-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_svvB4L_wEeisMMIUeH4UGw" source="PapyrusCSSForceValue">
-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_svvB4b_wEeisMMIUeH4UGw" key="fillColor" value="true"/>
-          </eAnnotations>
-          <children xmi:type="notation:DecorationNode" xmi:id="_jxGDoF3fEeiwL5tPgFMcjQ" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_jxGDoV3fEeiwL5tPgFMcjQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jxGDol3fEeiwL5tPgFMcjQ"/>
-          </children>
-          <element xmi:type="uml:Property" href="Vnf.uml#_jsFn0F3fEeiwL5tPgFMcjQ"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_jxDAUV3fEeiwL5tPgFMcjQ"/>
-        </children>
         <children xmi:type="notation:Shape" xmi:id="_Hix-UF3gEeiwL5tPgFMcjQ" type="Property_ClassAttributeLabel" fontColor="16711935">
           <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_svua0L_wEeisMMIUeH4UGw" source="PapyrusCSSForceValue">
             <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_svua0b_wEeisMMIUeH4UGw" key="fillColor" value="true"/>
@@ -5282,28 +5392,6 @@
           <element xmi:type="uml:Property" href="Vnf.uml#_HY63sF3gEeiwL5tPgFMcjQ"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_Hix-UV3gEeiwL5tPgFMcjQ"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_AXO_0F3vEeiwL5tPgFMcjQ" type="Property_ClassAttributeLabel" fontColor="16711935">
-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_euWXoGkFEeip9umi7zNprw" source="PapyrusCSSForceValue">
-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_euWXoWkFEeip9umi7zNprw" key="fontColor" value="true"/>
-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_svsloL_wEeisMMIUeH4UGw" key="fillColor" value="true"/>
-          </eAnnotations>
-          <children xmi:type="notation:DecorationNode" xmi:id="_AXRcEF3vEeiwL5tPgFMcjQ" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_AXRcEV3vEeiwL5tPgFMcjQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AXRcEl3vEeiwL5tPgFMcjQ"/>
-          </children>
-          <element xmi:type="uml:Property" href="Vnf.uml#_ANTnwF3vEeiwL5tPgFMcjQ"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_AXO_0V3vEeiwL5tPgFMcjQ"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_rqmjQF3vEeiwL5tPgFMcjQ" type="Property_ClassAttributeLabel" fontColor="16711935">
-          <children xmi:type="notation:DecorationNode" xmi:id="_rqqNoF3vEeiwL5tPgFMcjQ" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_rqqNoV3vEeiwL5tPgFMcjQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rqqNol3vEeiwL5tPgFMcjQ"/>
-          </children>
-          <element xmi:type="uml:Property" href="Vnf.uml#_rg2KUF3vEeiwL5tPgFMcjQ"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_rqmjQV3vEeiwL5tPgFMcjQ"/>
-        </children>
         <children xmi:type="notation:Shape" xmi:id="_D-2U0F3xEeiwL5tPgFMcjQ" type="Property_ClassAttributeLabel" fontColor="16711935">
           <children xmi:type="notation:DecorationNode" xmi:id="_D-4xEF3xEeiwL5tPgFMcjQ" visible="false" type="StereotypeLabel">
             <styles xmi:type="notation:StringValueStyle" xmi:id="_D-4xEV3xEeiwL5tPgFMcjQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
@@ -5415,18 +5503,6 @@
           <element xmi:type="uml:Property" href="Vnf.uml#_4zoYkF37Eei-d9bwZwcVEw"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_496V8V37Eei-d9bwZwcVEw"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_joMjUF4AEei-d9bwZwcVEw" type="Property_ClassAttributeLabel" fontColor="4227327">
-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_sbQUYF4AEei-d9bwZwcVEw" source="PapyrusCSSForceValue">
-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_sbQ7cF4AEei-d9bwZwcVEw" key="fontColor" value="true"/>
-          </eAnnotations>
-          <children xmi:type="notation:DecorationNode" xmi:id="_joQNsF4AEei-d9bwZwcVEw" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_joQNsV4AEei-d9bwZwcVEw" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_joQNsl4AEei-d9bwZwcVEw"/>
-          </children>
-          <element xmi:type="uml:Property" href="Vnf.uml#_jU8QIF4AEei-d9bwZwcVEw"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_joMjUV4AEei-d9bwZwcVEw"/>
-        </children>
         <children xmi:type="notation:Shape" xmi:id="_lzFGgF4AEei-d9bwZwcVEw" type="Property_ClassAttributeLabel" fontColor="4227327">
           <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_sbQ7cV4AEei-d9bwZwcVEw" source="PapyrusCSSForceValue">
             <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_sbQ7cl4AEei-d9bwZwcVEw" key="fontColor" value="true"/>
@@ -5451,45 +5527,6 @@
           <element xmi:type="uml:Property" href="Vnf.uml#_mlc-oF4AEei-d9bwZwcVEw"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_m4czIV4AEei-d9bwZwcVEw"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_puGxoF4AEei-d9bwZwcVEw" type="Property_ClassAttributeLabel" fontColor="4227327">
-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_sbRigl4AEei-d9bwZwcVEw" source="PapyrusCSSForceValue">
-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_sbRig14AEei-d9bwZwcVEw" key="fontColor" value="true"/>
-          </eAnnotations>
-          <children xmi:type="notation:DecorationNode" xmi:id="_puJ08F4AEei-d9bwZwcVEw" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_puJ08V4AEei-d9bwZwcVEw" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_puJ08l4AEei-d9bwZwcVEw"/>
-          </children>
-          <element xmi:type="uml:Property" href="Vnf.uml#_pavJsF4AEei-d9bwZwcVEw"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_puGxoV4AEei-d9bwZwcVEw"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_wnzxIF7AEeirAtMhXaZZ3A" type="Property_ClassAttributeLabel" fontColor="33023">
-          <children xmi:type="notation:DecorationNode" xmi:id="_wn5QsF7AEeirAtMhXaZZ3A" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_wn53wF7AEeirAtMhXaZZ3A" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wn53wV7AEeirAtMhXaZZ3A"/>
-          </children>
-          <element xmi:type="uml:Property" href="Vnf.uml#_wUfMgF7AEeirAtMhXaZZ3A"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_wnzxIV7AEeirAtMhXaZZ3A"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_ymV6YF7AEeirAtMhXaZZ3A" type="Property_ClassAttributeLabel" fontColor="33023">
-          <children xmi:type="notation:DecorationNode" xmi:id="_ymay4F7AEeirAtMhXaZZ3A" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_ymay4V7AEeirAtMhXaZZ3A" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ymay4l7AEeirAtMhXaZZ3A"/>
-          </children>
-          <element xmi:type="uml:Property" href="Vnf.uml#_yk6-EF7AEeirAtMhXaZZ3A"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_ymV6YV7AEeirAtMhXaZZ3A"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_zntQwF7AEeirAtMhXaZZ3A" type="Property_ClassAttributeLabel" fontColor="33023">
-          <children xmi:type="notation:DecorationNode" xmi:id="_znw7IF7AEeirAtMhXaZZ3A" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_znw7IV7AEeirAtMhXaZZ3A" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_znw7Il7AEeirAtMhXaZZ3A"/>
-          </children>
-          <element xmi:type="uml:Property" href="Vnf.uml#_zU9T4F7AEeirAtMhXaZZ3A"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_zntQwV7AEeirAtMhXaZZ3A"/>
-        </children>
         <children xmi:type="notation:Shape" xmi:id="_mkEXgBidEemVYPRf16WzdQ" type="Property_ClassAttributeLabel" fontColor="16711680" fontName="Segoe UI">
           <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_5KOaUBidEemVYPRf16WzdQ" source="PapyrusCSSForceValue">
             <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_5KPBYBidEemVYPRf16WzdQ" key="fontHeight" value="true"/>
@@ -6244,28 +6281,6 @@
       <element xmi:type="uml:DataType" href="Common.uml#_2aIggDa9EeivvI-m1BaAbA"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YepJ4XPWEeiuFfjlON-CuQ" x="40" y="20"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_ZruBAHPWEeiuFfjlON-CuQ" type="Enumeration_Shape">
-      <children xmi:type="notation:DecorationNode" xmi:id="_ZruBAnPWEeiuFfjlON-CuQ" type="Enumeration_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_ZruBA3PWEeiuFfjlON-CuQ" type="Enumeration_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ZruBBHPWEeiuFfjlON-CuQ" y="15"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_ZruBBXPWEeiuFfjlON-CuQ" type="Enumeration_LiteralCompartment">
-        <children xmi:type="notation:Shape" xmi:id="_n5S6AHPWEeiuFfjlON-CuQ" type="EnumerationLiteral_LiteralLabel">
-          <element xmi:type="uml:EnumerationLiteral" href="Vnf.uml#_J4maIGjsEeip9umi7zNprw"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_n5S6AXPWEeiuFfjlON-CuQ"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_n5ThEHPWEeiuFfjlON-CuQ" type="EnumerationLiteral_LiteralLabel">
-          <element xmi:type="uml:EnumerationLiteral" href="Vnf.uml#_L1m5YGjsEeip9umi7zNprw"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_n5ThEXPWEeiuFfjlON-CuQ"/>
-        </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="_ZruBBnPWEeiuFfjlON-CuQ"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_ZruBB3PWEeiuFfjlON-CuQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_ZruBCHPWEeiuFfjlON-CuQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZruBCXPWEeiuFfjlON-CuQ"/>
-      </children>
-      <element xmi:type="uml:Enumeration" href="Vnf.uml#_DK1hoGjsEeip9umi7zNprw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZruBAXPWEeiuFfjlON-CuQ" x="360" y="20"/>
-    </children>
     <children xmi:type="notation:Shape" xmi:id="_aVrkAHPWEeiuFfjlON-CuQ" type="Enumeration_Shape">
       <children xmi:type="notation:DecorationNode" xmi:id="_aVrkAnPWEeiuFfjlON-CuQ" type="Enumeration_NameLabel"/>
       <children xmi:type="notation:DecorationNode" xmi:id="_aVrkA3PWEeiuFfjlON-CuQ" type="Enumeration_FloatingNameLabel">
@@ -7436,14 +7451,6 @@
       <element xsi:nil="true"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_W3aSxpUGEeiYXO5wr78TUw" x="240" y="20"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_cCEZxJUGEeiYXO5wr78TUw" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_cCEZxZUGEeiYXO5wr78TUw"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_cCEZx5UGEeiYXO5wr78TUw" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Enumeration" href="Vnf.uml#_DK1hoGjsEeip9umi7zNprw"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cCEZxpUGEeiYXO5wr78TUw" x="560" y="20"/>
-    </children>
     <children xmi:type="notation:Shape" xmi:id="_gEbb95UGEeiYXO5wr78TUw" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_gEbb-JUGEeiYXO5wr78TUw"/>
       <styles xmi:type="notation:EObjectValueStyle" xmi:id="_gEbb-pUGEeiYXO5wr78TUw" name="BASE_ELEMENT">
@@ -7908,6 +7915,30 @@
       <element xmi:type="uml:DataType" href="Vnf.uml#_BAt7gBx6Eemit6R65X1VNQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BA46oRx6Eemit6R65X1VNQ" x="1120" y="1400"/>
     </children>
+    <children xmi:type="notation:Shape" xmi:id="_jD-UcEUJEemWRYeHGX88Yw" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_jD-UcUUJEemWRYeHGX88Yw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jD-7gEUJEemWRYeHGX88Yw" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:DataType" href="Vnf.uml#_hzvvUPxSEeijjKJn7OxwuQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jD-UckUJEemWRYeHGX88Yw" x="940" y="1600"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_jEpp4EUJEemWRYeHGX88Yw" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_jEpp4UUJEemWRYeHGX88Yw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jEqQ8EUJEemWRYeHGX88Yw" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:DataType" href="Vnf.uml#_cyGIcPxUEeijjKJn7OxwuQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jEpp4kUJEemWRYeHGX88Yw" x="1160" y="1600"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_jFVmYEUJEemWRYeHGX88Yw" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_jFVmYUUJEemWRYeHGX88Yw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jFWNcEUJEemWRYeHGX88Yw" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:DataType" href="Vnf.uml#_BAt7gBx6Eemit6R65X1VNQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jFVmYkUJEemWRYeHGX88Yw" x="1320" y="1400"/>
+    </children>
     <styles xmi:type="notation:StringValueStyle" xmi:id="_XaTYAXPWEeiuFfjlON-CuQ" name="diagram_compatibility_version" stringValue="1.4.0"/>
     <styles xmi:type="notation:DiagramStyle" xmi:id="_XaTYAnPWEeiuFfjlON-CuQ"/>
     <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_XaTYA3PWEeiuFfjlON-CuQ" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
@@ -7964,16 +7995,6 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_W3aSy5UGEeiYXO5wr78TUw"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_W3aSzJUGEeiYXO5wr78TUw"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_cCEZyJUGEeiYXO5wr78TUw" type="StereotypeCommentLink" source="_ZruBAHPWEeiuFfjlON-CuQ" target="_cCEZxJUGEeiYXO5wr78TUw">
-      <styles xmi:type="notation:FontStyle" xmi:id="_cCEZyZUGEeiYXO5wr78TUw"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_cCEZzZUGEeiYXO5wr78TUw" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Enumeration" href="Vnf.uml#_DK1hoGjsEeip9umi7zNprw"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_cCEZypUGEeiYXO5wr78TUw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_cCEZy5UGEeiYXO5wr78TUw"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_cCEZzJUGEeiYXO5wr78TUw"/>
-    </edges>
     <edges xmi:type="notation:Connector" xmi:id="_gEcDAJUGEeiYXO5wr78TUw" type="StereotypeCommentLink" source="_aVrkAHPWEeiuFfjlON-CuQ" target="_gEbb95UGEeiYXO5wr78TUw">
       <styles xmi:type="notation:FontStyle" xmi:id="_gEcDAZUGEeiYXO5wr78TUw"/>
       <styles xmi:type="notation:EObjectValueStyle" xmi:id="_gEcDBZUGEeiYXO5wr78TUw" name="BASE_ELEMENT">
@@ -8224,6 +8245,36 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HPSOdJqEEeidy9iGT_F5-w"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HPSOdZqEEeidy9iGT_F5-w"/>
     </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_jD-7gUUJEemWRYeHGX88Yw" type="StereotypeCommentLink" source="_hz78kPxSEeijjKJn7OxwuQ" target="_jD-UcEUJEemWRYeHGX88Yw">
+      <styles xmi:type="notation:FontStyle" xmi:id="_jD-7gkUJEemWRYeHGX88Yw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jD-7hkUJEemWRYeHGX88Yw" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:DataType" href="Vnf.uml#_hzvvUPxSEeijjKJn7OxwuQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jD-7g0UJEemWRYeHGX88Yw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jD-7hEUJEemWRYeHGX88Yw"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jD-7hUUJEemWRYeHGX88Yw"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_jEqQ8UUJEemWRYeHGX88Yw" type="StereotypeCommentLink" source="_cySVsPxUEeijjKJn7OxwuQ" target="_jEpp4EUJEemWRYeHGX88Yw">
+      <styles xmi:type="notation:FontStyle" xmi:id="_jEqQ8kUJEemWRYeHGX88Yw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jEqQ9kUJEemWRYeHGX88Yw" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:DataType" href="Vnf.uml#_cyGIcPxUEeijjKJn7OxwuQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jEqQ80UJEemWRYeHGX88Yw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jEqQ9EUJEemWRYeHGX88Yw"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jEqQ9UUJEemWRYeHGX88Yw"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_jFWNcUUJEemWRYeHGX88Yw" type="StereotypeCommentLink" source="_BA46oBx6Eemit6R65X1VNQ" target="_jFVmYEUJEemWRYeHGX88Yw">
+      <styles xmi:type="notation:FontStyle" xmi:id="_jFWNckUJEemWRYeHGX88Yw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jFWNdkUJEemWRYeHGX88Yw" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:DataType" href="Vnf.uml#_BAt7gBx6Eemit6R65X1VNQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jFWNc0UJEemWRYeHGX88Yw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jFWNdEUJEemWRYeHGX88Yw"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jFWNdUUJEemWRYeHGX88Yw"/>
+    </edges>
   </notation:Diagram>
   <notation:Diagram xmi:id="_4MDaUIOOEeivtfz_CvwDeA" type="PapyrusUMLClassDiagram" name="Runtime Topology" measurementUnit="Pixel">
     <children xmi:type="notation:Shape" xmi:id="_AmugkIOPEeivtfz_CvwDeA" type="Class_Shape">
@@ -8933,45 +8984,6 @@
       <element xsi:nil="true"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vkQ2RTw3EemSHu2qGsweWg" x="200"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_Y40joDw4EemSHu2qGsweWg" type="Class_Shape" fillColor="8047085">
-      <children xmi:type="notation:DecorationNode" xmi:id="_Y40jojw4EemSHu2qGsweWg" type="Class_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_Y40jozw4EemSHu2qGsweWg" type="Class_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Y40jpDw4EemSHu2qGsweWg" y="15"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_Y41KsDw4EemSHu2qGsweWg" type="Class_AttributeCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_Y41KsTw4EemSHu2qGsweWg"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_Y41Ksjw4EemSHu2qGsweWg"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_Y41Kszw4EemSHu2qGsweWg"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Y41KtDw4EemSHu2qGsweWg"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_Y41KtTw4EemSHu2qGsweWg" visible="false" type="Class_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_Y41Ktjw4EemSHu2qGsweWg"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_Y41Ktzw4EemSHu2qGsweWg"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_Y41KuDw4EemSHu2qGsweWg"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Y41KuTw4EemSHu2qGsweWg"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_Y41Kujw4EemSHu2qGsweWg" visible="false" type="Class_NestedClassifierCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_Y41Kuzw4EemSHu2qGsweWg"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_Y41KvDw4EemSHu2qGsweWg"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_Y41KvTw4EemSHu2qGsweWg"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Y41Kvjw4EemSHu2qGsweWg"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_Y4_iwDw4EemSHu2qGsweWg" visible="false" type="StereotypeLabel">
-        <styles xmi:type="notation:StringValueStyle" xmi:id="_Y4_iwTw4EemSHu2qGsweWg" name="stereotype" stringValue="OpenModel_Profile::OpenModelClass"/>
-        <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Y4_iwjw4EemSHu2qGsweWg"/>
-      </children>
-      <element xmi:type="uml:Class" href="Vnf.uml#_Y4w5QDw4EemSHu2qGsweWg"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Y40joTw4EemSHu2qGsweWg" x="360" y="660" width="121" height="81"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_Y5AJ1zw4EemSHu2qGsweWg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_Y5AJ2Dw4EemSHu2qGsweWg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Y5Aw4Dw4EemSHu2qGsweWg" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="Vnf.uml#_Y4w5QDw4EemSHu2qGsweWg"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Y5AJ2Tw4EemSHu2qGsweWg" x="200"/>
-    </children>
     <children xmi:type="notation:Shape" xmi:id="_AtSwwDxZEemSHu2qGsweWg" type="Class_Shape">
       <children xmi:type="notation:DecorationNode" xmi:id="_AtSwwjxZEemSHu2qGsweWg" type="Class_NameLabel"/>
       <children xmi:type="notation:DecorationNode" xmi:id="_AtSwwzxZEemSHu2qGsweWg" type="Class_FloatingNameLabel">
@@ -9044,13 +9056,13 @@
         <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jKWZ0jxkEemSdYSKacDoqQ"/>
       </children>
-      <element xmi:type="uml:Class" href="Vnf.uml#_jJ_NcDxkEemSdYSKacDoqQ"/>
+      <element xmi:type="uml:Class" href="Common.uml#_jJ_NcDxkEemSdYSKacDoqQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jKI-cTxkEemSdYSKacDoqQ" x="720" y="520" width="121" height="61"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_jKYPADxkEemSdYSKacDoqQ" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_jKYPATxkEemSdYSKacDoqQ"/>
       <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jKYPAzxkEemSdYSKacDoqQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="Vnf.uml#_jJ_NcDxkEemSdYSKacDoqQ"/>
+        <eObjectValue xmi:type="uml:Class" href="Common.uml#_jJ_NcDxkEemSdYSKacDoqQ"/>
       </styles>
       <element xsi:nil="true"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jKYPAjxkEemSdYSKacDoqQ" x="200"/>
@@ -9368,16 +9380,6 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vkQ2Sjw3EemSHu2qGsweWg"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vkRdUDw3EemSHu2qGsweWg"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_Y5Aw4Tw4EemSHu2qGsweWg" type="StereotypeCommentLink" source="_Y40joDw4EemSHu2qGsweWg" target="_Y5AJ1zw4EemSHu2qGsweWg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_Y5Aw4jw4EemSHu2qGsweWg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Y5Aw5jw4EemSHu2qGsweWg" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="Vnf.uml#_Y4w5QDw4EemSHu2qGsweWg"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Y5Aw4zw4EemSHu2qGsweWg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Y5Aw5Dw4EemSHu2qGsweWg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Y5Aw5Tw4EemSHu2qGsweWg"/>
-    </edges>
     <edges xmi:type="notation:Connector" xmi:id="_sUu8MDxYEemSHu2qGsweWg" type="Generalization_Edge" source="_xVcnkJs3EeiPBvbfaqSLYg" target="_vkHFQDw3EemSHu2qGsweWg">
       <children xmi:type="notation:DecorationNode" xmi:id="_sUvjQDxYEemSHu2qGsweWg" type="Generalization_StereotypeLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_z2_MsDxYEemSHu2qGsweWg" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -9399,17 +9401,6 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ulVs4DxYEemSHu2qGsweWg" id="(0.49586776859504134,0.0)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ulVs4TxYEemSHu2qGsweWg" id="(0.4968944099378882,1.0)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_xXAjQDxYEemSHu2qGsweWg" type="Generalization_Edge" source="_Y40joDw4EemSHu2qGsweWg" target="_vkHFQDw3EemSHu2qGsweWg">
-      <children xmi:type="notation:DecorationNode" xmi:id="_xXAjQzxYEemSHu2qGsweWg" type="Generalization_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_1S2GsDxYEemSHu2qGsweWg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_xXAjRDxYEemSHu2qGsweWg" x="-1" y="38"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_xXAjQTxYEemSHu2qGsweWg"/>
-      <element xmi:type="uml:Generalization" href="Vnf.uml#_xOGe4DxYEemSHu2qGsweWg"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xXAjQjxYEemSHu2qGsweWg" points="[420, 660, -643984, -643984]$[420, 620, -643984, -643984]$[260, 620, -643984, -643984]$[260, 581, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xohxEDxYEemSHu2qGsweWg" id="(0.49586776859504134,0.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xohxETxYEemSHu2qGsweWg" id="(0.4968944099378882,1.0)"/>
-    </edges>
     <edges xmi:type="notation:Connector" xmi:id="_AtbTpzxZEemSHu2qGsweWg" type="StereotypeCommentLink" source="_AtSwwDxZEemSHu2qGsweWg" target="_AtbTozxZEemSHu2qGsweWg">
       <styles xmi:type="notation:FontStyle" xmi:id="_AtbTqDxZEemSHu2qGsweWg"/>
       <styles xmi:type="notation:EObjectValueStyle" xmi:id="_AtbTrDxZEemSHu2qGsweWg" name="BASE_ELEMENT">
@@ -9434,7 +9425,7 @@
     <edges xmi:type="notation:Connector" xmi:id="_jKY2EDxkEemSdYSKacDoqQ" type="StereotypeCommentLink" source="_jKI-cDxkEemSdYSKacDoqQ" target="_jKYPADxkEemSdYSKacDoqQ">
       <styles xmi:type="notation:FontStyle" xmi:id="_jKY2ETxkEemSdYSKacDoqQ"/>
       <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jKZdITxkEemSdYSKacDoqQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="Vnf.uml#_jJ_NcDxkEemSdYSKacDoqQ"/>
+        <eObjectValue xmi:type="uml:Class" href="Common.uml#_jJ_NcDxkEemSdYSKacDoqQ"/>
       </styles>
       <element xsi:nil="true"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jKY2EjxkEemSdYSKacDoqQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
@@ -9469,7 +9460,7 @@
         <layoutConstraint xmi:type="notation:Location" xmi:id="_01GkVDxkEemSdYSKacDoqQ" x="-1" y="38"/>
       </children>
       <styles xmi:type="notation:FontStyle" xmi:id="_01GkUTxkEemSdYSKacDoqQ"/>
-      <element xmi:type="uml:Generalization" href="Vnf.uml#_0sPjQDxkEemSdYSKacDoqQ"/>
+      <element xmi:type="uml:Generalization" href="Common.uml#_0sPjQDxkEemSdYSKacDoqQ"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_01GkUjxkEemSdYSKacDoqQ" points="[800, 520, -643984, -643984]$[780, 480, -643984, -643984]$[520, 480, -643984, -643984]$[520, 441, -643984, -643984]"/>
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1Gf2UDxkEemSdYSKacDoqQ" id="(0.49586776859504134,0.0)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1Gf2UTxkEemSdYSKacDoqQ" id="(0.4979253112033195,1.0)"/>
diff --git a/ONAP Information Model/Vnf.uml b/ONAP Information Model/Vnf.uml
index c08942f..9950748 100644
--- a/ONAP Information Model/Vnf.uml
+++ b/ONAP Information Model/Vnf.uml
@@ -483,6 +483,12 @@ NOTE 2: virtualLinkProfile needs to be provided for all VLs that the CPs of the
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_-3nXgRk4Eem_VM0Ij2_uSw" value="*"/>
         </ownedEnd>
       </packagedElement>
+      <packagedElement xmi:type="uml:Association" xmi:id="_wHic8ET_EemWRYeHGX88Yw" name="VnfdDefinesSecurityGroupRule" memberEnd="_wHuqMET_EemWRYeHGX88Yw _wHxGcET_EemWRYeHGX88Yw">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_wHq_0ET_EemWRYeHGX88Yw" source="org.eclipse.papyrus">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_wHrm4ET_EemWRYeHGX88Yw" key="nature" value="UML_Nature"/>
+        </eAnnotations>
+        <ownedEnd xmi:type="uml:Property" xmi:id="_wHxGcET_EemWRYeHGX88Yw" name="_vnfd" type="_aaEZADOREeiHat9KcP8uWA" association="_wHic8ET_EemWRYeHGX88Yw"/>
+      </packagedElement>
     </packagedElement>
     <packagedElement xmi:type="uml:Package" xmi:id="_zPN5MDOHEei5Af8DcjrhIQ" name="Diagrams" URI="">
       <ownedComment xmi:type="uml:Comment" xmi:id="_bphG0DTSEeiwQ6KPLHcy4g" annotatedElement="_zPN5MDOHEei5Af8DcjrhIQ">
@@ -570,16 +576,6 @@ This will probably need to move to common</body>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_YFPBADwsEemSHu2qGsweWg" value="*"/>
         </ownedEnd>
       </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_Y4w5QDw4EemSHu2qGsweWg" name="Pnfd">
-        <generalization xmi:type="uml:Generalization" xmi:id="_xOGe4DxYEemSHu2qGsweWg">
-          <general xmi:type="uml:Class" href="Nf.uml#_O385oJssEeiPBvbfaqSLYg"/>
-        </generalization>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_jJ_NcDxkEemSdYSKacDoqQ" name="LinkDesc">
-        <generalization xmi:type="uml:Generalization" xmi:id="_0sPjQDxkEemSdYSKacDoqQ">
-          <general xmi:type="uml:Class" href="Resource.uml#_DAQisJpXEeidy9iGT_F5-w"/>
-        </generalization>
-      </packagedElement>
     </packagedElement>
     <packagedElement xmi:type="uml:Package" xmi:id="_zPN5MTOHEei5Af8DcjrhIQ" name="Interfaces"/>
     <packagedElement xmi:type="uml:Package" xmi:id="_zPN5MjOHEei5Af8DcjrhIQ" name="ObjectClasses">
@@ -595,7 +591,7 @@ A VNFC will only be in one VNFDesc.   If a vendor wants to use the VNFC in mupli
 &#xD;
 </body>
         </ownedComment>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_l8PhgDWbEei9Ia34RXjpEg" name="vduId">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_l8PhgDWbEei9Ia34RXjpEg" name="id">
           <ownedComment xmi:type="uml:Comment" xmi:id="_sSUSwDWbEei9Ia34RXjpEg" annotatedElement="_l8PhgDWbEei9Ia34RXjpEg">
             <body>Unique identifier of this Vdu in VNFD.&#xD;
 </body>
@@ -909,6 +905,13 @@ NOTE:   This shall be used to describe both the software image loaded on the vir
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_24918Cr_EemS0_wZSU3sbA"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_24-dACr_EemS0_wZSU3sbA" value="*"/>
         </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_wHuqMET_EemWRYeHGX88Yw" name="_securityGroupRule" type="_pQg3kET7EemWRYeHGX88Yw" association="_wHic8ET_EemWRYeHGX88Yw">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_MfuagEUAEemWRYeHGX88Yw" annotatedElement="_wHuqMET_EemWRYeHGX88Yw">
+            <body>Defines security group rules to be used by the VNF.</body>
+          </ownedComment>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_wHwfYET_EemWRYeHGX88Yw"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_wHwfYUT_EemWRYeHGX88Yw" value="*"/>
+        </ownedAttribute>
       </packagedElement>
       <packagedElement xmi:type="uml:Class" xmi:id="_J0Zx0DOSEeiHat9KcP8uWA" name="SwImageDesc">
         <ownedComment xmi:type="uml:Comment" xmi:id="_8Nl8oDasEei23_xWdimG9w" annotatedElement="_J0Zx0DOSEeiHat9KcP8uWA">
@@ -1698,68 +1701,40 @@ Diversity - Resources are geo-diverse ( cannot be co-located).&#xD;
         <ownedComment xmi:type="uml:Comment" xmi:id="_Qzli4F4CEei-d9bwZwcVEw" annotatedElement="_jH_PgF3PEeiwL5tPgFMcjQ">
           <body>An implementation of an NF that can be deployed on a Network Function Virtualisation Infrastructure (NFVI).</body>
         </ownedComment>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_xJolUF3PEeiwL5tPgFMcjQ" name="vnfInstanceId">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_5Pn1AF3PEeiwL5tPgFMcjQ" annotatedElement="_xJolUF3PEeiwL5tPgFMcjQ">
-            <body>identifier of the VNF instance</body>
-          </ownedComment>
-          <type xmi:type="uml:DataType" href="Common.uml#_AuYtcDkBEeiWMf5FLWfdLA"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_OD8jEF3REeiwL5tPgFMcjQ" name="vnfInstanceName">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_BiOG4F3cEeiwL5tPgFMcjQ" annotatedElement="_OD8jEF3REeiwL5tPgFMcjQ">
-            <body>name of the VNF instance.  Multiple names are possible.</body>
-          </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_vFDwEJdXEei-sOl6ywWHlg" value="1"/>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_vFPWQJdXEei-sOl6ywWHlg" value="*"/>
-        </ownedAttribute>
+        <generalization xmi:type="uml:Generalization" xmi:id="_pAekkEUIEemWRYeHGX88Yw">
+          <general xmi:type="uml:Class" href="Nf.uml#_VtzSoESyEeiVGPeZpaYNtQ"/>
+        </generalization>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_xSnkYF3eEeiwL5tPgFMcjQ" name="vnfProductName">
           <ownedComment xmi:type="uml:Comment" xmi:id="_5gjPIF3eEeiwL5tPgFMcjQ" annotatedElement="_xSnkYF3eEeiwL5tPgFMcjQ">
             <body>name to identify the VNF Product, invariant for the VNF Product lifetime</body>
           </ownedComment>
           <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_zhxjkF3eEeiwL5tPgFMcjQ"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_zhxjkF3eEeiwL5tPgFMcjQ" value="1"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zh6GcF3eEeiwL5tPgFMcjQ" value="1"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_jsFn0F3fEeiwL5tPgFMcjQ" name="description">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_pn8iQF3fEeiwL5tPgFMcjQ" annotatedElement="_jsFn0F3fEeiwL5tPgFMcjQ">
-            <body>description of the VNF instance</body>
-          </ownedComment>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_mtT9IF3fEeiwL5tPgFMcjQ"/>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_mtbR4F3fEeiwL5tPgFMcjQ" value="1"/>
-        </ownedAttribute>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_HY63sF3gEeiwL5tPgFMcjQ" name="vnfProvider">
           <ownedComment xmi:type="uml:Comment" xmi:id="_ODWvYF3gEeiwL5tPgFMcjQ" annotatedElement="_HY63sF3gEeiwL5tPgFMcjQ">
             <body>provider of the VNF model</body>
           </ownedComment>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_ANTnwF3vEeiwL5tPgFMcjQ" name="vnfdId">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_Uapq0F3vEeiwL5tPgFMcjQ" annotatedElement="_ANTnwF3vEeiwL5tPgFMcjQ">
-            <body>identifier of the VNF model</body>
-          </ownedComment>
-          <type xmi:type="uml:DataType" href="Common.uml#_AuYtcDkBEeiWMf5FLWfdLA"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_rg2KUF3vEeiwL5tPgFMcjQ" name="vnfdVersion">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_x6fM8F3vEeiwL5tPgFMcjQ" annotatedElement="_rg2KUF3vEeiwL5tPgFMcjQ">
-            <body>version of the VNF model</body>
-          </ownedComment>
           <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
         </ownedAttribute>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_D0XjIF3xEeiwL5tPgFMcjQ" name="vnfSoftwareVersion">
           <ownedComment xmi:type="uml:Comment" xmi:id="_JKUUIF3xEeiwL5tPgFMcjQ" annotatedElement="_D0XjIF3xEeiwL5tPgFMcjQ">
             <body>Software version of the VNF. This is changed when there is any change to the software that is included in the VNF package</body>
           </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+          <type xmi:type="uml:PrimitiveType" href="Common.uml#_oXexoD2uEeiu6I5JfRTxxQ"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_b9AvYF33EeiwL5tPgFMcjQ" name="onboardedVnfPkgInfoId">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_b9AvYF33EeiwL5tPgFMcjQ" name="vnfPkgId">
           <ownedComment xmi:type="uml:Comment" xmi:id="_qk93QF33EeiwL5tPgFMcjQ" annotatedElement="_b9AvYF33EeiwL5tPgFMcjQ">
             <body>identifier of the specific VNF package on which the VNF instance is based</body>
           </ownedComment>
           <type xmi:type="uml:DataType" href="Common.uml#_AuYtcDkBEeiWMf5FLWfdLA"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_yX0vkF33EeiwL5tPgFMcjQ" name="availabilityZone">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yX0vkF33EeiwL5tPgFMcjQ" name="zone">
           <ownedComment xmi:type="uml:Comment" xmi:id="_2-FJAF33EeiwL5tPgFMcjQ" annotatedElement="_yX0vkF33EeiwL5tPgFMcjQ">
             <body>availability zone information of the VNF instance</body>
           </ownedComment>
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
         </ownedAttribute>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_2BvAEF34EeiwL5tPgFMcjQ" name="operationalStatus" type="_JqA_UHPTEeiuFfjlON-CuQ">
           <ownedComment xmi:type="uml:Comment" xmi:id="_66NK4F34EeiwL5tPgFMcjQ" annotatedElement="_2BvAEF34EeiwL5tPgFMcjQ">
@@ -1777,6 +1752,7 @@ Diversity - Resources are geo-diverse ( cannot be co-located).&#xD;
           <ownedComment xmi:type="uml:Comment" xmi:id="_WAKrkF35EeiwL5tPgFMcjQ" annotatedElement="_Pjwo0F35EeiwL5tPgFMcjQ">
             <body>oam ip address, ipv4</body>
           </ownedComment>
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_S169IF35EeiwL5tPgFMcjQ"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_S1_1oF35EeiwL5tPgFMcjQ" value="1"/>
         </ownedAttribute>
@@ -1784,6 +1760,7 @@ Diversity - Resources are geo-diverse ( cannot be co-located).&#xD;
           <ownedComment xmi:type="uml:Comment" xmi:id="_9wtBcF35EeiwL5tPgFMcjQ" annotatedElement="_s23WgF35EeiwL5tPgFMcjQ">
             <body>oam ip address, ipv6</body>
           </ownedComment>
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_7NWT4F35EeiwL5tPgFMcjQ"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_7NbMYF35EeiwL5tPgFMcjQ" value="1"/>
         </ownedAttribute>
@@ -1791,6 +1768,7 @@ Diversity - Resources are geo-diverse ( cannot be co-located).&#xD;
           <ownedComment xmi:type="uml:Comment" xmi:id="_iXMAsF37Eei-d9bwZwcVEw" annotatedElement="_t2N6sF35EeiwL5tPgFMcjQ">
             <body>information specific to an instantiated VNF instance, e.g., vm information</body>
           </ownedComment>
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_fS6-cF37Eei-d9bwZwcVEw"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_fTKPAF37Eei-d9bwZwcVEw" value="1"/>
         </ownedAttribute>
@@ -1802,9 +1780,9 @@ Diversity - Resources are geo-diverse ( cannot be co-located).&#xD;
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_tiO80F37Eei-d9bwZwcVEw"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tic_QF37Eei-d9bwZwcVEw" value="1"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_wvGzYF35EeiwL5tPgFMcjQ" name="isClosedLoopDisabled">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_wvGzYF35EeiwL5tPgFMcjQ" name="closedLoopEnabled">
           <ownedComment xmi:type="uml:Comment" xmi:id="_AtuhUF38Eei-d9bwZwcVEw" annotatedElement="_wvGzYF35EeiwL5tPgFMcjQ">
-            <body>whether closed loop function is enabled</body>
+            <body>Indicates whether the closed loop function is enabled or disabled.</body>
           </ownedComment>
           <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_9r9ZcF37Eei-d9bwZwcVEw"/>
@@ -1825,12 +1803,6 @@ Diversity - Resources are geo-diverse ( cannot be co-located).&#xD;
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_OBk9AF38Eei-d9bwZwcVEw"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OBrDoF38Eei-d9bwZwcVEw" value="1"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_jU8QIF4AEei-d9bwZwcVEw" name="nfNamingCode">
-          <ownedComment xmi:type="uml:Comment" xmi:id="__lXZoHPJEeiuFfjlON-CuQ" annotatedElement="_jU8QIF4AEei-d9bwZwcVEw">
-            <body>String assigned to this model used for naming purpose.</body>
-          </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-        </ownedAttribute>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_lfpNIF4AEei-d9bwZwcVEw" name="vnfNamingPolicyId">
           <ownedComment xmi:type="uml:Comment" xmi:id="_F-oBwHPKEeiuFfjlON-CuQ" annotatedElement="_lfpNIF4AEei-d9bwZwcVEw">
             <body>Identifier of the policy which has the naming logic for this VNF instance</body>
@@ -1843,32 +1815,9 @@ Diversity - Resources are geo-diverse ( cannot be co-located).&#xD;
           </ownedComment>
           <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_pavJsF4AEei-d9bwZwcVEw" name="nfType">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_MX2NoHPKEeiuFfjlON-CuQ" annotatedElement="_pavJsF4AEei-d9bwZwcVEw">
-            <body>Generic description of the type of network function</body>
-          </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_wUfMgF7AEeirAtMhXaZZ3A" name="nfFunction">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_OvNtoHPKEeiuFfjlON-CuQ" annotatedElement="_wUfMgF7AEeirAtMhXaZZ3A">
-            <body>English description of network function that the specific VNF deployment is providing.</body>
-          </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_yk6-EF7AEeirAtMhXaZZ3A" name="nfRole">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_RYfdAHPKEeiuFfjlON-CuQ" annotatedElement="_yk6-EF7AEeirAtMhXaZZ3A">
-            <body>Role in the network this model will be providing </body>
-          </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_zU9T4F7AEeirAtMhXaZZ3A" name="closedLoopStatus" type="_DK1hoGjsEeip9umi7zNprw">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_UQngsHPKEeiuFfjlON-CuQ" annotatedElement="_zU9T4F7AEeirAtMhXaZZ3A">
-            <body>Whether closed loop capabilities are enabled for this or not.</body>
-          </ownedComment>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_HAitoF-FEeiaLPXj8My4aQ" name="_nfc (vnfcinstance)" type="_OpdBwF9vEeiaLPXj8My4aQ" aggregation="composite" association="_HAfqUF-FEeiaLPXj8My4aQ">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_HAitoF-FEeiaLPXj8My4aQ" name="_vnfc" type="_OpdBwF9vEeiaLPXj8My4aQ" aggregation="composite" association="_HAfqUF-FEeiaLPXj8My4aQ">
           <ownedComment xmi:type="uml:Comment" xmi:id="_kJCK4HPKEeiuFfjlON-CuQ" annotatedElement="_HAitoF-FEeiaLPXj8My4aQ">
-            <body>Relatonship to the NF components that are part of this VNF.</body>
+            <body>Relatonship to the VNF components that are part of this VNF.</body>
           </ownedComment>
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_HAjUsV-FEeiaLPXj8My4aQ" value="1"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_HAjUsl-FEeiaLPXj8My4aQ" value="*"/>
@@ -2007,7 +1956,7 @@ Diversity - Resources are geo-diverse ( cannot be co-located).&#xD;
             <body>whether the VNFC instance is instantiated</body>
           </ownedComment>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_WbPTMGN5Eeio9amveq0yWQ" name="closedLoopStatus" type="_DK1hoGjsEeip9umi7zNprw">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_WbPTMGN5Eeio9amveq0yWQ" name="closedLoopStatus">
           <ownedComment xmi:type="uml:Comment" xmi:id="_oQc2wHPLEeiuFfjlON-CuQ" annotatedElement="_WbPTMGN5Eeio9amveq0yWQ">
             <body>Whether closed loop capabilities are enabled for this or not.</body>
           </ownedComment>
@@ -2337,7 +2286,72 @@ This could include the number of CPU cores on this logical node, a memory config
         <generalization xmi:type="uml:Generalization" xmi:id="_lFpyYLILEeid-vjMcczUWA">
           <general xmi:type="uml:Class" href="Common.uml#_AC2eIDQUEeixv_sLOod4lQ"/>
         </generalization>
-        <generalization xmi:type="uml:Generalization" xmi:id="_rT3eoDxkEemSdYSKacDoqQ" general="_jJ_NcDxkEemSdYSKacDoqQ"/>
+        <generalization xmi:type="uml:Generalization" xmi:id="_rT3eoDxkEemSdYSKacDoqQ">
+          <general xmi:type="uml:Class" href="Common.uml#_jJ_NcDxkEemSdYSKacDoqQ"/>
+        </generalization>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Class" xmi:id="_pQg3kET7EemWRYeHGX88Yw" name="SecurityGroupRule">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_uU5XcET7EemWRYeHGX88Yw" annotatedElement="_pQg3kET7EemWRYeHGX88Yw">
+          <body>Security group rule specifies the matching criteria for the ingress and/or egress traffic to/from the visited connection points. If an ingress traffic is accepted, the corresponding egress response shall be allowed, regardless of the security group rules on the egress direction. If an egress traffic is allowed, the corresponding ingress response shall be accepted, regardless of the security group rules on the ingress direction. The design of security group rule follows a permissive model where all security group rules applied to a CP are dealt with in an &quot;OR&quot; logic fashion, i.e. the traffic is allowed if it matches any security group rule applied to this CP.</body>
+        </ownedComment>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_2tGYgET7EemWRYeHGX88Yw" name="securityGroupRuleId" visibility="public">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_DLfL0ET8EemWRYeHGX88Yw" annotatedElement="_2tGYgET7EemWRYeHGX88Yw">
+            <body>Identifier of the security group rule.</body>
+          </ownedComment>
+          <type xmi:type="uml:DataType" href="Common.uml#_AuYtcDkBEeiWMf5FLWfdLA"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_GBV-oET8EemWRYeHGX88Yw" name="description" visibility="public">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_OPGDMET8EemWRYeHGX88Yw">
+            <body>Human readable description of the security group rule</body>
+          </ownedComment>
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_K2g90ET8EemWRYeHGX88Yw"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_K29pwET8EemWRYeHGX88Yw" value="1"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_nFlboET8EemWRYeHGX88Yw" name="direction" visibility="public" type="_T3At8ET8EemWRYeHGX88Yw">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_4iU_UET8EemWRYeHGX88Yw" annotatedElement="_nFlboET8EemWRYeHGX88Yw">
+            <body>The direction in which the security group rule is applied. </body>
+          </ownedComment>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_qKglMET8EemWRYeHGX88Yw"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_qKy5EET8EemWRYeHGX88Yw" value="1"/>
+          <defaultValue xmi:type="uml:LiteralString" xmi:id="_0HOtAET8EemWRYeHGX88Yw" name="Ingress" value="INGRESS"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_ZFaQAET9EemWRYeHGX88Yw" name="etherType" visibility="public">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_pOd-QET9EemWRYeHGX88Yw" annotatedElement="_ZFaQAET9EemWRYeHGX88Yw">
+            <body>Indicates the protocol carried over the Ethernet layer.</body>
+          </ownedComment>
+          <type xmi:type="uml:Enumeration" href="Common.uml#_TTf2EB89EemJTaeYhZuDRA"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_gzO3UET9EemWRYeHGX88Yw"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_gzgkIET9EemWRYeHGX88Yw" value="1"/>
+          <defaultValue xmi:type="uml:LiteralString" xmi:id="_kQWecET9EemWRYeHGX88Yw" name="IpV4" value="IPV4"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_vyMxAET9EemWRYeHGX88Yw" name="protocol" visibility="public">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_C645IET-EemWRYeHGX88Yw" annotatedElement="_vyMxAET9EemWRYeHGX88Yw">
+            <body>Indicates the protocol carried over the IP layer. Permitted values: any protocol defined in the IANA protocol registry, e.g. TCP, UDP, ICMP, etc.&#xD;
+Note: IFA011 defines this as an enum, but as the list is not complete, made this a string.</body>
+          </ownedComment>
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_494dcET9EemWRYeHGX88Yw"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4-I8IET9EemWRYeHGX88Yw" value="1"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_SagBwET-EemWRYeHGX88Yw" name="portRangeMin" visibility="public">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_hcBgMET-EemWRYeHGX88Yw" annotatedElement="_SagBwET-EemWRYeHGX88Yw">
+            <body>Indicates minimum port number in the range that is matched by the security group rule.  If a value is provided at design-time, this value may be overridden at run-time based on other deployment requirements or constraints.</body>
+          </ownedComment>
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_YAKpwET-EemWRYeHGX88Yw"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_YAbIcET-EemWRYeHGX88Yw" value="1"/>
+          <defaultValue xmi:type="uml:LiteralInteger" xmi:id="_kyGrMET-EemWRYeHGX88Yw" name="Range"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_qbWLoET-EemWRYeHGX88Yw" name="portRangeMax" visibility="public">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_qbWLoUT-EemWRYeHGX88Yw" annotatedElement="_qbWLoET-EemWRYeHGX88Yw">
+            <body>Indicates maximum port number in the range that is matched by the security group rule.  If a value is provided at design-time, this value may be overridden at run-time based on other deployment requirements or constraints.</body>
+          </ownedComment>
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_qbWLokT-EemWRYeHGX88Yw"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_qbWLo0T-EemWRYeHGX88Yw" value="1"/>
+          <defaultValue xmi:type="uml:LiteralInteger" xmi:id="_qbWLpET-EemWRYeHGX88Yw" name="Range" value="65535"/>
+        </ownedAttribute>
       </packagedElement>
     </packagedElement>
     <packagedElement xmi:type="uml:Package" xmi:id="_zPN5MzOHEei5Af8DcjrhIQ" name="TypeDefinitions">
@@ -2753,10 +2767,6 @@ NOTE: The MANO or NFVI may not support the recommended collectionPeriod based on
           <type xmi:type="uml:DataType" href="Common.uml#_LsX6UDgXEeiOYfGHew0BGg"/>
         </ownedAttribute>
       </packagedElement>
-      <packagedElement xmi:type="uml:Enumeration" xmi:id="_DK1hoGjsEeip9umi7zNprw" name="ClosedLoopStatus">
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_J4maIGjsEeip9umi7zNprw" name="ENABLED"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_L1m5YGjsEeip9umi7zNprw" name="DISABLED"/>
-      </packagedElement>
       <packagedElement xmi:type="uml:Enumeration" xmi:id="_aYK0IHPSEeiuFfjlON-CuQ" name="ProvStatus">
         <ownedComment xmi:type="uml:Comment" xmi:id="_Ij2twHVuEeityfM-lkDl2Q" annotatedElement="_aYK0IHPSEeiuFfjlON-CuQ">
           <body>Provisioning status, used as a trigger for operational monitoring of this resource by service assurance systems.</body>
@@ -2769,8 +2779,8 @@ NOTE: The MANO or NFVI may not support the recommended collectionPeriod based on
         <ownedComment xmi:type="uml:Comment" xmi:id="_dtARwHVuEeityfM-lkDl2Q" annotatedElement="_JqA_UHPTEeiuFfjlON-CuQ">
           <body>Indicator for whether the resource is considered operational. Valid values are in-service-path and out-of-service-path.</body>
         </ownedComment>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_QPdCQHPTEeiuFfjlON-CuQ" name="IN_SERVICE_PATH"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_TkXIkHPTEeiuFfjlON-CuQ" name="OUT_OF_SERVICE_PATH"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_QPdCQHPTEeiuFfjlON-CuQ" name="IN_SERVICE"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_TkXIkHPTEeiuFfjlON-CuQ" name="OUT_OF_SERVICE"/>
       </packagedElement>
       <packagedElement xmi:type="uml:Enumeration" xmi:id="_5--AQJdUEei-sOl6ywWHlg" name="OrchestrationStatus">
         <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_v6IPgJdaEei-sOl6ywWHlg" name="INVENTORIED"/>
@@ -2971,6 +2981,13 @@ The attached VDUs shall connect to the same internal VLD.&#xD;
           <general xmi:type="uml:DataType" href="Common.uml#_B1G2UDd_EeiIfPeSAqyGdQ"/>
         </generalization>
       </packagedElement>
+      <packagedElement xmi:type="uml:Enumeration" xmi:id="_T3At8ET8EemWRYeHGX88Yw" name="Direction">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_cDDiUET8EemWRYeHGX88Yw" annotatedElement="_T3At8ET8EemWRYeHGX88Yw">
+          <body>Ingress or egress traffic</body>
+        </ownedComment>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_eYJKYET8EemWRYeHGX88Yw" name="INGRESS"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_hOtH0ET8EemWRYeHGX88Yw" name="EGRESS"/>
+      </packagedElement>
     </packagedElement>
     <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_0Mc-4D2KEeiFiY3bcpqGkg">
       <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_BXttMDksEemjyLkBMGZA1g" source="PapyrusVersion">
@@ -3196,13 +3213,8 @@ The attached VDUs shall connect to the same internal VLD.&#xD;
   <OpenModel_Profile:OpenModelAttribute xmi:id="_KFKvMDnIEeiWMf5FLWfdLA" base_StructuralFeature="_KFKIIDnIEeiWMf5FLWfdLA"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_SHcjkDnIEeiWMf5FLWfdLA" base_StructuralFeature="_SHb8gDnIEeiWMf5FLWfdLA"/>
   <OpenModel_Profile:OpenModelClass xmi:id="_jKtzYF3PEeiwL5tPgFMcjQ" base_Class="_jH_PgF3PEeiwL5tPgFMcjQ"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_xJpMYF3PEeiwL5tPgFMcjQ" base_StructuralFeature="_xJolUF3PEeiwL5tPgFMcjQ"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_OD8jEV3REeiwL5tPgFMcjQ" base_StructuralFeature="_OD8jEF3REeiwL5tPgFMcjQ"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_xSoLcF3eEeiwL5tPgFMcjQ" base_StructuralFeature="_xSnkYF3eEeiwL5tPgFMcjQ"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_jsFn0V3fEeiwL5tPgFMcjQ" base_StructuralFeature="_jsFn0F3fEeiwL5tPgFMcjQ"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_xSoLcF3eEeiwL5tPgFMcjQ" base_StructuralFeature="_xSnkYF3eEeiwL5tPgFMcjQ" isInvariant="true"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_HY63sV3gEeiwL5tPgFMcjQ" base_StructuralFeature="_HY63sF3gEeiwL5tPgFMcjQ"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_ANUO0F3vEeiwL5tPgFMcjQ" base_StructuralFeature="_ANTnwF3vEeiwL5tPgFMcjQ"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_rg2KUV3vEeiwL5tPgFMcjQ" base_StructuralFeature="_rg2KUF3vEeiwL5tPgFMcjQ"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_D0XjIV3xEeiwL5tPgFMcjQ" base_StructuralFeature="_D0XjIF3xEeiwL5tPgFMcjQ"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_b9BWcF33EeiwL5tPgFMcjQ" base_StructuralFeature="_b9AvYF33EeiwL5tPgFMcjQ"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_yX1WoF33EeiwL5tPgFMcjQ" base_StructuralFeature="_yX0vkF33EeiwL5tPgFMcjQ"/>
@@ -3215,13 +3227,8 @@ The attached VDUs shall connect to the same internal VLD.&#xD;
   <OpenModel_Profile:OpenModelAttribute xmi:id="_wvHacF35EeiwL5tPgFMcjQ" base_StructuralFeature="_wvGzYF35EeiwL5tPgFMcjQ"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_xjTQcF35EeiwL5tPgFMcjQ" base_StructuralFeature="_xjSpYF35EeiwL5tPgFMcjQ"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_4zo_oF37Eei-d9bwZwcVEw" base_StructuralFeature="_4zoYkF37Eei-d9bwZwcVEw"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_jU8QIV4AEei-d9bwZwcVEw" base_StructuralFeature="_jU8QIF4AEei-d9bwZwcVEw"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_lfp0MF4AEei-d9bwZwcVEw" base_StructuralFeature="_lfpNIF4AEei-d9bwZwcVEw"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_mlc-oV4AEei-d9bwZwcVEw" base_StructuralFeature="_mlc-oF4AEei-d9bwZwcVEw"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_pavwwF4AEei-d9bwZwcVEw" base_StructuralFeature="_pavJsF4AEei-d9bwZwcVEw"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_wUiP0F7AEeirAtMhXaZZ3A" base_StructuralFeature="_wUfMgF7AEeirAtMhXaZZ3A"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_yk7lIF7AEeirAtMhXaZZ3A" base_StructuralFeature="_yk6-EF7AEeirAtMhXaZZ3A"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_zU9T4V7AEeirAtMhXaZZ3A" base_StructuralFeature="_zU9T4F7AEeirAtMhXaZZ3A"/>
   <OpenModel_Profile:OpenModelClass xmi:id="_Opdo0F9vEeiaLPXj8My4aQ" base_Class="_OpdBwF9vEeiaLPXj8My4aQ"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_dWI4oF9vEeiaLPXj8My4aQ" base_StructuralFeature="_dWIRkF9vEeiaLPXj8My4aQ"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_fIfAAV9vEeiaLPXj8My4aQ" base_StructuralFeature="_fIfAAF9vEeiaLPXj8My4aQ"/>
@@ -3250,12 +3257,8 @@ The attached VDUs shall connect to the same internal VLD.&#xD;
   <OpenModel_Profile:OpenModelClass xmi:id="_TuSmgH7dEei4v5WRHqfM1Q" base_Class="_TuRYYH7dEei4v5WRHqfM1Q"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_inPiUX7eEei4v5WRHqfM1Q" base_StructuralFeature="_inPiUH7eEei4v5WRHqfM1Q"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_inQwc37eEei4v5WRHqfM1Q" base_StructuralFeature="_inQwcn7eEei4v5WRHqfM1Q"/>
-  <OpenModel_Profile:Obsolete xmi:id="_FJDJgJTYEeiYXO5wr78TUw" base_Element="_S4W1oDazEei23_xWdimG9w"/>
   <OpenModel_Profile:Obsolete xmi:id="_PAg94JTYEeiYXO5wr78TUw" base_Element="_mqETUDa4EeivvI-m1BaAbA"/>
   <OpenModel_Profile:Obsolete xmi:id="_Rur0UJTYEeiYXO5wr78TUw" base_Element="_3WU1QDa4EeivvI-m1BaAbA"/>
-  <OpenModel_Profile:Obsolete xmi:id="_VfRxEJTYEeiYXO5wr78TUw" base_Element="_TXQisDa0Eei23_xWdimG9w"/>
-  <OpenModel_Profile:Obsolete xmi:id="_XetSMJTYEeiYXO5wr78TUw" base_Element="_mxsiIDa0Eei23_xWdimG9w"/>
-  <OpenModel_Profile:Obsolete xmi:id="_kKQXwJTYEeiYXO5wr78TUw" base_Element="_DpVfADa5EeivvI-m1BaAbA"/>
   <OpenModel_Profile:Obsolete xmi:id="_nXoSsJTYEeiYXO5wr78TUw" base_Element="_gv2iMDa5EeivvI-m1BaAbA"/>
   <OpenModel_Profile:Obsolete xmi:id="_oh9-4JTYEeiYXO5wr78TUw" base_Element="_heqI8Da5EeivvI-m1BaAbA"/>
   <OpenModel_Profile:Obsolete xmi:id="_rgio0JTYEeiYXO5wr78TUw" base_Element="_dSO64DawEei23_xWdimG9w"/>
@@ -3354,17 +3357,10 @@ The attached VDUs shall connect to the same internal VLD.&#xD;
   <OpenModel_Profile:Preliminary xmi:id="_BPOwwJUDEeiYXO5wr78TUw" base_Element="_DZsyMDnHEeiWMf5FLWfdLA"/>
   <OpenModel_Profile:Preliminary xmi:id="_DYdHEJUDEeiYXO5wr78TUw" base_Element="_Eu3jcDnJEeiWMf5FLWfdLA"/>
   <OpenModel_Profile:Experimental xmi:id="_sbe_kJUDEeiYXO5wr78TUw" base_Element="_jH_PgF3PEeiwL5tPgFMcjQ"/>
-  <OpenModel_Profile:Experimental xmi:id="_trhEEJUDEeiYXO5wr78TUw" base_Element="_xJolUF3PEeiwL5tPgFMcjQ"/>
-  <OpenModel_Profile:Experimental xmi:id="_u3KX0JUDEeiYXO5wr78TUw" base_Element="_OD8jEF3REeiwL5tPgFMcjQ"/>
   <OpenModel_Profile:Experimental xmi:id="_xLACsJUDEeiYXO5wr78TUw" base_Element="_b9AvYF33EeiwL5tPgFMcjQ"/>
   <OpenModel_Profile:Experimental xmi:id="_zYnJwJUDEeiYXO5wr78TUw" base_Element="_2BvAEF34EeiwL5tPgFMcjQ"/>
-  <OpenModel_Profile:Experimental xmi:id="_1aDdEJUDEeiYXO5wr78TUw" base_Element="_jU8QIF4AEei-d9bwZwcVEw"/>
   <OpenModel_Profile:Experimental xmi:id="_2uVvcJUDEeiYXO5wr78TUw" base_Element="_lfpNIF4AEei-d9bwZwcVEw"/>
   <OpenModel_Profile:Experimental xmi:id="_3-oSoJUDEeiYXO5wr78TUw" base_Element="_mlc-oF4AEei-d9bwZwcVEw"/>
-  <OpenModel_Profile:Experimental xmi:id="_5VafYJUDEeiYXO5wr78TUw" base_Element="_pavJsF4AEei-d9bwZwcVEw"/>
-  <OpenModel_Profile:Experimental xmi:id="_6nTlEJUDEeiYXO5wr78TUw" base_Element="_wUfMgF7AEeirAtMhXaZZ3A"/>
-  <OpenModel_Profile:Experimental xmi:id="_74rGUJUDEeiYXO5wr78TUw" base_Element="_yk6-EF7AEeirAtMhXaZZ3A"/>
-  <OpenModel_Profile:Experimental xmi:id="_9m4UkJUDEeiYXO5wr78TUw" base_Element="_zU9T4F7AEeirAtMhXaZZ3A"/>
   <OpenModel_Profile:Experimental xmi:id="_PWDFAJUEEeiYXO5wr78TUw" base_Element="_B2EJwF35EeiwL5tPgFMcjQ"/>
   <OpenModel_Profile:Experimental xmi:id="_RudG0JUEEeiYXO5wr78TUw" base_Element="_OpdBwF9vEeiaLPXj8My4aQ"/>
   <OpenModel_Profile:Experimental xmi:id="_S-4z8JUEEeiYXO5wr78TUw" base_Element="_dWIRkF9vEeiaLPXj8My4aQ"/>
@@ -3379,9 +3375,6 @@ The attached VDUs shall connect to the same internal VLD.&#xD;
   <OpenModel_Profile:Experimental xmi:id="_8B_IcJUFEeiYXO5wr78TUw" base_Element="_kxfYYHPSEeiuFfjlON-CuQ"/>
   <OpenModel_Profile:Experimental xmi:id="_9nSSUJUFEeiYXO5wr78TUw" base_Element="_nDl94HPSEeiuFfjlON-CuQ"/>
   <OpenModel_Profile:Experimental xmi:id="_-rp5YJUFEeiYXO5wr78TUw" base_Element="_okbegHPSEeiuFfjlON-CuQ"/>
-  <OpenModel_Profile:Preliminary xmi:id="_cBQhcJUGEeiYXO5wr78TUw" base_Element="_DK1hoGjsEeip9umi7zNprw"/>
-  <OpenModel_Profile:Preliminary xmi:id="_c7EeUJUGEeiYXO5wr78TUw" base_Element="_J4maIGjsEeip9umi7zNprw"/>
-  <OpenModel_Profile:Preliminary xmi:id="_dyG0AJUGEeiYXO5wr78TUw" base_Element="_L1m5YGjsEeip9umi7zNprw"/>
   <OpenModel_Profile:Preliminary xmi:id="_gDtDMJUGEeiYXO5wr78TUw" base_Element="_pRh10DnOEeiWMf5FLWfdLA"/>
   <OpenModel_Profile:Preliminary xmi:id="_tzIAkJUGEeiYXO5wr78TUw" base_Element="_zR55wD5cEeijbdkIlrq2uQ"/>
   <OpenModel_Profile:Preliminary xmi:id="_ugpN4JUGEeiYXO5wr78TUw" base_Element="_1euWoD5cEeijbdkIlrq2uQ"/>
@@ -3411,7 +3404,6 @@ The attached VDUs shall connect to the same internal VLD.&#xD;
   <OpenModel_Profile:Preliminary xmi:id="_fbVJsJUIEeiYXO5wr78TUw" base_Element="_0RG8kEcmEei7eo5RdnNiBQ"/>
   <OpenModel_Profile:Preliminary xmi:id="_iO6EkJUIEeiYXO5wr78TUw" base_Element="_AJK9MDa0Eei23_xWdimG9w"/>
   <OpenModel_Profile:Preliminary xmi:id="_jCVFkJUIEeiYXO5wr78TUw" base_Element="_HJMDUDa0Eei23_xWdimG9w"/>
-  <OpenModel_Profile:Preliminary xmi:id="_jzRaUJUIEeiYXO5wr78TUw" base_Element="_TXQisDa0Eei23_xWdimG9w"/>
   <OpenModel_Profile:Preliminary xmi:id="_khaSsJUIEeiYXO5wr78TUw" base_Element="_c4PJsDa0Eei23_xWdimG9w"/>
   <OpenModel_Profile:Preliminary xmi:id="_mKVYUJUIEeiYXO5wr78TUw" base_Element="_MRthQDmyEeiWMf5FLWfdLA"/>
   <OpenModel_Profile:Preliminary xmi:id="_m7nrUJUIEeiYXO5wr78TUw" base_Element="_awsTUDmyEeiWMf5FLWfdLA"/>
@@ -3481,10 +3473,7 @@ The attached VDUs shall connect to the same internal VLD.&#xD;
   <OpenModel_Profile:OpenModelClass xmi:id="_mcYKMLIKEeid-vjMcczUWA" base_Class="_mcXjILIKEeid-vjMcczUWA"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_0kN_cbxOEeiMnLuHd6ALAg" base_StructuralFeature="_0kN_cLxOEeiMnLuHd6ALAg"/>
   <OpenModel_Profile:Experimental xmi:id="_TSB-AL23EeigqpWKF5WysQ" base_Element="_xSnkYF3eEeiwL5tPgFMcjQ"/>
-  <OpenModel_Profile:Experimental xmi:id="_WxS6ML23EeigqpWKF5WysQ" base_Element="_jsFn0F3fEeiwL5tPgFMcjQ"/>
   <OpenModel_Profile:Experimental xmi:id="_aT_k4L23EeigqpWKF5WysQ" base_Element="_HY63sF3gEeiwL5tPgFMcjQ"/>
-  <OpenModel_Profile:Experimental xmi:id="_ck3bUL23EeigqpWKF5WysQ" base_Element="_ANTnwF3vEeiwL5tPgFMcjQ"/>
-  <OpenModel_Profile:Experimental xmi:id="_1cbFML_wEeisMMIUeH4UGw" base_Element="_rg2KUF3vEeiwL5tPgFMcjQ"/>
   <OpenModel_Profile:Experimental xmi:id="_305_gL_wEeisMMIUeH4UGw" base_Element="_D0XjIF3xEeiwL5tPgFMcjQ"/>
   <OpenModel_Profile:Experimental xmi:id="_7EqgEL_wEeisMMIUeH4UGw" base_Element="_yX0vkF33EeiwL5tPgFMcjQ"/>
   <OpenModel_Profile:Experimental xmi:id="_1Et6YL_xEeisMMIUeH4UGw" base_Element="_Pjwo0F35EeiwL5tPgFMcjQ"/>
@@ -3613,7 +3602,6 @@ The attached VDUs shall connect to the same internal VLD.&#xD;
   <OpenModel_Profile:OpenModelAttribute xmi:id="_fcJasSpFEemS0_wZSU3sbA" base_StructuralFeature="_fcJasCpFEemS0_wZSU3sbA"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_pEfN8CpFEemS0_wZSU3sbA" base_StructuralFeature="_pEem4CpFEemS0_wZSU3sbA"/>
   <OpenModel_Profile:PassedByReference xmi:id="_2kTpECpFEemS0_wZSU3sbA" base_Property="_pEem4CpFEemS0_wZSU3sbA"/>
-  <OpenModel_Profile:Obsolete xmi:id="_yh6VMCpGEemS0_wZSU3sbA" base_Element="_aQl4oCpBEemS0_wZSU3sbA"/>
   <OpenModel_Profile:Experimental xmi:id="_3AyUQCpGEemS0_wZSU3sbA" base_Element="_iunqUCpAEemS0_wZSU3sbA"/>
   <OpenModel_Profile:Experimental xmi:id="_8rXRcCpGEemS0_wZSU3sbA" base_Element="_4oVvoCpAEemS0_wZSU3sbA"/>
   <OpenModel_Profile:Experimental xmi:id="_99K3kCpGEemS0_wZSU3sbA" base_Element="_FFksYCpBEemS0_wZSU3sbA"/>
@@ -3756,7 +3744,33 @@ The attached VDUs shall connect to the same internal VLD.&#xD;
   <OpenModel_Profile:Future xmi:id="_zOyuADU2Eem2n8bBHelJyw" base_Element="_5--AQJdUEei-sOl6ywWHlg"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_4VCl0TwrEemSHu2qGsweWg" base_StructuralFeature="_4VCl0DwrEemSHu2qGsweWg"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_L7b9oTwsEemSHu2qGsweWg" base_StructuralFeature="_L7b9oDwsEemSHu2qGsweWg"/>
-  <OpenModel_Profile:OpenModelClass xmi:id="_Y4xgUDw4EemSHu2qGsweWg" base_Class="_Y4w5QDw4EemSHu2qGsweWg"/>
-  <OpenModel_Profile:OpenModelClass xmi:id="_jJ_0gDxkEemSdYSKacDoqQ" base_Class="_jJ_NcDxkEemSdYSKacDoqQ"/>
-  <OpenModel_Profile:Experimental xmi:id="_oiRO0DxmEemL36iV0V0qOA" base_Element="_jJ_NcDxkEemSdYSKacDoqQ"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_3cECMET5EemWRYeHGX88Yw"/>
+  <OpenModel_Profile:Deprecated xmi:id="_Lh9ZcET6EemWRYeHGX88Yw" base_Element="_S4W1oDazEei23_xWdimG9w"/>
+  <OpenModel_Profile:Deprecated xmi:id="_aFnQIET6EemWRYeHGX88Yw" base_Element="_TXQisDa0Eei23_xWdimG9w"/>
+  <OpenModel_Profile:Deprecated xmi:id="_dFkaIET6EemWRYeHGX88Yw" base_Element="_mxsiIDa0Eei23_xWdimG9w"/>
+  <OpenModel_Profile:Deprecated xmi:id="_nSorEET6EemWRYeHGX88Yw" base_Element="_aQl4oCpBEemS0_wZSU3sbA"/>
+  <OpenModel_Profile:Deprecated xmi:id="_y-z-UET6EemWRYeHGX88Yw" base_Element="_DpVfADa5EeivvI-m1BaAbA"/>
+  <OpenModel_Profile:OpenModelClass xmi:id="_pQg3kUT7EemWRYeHGX88Yw" base_Class="_pQg3kET7EemWRYeHGX88Yw"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_2tG_kET7EemWRYeHGX88Yw" base_StructuralFeature="_2tGYgET7EemWRYeHGX88Yw" isInvariant="true"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_GBWlsET8EemWRYeHGX88Yw" base_StructuralFeature="_GBV-oET8EemWRYeHGX88Yw"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_nFmCsET8EemWRYeHGX88Yw" base_StructuralFeature="_nFlboET8EemWRYeHGX88Yw"/>
+  <OpenModel_Profile:Experimental xmi:id="_76fN8ET8EemWRYeHGX88Yw" base_Element="_T3At8ET8EemWRYeHGX88Yw"/>
+  <OpenModel_Profile:Reference xmi:id="_9w8ZQET8EemWRYeHGX88Yw" base_Element="_T3At8ET8EemWRYeHGX88Yw" reference="IFA011 V2.5.1"/>
+  <OpenModel_Profile:Experimental xmi:id="_E_o0kET9EemWRYeHGX88Yw" base_Element="_pQg3kET7EemWRYeHGX88Yw"/>
+  <OpenModel_Profile:Reference xmi:id="_FAOqcET9EemWRYeHGX88Yw" base_Element="_pQg3kET7EemWRYeHGX88Yw" reference="IFA011 V2.5.1"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_ZFa3EET9EemWRYeHGX88Yw" base_StructuralFeature="_ZFaQAET9EemWRYeHGX88Yw"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_vyMxAUT9EemWRYeHGX88Yw" base_StructuralFeature="_vyMxAET9EemWRYeHGX88Yw"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_SagBwUT-EemWRYeHGX88Yw" base_StructuralFeature="_SagBwET-EemWRYeHGX88Yw"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_qbXZwET-EemWRYeHGX88Yw" base_StructuralFeature="_qbWLoET-EemWRYeHGX88Yw"/>
+  <OpenModel_Profile:Experimental xmi:id="_BEuzUET_EemWRYeHGX88Yw" base_Element="_2tGYgET7EemWRYeHGX88Yw"/>
+  <OpenModel_Profile:Experimental xmi:id="_Cslh8ET_EemWRYeHGX88Yw" base_Element="_GBV-oET8EemWRYeHGX88Yw"/>
+  <OpenModel_Profile:Experimental xmi:id="_EUmooET_EemWRYeHGX88Yw" base_Element="_nFlboET8EemWRYeHGX88Yw"/>
+  <OpenModel_Profile:Experimental xmi:id="_F-D5wET_EemWRYeHGX88Yw" base_Element="_ZFaQAET9EemWRYeHGX88Yw"/>
+  <OpenModel_Profile:Experimental xmi:id="_HpwmkET_EemWRYeHGX88Yw" base_Element="_vyMxAET9EemWRYeHGX88Yw"/>
+  <OpenModel_Profile:Experimental xmi:id="_JKD7sET_EemWRYeHGX88Yw" base_Element="_SagBwET-EemWRYeHGX88Yw"/>
+  <OpenModel_Profile:Experimental xmi:id="_LdO4MET_EemWRYeHGX88Yw" base_Element="_qbWLoET-EemWRYeHGX88Yw"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_wHuqMUT_EemWRYeHGX88Yw" base_StructuralFeature="_wHuqMET_EemWRYeHGX88Yw"/>
+  <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"/>
 </xmi:XMI>
author	jjewitt58 <jessie.jewitt@oamtechnologies.com>	2019-03-12 14:03:30 -0700
committer	jjewitt58 <jessie.jewitt@oamtechnologies.com>	2019-03-12 14:03:30 -0700
commit	03991d6387401327cf17b3389521262ec2c89dea (patch)
tree	f7351a2b290698649288e0b2eb296f561df4cbb9
parent	d50470f7adcf3f2f8e49b7adb886763f898910d0 (diff)