From bbf1c746723814a7adbf94b5c6ce40ae86b83dd7 Mon Sep 17 00:00:00 2001
From: Kevin Scaggs <ks0567@att.com>
Date: Wed, 22 May 2019 13:38:40 -0500
Subject: Updates to Vnf submodel

Updated attributes in VirtualLinkProfile and VirtualStorageDesc from
experimental to Preliminary per ETSI 2.5.1.

Issue-ID: MODELING-104

Change-Id: I2214e7823355c0f9d4a347d5c6231277670336ed
Signed-off-by: Kevin Scaggs <ks0567@att.com>
---
 ONAP Information Model/Vnf.notation |  3 ++-
 ONAP Information Model/Vnf.uml      | 10 +++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/ONAP Information Model/Vnf.notation b/ONAP Information Model/Vnf.notation
index 4fac32f..af9a340 100644
--- a/ONAP Information Model/Vnf.notation	
+++ b/ONAP Information Model/Vnf.notation	
@@ -2628,11 +2628,12 @@
         <layoutConstraint xmi:type="notation:Location" xmi:id="_SeL-ozgSEeiOYfGHew0BGg" y="15"/>
       </children>
       <children xmi:type="notation:BasicCompartment" xmi:id="_SeL-pDgSEeiOYfGHew0BGg" type="Class_AttributeCompartment">
-        <children xmi:type="notation:Shape" xmi:id="_5N6tkBx5Eemit6R65X1VNQ" type="Property_ClassAttributeLabel" fontColor="16711680" fontName="Segoe UI">
+        <children xmi:type="notation:Shape" xmi:id="_5N6tkBx5Eemit6R65X1VNQ" type="Property_ClassAttributeLabel" fontName="Segoe UI">
           <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kCWSQBx6Eemit6R65X1VNQ" source="PapyrusCSSForceValue">
             <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kCW5UBx6Eemit6R65X1VNQ" key="fontHeight" value="true"/>
             <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kCXgYBx6Eemit6R65X1VNQ" key="bold" value="true"/>
             <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kCYHcBx6Eemit6R65X1VNQ" key="italic" value="true"/>
+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Tni3kHzAEemb-p7Qie3MHg" key="fontColor" value="true"/>
           </eAnnotations>
           <children xmi:type="notation:DecorationNode" xmi:id="_5PQKUBx5Eemit6R65X1VNQ" visible="false" type="StereotypeLabel">
             <styles xmi:type="notation:StringValueStyle" xmi:id="_5PQKURx5Eemit6R65X1VNQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
diff --git a/ONAP Information Model/Vnf.uml b/ONAP Information Model/Vnf.uml
index b11ced4..c6a12b5 100644
--- a/ONAP Information Model/Vnf.uml	
+++ b/ONAP Information Model/Vnf.uml	
@@ -3648,13 +3648,9 @@ The attached VDUs shall connect to the same internal VLD.&#xD;
   <OpenModel_Profile:OpenModelAttribute xmi:id="_BecYMSpCEemS0_wZSU3sbA" base_StructuralFeature="_BecYMCpCEemS0_wZSU3sbA"/>
   <OpenModel_Profile:Experimental xmi:id="_QP1I4CpCEemS0_wZSU3sbA" base_Element="_BecYMCpCEemS0_wZSU3sbA"/>
   <OpenModel_Profile:Reference xmi:id="_CfmdwCpDEemS0_wZSU3sbA" base_Element="_K_9mADOSEeiHat9KcP8uWA" reference="IFA011 v2.5.1"/>
-  <OpenModel_Profile:Experimental xmi:id="_Vny2oCpDEemS0_wZSU3sbA" base_Element="_6sJ0QDdKEeiIfPeSAqyGdQ"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_nb_4ESpDEemS0_wZSU3sbA" base_StructuralFeature="_nb_4ECpDEemS0_wZSU3sbA"/>
-  <OpenModel_Profile:Experimental xmi:id="_RS7SsCpEEemS0_wZSU3sbA" base_Element="_nb_4ECpDEemS0_wZSU3sbA"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_WPIuACpEEemS0_wZSU3sbA" base_StructuralFeature="_WPIG8CpEEemS0_wZSU3sbA"/>
-  <OpenModel_Profile:Experimental xmi:id="_gX-mQCpEEemS0_wZSU3sbA" base_Element="_WPIG8CpEEemS0_wZSU3sbA"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_orwaUCpEEemS0_wZSU3sbA" base_StructuralFeature="_orvzQCpEEemS0_wZSU3sbA"/>
-  <OpenModel_Profile:Experimental xmi:id="_v8utkCpEEemS0_wZSU3sbA" base_Element="_orvzQCpEEemS0_wZSU3sbA"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_DVD0MSpFEemS0_wZSU3sbA" base_StructuralFeature="_DVD0MCpFEemS0_wZSU3sbA"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_Xbog4SpFEemS0_wZSU3sbA" base_StructuralFeature="_Xbog4CpFEemS0_wZSU3sbA"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_fcJasSpFEemS0_wZSU3sbA" base_StructuralFeature="_fcJasCpFEemS0_wZSU3sbA"/>
@@ -3707,7 +3703,6 @@ The attached VDUs shall connect to the same internal VLD.&#xD;
   <OpenModel_Profile:OpenModelAttribute xmi:id="_ix-0YSsREemS0_wZSU3sbA" base_StructuralFeature="_ix-0YCsREemS0_wZSU3sbA"/>
   <OpenModel_Profile:Experimental xmi:id="_Y1jLACsSEemS0_wZSU3sbA" base_Element="_ix8YIisREemS0_wZSU3sbA"/>
   <OpenModel_Profile:PassedByReference xmi:id="_Y29gQCsSEemS0_wZSU3sbA" base_Property="_ix8YIisREemS0_wZSU3sbA"/>
-  <OpenModel_Profile:Experimental xmi:id="_EoLdUCsTEemS0_wZSU3sbA" base_Element="_5LWhwBx5Eemit6R65X1VNQ"/>
   <OpenModel_Profile:Reference xmi:id="_BP2F8CvLEemS0_wZSU3sbA" base_Element="_6C8F4DnAEeiWMf5FLWfdLA" reference="IFA011 v2.5.1"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_O353ECvLEemS0_wZSU3sbA" base_StructuralFeature="_O35QACvLEemS0_wZSU3sbA" isInvariant="true"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_ZpVZUSvLEemS0_wZSU3sbA" base_StructuralFeature="_ZpVZUCvLEemS0_wZSU3sbA"/>
@@ -3853,4 +3848,9 @@ The attached VDUs shall connect to the same internal VLD.&#xD;
   <OpenModel_Profile:Preliminary xmi:id="_pOMTIHceEemNMq0I6vgjDA" base_Element="_vyMxAET9EemWRYeHGX88Yw"/>
   <OpenModel_Profile:Preliminary xmi:id="_qcFpoHceEemNMq0I6vgjDA" base_Element="_SagBwET-EemWRYeHGX88Yw"/>
   <OpenModel_Profile:Preliminary xmi:id="_rrWSEHceEemNMq0I6vgjDA" base_Element="_qbWLoET-EemWRYeHGX88Yw"/>
+  <OpenModel_Profile:Preliminary xmi:id="_RcGTsHzAEemb-p7Qie3MHg" base_Element="_5LWhwBx5Eemit6R65X1VNQ"/>
+  <OpenModel_Profile:Preliminary xmi:id="_XGJFYHzAEemb-p7Qie3MHg" base_Element="_nb_4ECpDEemS0_wZSU3sbA"/>
+  <OpenModel_Profile:Preliminary xmi:id="_aZcpMHzAEemb-p7Qie3MHg" base_Element="_WPIG8CpEEemS0_wZSU3sbA"/>
+  <OpenModel_Profile:Preliminary xmi:id="_cXJE8HzAEemb-p7Qie3MHg" base_Element="_orvzQCpEEemS0_wZSU3sbA"/>
+  <OpenModel_Profile:Preliminary xmi:id="_di5tcHzAEemb-p7Qie3MHg" base_Element="_6sJ0QDdKEeiIfPeSAqyGdQ"/>
 </xmi:XMI>
-- 
cgit 1.2.3-korg