Merge "delete resourceGroup in service descriptor" into R3workingbranch

2 files changed, 0 insertions, 191 deletions

diff --git a/papyrus/ONAP Information Model/Service.notation b/papyrus/ONAP Information Model/Service.notation
index 6478f20..abf8e22 100644
--- a/papyrus/ONAP Information Model/Service.notation
+++ b/papyrus/ONAP Information Model/Service.notation
@@ -4874,72 +4874,6 @@
       <element xsi:nil="true"/>

       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_D-0N4Kz8EeiRK6iIVq4LZA" x="200"/>

     </children>

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

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

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

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

-      </children>

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

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

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

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

-        </children>

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

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

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

-        </children>

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

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

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

-        </children>

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

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

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

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_-Hcf4Kz9EeiRK6iIVq4LZA" type="Property_ClassAttributeLabel">

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

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

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_GJGCIKz-EeiRK6iIVq4LZA" type="Property_ClassAttributeLabel">

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

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

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_WERscKz-EeiRK6iIVq4LZA" type="Property_ClassAttributeLabel">

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

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

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_ZDTCUKz-EeiRK6iIVq4LZA" type="Property_ClassAttributeLabel">

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

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

-        </children>

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

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

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

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

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_Z-ULC6z8EeiRK6iIVq4LZA" type="Class_OperationCompartment">

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

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

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

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

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_Z-ULEKz8EeiRK6iIVq4LZA" type="Class_NestedClassifierCompartment">

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

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

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

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

-      </children>

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

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z-ULAqz8EeiRK6iIVq4LZA" x="500" y="-40"/>

-    </children>

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

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

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

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

-      </styles>

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

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

-    </children>

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

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

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

@@ -4976,16 +4910,6 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_D-0N5az8EeiRK6iIVq4LZA"/>

       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_D-0N5qz8EeiRK6iIVq4LZA"/>

     </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_Z-nGAqz8EeiRK6iIVq4LZA" type="StereotypeCommentLink" source="_Z-ULAaz8EeiRK6iIVq4LZA" target="_Z-nF_qz8EeiRK6iIVq4LZA">

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

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

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

-      </styles>

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

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

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

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

-    </edges>

     <edges xmi:type="notation:Connector" xmi:id="_jjOvcKz_EeiRK6iIVq4LZA" type="Association_Edge" source="_Dz2bUKz5EeiRK6iIVq4LZA" target="_D-rD4Kz8EeiRK6iIVq4LZA">

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

         <layoutConstraint xmi:type="notation:Location" xmi:id="_jjOvdKz_EeiRK6iIVq4LZA" y="-20"/>

@@ -5011,37 +4935,6 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jkbCQKz_EeiRK6iIVq4LZA" id="(0.5460750853242321,1.0)"/>

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

     </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_7ukSEKz_EeiRK6iIVq4LZA" type="Association_Edge" source="_Dz2bUKz5EeiRK6iIVq4LZA" target="_Z-ULAaz8EeiRK6iIVq4LZA">

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

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

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_7ukSFKz_EeiRK6iIVq4LZA" y="-20"/>

-      </children>

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

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

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_7ukSFqz_EeiRK6iIVq4LZA" y="20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_7ukSF6z_EeiRK6iIVq4LZA" type="Association_TargetRoleLabel">

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

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

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_7ukSGaz_EeiRK6iIVq4LZA" type="Association_SourceRoleLabel">

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

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

-      </children>

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

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

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

-      </children>

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

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

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_7ukSHqz_EeiRK6iIVq4LZA" x="-39" y="-16"/>

-      </children>

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

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

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_7ukSEqz_EeiRK6iIVq4LZA" points="[153, 100, -643984, -643984]$[160, 60, -643984, -643984]$[500, 60, -643984, -643984]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7wgLwKz_EeiRK6iIVq4LZA" id="(1.0,0.08298755186721991)"/>

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

-    </edges>

     <edges xmi:type="notation:Connector" xmi:id="_eM02AK0AEeiRK6iIVq4LZA" type="Association_Edge" source="_Dz2bUKz5EeiRK6iIVq4LZA" target="_Po5Ewqz7EeiRK6iIVq4LZA">

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

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

@@ -5073,30 +4966,5 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_eN3-4K0AEeiRK6iIVq4LZA" id="(1.0,0.6639004149377593)"/>

       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_eN3-4a0AEeiRK6iIVq4LZA" id="(0.2054794520547945,0.0)"/>

     </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_xLuI8K0AEeiRK6iIVq4LZA" type="Association_Edge" source="_Z-ULAaz8EeiRK6iIVq4LZA" target="_Po5Ewqz7EeiRK6iIVq4LZA">

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

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_xLuI9K0AEeiRK6iIVq4LZA" y="-20"/>

-      </children>

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

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_xLuI9q0AEeiRK6iIVq4LZA" y="20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_xLuI960AEeiRK6iIVq4LZA" type="Association_TargetRoleLabel">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_xLuI-K0AEeiRK6iIVq4LZA" y="-20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_xLuI-a0AEeiRK6iIVq4LZA" type="Association_SourceRoleLabel">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_xLuI-q0AEeiRK6iIVq4LZA" y="20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_xLuI-60AEeiRK6iIVq4LZA" type="Association_SourceMultiplicityLabel">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_xLuI_K0AEeiRK6iIVq4LZA" x="-29" y="-25"/>

-      </children>

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

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

-      </children>

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

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

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xLuI8q0AEeiRK6iIVq4LZA" points="[660, 183, -643984, -643984]$[540, 400, -643984, -643984]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xNXHsK0AEeiRK6iIVq4LZA" id="(0.27303754266211605,1.0)"/>

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

-    </edges>

   </notation:Diagram>

 </xmi:XMI>

diff --git a/papyrus/ONAP Information Model/Service.uml b/papyrus/ONAP Information Model/Service.uml
index 618427f..3c24aee 100644
--- a/papyrus/ONAP Information Model/Service.uml
+++ b/papyrus/ONAP Information Model/Service.uml
@@ -566,10 +566,6 @@ If null, then represents to the end of time&#xD;
         <ownedAttribute xmi:type="uml:Property" xmi:id="_wTV-MKz6EeiRK6iIVq4LZA" name="version">

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

         </ownedAttribute>

-        <ownedAttribute xmi:type="uml:Property" xmi:id="_7tq6Mqz_EeiRK6iIVq4LZA" name="resourcedescriptorgroup" type="_Z-LBEKz8EeiRK6iIVq4LZA" association="_7thJMKz_EeiRK6iIVq4LZA">

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

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

-        </ownedAttribute>

         <ownedAttribute xmi:type="uml:Property" xmi:id="_eMPAI60AEeiRK6iIVq4LZA" name="resourcedescriptor" type="_Po5EwKz7EeiRK6iIVq4LZA" association="_eMPAIK0AEeiRK6iIVq4LZA">

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

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

@@ -618,36 +614,6 @@ If null, then represents to the end of time&#xD;
           <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>

         </ownedAttribute>

       </packagedElement>

-      <packagedElement xmi:type="uml:Class" xmi:id="_Z-LBEKz8EeiRK6iIVq4LZA" name="ResourceDescriptorGroup">

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

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

-        </ownedAttribute>

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

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

-        </ownedAttribute>

-        <ownedAttribute xmi:type="uml:Property" xmi:id="_1mNeoKz9EeiRK6iIVq4LZA" name="href">

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

-        </ownedAttribute>

-        <ownedAttribute xmi:type="uml:Property" xmi:id="_5EPrwKz9EeiRK6iIVq4LZA" name="description">

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

-        </ownedAttribute>

-        <ownedAttribute xmi:type="uml:Property" xmi:id="_-Gs5AKz9EeiRK6iIVq4LZA" name="type">

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

-        </ownedAttribute>

-        <ownedAttribute xmi:type="uml:Property" xmi:id="_GIflMKz-EeiRK6iIVq4LZA" name="members" visibility="public">

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

-        </ownedAttribute>

-        <ownedAttribute xmi:type="uml:Property" xmi:id="_WDrPgKz-EeiRK6iIVq4LZA" name="metadata">

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

-        </ownedAttribute>

-        <ownedAttribute xmi:type="uml:Property" xmi:id="_ZCaRgKz-EeiRK6iIVq4LZA" name="initial_count">

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

-        </ownedAttribute>

-        <ownedAttribute xmi:type="uml:Property" xmi:id="_xKrnI60AEeiRK6iIVq4LZA" name="resourcedescriptor" type="_Po5EwKz7EeiRK6iIVq4LZA" aggregation="shared" association="_xKrnIK0AEeiRK6iIVq4LZA">

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

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

-        </ownedAttribute>

-      </packagedElement>

       <packagedElement xmi:type="uml:Association" xmi:id="_jioSgKz_EeiRK6iIVq4LZA" name="ServiceDescriptorHasAttachments" memberEnd="_jioSg6z_EeiRK6iIVq4LZA _jiyDgqz_EeiRK6iIVq4LZA">

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

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

@@ -658,24 +624,12 @@ If null, then represents to the end of time&#xD;
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_jiyDgaz_EeiRK6iIVq4LZA" value="*"/>

         </ownedEnd>

       </packagedElement>

-      <packagedElement xmi:type="uml:Association" xmi:id="_7thJMKz_EeiRK6iIVq4LZA" name="ServiceDescriptorHasReferenceOnResourceGroup" memberEnd="_7tq6Mqz_EeiRK6iIVq4LZA _7tq6Nqz_EeiRK6iIVq4LZA">

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

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

-        </eAnnotations>

-        <ownedEnd xmi:type="uml:Property" xmi:id="_7tq6Nqz_EeiRK6iIVq4LZA" name="servicedescriptor" type="_DzsqUKz5EeiRK6iIVq4LZA" association="_7thJMKz_EeiRK6iIVq4LZA"/>

-      </packagedElement>

       <packagedElement xmi:type="uml:Association" xmi:id="_eMPAIK0AEeiRK6iIVq4LZA" name="ServiceDescriptorHasReferenceOnResourceDescriptor" memberEnd="_eMPAI60AEeiRK6iIVq4LZA _eMPAJ60AEeiRK6iIVq4LZA">

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

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

         </eAnnotations>

         <ownedEnd xmi:type="uml:Property" xmi:id="_eMPAJ60AEeiRK6iIVq4LZA" name="servicedescriptor" type="_DzsqUKz5EeiRK6iIVq4LZA" association="_eMPAIK0AEeiRK6iIVq4LZA"/>

       </packagedElement>

-      <packagedElement xmi:type="uml:Association" xmi:id="_xKrnIK0AEeiRK6iIVq4LZA" name="ResourceGroupRealizedByResourceDescriptors" visibility="package" memberEnd="_xKrnI60AEeiRK6iIVq4LZA _xLHsAK0AEeiRK6iIVq4LZA">

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

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

-        </eAnnotations>

-        <ownedEnd xmi:type="uml:Property" xmi:id="_xLHsAK0AEeiRK6iIVq4LZA" name="resourcegroup" type="_Z-LBEKz8EeiRK6iIVq4LZA" association="_xKrnIK0AEeiRK6iIVq4LZA"/>

-      </packagedElement>

       <packagedElement xmi:type="uml:Class" xmi:id="_CUXcMK0SEei2W47ZDLIFGA" name="ServiceDescriptor">

         <ownedAttribute xmi:type="uml:Property" xmi:id="_U1UO4K0SEei2W47ZDLIFGA" name="invariantUuid" visibility="public">

           <ownedComment xmi:type="uml:Comment" xmi:id="_U1UO4a0SEei2W47ZDLIFGA" annotatedElement="_U1UO4K0SEei2W47ZDLIFGA">

@@ -2277,23 +2231,10 @@ NOTE 3: 	When the corresponding NS level is used in the context of NS scaling, t
   <OpenModel_Profile:OpenModelAttribute xmi:id="_NRPbcaz8EeiRK6iIVq4LZA" base_StructuralFeature="_NRPbcKz8EeiRK6iIVq4LZA"/>

   <OpenModel_Profile:OpenModelAttribute xmi:id="_QekTEaz8EeiRK6iIVq4LZA" base_StructuralFeature="_QekTEKz8EeiRK6iIVq4LZA"/>

   <OpenModel_Profile:OpenModelAttribute xmi:id="_TvLvQaz8EeiRK6iIVq4LZA" base_StructuralFeature="_TvLvQKz8EeiRK6iIVq4LZA"/>

-  <OpenModel_Profile:OpenModelClass xmi:id="_Z-ULAKz8EeiRK6iIVq4LZA" base_Class="_Z-LBEKz8EeiRK6iIVq4LZA"/>

-  <OpenModel_Profile:OpenModelAttribute xmi:id="_ccvf0az9EeiRK6iIVq4LZA" base_StructuralFeature="_ccvf0Kz9EeiRK6iIVq4LZA"/>

-  <OpenModel_Profile:OpenModelAttribute xmi:id="_zQm5Maz9EeiRK6iIVq4LZA" base_StructuralFeature="_zQm5MKz9EeiRK6iIVq4LZA"/>

-  <OpenModel_Profile:OpenModelAttribute xmi:id="_1mNeoaz9EeiRK6iIVq4LZA" base_StructuralFeature="_1mNeoKz9EeiRK6iIVq4LZA"/>

-  <OpenModel_Profile:OpenModelAttribute xmi:id="_5EPrwaz9EeiRK6iIVq4LZA" base_StructuralFeature="_5EPrwKz9EeiRK6iIVq4LZA"/>

-  <OpenModel_Profile:OpenModelAttribute xmi:id="_-Gs5Aaz9EeiRK6iIVq4LZA" base_StructuralFeature="_-Gs5AKz9EeiRK6iIVq4LZA"/>

-  <OpenModel_Profile:OpenModelAttribute xmi:id="_GIflMaz-EeiRK6iIVq4LZA" base_StructuralFeature="_GIflMKz-EeiRK6iIVq4LZA"/>

-  <OpenModel_Profile:OpenModelAttribute xmi:id="_WDrPgaz-EeiRK6iIVq4LZA" base_StructuralFeature="_WDrPgKz-EeiRK6iIVq4LZA"/>

-  <OpenModel_Profile:OpenModelAttribute xmi:id="_ZCaRgaz-EeiRK6iIVq4LZA" base_StructuralFeature="_ZCaRgKz-EeiRK6iIVq4LZA"/>

   <OpenModel_Profile:OpenModelAttribute xmi:id="_jioShKz_EeiRK6iIVq4LZA" base_StructuralFeature="_jioSg6z_EeiRK6iIVq4LZA"/>

   <OpenModel_Profile:OpenModelAttribute xmi:id="_jiyDg6z_EeiRK6iIVq4LZA" base_StructuralFeature="_jiyDgqz_EeiRK6iIVq4LZA"/>

-  <OpenModel_Profile:OpenModelAttribute xmi:id="_7tq6M6z_EeiRK6iIVq4LZA" base_StructuralFeature="_7tq6Mqz_EeiRK6iIVq4LZA"/>

-  <OpenModel_Profile:OpenModelAttribute xmi:id="_7tq6N6z_EeiRK6iIVq4LZA" base_StructuralFeature="_7tq6Nqz_EeiRK6iIVq4LZA"/>

   <OpenModel_Profile:OpenModelAttribute xmi:id="_eMPAJK0AEeiRK6iIVq4LZA" base_StructuralFeature="_eMPAI60AEeiRK6iIVq4LZA"/>

   <OpenModel_Profile:OpenModelAttribute xmi:id="_eMPAKK0AEeiRK6iIVq4LZA" base_StructuralFeature="_eMPAJ60AEeiRK6iIVq4LZA"/>

-  <OpenModel_Profile:OpenModelAttribute xmi:id="_xKrnJK0AEeiRK6iIVq4LZA" base_StructuralFeature="_xKrnI60AEeiRK6iIVq4LZA"/>

-  <OpenModel_Profile:OpenModelAttribute xmi:id="_xLHsAa0AEeiRK6iIVq4LZA" base_StructuralFeature="_xLHsAK0AEeiRK6iIVq4LZA"/>

   <OpenModel_Profile:OpenModelClass xmi:id="_CUhNMK0SEei2W47ZDLIFGA" base_Class="_CUXcMK0SEei2W47ZDLIFGA"/>

   <OpenModel_Profile:OpenModelAttribute xmi:id="_U1UO4q0SEei2W47ZDLIFGA" base_StructuralFeature="_U1UO4K0SEei2W47ZDLIFGA"/>

   <OpenModel_Profile:OpenModelAttribute xmi:id="_V-onYq0SEei2W47ZDLIFGA" base_StructuralFeature="_V-onYK0SEei2W47ZDLIFGA"/>