Update ParameterGroup associations

Issue-ID: MODELING-104

Change-Id: I41e0fb9a22d965c2b81f5d60c96f25be28e2fc39
Signed-off-by: guochuyicmri <guochuyi@chinamobile.com>

2 files changed, 133 insertions, 411 deletions

diff --git a/ONAP Information Model/Service.notation b/ONAP Information Model/Service.notation
index 4ffc63e..28eab26 100644
--- a/ONAP Information Model/Service.notation
+++ b/ONAP Information Model/Service.notation
@@ -3220,20 +3220,6 @@
         <layoutConstraint xmi:type="notation:Location" xmi:id="_jBfA0R9cEemLMI6HKP6Lbw" y="15"/>

       </children>

       <children xmi:type="notation:BasicCompartment" xmi:id="_jBfA0h9cEemLMI6HKP6Lbw" type="Class_AttributeCompartment">

-        <children xmi:type="notation:Shape" xmi:id="_UGvFYId-EemlroDdeOKzBQ" type="Property_ClassAttributeLabel" fontColor="32768" fontName="Segoe UI">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_b24A4Id-EemlroDdeOKzBQ" source="PapyrusCSSForceValue">

-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_b24A4Yd-EemlroDdeOKzBQ" key="fontHeight" value="true"/>

-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_b24A4od-EemlroDdeOKzBQ" key="bold" value="true"/>

-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_b24A44d-EemlroDdeOKzBQ" key="italic" value="true"/>

-          </eAnnotations>

-          <children xmi:type="notation:DecorationNode" xmi:id="_UG-9AId-EemlroDdeOKzBQ" visible="false" type="StereotypeLabel">

-            <styles xmi:type="notation:StringValueStyle" xmi:id="_UG-9AYd-EemlroDdeOKzBQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>

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

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UG-9Aod-EemlroDdeOKzBQ"/>

-          </children>

-          <element xmi:type="uml:Property" href="Service.uml#_UD9eMId-EemlroDdeOKzBQ"/>

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

-        </children>

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

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

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

@@ -3396,20 +3382,6 @@
           <element xmi:type="uml:Property" href="Service.uml#_e7RHUIdwEem5i7slCUMe6w"/>

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

         </children>

-        <children xmi:type="notation:Shape" xmi:id="_pmdQcKhmEem1A8dEHCW-Ig" type="Property_ClassAttributeLabel" fontColor="32768" fontName="Segoe UI">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ySVbcKhmEem1A8dEHCW-Ig" source="PapyrusCSSForceValue">

-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ySVbcahmEem1A8dEHCW-Ig" key="fontHeight" value="true"/>

-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ySVbcqhmEem1A8dEHCW-Ig" key="bold" value="true"/>

-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ySVbc6hmEem1A8dEHCW-Ig" key="italic" value="true"/>

-          </eAnnotations>

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

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

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

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

-          </children>

-          <element xmi:type="uml:Property" href="Service.uml#_pjNvMKhmEem1A8dEHCW-Ig"/>

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

-        </children>

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

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

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

@@ -3571,20 +3543,6 @@
           <element xmi:type="uml:Property" href="Service.uml#_OmeeoId6Eemz_I38RrvOQg"/>

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

         </children>

-        <children xmi:type="notation:Shape" xmi:id="_O7XJgId6Eemz_I38RrvOQg" type="Property_ClassAttributeLabel" fontColor="8388736" fontName="Segoe UI">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yz3DMId7EemlroDdeOKzBQ" source="PapyrusCSSForceValue">

-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yz3DMYd7EemlroDdeOKzBQ" key="fontHeight" value="true"/>

-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yz3DMod7EemlroDdeOKzBQ" key="bold" value="true"/>

-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yz3DM4d7EemlroDdeOKzBQ" key="italic" value="true"/>

-          </eAnnotations>

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

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

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

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

-          </children>

-          <element xmi:type="uml:Property" href="Service.uml#_O6BswId6Eemz_I38RrvOQg"/>

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

-        </children>

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

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

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

@@ -3962,45 +3920,6 @@
       <element xsi:nil="true"/>

       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BZSSVl0VEemiOP02o5T8tA" x="200"/>

     </children>

-    <children xmi:type="notation:Shape" xmi:id="_EwCLkl0VEemiOP02o5T8tA" type="Class_Shape">

-      <children xmi:type="notation:DecorationNode" xmi:id="_EwL8kF0VEemiOP02o5T8tA" type="Class_NameLabel"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_EwL8kV0VEemiOP02o5T8tA" type="Class_FloatingNameLabel">

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

-      </children>

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

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

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

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

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

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_EwL8mF0VEemiOP02o5T8tA" visible="false" type="Class_OperationCompartment">

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

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

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

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

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_EwL8nV0VEemiOP02o5T8tA" visible="false" type="Class_NestedClassifierCompartment">

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

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

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

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

-      </children>

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

-        <styles xmi:type="notation:StringValueStyle" xmi:id="_1N32MLclEemG6epU56F5-w" name="stereotype" stringValue="OpenModel_Profile::OpenModelClass"/>

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

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

-      </children>

-      <element xmi:type="uml:Class" href="Service.uml#_EwCLkF0VEemiOP02o5T8tA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EwCLk10VEemiOP02o5T8tA" x="800" y="-240"/>

-    </children>

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

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

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

-        <eObjectValue xmi:type="uml:Class" href="Service.uml#_EwCLkF0VEemiOP02o5T8tA"/>

-      </styles>

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

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EwL8sl0VEemiOP02o5T8tA" x="200"/>

-    </children>

     <children xmi:type="notation:Shape" xmi:id="_rMLGYILdEemyVus8T4NvCQ" type="Enumeration_Shape">

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

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

@@ -4355,52 +4274,83 @@
       <element xsi:nil="true"/>

       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_R_-b9Yd4Eemz_I38RrvOQg" x="200"/>

     </children>

-    <children xmi:type="notation:Shape" xmi:id="_pCDToId8EemlroDdeOKzBQ" type="DataType_Shape" fontColor="8388736" fontName="Segoe UI">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__DXOsId8EemlroDdeOKzBQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__DXOsYd8EemlroDdeOKzBQ" key="fontHeight" value="true"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__DXOsod8EemlroDdeOKzBQ" key="bold" value="true"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__DdVUId8EemlroDdeOKzBQ" key="italic" value="true"/>

-      </eAnnotations>

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

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

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

-      </children>

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

-        <children xmi:type="notation:Shape" xmi:id="_6MUnQId8EemlroDdeOKzBQ" type="Property_DataTypeAttributeLabel" fontColor="8388736" fontName="Segoe UI">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Az6mUId9EemlroDdeOKzBQ" source="PapyrusCSSForceValue">

-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Az6mUYd9EemlroDdeOKzBQ" key="fontHeight" value="true"/>

-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Az6mUod9EemlroDdeOKzBQ" key="bold" value="true"/>

-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_A0As8Id9EemlroDdeOKzBQ" key="italic" value="true"/>

-          </eAnnotations>

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

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

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

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

-          </children>

-          <element xmi:type="uml:Property" href="Service.uml#_Kq0r8Id7EemlroDdeOKzBQ"/>

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

-        </children>

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

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

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

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

+    <children xmi:type="notation:Shape" xmi:id="_CXzYkM4WEemGnM6PX4DG6A" type="Class_Shape">

+      <children xmi:type="notation:DecorationNode" xmi:id="_CX_l0M4WEemGnM6PX4DG6A" type="Class_NameLabel"/>

+      <children xmi:type="notation:DecorationNode" xmi:id="_CX_l0c4WEemGnM6PX4DG6A" type="Class_FloatingNameLabel">

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

+      </children>

+      <children xmi:type="notation:BasicCompartment" xmi:id="_CX_l084WEemGnM6PX4DG6A" visible="false" type="Class_AttributeCompartment">

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

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

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

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

+      </children>

+      <children xmi:type="notation:BasicCompartment" xmi:id="_CX_l2M4WEemGnM6PX4DG6A" visible="false" type="Class_OperationCompartment">

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

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

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

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

+      </children>

+      <children xmi:type="notation:BasicCompartment" xmi:id="_CX_l3c4WEemGnM6PX4DG6A" visible="false" type="Class_NestedClassifierCompartment">

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

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

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

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

+      </children>

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

+        <styles xmi:type="notation:StringValueStyle" xmi:id="_CZI1Uc4WEemGnM6PX4DG6A" name="stereotype" stringValue="OpenModel_Profile::OpenModelClass"/>

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

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

+      </children>

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

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CXzYkc4WEemGnM6PX4DG6A" x="680" y="-220" height="70"/>

+    </children>

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

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

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

+        <eObjectValue xmi:type="uml:Class" href="Common.uml#_fcsFcJ2BEemXg71wwI_kPA"/>

+      </styles>

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

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CZbJNc4WEemGnM6PX4DG6A" x="200"/>

+    </children>

+    <children xmi:type="notation:Shape" xmi:id="_T3Q5EM4WEemGnM6PX4DG6A" type="Class_Shape">

+      <children xmi:type="notation:DecorationNode" xmi:id="_T3Q5Es4WEemGnM6PX4DG6A" type="Class_NameLabel"/>

+      <children xmi:type="notation:DecorationNode" xmi:id="_T3Q5E84WEemGnM6PX4DG6A" type="Class_FloatingNameLabel">

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

+      </children>

+      <children xmi:type="notation:BasicCompartment" xmi:id="_T3Q5Fc4WEemGnM6PX4DG6A" visible="false" type="Class_AttributeCompartment">

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

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

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

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

       </children>

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

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

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

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

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

+      <children xmi:type="notation:BasicCompartment" xmi:id="_T3Q5Gs4WEemGnM6PX4DG6A" visible="false" type="Class_OperationCompartment">

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

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

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

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

       </children>

-      <element xmi:type="uml:DataType" href="Service.uml#_Q7cmQF0aEemiOP02o5T8tA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pCDToYd8EemlroDdeOKzBQ" x="1360" y="-180"/>

+      <children xmi:type="notation:BasicCompartment" xmi:id="_T3Q5H84WEemGnM6PX4DG6A" visible="false" type="Class_NestedClassifierCompartment">

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

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

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

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

+      </children>

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

+        <styles xmi:type="notation:StringValueStyle" xmi:id="_T37ncc4WEemGnM6PX4DG6A" name="stereotype" stringValue="OpenModel_Profile::OpenModelClass"/>

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

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

+      </children>

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

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_T3Q5Ec4WEemGnM6PX4DG6A" x="1220" y="-160" height="61"/>

     </children>

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

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

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

-        <eObjectValue xmi:type="uml:DataType" href="Service.uml#_Q7cmQF0aEemiOP02o5T8tA"/>

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

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

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

+        <eObjectValue xmi:type="uml:Class" href="Common.uml#_0Zik0DFPEemw1_Ys6rcLWw"/>

       </styles>

       <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zGLvErdgEemG6epU56F5-w" x="1560" y="-180"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_T4N7Vc4WEemGnM6PX4DG6A" x="200"/>

     </children>

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

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

@@ -4930,47 +4880,6 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_BZSSW10VEemiOP02o5T8tA"/>

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

     </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_EwL8tF0VEemiOP02o5T8tA" type="StereotypeCommentLink" source="_EwCLkl0VEemiOP02o5T8tA" target="_EwL8sF0VEemiOP02o5T8tA">

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

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

-        <eObjectValue xmi:type="uml:Class" href="Service.uml#_EwCLkF0VEemiOP02o5T8tA"/>

-      </styles>

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

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

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

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

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_XB9DwF0VEemiOP02o5T8tA" type="Association_Edge" source="_EwCLkl0VEemiOP02o5T8tA" target="_nTtrAB9cEemLMI6HKP6Lbw">

-      <children xmi:type="notation:DecorationNode" xmi:id="_XB9Dw10VEemiOP02o5T8tA" type="Association_StereotypeLabel">

-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Xtxn8F0VEemiOP02o5T8tA" name="IS_UPDATED_POSITION" booleanValue="true"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_XB9DxF0VEemiOP02o5T8tA" y="-19"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_XB9DxV0VEemiOP02o5T8tA" type="Association_NameLabel">

-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_XuEi4F0VEemiOP02o5T8tA" name="IS_UPDATED_POSITION" booleanValue="true"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_XB9Dxl0VEemiOP02o5T8tA" x="-1" y="18"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_XB9Dx10VEemiOP02o5T8tA" visible="false" type="Association_TargetRoleLabel">

-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_XuXd0F0VEemiOP02o5T8tA" name="IS_UPDATED_POSITION" booleanValue="true"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_XB9DyF0VEemiOP02o5T8tA" x="61" y="-19"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_XB9DyV0VEemiOP02o5T8tA" visible="false" type="Association_SourceRoleLabel">

-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_XuhO0F0VEemiOP02o5T8tA" name="IS_UPDATED_POSITION" booleanValue="true"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_XB9Dyl0VEemiOP02o5T8tA" x="-60" y="20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_XB9Dy10VEemiOP02o5T8tA" type="Association_SourceMultiplicityLabel">

-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Xu0JwF0VEemiOP02o5T8tA" name="IS_UPDATED_POSITION" booleanValue="true"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_XB9DzF0VEemiOP02o5T8tA" x="59" y="18"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_XB9DzV0VEemiOP02o5T8tA" type="Association_TargetMultiplicityLabel">

-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_XvHEsF0VEemiOP02o5T8tA" name="IS_UPDATED_POSITION" booleanValue="true"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_XB9Dzl0VEemiOP02o5T8tA" x="-60" y="-20"/>

-      </children>

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

-      <element xmi:type="uml:Association" href="Service.uml#_XBqI0F0VEemiOP02o5T8tA"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_XB9Dwl0VEemiOP02o5T8tA" points="[700, -180, -643984, -643984]$[540, -180, -643984, -643984]$[540, -40, -643984, -643984]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XCsqoF0VEemiOP02o5T8tA" id="(0.0,0.6)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XCsqoV0VEemiOP02o5T8tA" id="(0.4750593824228028,0.0)"/>

-    </edges>

     <edges xmi:type="notation:Connector" xmi:id="_qQzMUF0XEemiOP02o5T8tA" type="Generalization_Edge" source="_A_9MMl0VEemiOP02o5T8tA" target="_AkYqgF0VEemiOP02o5T8tA">

       <children xmi:type="notation:DecorationNode" xmi:id="_qQzMU10XEemiOP02o5T8tA" type="Generalization_StereotypeLabel">

         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_7tzOsF0XEemiOP02o5T8tA" name="IS_UPDATED_POSITION" booleanValue="true"/>

@@ -5116,15 +5025,66 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_KCqoIIneEemVXsYTZj8frQ" id="(0.0,0.4)"/>

       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_KflNoIneEemVXsYTZj8frQ" id="(0.0,0.49382716049382713)"/>

     </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_zGLvFLdgEemG6epU56F5-w" type="StereotypeCommentLink" source="_pCDToId8EemlroDdeOKzBQ" target="_zGLvELdgEemG6epU56F5-w">

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

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

-        <eObjectValue xmi:type="uml:DataType" href="Service.uml#_Q7cmQF0aEemiOP02o5T8tA"/>

+    <edges xmi:type="notation:Connector" xmi:id="_CZhP0c4WEemGnM6PX4DG6A" type="StereotypeCommentLink" source="_CXzYkM4WEemGnM6PX4DG6A" target="_CZbJM84WEemGnM6PX4DG6A">

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

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

+        <eObjectValue xmi:type="uml:Class" href="Common.uml#_fcsFcJ2BEemXg71wwI_kPA"/>

       </styles>

       <element xsi:nil="true"/>

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

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

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

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

+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_CZhP1M4WEemGnM6PX4DG6A"/>

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

+    </edges>

+    <edges xmi:type="notation:Connector" xmi:id="_J-YvcM4WEemGnM6PX4DG6A" type="Association_Edge" source="_z7-GEILzEemyVus8T4NvCQ" target="_CXzYkM4WEemGnM6PX4DG6A">

+      <children xmi:type="notation:DecorationNode" xmi:id="_J-Yvc84WEemGnM6PX4DG6A" type="Association_StereotypeLabel">

+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_LhruMM4WEemGnM6PX4DG6A" name="IS_UPDATED_POSITION" booleanValue="true"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_J-YvdM4WEemGnM6PX4DG6A" x="1" y="-18"/>

+      </children>

+      <children xmi:type="notation:DecorationNode" xmi:id="_J-Yvdc4WEemGnM6PX4DG6A" type="Association_NameLabel">

+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_LjNYMM4WEemGnM6PX4DG6A" name="IS_UPDATED_POSITION" booleanValue="true"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_J-Yvds4WEemGnM6PX4DG6A" y="19"/>

+      </children>

+      <children xmi:type="notation:DecorationNode" xmi:id="_J-Yvd84WEemGnM6PX4DG6A" visible="false" type="Association_TargetRoleLabel">

+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_LkvCMM4WEemGnM6PX4DG6A" name="IS_UPDATED_POSITION" booleanValue="true"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_J-YveM4WEemGnM6PX4DG6A" x="26" y="-18"/>

+      </children>

+      <children xmi:type="notation:DecorationNode" xmi:id="_J-Yvec4WEemGnM6PX4DG6A" visible="false" type="Association_SourceRoleLabel">

+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_LmeHkM4WEemGnM6PX4DG6A" name="IS_UPDATED_POSITION" booleanValue="true"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_J-Yves4WEemGnM6PX4DG6A" x="-26" y="19"/>

+      </children>

+      <children xmi:type="notation:DecorationNode" xmi:id="_J-Yve84WEemGnM6PX4DG6A" type="Association_SourceMultiplicityLabel">

+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_LoA_sM4WEemGnM6PX4DG6A" name="IS_UPDATED_POSITION" booleanValue="true"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_J-YvfM4WEemGnM6PX4DG6A" x="20" y="-13"/>

+      </children>

+      <children xmi:type="notation:DecorationNode" xmi:id="_J-Yvfc4WEemGnM6PX4DG6A" type="Association_TargetMultiplicityLabel">

+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_LqIfkM4WEemGnM6PX4DG6A" name="IS_UPDATED_POSITION" booleanValue="true"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_J-Yvfs4WEemGnM6PX4DG6A" x="-26" y="-18"/>

+      </children>

+      <styles xmi:type="notation:FontStyle" xmi:id="_J-Yvcc4WEemGnM6PX4DG6A"/>

+      <element xmi:type="uml:Association" href="Common.uml#_zkmnYJ2sEemXg71wwI_kPA"/>

+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_J-Yvcs4WEemGnM6PX4DG6A" points="[424, -189, -643984, -643984]$[600, -201, -643984, -643984]"/>

+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Lr2W0M4WEemGnM6PX4DG6A" id="(1.0,0.49586776859504134)"/>

+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Lr2W0c4WEemGnM6PX4DG6A" id="(0.0,0.5714285714285714)"/>

+    </edges>

+    <edges xmi:type="notation:Connector" xmi:id="_T4N7V84WEemGnM6PX4DG6A" type="StereotypeCommentLink" source="_T3Q5EM4WEemGnM6PX4DG6A" target="_T4N7U84WEemGnM6PX4DG6A">

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

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

+        <eObjectValue xmi:type="uml:Class" href="Common.uml#_0Zik0DFPEemw1_Ys6rcLWw"/>

+      </styles>

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

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

+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_T4N7Ws4WEemGnM6PX4DG6A"/>

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

+    </edges>

+    <edges xmi:type="notation:Connector" xmi:id="_z0Dl0M4WEemGnM6PX4DG6A" type="Generalization_Edge" source="_bHBZwB9eEemLMI6HKP6Lbw" target="_T3Q5EM4WEemGnM6PX4DG6A">

+      <children xmi:type="notation:DecorationNode" xmi:id="_z0Dl084WEemGnM6PX4DG6A" type="Generalization_StereotypeLabel">

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_z0Dl1M4WEemGnM6PX4DG6A" y="40"/>

+      </children>

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

+      <element xmi:type="uml:Generalization" href="Service.uml#_xnyJAIMLEemyVus8T4NvCQ"/>

+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_z0Dl0s4WEemGnM6PX4DG6A" points="[1280, -40, -643984, -643984]$[1280, -99, -643984, -643984]"/>

+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_z2oYsM4WEemGnM6PX4DG6A" id="(0.6644518272425249,0.0)"/>

+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_z2oYsc4WEemGnM6PX4DG6A" id="(0.47619047619047616,1.0)"/>

     </edges>

   </notation:Diagram>

   <notation:Diagram xmi:id="_OMM7IF0BEemn7e9Q1aGp7A" type="PapyrusUMLClassDiagram" name="Atomic / Composite Service View" measurementUnit="Pixel">

@@ -6194,45 +6154,6 @@
     </edges>

   </notation:Diagram>

   <notation:Diagram xmi:id="_Sb8ysKFVEemY46Vmc0cZBg" type="PapyrusUMLClassDiagram" name="ServiceProperties" measurementUnit="Pixel">

-    <children xmi:type="notation:Shape" xmi:id="_jNe2MKFVEemY46Vmc0cZBg" type="Class_Shape">

-      <children xmi:type="notation:DecorationNode" xmi:id="_jNe2MqFVEemY46Vmc0cZBg" type="Class_NameLabel"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_jNe2M6FVEemY46Vmc0cZBg" type="Class_FloatingNameLabel">

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

-      </children>

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

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

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

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

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

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_jNe2OqFVEemY46Vmc0cZBg" visible="false" type="Class_OperationCompartment">

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

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

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

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

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_jNe2P6FVEemY46Vmc0cZBg" visible="false" type="Class_NestedClassifierCompartment">

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

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

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

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

-      </children>

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

-        <styles xmi:type="notation:StringValueStyle" xmi:id="_s8OeIbcnEemG6epU56F5-w" name="stereotype" stringValue="OpenModel_Profile::OpenModelClass"/>

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

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

-      </children>

-      <element xmi:type="uml:Class" href="Service.uml#_EwCLkF0VEemiOP02o5T8tA"/>

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

-    </children>

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

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

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

-        <eObjectValue xmi:type="uml:Class" href="Service.uml#_EwCLkF0VEemiOP02o5T8tA"/>

-      </styles>

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

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jNrDgKFVEemY46Vmc0cZBg" x="200"/>

-    </children>

     <children xmi:type="notation:Shape" xmi:id="_WNkioLcsEemG6epU56F5-w" type="Class_Shape">

       <children xmi:type="notation:DecorationNode" xmi:id="_WNkiorcsEemG6epU56F5-w" type="Class_NameLabel"/>

       <children xmi:type="notation:DecorationNode" xmi:id="_WNlJsLcsEemG6epU56F5-w" type="Class_FloatingNameLabel">

@@ -6614,45 +6535,6 @@
       <element xsi:nil="true"/>

       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sSDe97dXEemG6epU56F5-w" x="200"/>

     </children>

-    <children xmi:type="notation:Shape" xmi:id="_j7dVgLdZEemG6epU56F5-w" type="Class_Shape">

-      <children xmi:type="notation:DecorationNode" xmi:id="_j7dVgrdZEemG6epU56F5-w" type="Class_NameLabel"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_j7dVg7dZEemG6epU56F5-w" type="Class_FloatingNameLabel">

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

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_j7dVhbdZEemG6epU56F5-w" type="Class_AttributeCompartment">

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

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

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

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

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_j7dVirdZEemG6epU56F5-w" visible="false" type="Class_OperationCompartment">

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

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

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

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

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_j7dVj7dZEemG6epU56F5-w" visible="false" type="Class_NestedClassifierCompartment">

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

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

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

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

-      </children>

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

-        <styles xmi:type="notation:StringValueStyle" xmi:id="_j7i1EbdZEemG6epU56F5-w" name="stereotype" stringValue="OpenModel_Profile::OpenModelClass"/>

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

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

-      </children>

-      <element xmi:type="uml:Class" href="Service.uml#_EwCLkF0VEemiOP02o5T8tA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_j7dVgbdZEemG6epU56F5-w" x="440" y="780"/>

-    </children>

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

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

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

-        <eObjectValue xmi:type="uml:Class" href="Service.uml#_EwCLkF0VEemiOP02o5T8tA"/>

-      </styles>

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

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_j7l4ZbdZEemG6epU56F5-w" x="200"/>

-    </children>

     <children xmi:type="notation:Shape" xmi:id="_rS-8sLdZEemG6epU56F5-w" type="Class_Shape">

       <children xmi:type="notation:DecorationNode" xmi:id="_rS-8srdZEemG6epU56F5-w" type="Class_NameLabel"/>

       <children xmi:type="notation:DecorationNode" xmi:id="_rS-8s7dZEemG6epU56F5-w" type="Class_FloatingNameLabel">

@@ -6918,16 +6800,6 @@
       <owner xmi:type="uml:Package" href="Service.uml#_fXNM8DOHEei5Af8DcjrhIQ"/>

     </styles>

     <element xmi:type="uml:Package" href="Service.uml#_fXNM8DOHEei5Af8DcjrhIQ"/>

-    <edges xmi:type="notation:Connector" xmi:id="_jNrDgqFVEemY46Vmc0cZBg" type="StereotypeCommentLink" source="_jNe2MKFVEemY46Vmc0cZBg" target="_jNrDfqFVEemY46Vmc0cZBg">

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

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

-        <eObjectValue xmi:type="uml:Class" href="Service.uml#_EwCLkF0VEemiOP02o5T8tA"/>

-      </styles>

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

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

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

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

-    </edges>

     <edges xmi:type="notation:Connector" xmi:id="_WNx-ALcsEemG6epU56F5-w" type="StereotypeCommentLink" source="_WNkioLcsEemG6epU56F5-w" target="_WNxW87csEemG6epU56F5-w">

       <styles xmi:type="notation:FontStyle" xmi:id="_WNx-AbcsEemG6epU56F5-w"/>

       <styles xmi:type="notation:EObjectValueStyle" xmi:id="_WNx-BbcsEemG6epU56F5-w" name="BASE_ELEMENT">

@@ -6968,39 +6840,6 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4dOQwLdWEemG6epU56F5-w"/>

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

     </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_7pZR0LdWEemG6epU56F5-w" type="Generalization_Edge" source="_4ChRwLdWEemG6epU56F5-w" target="_jNe2MKFVEemY46Vmc0cZBg">

-      <children xmi:type="notation:DecorationNode" xmi:id="_7pZR07dWEemG6epU56F5-w" type="Generalization_StereotypeLabel">

-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__o070LdWEemG6epU56F5-w" name="IS_UPDATED_POSITION" booleanValue="true"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_7pZR1LdWEemG6epU56F5-w" x="-1" y="38"/>

-      </children>

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

-      <element xmi:type="uml:Generalization" href="Service.uml#_7pFv0LdWEemG6epU56F5-w"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_7pZR0rdWEemG6epU56F5-w" points="[340, 220, -643984, -643984]$[340, 180, -643984, -643984]$[500, 180, -643984, -643984]$[500, 140, -643984, -643984]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7p7dULdWEemG6epU56F5-w" id="(0.517799352750809,0.0)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7p7dUbdWEemG6epU56F5-w" id="(0.4918032786885246,1.0)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_99bJ8LdWEemG6epU56F5-w" type="Generalization_Edge" source="_3tCJ8LdWEemG6epU56F5-w" target="_jNe2MKFVEemY46Vmc0cZBg">

-      <children xmi:type="notation:DecorationNode" xmi:id="_99bxALdWEemG6epU56F5-w" type="Generalization_StereotypeLabel">

-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__R2mQLdWEemG6epU56F5-w" name="IS_UPDATED_POSITION" booleanValue="true"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_99bxAbdWEemG6epU56F5-w" y="39"/>

-      </children>

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

-      <element xmi:type="uml:Generalization" href="Service.uml#_99KrQLdWEemG6epU56F5-w"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_99bJ8rdWEemG6epU56F5-w" points="[80, 220, -643984, -643984]$[80, 180, -643984, -643984]$[440, 180, -643984, -643984]$[500, 180, -643984, -643984]$[500, 140, -643984, -643984]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_994c8LdWEemG6epU56F5-w" id="(0.5042016806722689,0.0)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_994c8bdWEemG6epU56F5-w" id="(0.4918032786885246,1.0)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_-4aykLdWEemG6epU56F5-w" type="Generalization_Edge" source="_4dGU8LdWEemG6epU56F5-w" target="_jNe2MKFVEemY46Vmc0cZBg">

-      <children xmi:type="notation:DecorationNode" xmi:id="_-4ayk7dWEemG6epU56F5-w" type="Generalization_StereotypeLabel">

-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="__56EwLdWEemG6epU56F5-w" name="IS_UPDATED_POSITION" booleanValue="true"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_-4aylLdWEemG6epU56F5-w" x="-1" y="38"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_-4aykbdWEemG6epU56F5-w"/>

-      <element xmi:type="uml:Generalization" href="Service.uml#_-4ENQLdWEemG6epU56F5-w"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_-4aykrdWEemG6epU56F5-w" points="[660, 220, -643984, -643984]$[660, 180, -643984, -643984]$[500, 180, -643984, -643984]$[500, 140, -643984, -643984]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-4_aULdWEemG6epU56F5-w" id="(0.4444444444444444,0.0)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-5ABYLdWEemG6epU56F5-w" id="(0.4918032786885246,1.0)"/>

-    </edges>

     <edges xmi:type="notation:Connector" xmi:id="_sSEGALdXEemG6epU56F5-w" type="StereotypeCommentLink" source="_sR8KMLdXEemG6epU56F5-w" target="_sSDe9bdXEemG6epU56F5-w">

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

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

@@ -7011,27 +6850,6 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sSEGA7dXEemG6epU56F5-w"/>

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

     </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_fJrBgLdZEemG6epU56F5-w" type="Generalization_Edge" source="_sR8KMLdXEemG6epU56F5-w" target="_jNe2MKFVEemY46Vmc0cZBg">

-      <children xmi:type="notation:DecorationNode" xmi:id="_fJrBg7dZEemG6epU56F5-w" type="Generalization_StereotypeLabel">

-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_gCtiULdZEemG6epU56F5-w" name="IS_UPDATED_POSITION" booleanValue="true"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_fJrBhLdZEemG6epU56F5-w" x="-1" y="38"/>

-      </children>

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

-      <element xmi:type="uml:Generalization" href="Service.uml#_fJW4cLdZEemG6epU56F5-w"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_fJrBgrdZEemG6epU56F5-w" points="[920, 240, -643984, -643984]$[920, 180, -643984, -643984]$[660, 180, -643984, -643984]$[500, 180, -643984, -643984]$[500, 140, -643984, -643984]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fKNNALdZEemG6epU56F5-w" id="(0.6,0.0)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fKNNAbdZEemG6epU56F5-w" id="(0.4918032786885246,1.0)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_j7l4Z7dZEemG6epU56F5-w" type="StereotypeCommentLink" source="_j7dVgLdZEemG6epU56F5-w" target="_j7l4Y7dZEemG6epU56F5-w">

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

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

-        <eObjectValue xmi:type="uml:Class" href="Service.uml#_EwCLkF0VEemiOP02o5T8tA"/>

-      </styles>

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

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

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

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

-    </edges>

     <edges xmi:type="notation:Connector" xmi:id="_rTJUwLdZEemG6epU56F5-w" type="StereotypeCommentLink" source="_rS-8sLdZEemG6epU56F5-w" target="_rTItt7dZEemG6epU56F5-w">

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

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

@@ -7052,38 +6870,5 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tJvC8LdZEemG6epU56F5-w"/>

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

     </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_Iib5cLdaEemG6epU56F5-w" type="Generalization_Edge" source="_rS-8sLdZEemG6epU56F5-w" target="_j7dVgLdZEemG6epU56F5-w">

-      <children xmi:type="notation:DecorationNode" xmi:id="_IicggLdaEemG6epU56F5-w" type="Generalization_StereotypeLabel">

-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_53SE4LdfEemG6epU56F5-w" name="IS_UPDATED_POSITION" booleanValue="true"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_IicggbdaEemG6epU56F5-w" y="39"/>

-      </children>

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

-      <element xmi:type="uml:Generalization" href="Service.uml#_IiC34LdaEemG6epU56F5-w"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Iib5crdaEemG6epU56F5-w" points="[500, 960, -643984, -643984]$[500, 880, -643984, -643984]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ii8PwLdaEemG6epU56F5-w" id="(0.4778156996587031,0.0)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ii8PwbdaEemG6epU56F5-w" id="(0.4918032786885246,1.0)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_JL_MwLdaEemG6epU56F5-w" type="Generalization_Edge" source="_tJmgELdZEemG6epU56F5-w" target="_j7dVgLdZEemG6epU56F5-w">

-      <children xmi:type="notation:DecorationNode" xmi:id="_JL_z0LdaEemG6epU56F5-w" type="Generalization_StereotypeLabel">

-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_KZ_4ALdaEemG6epU56F5-w" name="IS_UPDATED_POSITION" booleanValue="true"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_JL_z0bdaEemG6epU56F5-w" x="1" y="38"/>

-      </children>

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

-      <element xmi:type="uml:Generalization" href="Service.uml#_JLxKULdaEemG6epU56F5-w"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_JL_MwrdaEemG6epU56F5-w" points="[740, 960, -643984, -643984]$[740, 920, -643984, -643984]$[500, 920, -643984, -643984]$[500, 880, -643984, -643984]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JMb4sLdaEemG6epU56F5-w" id="(0.38095238095238093,0.0)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JMb4sbdaEemG6epU56F5-w" id="(0.4918032786885246,1.0)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_J1-k8LdaEemG6epU56F5-w" type="Generalization_Edge" source="_WNkioLcsEemG6epU56F5-w" target="_j7dVgLdZEemG6epU56F5-w">

-      <children xmi:type="notation:DecorationNode" xmi:id="_J1-k87daEemG6epU56F5-w" type="Generalization_StereotypeLabel">

-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Ku0RcLdaEemG6epU56F5-w" name="IS_UPDATED_POSITION" booleanValue="true"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_J1_MALdaEemG6epU56F5-w" y="39"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_J1-k8bdaEemG6epU56F5-w"/>

-      <element xmi:type="uml:Generalization" href="Service.uml#_J1utULdaEemG6epU56F5-w"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_J1-k8rdaEemG6epU56F5-w" points="[260, 960, -643984, -643984]$[260, 920, -643984, -643984]$[500, 920, -643984, -643984]$[500, 880, -643984, -643984]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J2h-kLdaEemG6epU56F5-w" id="(0.5042016806722689,0.0)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J2h-kbdaEemG6epU56F5-w" id="(0.4918032786885246,1.0)"/>

-    </edges>

   </notation:Diagram>

 </xmi:XMI>

diff --git a/ONAP Information Model/Service.uml b/ONAP Information Model/Service.uml
index a49a5c2..7b795fb 100644
--- a/ONAP Information Model/Service.uml
+++ b/ONAP Information Model/Service.uml
@@ -455,15 +455,6 @@
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OBr6oDJ3Eem5adcA1c6ckw" value="*"/>

         </ownedEnd>

       </packagedElement>

-      <packagedElement xmi:type="uml:Association" xmi:id="_XBqI0F0VEemiOP02o5T8tA" name="ServiceProfileReferencesServiceDescriptor" memberEnd="_XBqI010VEemiOP02o5T8tA _XBqI110VEemiOP02o5T8tA">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_XBqI0V0VEemiOP02o5T8tA" source="org.eclipse.papyrus">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_XBqI0l0VEemiOP02o5T8tA" key="nature" value="UML_Nature"/>

-        </eAnnotations>

-        <ownedEnd xmi:type="uml:Property" xmi:id="_XBqI110VEemiOP02o5T8tA" name="class9" type="_EwCLkF0VEemiOP02o5T8tA" association="_XBqI0F0VEemiOP02o5T8tA">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_EkhF0F0aEemiOP02o5T8tA"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ekq20F0aEemiOP02o5T8tA" value="*"/>

-        </ownedEnd>

-      </packagedElement>

     </packagedElement>

     <packagedElement xmi:type="uml:Package" xmi:id="_fXNM8DOHEei5Af8DcjrhIQ" name="Diagrams">

       <ownedComment xmi:type="uml:Comment" xmi:id="_eIxScJAiEei1uKE-hf_HvQ">

@@ -657,11 +648,6 @@ Service.</body>
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_fBfcYId2Eemz_I38RrvOQg"/>

           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_fHVlsId2Eemz_I38RrvOQg" value="*"/>

         </ownedAttribute>

-        <ownedAttribute xmi:type="uml:Property" xmi:id="_pjNvMKhmEem1A8dEHCW-Ig" name="maxAvailableNumber">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_wMYbkKhmEem1A8dEHCW-Ig"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_wMko0KhmEem1A8dEHCW-Ig" value="1"/>

-        </ownedAttribute>

       </packagedElement>

       <packagedElement xmi:type="uml:Class" xmi:id="_HFfXUD0QEeiWMf5FLWfdLA" name="ServiceInstance" isAbstract="true">

         <ownedComment xmi:type="uml:Comment" xmi:id="_cnoqID0QEeiWMf5FLWfdLA" annotatedElement="_HFfXUD0QEeiWMf5FLWfdLA">

@@ -718,7 +704,9 @@ Service.</body>
         </ownedAttribute>

         <ownedAttribute xmi:type="uml:Property" xmi:id="_OmeeoId6Eemz_I38RrvOQg" name="instanceSharingNumber">

           <ownedComment xmi:type="uml:Comment" xmi:id="_6hlXgId6EemlroDdeOKzBQ" annotatedElement="_OmeeoId6Eemz_I38RrvOQg">

-            <body>Record the using number by multiple services. The beginning number is 1 when instanciation, and will increase one number each time this instance is shared by orther services. This attribute can be used when an service instance is prepared to be deleted, the detected number will help to find how many ongoing services is reusing this instance. If number is more than 1, it shows this is reusing by other service, otherwise it can be deleted directly. &#xD;

+            <body>Record the number of services that are using this service instance.&#xD;

+Note: This attribute can be used when a service instance is prepared to be deleted, the detected number will help to find how many services are using this instance. If number is greater than 1, it shows this instance is used by other service(s), otherwise it can be deleted.&#xD;

+ &#xD;

 &#xD;

 </body>

           </ownedComment>

@@ -726,14 +714,6 @@ Service.</body>
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_eFOEkId6Eemz_I38RrvOQg"/>

           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_eFULMId6Eemz_I38RrvOQg" value="1"/>

         </ownedAttribute>

-        <ownedAttribute xmi:type="uml:Property" xmi:id="_O6BswId6Eemz_I38RrvOQg" name="instanceProperties" type="_Q7cmQF0aEemiOP02o5T8tA">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_OJECULgsEem9SoGzhP7GLQ" annotatedElement="_O6BswId6Eemz_I38RrvOQg">

-            <body>A set of attributes that hold the service specific information. For example, network slice profile will hold network slice specific parameters, which are not relevant for other services.&#xD;

-</body>

-          </ownedComment>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_RIQpcId7EemlroDdeOKzBQ"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_RKvVsId7EemlroDdeOKzBQ" value="1"/>

-        </ownedAttribute>

       </packagedElement>

       <packagedElement xmi:type="uml:Class" xmi:id="_7SrB0D0VEeiWMf5FLWfdLA" name="ServiceCompositeDescriptor">

         <ownedComment xmi:type="uml:Comment" xmi:id="__fC7oD0VEeiWMf5FLWfdLA" annotatedElement="_7SrB0D0VEeiWMf5FLWfdLA">

@@ -998,9 +978,6 @@ Service.</body>
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_-s0pdTJ2Eem5adcA1c6ckw"/>

           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_-s0pdjJ2Eem5adcA1c6ckw" value="*"/>

         </ownedAttribute>

-        <ownedAttribute xmi:type="uml:Property" xmi:id="_UD9eMId-EemlroDdeOKzBQ" name="availableInstanceNumber">

-          <type xmi:type="uml:DataType" href="Common.uml#_vxJ9ADafEei23_xWdimG9w"/>

-        </ownedAttribute>

       </packagedElement>

       <packagedElement xmi:type="uml:Class" xmi:id="_UWL1gMDfEeiebIKjAGZWdA" name="ServiceCharacteristic">

         <ownedComment xmi:type="uml:Comment" xmi:id="_pdNhcFuREemhIbrwQ6FkuQ" annotatedElement="_UWL1gMDfEeiebIKjAGZWdA">

@@ -1324,29 +1301,15 @@ NOTE: Cardinality of zero is only valid for a non-instantiated NS.&#xD;
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_bnGZkUS4EeiVGPeZpaYNtQ" value="*"/>

         </ownedAttribute>

       </packagedElement>

-      <packagedElement xmi:type="uml:Class" xmi:id="_EwCLkF0VEemiOP02o5T8tA" name="ServiceProperties">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_cHzv0LdVEemG6epU56F5-w" annotatedElement="_EwCLkF0VEemiOP02o5T8tA">

-          <body>A set of properties that hold the service specific information, which are strongly related to this service with the function realization. For example, when instanciating a network slice service, serviceProperties will hold network slice specific parameters, which are not relevant for other services.</body>

-        </ownedComment>

-        <ownedAttribute xmi:type="uml:Property" xmi:id="_XBqI010VEemiOP02o5T8tA" name="servicedescriptor" type="_Jvy-QD0MEeiWMf5FLWfdLA" association="_XBqI0F0VEemiOP02o5T8tA">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_prqe4LgwEem9SoGzhP7GLQ" annotatedElement="_XBqI010VEemiOP02o5T8tA">

-            <body>Describe the relationship between a servvice and serviceProfile. One service can corresponding multiple specific service properties; one serviceProperties can be used for multiple ServiceDescriptor  </body>

-          </ownedComment>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_XBqI1V0VEemiOP02o5T8tA" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_XBqI1l0VEemiOP02o5T8tA" value="*"/>

-        </ownedAttribute>

-      </packagedElement>

       <packagedElement xmi:type="uml:Class" xmi:id="_tJhnkLdZEemG6epU56F5-w" name="BBSProperties">

         <ownedComment xmi:type="uml:Comment" xmi:id="_fQgAMLgzEem9SoGzhP7GLQ" annotatedElement="_tJhnkLdZEemG6epU56F5-w">

           <body>A set of BBS case specific properties information, which are needed for BBS service with the function realization. </body>

         </ownedComment>

-        <generalization xmi:type="uml:Generalization" xmi:id="_JLxKULdaEemG6epU56F5-w" general="_EwCLkF0VEemiOP02o5T8tA"/>

       </packagedElement>

       <packagedElement xmi:type="uml:Class" xmi:id="_rS7SULdZEemG6epU56F5-w" name="NetworkSlicingProperties">

         <ownedComment xmi:type="uml:Comment" xmi:id="_aHk-kLgzEem9SoGzhP7GLQ" annotatedElement="_rS7SULdZEemG6epU56F5-w">

           <body>A set of Slicing case specific properties information, which are needed for network slicing service with the function realization. </body>

         </ownedComment>

-        <generalization xmi:type="uml:Generalization" xmi:id="_IiC34LdaEemG6epU56F5-w" general="_EwCLkF0VEemiOP02o5T8tA"/>

         <ownedAttribute xmi:type="uml:Property" xmi:id="_qL1j0LgcEem9SoGzhP7GLQ" name="propertiesId">

           <ownedComment xmi:type="uml:Comment" xmi:id="_qL1j0bgcEem9SoGzhP7GLQ" annotatedElement="_qL1j0LgcEem9SoGzhP7GLQ">

             <body>A unique identifier of property of network slice related requirement should be supported by the network slice instance.</body>

@@ -1441,14 +1404,12 @@ AllowedValues: stationary, nomadic, restricted mobility, fully mobility.</body>
           <body>The set of GSMA defined GST properties for network slicing service fuction realization.&#xD;

 </body>

         </ownedComment>

-        <generalization xmi:type="uml:Generalization" xmi:id="_fJW4cLdZEemG6epU56F5-w" general="_EwCLkF0VEemiOP02o5T8tA"/>

       </packagedElement>

       <packagedElement xmi:type="uml:Class" xmi:id="_4dD4sLdWEemG6epU56F5-w" name="3GPPSliceProfile">

         <ownedComment xmi:type="uml:Comment" xmi:id="_Jpl8gLdfEemG6epU56F5-w" annotatedElement="_4dD4sLdWEemG6epU56F5-w">

           <body>The set of 3GPP defined SliceProfile for network slicing subnet service fuction realization.&#xD;

 </body>

         </ownedComment>

-        <generalization xmi:type="uml:Generalization" xmi:id="_-4ENQLdWEemG6epU56F5-w" general="_EwCLkF0VEemiOP02o5T8tA"/>

         <ownedAttribute xmi:type="uml:Property" xmi:id="_VFsicLgaEem9SoGzhP7GLQ" name="sliceProfileId">

           <ownedComment xmi:type="uml:Comment" xmi:id="_rc_LMLgzEem9SoGzhP7GLQ" annotatedElement="_VFsicLgaEem9SoGzhP7GLQ">

             <body>A unique identifier of the property of network slice subnet related requirement should be supported by the network slice subnet instance.</body>

@@ -1489,7 +1450,6 @@ AllowedValues: shared, non-shared.&#xD;
           <body>The set of 3GPP defined ServiceProfile for network slicing service function realization.&#xD;

 </body>

         </ownedComment>

-        <generalization xmi:type="uml:Generalization" xmi:id="_7pFv0LdWEemG6epU56F5-w" general="_EwCLkF0VEemiOP02o5T8tA"/>

         <ownedAttribute xmi:type="uml:Property" xmi:id="_GgGmkLdgEemG6epU56F5-w" name="serviceProfileId">

           <ownedComment xmi:type="uml:Comment" xmi:id="__6w4ALdkEemG6epU56F5-w" annotatedElement="_GgGmkLdgEemG6epU56F5-w">

             <body>A unique identifier of property of network slice related requirement should be supported by the network slice instance.</body>

@@ -1581,13 +1541,11 @@ AllowedValues: shared, non-shared.&#xD;
         <ownedComment xmi:type="uml:Comment" xmi:id="_J3ENQLdeEemG6epU56F5-w" annotatedElement="_3s_tsLdWEemG6epU56F5-w">

           <body>A set of CCVPN case specific properties information, which are needed for CCVPN service with the function realization. </body>

         </ownedComment>

-        <generalization xmi:type="uml:Generalization" xmi:id="_99KrQLdWEemG6epU56F5-w" general="_EwCLkF0VEemiOP02o5T8tA"/>

       </packagedElement>

       <packagedElement xmi:type="uml:Class" xmi:id="_WNfqILcsEemG6epU56F5-w" name="CcvpnProperties">

         <ownedComment xmi:type="uml:Comment" xmi:id="_AEjfcLdgEemG6epU56F5-w" annotatedElement="_WNfqILcsEemG6epU56F5-w">

           <body>A set of CCVPN case specific properties information, which are needed for CCVPN service with the function realization. </body>

         </ownedComment>

-        <generalization xmi:type="uml:Generalization" xmi:id="_J1utULdaEemG6epU56F5-w" general="_EwCLkF0VEemiOP02o5T8tA"/>

       </packagedElement>

     </packagedElement>

     <packagedElement xmi:type="uml:Package" xmi:id="_fXObEDOHEei5Af8DcjrhIQ" name="TypeDefinitions">

@@ -1710,16 +1668,6 @@ reference point.</body>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="__sr8sId1Eemz_I38RrvOQg" value="*"/>

         </ownedAttribute>

       </packagedElement>

-      <packagedElement xmi:type="uml:DataType" xmi:id="_Q7cmQF0aEemiOP02o5T8tA" name="ServiceInstanceProperties">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_UXQC4LgsEem9SoGzhP7GLQ" annotatedElement="_Q7cmQF0aEemiOP02o5T8tA">

-          <body>Record a set of property information this service instance holds, for example latency of this instance.</body>

-        </ownedComment>

-        <ownedAttribute xmi:type="uml:Property" xmi:id="_Kq0r8Id7EemlroDdeOKzBQ" name="instanceProperties">

-          <type xmi:type="uml:DataType" href="Common.uml#_vxJ9ADafEei23_xWdimG9w"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_hf2i8Id7EemlroDdeOKzBQ"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_h3GlUId7EemlroDdeOKzBQ" value="*"/>

-        </ownedAttribute>

-      </packagedElement>

       <packagedElement xmi:type="uml:Enumeration" xmi:id="_gFg8sF0aEemiOP02o5T8tA" name="ServiceLcmEvent">

         <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Dk8AoId2Eemz_I38RrvOQg" name="EVENT_START_DEPLOYMENT"/>

         <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_EEH3AId2Eemz_I38RrvOQg" name="EVENT_END_DEPLOYMENT"/>

@@ -2060,9 +2008,6 @@ reference point.</body>
   <OpenModel_Profile:Preliminary xmi:id="_Q5paQFoLEemSNe5QiI5UBQ" base_Element="_Lvny4MDgEeiebIKjAGZWdA"/>

   <OpenModel_Profile:Preliminary xmi:id="_xyntQFrNEem07dac9irJSQ" base_Element="_IdqxoI9WEeiT7tMsBl6xjA"/>

   <OpenModel_Profile:Preliminary xmi:id="_1OLh4F0BEemiOP02o5T8tA" base_Element="_1Rt9wPL4EeiazPylpq3fUA"/>

-  <OpenModel_Profile:OpenModelClass xmi:id="_EwCLkV0VEemiOP02o5T8tA" base_Class="_EwCLkF0VEemiOP02o5T8tA"/>

-  <OpenModel_Profile:OpenModelAttribute xmi:id="_XBqI1F0VEemiOP02o5T8tA" base_StructuralFeature="_XBqI010VEemiOP02o5T8tA"/>

-  <OpenModel_Profile:OpenModelAttribute xmi:id="_XBqI2F0VEemiOP02o5T8tA" base_StructuralFeature="_XBqI110VEemiOP02o5T8tA"/>

   <OpenModel_Profile:OpenModelAttribute xmi:id="_lpEDIILdEemyVus8T4NvCQ">

     <base_StructuralFeature xmi:type="uml:Property" href="Common.uml#_lo6SIILdEemyVus8T4NvCQ"/>

   </OpenModel_Profile:OpenModelAttribute>

@@ -2108,13 +2053,8 @@ reference point.</body>
   <OpenModel_Profile:Experimental xmi:id="_LJq9YId2Eemz_I38RrvOQg" base_Element="_gFg8sF0aEemiOP02o5T8tA"/>

   <ActionLanguage:TextualRepresentation xmi:id="_66AbYId2Eemz_I38RrvOQg" base_Comment="_656UwId2Eemz_I38RrvOQg" language="org.eclipse.papyrus.uml.textedit.property.xtext.UmlProperty"/>

   <OpenModel_Profile:OpenModelAttribute xmi:id="_OmeeoYd6Eemz_I38RrvOQg" base_StructuralFeature="_OmeeoId6Eemz_I38RrvOQg"/>

-  <OpenModel_Profile:OpenModelAttribute xmi:id="_O6BswYd6Eemz_I38RrvOQg" base_StructuralFeature="_O6BswId6Eemz_I38RrvOQg"/>

-  <OpenModel_Profile:OpenModelAttribute xmi:id="_Kq6ykId7EemlroDdeOKzBQ" base_StructuralFeature="_Kq0r8Id7EemlroDdeOKzBQ"/>

-  <OpenModel_Profile:OpenModelAttribute xmi:id="_UEDk0Id-EemlroDdeOKzBQ" base_StructuralFeature="_UD9eMId-EemlroDdeOKzBQ"/>

   <ActionLanguage:TextualRepresentation xmi:id="_EUv6kKFtEemY46Vmc0cZBg" base_Comment="_EUn-wKFtEemY46Vmc0cZBg" language="org.eclipse.papyrus.uml.textedit.property.xtext.UmlProperty"/>

-  <OpenModel_Profile:OpenModelAttribute xmi:id="_pjT10KhmEem1A8dEHCW-Ig" base_StructuralFeature="_pjNvMKhmEem1A8dEHCW-Ig"/>

   <OpenModel_Profile:OpenModelClass xmi:id="_WNgRMLcsEemG6epU56F5-w" base_Class="_WNfqILcsEemG6epU56F5-w"/>

-  <OpenModel_Profile:Experimental xmi:id="_tKMdULdWEemG6epU56F5-w" base_Element="_EwCLkF0VEemiOP02o5T8tA"/>

   <OpenModel_Profile:OpenModelClass xmi:id="_3s_tsbdWEemG6epU56F5-w" base_Class="_3s_tsLdWEemG6epU56F5-w"/>

   <OpenModel_Profile:OpenModelClass xmi:id="_4CcZQbdWEemG6epU56F5-w" base_Class="_4CcZQLdWEemG6epU56F5-w"/>

   <OpenModel_Profile:OpenModelClass xmi:id="_4dD4sbdWEemG6epU56F5-w" base_Class="_4dD4sLdWEemG6epU56F5-w"/>

@@ -2135,10 +2075,7 @@ reference point.</body>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_JNJbobdgEemG6epU56F5-w" base_StructuralFeature="_JNJboLdgEemG6epU56F5-w" support="OPTIONAL"/>

   <OpenModel_Profile:OpenModelAttribute xmi:id="_mCRM0bdgEemG6epU56F5-w" base_StructuralFeature="_mCRM0LdgEemG6epU56F5-w"/>

   <OpenModel_Profile:OpenModelAttribute xmi:id="_mZZTYbdgEemG6epU56F5-w" base_StructuralFeature="_mZZTYLdgEemG6epU56F5-w" support="OPTIONAL"/>

-  <OpenModel_Profile:Experimental xmi:id="_r84xILdgEemG6epU56F5-w" base_Element="_pjNvMKhmEem1A8dEHCW-Ig"/>

   <OpenModel_Profile:Experimental xmi:id="_w1oowLdgEemG6epU56F5-w" base_Element="_OmeeoId6Eemz_I38RrvOQg"/>

-  <OpenModel_Profile:Experimental xmi:id="_xsHk0LdgEemG6epU56F5-w" base_Element="_O6BswId6Eemz_I38RrvOQg"/>

-  <OpenModel_Profile:Experimental xmi:id="_zFKbYLdgEemG6epU56F5-w" base_Element="_Q7cmQF0aEemiOP02o5T8tA"/>

   <OpenModel_Profile:Experimental xmi:id="_3LafELdgEemG6epU56F5-w" base_Element="_sR5G4LdXEemG6epU56F5-w"/>

   <OpenModel_Profile:OpenModelAttribute xmi:id="_VFsicbgaEem9SoGzhP7GLQ" base_StructuralFeature="_VFsicLgaEem9SoGzhP7GLQ"/>

   <OpenModel_Profile:OpenModelAttribute xmi:id="_qL1j0rgcEem9SoGzhP7GLQ" base_StructuralFeature="_qL1j0LgcEem9SoGzhP7GLQ" isInvariant="true"/>