Updates to Common, Vnf, and Service submodels

Common updates include refinements to ThresholdCrossingAlertFields and
related enums and corrections per internal review.  Service updates
include updates to ServiceOrder & relationship between Service and
AllottedResource.   Vnf updates include slight updates to
AllottedResource and updates to Vnf and Vnfc classes from faulty to
experimental.

Issue-ID: MODELING-104

Change-Id: I193ad63cdae024e938f2cb9d7bd0d27ac1bcf78c

Change-Id: I193ad63cdae024e938f2cb9d7bd0d27ac1bcf78c
Signed-off-by: Kevin Scaggs <ks0567@att.com>

1 files changed, 83 insertions, 24 deletions

diff --git a/papyrus/ONAP Information Model/Common.notation b/papyrus/ONAP Information Model/Common.notation
index 780bd90..d5c57e8 100644
--- a/papyrus/ONAP Information Model/Common.notation
+++ b/papyrus/ONAP Information Model/Common.notation
@@ -288,7 +288,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NcoTp4EsEeieQ4zKGFzYtQ"/>

       </children>

       <element xmi:type="uml:Enumeration" href="Common.uml#_NcX08IEsEeieQ4zKGFzYtQ"/>

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

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NcnskYEsEeieQ4zKGFzYtQ" x="700" y="160"/>

     </children>

     <children xmi:type="notation:Shape" xmi:id="_H0sG0IFEEeieQ4zKGFzYtQ" type="Enumeration_Shape" fillColor="32768">

       <children xmi:type="notation:DecorationNode" xmi:id="_H0st4IFEEeieQ4zKGFzYtQ" type="Enumeration_NameLabel"/>

@@ -398,7 +398,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wrxru4FdEeieQ4zKGFzYtQ"/>

       </children>

       <element xmi:type="uml:DataType" href="Common.uml#_wrtaQIFdEeieQ4zKGFzYtQ"/>

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

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wrxEoYFdEeieQ4zKGFzYtQ" x="520" y="160"/>

     </children>

     <children xmi:type="notation:Shape" xmi:id="_BTQTsIbiEei-x_BD9U-ssQ" type="DataType_Shape">

       <children xmi:type="notation:DecorationNode" xmi:id="_BTWaUIbiEei-x_BD9U-ssQ" type="DataType_NameLabel"/>

@@ -529,7 +529,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BTXodIbiEei-x_BD9U-ssQ"/>

       </children>

       <element xmi:type="uml:DataType" href="Common.uml#_BTMpUIbiEei-x_BD9U-ssQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BTQTsYbiEei-x_BD9U-ssQ" x="280" y="160" height="341"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BTQTsYbiEei-x_BD9U-ssQ" x="260" y="160" height="341"/>

     </children>

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

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

@@ -1008,7 +1008,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_koyrSYkOEeiddpojVtQ0Hg"/>

       </children>

       <element xmi:type="uml:DataType" href="Common.uml#_kokBwIkOEeiddpojVtQ0Hg"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kotLsYkOEeiddpojVtQ0Hg" x="800" y="20" height="861"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kotLsYkOEeiddpojVtQ0Hg" x="840" y="20" height="861"/>

     </children>

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

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

@@ -1404,7 +1404,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sOwdLpQ9Eei6kI-JPNdeuw"/>

       </children>

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

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sOwdIZQ9Eei6kI-JPNdeuw" x="280" y="20"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sOwdIZQ9Eei6kI-JPNdeuw" x="540" y="20"/>

     </children>

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

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

@@ -1563,7 +1563,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="__EPJrJaTEeiGg_moIHe9Sw"/>

       </children>

       <element xmi:type="uml:DataType" href="Common.uml#__ENUcJaTEeiGg_moIHe9Sw"/>

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

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="__EOikZaTEeiGg_moIHe9Sw" x="300" y="20"/>

     </children>

     <children xmi:type="notation:Shape" xmi:id="_Dg4FUJaaEeiGg_moIHe9Sw" type="PrimitiveType_Shape">

       <children xmi:type="notation:DecorationNode" xmi:id="_Dg4sYJaaEeiGg_moIHe9Sw" type="PrimitiveType_NameLabel"/>

@@ -1724,7 +1724,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tpxkuaJWEeibfLkXoC-lBg"/>

       </children>

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

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tpwWkaJWEeibfLkXoC-lBg" x="600" y="20"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tpwWkaJWEeibfLkXoC-lBg" x="20" y="160"/>

     </children>

     <children xmi:type="notation:Shape" xmi:id="_zEG8sKcHEeiFp-jDq2Hw-A" type="DataType_Shape" fillColor="32768">

       <children xmi:type="notation:DecorationNode" xmi:id="_zELOIKcHEeiFp-jDq2Hw-A" type="DataType_NameLabel"/>

@@ -2602,6 +2602,62 @@
       <element xmi:type="uml:DataType" href="Common.uml#_9xbHMLHMEeid-vjMcczUWA"/>

       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9xcVUbHMEeid-vjMcczUWA" x="260" y="1520"/>

     </children>

+    <children xmi:type="notation:Shape" xmi:id="_w7Jp4L21EeigqpWKF5WysQ" type="Enumeration_Shape" fillColor="32768">

+      <children xmi:type="notation:DecorationNode" xmi:id="_w7Jp4r21EeigqpWKF5WysQ" type="Enumeration_NameLabel"/>

+      <children xmi:type="notation:DecorationNode" xmi:id="_w7Jp4721EeigqpWKF5WysQ" type="Enumeration_FloatingNameLabel">

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

+      </children>

+      <children xmi:type="notation:BasicCompartment" xmi:id="_w7Jp5b21EeigqpWKF5WysQ" type="Enumeration_LiteralCompartment">

+        <children xmi:type="notation:Shape" xmi:id="_x8VaEL21EeigqpWKF5WysQ" type="EnumerationLiteral_LiteralLabel">

+          <element xmi:type="uml:EnumerationLiteral" href="Common.uml#_BR0dsL2zEeigqpWKF5WysQ"/>

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

+        </children>

+        <children xmi:type="notation:Shape" xmi:id="_x8WBIL21EeigqpWKF5WysQ" type="EnumerationLiteral_LiteralLabel">

+          <element xmi:type="uml:EnumerationLiteral" href="Common.uml#_DmJ30L2zEeigqpWKF5WysQ"/>

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

+        </children>

+        <children xmi:type="notation:Shape" xmi:id="_x8WBIr21EeigqpWKF5WysQ" type="EnumerationLiteral_LiteralLabel">

+          <element xmi:type="uml:EnumerationLiteral" href="Common.uml#_FmuocL2zEeigqpWKF5WysQ"/>

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

+        </children>

+        <children xmi:type="notation:Shape" xmi:id="_x8WBJL21EeigqpWKF5WysQ" type="EnumerationLiteral_LiteralLabel">

+          <element xmi:type="uml:EnumerationLiteral" href="Common.uml#_Hfx0wL2zEeigqpWKF5WysQ"/>

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

+        </children>

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

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

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

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

+      </children>

+      <element xmi:type="uml:Enumeration" href="Common.uml#_8Xi8EL2yEeigqpWKF5WysQ"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w7Jp4b21EeigqpWKF5WysQ" x="20" y="20"/>

+    </children>

+    <children xmi:type="notation:Shape" xmi:id="_5Z3ioL21EeigqpWKF5WysQ" type="Enumeration_Shape" fillColor="32768">

+      <children xmi:type="notation:DecorationNode" xmi:id="_5Z4JsL21EeigqpWKF5WysQ" type="Enumeration_NameLabel"/>

+      <children xmi:type="notation:DecorationNode" xmi:id="_5Z4Jsb21EeigqpWKF5WysQ" type="Enumeration_FloatingNameLabel">

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

+      </children>

+      <children xmi:type="notation:BasicCompartment" xmi:id="_5Z4Js721EeigqpWKF5WysQ" type="Enumeration_LiteralCompartment">

+        <children xmi:type="notation:Shape" xmi:id="_6e4p8L21EeigqpWKF5WysQ" type="EnumerationLiteral_LiteralLabel">

+          <element xmi:type="uml:EnumerationLiteral" href="Common.uml#_dgnEIL2yEeigqpWKF5WysQ"/>

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

+        </children>

+        <children xmi:type="notation:Shape" xmi:id="_6e5RAL21EeigqpWKF5WysQ" type="EnumerationLiteral_LiteralLabel">

+          <element xmi:type="uml:EnumerationLiteral" href="Common.uml#_fV4jsL2yEeigqpWKF5WysQ"/>

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

+        </children>

+        <children xmi:type="notation:Shape" xmi:id="_6e5RAr21EeigqpWKF5WysQ" type="EnumerationLiteral_LiteralLabel">

+          <element xmi:type="uml:EnumerationLiteral" href="Common.uml#_hIyEsL2yEeigqpWKF5WysQ"/>

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

+        </children>

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

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

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

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

+      </children>

+      <element xmi:type="uml:Enumeration" href="Common.uml#_ZTMBcL2yEeigqpWKF5WysQ"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5Z3iob21EeigqpWKF5WysQ" x="180" y="20"/>

+    </children>

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

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

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

@@ -2646,15 +2702,6 @@
         <layoutConstraint xmi:type="notation:Location" xmi:id="_X2pfUYnbEeiOe-BKGdv_Yg" y="15"/>

       </children>

       <children xmi:type="notation:BasicCompartment" xmi:id="_X2pfUonbEeiOe-BKGdv_Yg" type="Class_AttributeCompartment">

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

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

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

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

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

-          </children>

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

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

-        </children>

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

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

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

@@ -2687,7 +2734,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_X21skonbEeiOe-BKGdv_Yg"/>

       </children>

       <element xmi:type="uml:Class" href="Common.uml#_PmIOkH7uEeifJIHxnlj6Cg"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_X2o4QYnbEeiOe-BKGdv_Yg" y="280"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_X2o4QYnbEeiOe-BKGdv_Yg" x="40" y="216" height="61"/>

     </children>

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

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

@@ -2883,7 +2930,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_u-PF_InbEeiOe-BKGdv_Yg"/>

       </children>

       <element xmi:type="uml:DataType" href="Common.uml#_f1L3IH7uEeifJIHxnlj6Cg"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_u-Oe4YnbEeiOe-BKGdv_Yg" x="380" y="20"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_u-Oe4YnbEeiOe-BKGdv_Yg" x="280" y="280"/>

     </children>

     <children xmi:type="notation:Shape" xmi:id="_wA6D4InbEeiOe-BKGdv_Yg" type="DataType_Shape" fillColor="32768">

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

@@ -2891,6 +2938,15 @@
         <layoutConstraint xmi:type="notation:Location" xmi:id="_wA6q8onbEeiOe-BKGdv_Yg" y="15"/>

       </children>

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

+        <children xmi:type="notation:Shape" xmi:id="_Kml_gL0VEeiIStCQ6XYZ_w" type="Property_DataTypeAttributeLabel">

+          <children xmi:type="notation:DecorationNode" xmi:id="_Kmw-oL0VEeiIStCQ6XYZ_w" visible="false" type="StereotypeLabel">

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

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

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Kmw-or0VEeiIStCQ6XYZ_w"/>

+          </children>

+          <element xmi:type="uml:Property" href="Common.uml#_KiF6AL0VEeiIStCQ6XYZ_w"/>

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

+        </children>

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

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

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

@@ -3011,7 +3067,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wA6q_InbEeiOe-BKGdv_Yg"/>

       </children>

       <element xmi:type="uml:DataType" href="Common.uml#_h_gkMH7vEeifJIHxnlj6Cg"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wA6D4YnbEeiOe-BKGdv_Yg" x="380" y="400"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wA6D4YnbEeiOe-BKGdv_Yg" x="280" height="261"/>

     </children>

     <children xmi:type="notation:Shape" xmi:id="_IIqKMIngEeiOe-BKGdv_Yg" type="Enumeration_Shape" fillColor="32768">

       <children xmi:type="notation:DecorationNode" xmi:id="_IIqxQIngEeiOe-BKGdv_Yg" type="Enumeration_NameLabel"/>

@@ -3080,7 +3136,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IIyGAongEeiOe-BKGdv_Yg"/>

       </children>

       <element xmi:type="uml:Enumeration" href="Common.uml#_IInt8IngEeiOe-BKGdv_Yg"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IIqKMYngEeiOe-BKGdv_Yg" x="980" height="241"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IIqKMYngEeiOe-BKGdv_Yg" x="520" y="280" height="241"/>

     </children>

     <children xmi:type="notation:Shape" xmi:id="_2x7KEInuEeiOe-BKGdv_Yg" type="Enumeration_Shape" fillColor="32768">

       <children xmi:type="notation:DecorationNode" xmi:id="_2x7KEonuEeiOe-BKGdv_Yg" type="Enumeration_NameLabel"/>

@@ -3110,12 +3166,12 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2x7xJonuEeiOe-BKGdv_Yg"/>

       </children>

       <element xmi:type="uml:Enumeration" href="Common.uml#_2x4t0InuEeiOe-BKGdv_Yg"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2x7KEYnuEeiOe-BKGdv_Yg" x="980" y="256"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2x7KEYnuEeiOe-BKGdv_Yg" x="560" y="540"/>

     </children>

     <children xmi:type="notation:Shape" xmi:id="_VcC2QKZEEeily5uFlujj3Q" type="Comment_Shape">

       <children xmi:type="notation:DecorationNode" xmi:id="_VcEEYKZEEeily5uFlujj3Q" type="Comment_BodyLabel"/>

       <element xmi:type="uml:Comment" href="Common.uml#_Vb-k0KZEEeily5uFlujj3Q"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VcC2QaZEEeily5uFlujj3Q" x="120" y="40"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VcC2QaZEEeily5uFlujj3Q" x="40" y="40"/>

     </children>

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

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

@@ -3334,7 +3390,10 @@
           <element xmi:type="uml:Property" href="Common.uml#_ahVkcIFKEeieQ4zKGFzYtQ"/>

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

         </children>

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

+        <children xmi:type="notation:Shape" xmi:id="_2yPwMJGvEeiUeLUnFxb3Bg" type="Property_DataTypeAttributeLabel" fontColor="255">

+          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Q-hgAL0XEeiIStCQ6XYZ_w" source="PapyrusCSSForceValue">

+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Q-iHEL0XEeiIStCQ6XYZ_w" key="fontColor" value="true"/>

+          </eAnnotations>

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

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

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

@@ -4493,7 +4552,7 @@
       <element xmi:type="uml:DataType" href="Common.uml#_7F_D8H7wEeifJIHxnlj6Cg"/>

       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pRsVQZGvEeiUeLUnFxb3Bg" x="880" y="940"/>

     </children>

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

+    <children xmi:type="notation:Shape" xmi:id="_rLOpwJGvEeiUeLUnFxb3Bg" type="DataType_Shape" fillColor="32768">

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

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

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