summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Scaggs <ks0567@att.com>2019-01-25 15:20:52 -0600
committerKevin Scaggs <ks0567@att.com>2019-01-25 15:20:52 -0600
commitb4428aebb6211affb10196e4020956c796b6d3f8 (patch)
treea7dfc2697a3a587045f205409e9ec336ad40b129
parent39db98e4fc293ac98967adbfb155b8cee4489937 (diff)
Updates to Service
Finished draft of composite/atomic service diagram, cleaned up duplicate classes, obsolete classes, and associated relationships Issue-ID: MODELING-104 Change-Id: I9bc57de2389a109daa919c538377167623980c4f Signed-off-by: Kevin Scaggs <ks0567@att.com>
Diffstat
-rw-r--r--papyrus/ONAP Information Model/Service.notation443
-rw-r--r--papyrus/ONAP Information Model/Service.uml141
2 files changed, 264 insertions, 320 deletions
diff --git a/papyrus/ONAP Information Model/Service.notation b/papyrus/ONAP Information Model/Service.notation
index b1e2e65..adaf44a 100644
--- a/papyrus/ONAP Information Model/Service.notation
+++ b/papyrus/ONAP Information Model/Service.notation
@@ -364,6 +364,16 @@
<element xsi:nil="true"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_uZs5Yj0XEeiWMf5FLWfdLA" x="200"/>
</children>
+ <children xmi:type="notation:Shape" xmi:id="_ZFHv8CC9Eemw1L3J4dNy4w" type="Comment_Shape">
+ <children xmi:type="notation:DecorationNode" xmi:id="_ZFHv8iC9Eemw1L3J4dNy4w" type="Comment_BodyLabel"/>
+ <element xmi:type="uml:Comment" href="Service.uml#_ZFF6wCC9Eemw1L3J4dNy4w"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZFHv8SC9Eemw1L3J4dNy4w" x="800" y="360" width="197"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_ehMXECC9Eemw1L3J4dNy4w" type="Comment_Shape">
+ <children xmi:type="notation:DecorationNode" xmi:id="_ehMXEiC9Eemw1L3J4dNy4w" type="Comment_BodyLabel"/>
+ <element xmi:type="uml:Comment" href="Service.uml#_ehLI8CC9Eemw1L3J4dNy4w"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ehMXESC9Eemw1L3J4dNy4w" x="820" y="480"/>
+ </children>
<styles xmi:type="notation:StringValueStyle" xmi:id="_IODesD0MEeiWMf5FLWfdLA" name="diagram_compatibility_version" stringValue="1.4.0"/>
<styles xmi:type="notation:DiagramStyle" xmi:id="_IODesT0MEeiWMf5FLWfdLA"/>
<styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_IODesj0MEeiWMf5FLWfdLA" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
@@ -390,62 +400,6 @@
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_cEoG5D0UEeiWMf5FLWfdLA"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_cEoG5T0UEeiWMf5FLWfdLA"/>
</edges>
- <edges xmi:type="notation:Connector" xmi:id="_2QYCED0UEeiWMf5FLWfdLA" type="Association_Edge" source="_S6TeoD0PEeiWMf5FLWfdLA" target="_b8CyoD0UEeiWMf5FLWfdLA">
- <children xmi:type="notation:DecorationNode" xmi:id="_2QYpID0UEeiWMf5FLWfdLA" type="Association_StereotypeLabel">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_2QYpIT0UEeiWMf5FLWfdLA" y="-20"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_2QYpIj0UEeiWMf5FLWfdLA" type="Association_NameLabel">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_2QYpIz0UEeiWMf5FLWfdLA" x="1" y="-53"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_2QYpJD0UEeiWMf5FLWfdLA" visible="false" type="Association_TargetRoleLabel">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_2QYpJT0UEeiWMf5FLWfdLA" y="-20"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_2QYpJj0UEeiWMf5FLWfdLA" visible="false" type="Association_SourceRoleLabel">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_2QYpJz0UEeiWMf5FLWfdLA" y="20"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_2QYpKD0UEeiWMf5FLWfdLA" type="Association_SourceMultiplicityLabel">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_2QYpKT0UEeiWMf5FLWfdLA" x="-5" y="-13"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_2QYpKj0UEeiWMf5FLWfdLA" type="Association_TargetMultiplicityLabel">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_2QYpKz0UEeiWMf5FLWfdLA" y="-20"/>
- </children>
- <styles xmi:type="notation:FontStyle" xmi:id="_2QYCET0UEeiWMf5FLWfdLA"/>
- <element xmi:type="uml:Association" href="Service.uml#_2PSc8D0UEeiWMf5FLWfdLA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_2QYCEj0UEeiWMf5FLWfdLA" points="[496, 60, -643984, -643984]$[720, 60, -643984, -643984]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2XQGID0UEeiWMf5FLWfdLA" id="(1.0,0.09049773755656108)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2XQGIT0UEeiWMf5FLWfdLA" id="(0.0,0.09049773755656108)"/>
- </edges>
- <edges xmi:type="notation:Connector" xmi:id="_JvBzID0VEeiWMf5FLWfdLA" type="Association_Edge" source="_b8CyoD0UEeiWMf5FLWfdLA" target="_b8CyoD0UEeiWMf5FLWfdLA" routing="Rectilinear">
- <children xmi:type="notation:DecorationNode" xmi:id="_JvCaMD0VEeiWMf5FLWfdLA" type="Association_StereotypeLabel">
- <styles xmi:type="notation:BooleanValueStyle" xmi:id="_OVUBwD0VEeiWMf5FLWfdLA" name="IS_UPDATED_POSITION" booleanValue="true"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_JvCaMT0VEeiWMf5FLWfdLA" y="-20"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_JvCaMj0VEeiWMf5FLWfdLA" type="Association_NameLabel">
- <styles xmi:type="notation:BooleanValueStyle" xmi:id="_OXbhoD0VEeiWMf5FLWfdLA" name="IS_UPDATED_POSITION" booleanValue="true"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_JvCaMz0VEeiWMf5FLWfdLA" x="-3" y="-74"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_JvCaND0VEeiWMf5FLWfdLA" visible="false" type="Association_TargetRoleLabel">
- <styles xmi:type="notation:BooleanValueStyle" xmi:id="_OX7Q4D0VEeiWMf5FLWfdLA" name="IS_UPDATED_POSITION" booleanValue="true"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_JvCaNT0VEeiWMf5FLWfdLA" x="-6" y="-139"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_JvCaNj0VEeiWMf5FLWfdLA" visible="false" type="Association_SourceRoleLabel">
- <styles xmi:type="notation:BooleanValueStyle" xmi:id="_OYgfsD0VEeiWMf5FLWfdLA" name="IS_UPDATED_POSITION" booleanValue="true"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_JvDBQD0VEeiWMf5FLWfdLA" x="-121" y="19"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_JvDBQT0VEeiWMf5FLWfdLA" type="Association_SourceMultiplicityLabel">
- <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Obx2ID0VEeiWMf5FLWfdLA" name="IS_UPDATED_POSITION" booleanValue="true"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_JvDBQj0VEeiWMf5FLWfdLA" x="18" y="-13"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_JvDBQz0VEeiWMf5FLWfdLA" type="Association_TargetMultiplicityLabel">
- <styles xmi:type="notation:BooleanValueStyle" xmi:id="_OcirID0VEeiWMf5FLWfdLA" name="IS_UPDATED_POSITION" booleanValue="true"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_JvDBRD0VEeiWMf5FLWfdLA" x="-13" y="-27"/>
- </children>
- <styles xmi:type="notation:FontStyle" xmi:id="_JvBzIT0VEeiWMf5FLWfdLA"/>
- <element xmi:type="uml:Association" href="Service.uml#_JuGmED0VEeiWMf5FLWfdLA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_JvBzIj0VEeiWMf5FLWfdLA" points="[1111, 80, -643984, -643984]$[1173, 80, -643984, -643984]$[1173, 160, -643984, -643984]$[1111, 160, -643984, -643984]$[1111, 140, -643984, -643984]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JxpCQD0VEeiWMf5FLWfdLA" id="(1.0,0.18099547511312217)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JxppUD0VEeiWMf5FLWfdLA" id="(1.0,0.5429864253393665)"/>
- </edges>
<edges xmi:type="notation:Connector" xmi:id="_uZs5ZD0XEeiWMf5FLWfdLA" type="StereotypeCommentLink" source="_uHaPgD0XEeiWMf5FLWfdLA" target="_uZs5YD0XEeiWMf5FLWfdLA">
<styles xmi:type="notation:FontStyle" xmi:id="_uZs5ZT0XEeiWMf5FLWfdLA"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_uaEFwD0XEeiWMf5FLWfdLA" name="BASE_ELEMENT">
@@ -456,68 +410,6 @@
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uZs5Zz0XEeiWMf5FLWfdLA"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uZs5aD0XEeiWMf5FLWfdLA"/>
</edges>
- <edges xmi:type="notation:Connector" xmi:id="_IOvkwD0YEeiWMf5FLWfdLA" type="Association_Edge" source="_S6TeoD0PEeiWMf5FLWfdLA" target="_uHaPgD0XEeiWMf5FLWfdLA" routing="Rectilinear">
- <children xmi:type="notation:DecorationNode" xmi:id="_IOvkwz0YEeiWMf5FLWfdLA" type="Association_StereotypeLabel">
- <styles xmi:type="notation:BooleanValueStyle" xmi:id="_nC_LMENREeiVGPeZpaYNtQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_IOvkxD0YEeiWMf5FLWfdLA" y="-20"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_IOwL0D0YEeiWMf5FLWfdLA" type="Association_NameLabel">
- <styles xmi:type="notation:BooleanValueStyle" xmi:id="_nF58UENREeiVGPeZpaYNtQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_IOwL0T0YEeiWMf5FLWfdLA" x="6" y="66"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_IOwL0j0YEeiWMf5FLWfdLA" visible="false" type="Association_TargetRoleLabel">
- <styles xmi:type="notation:BooleanValueStyle" xmi:id="_nIrjgENREeiVGPeZpaYNtQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_IOwL0z0YEeiWMf5FLWfdLA" x="12" y="-20"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_IOwL1D0YEeiWMf5FLWfdLA" visible="false" type="Association_SourceRoleLabel">
- <styles xmi:type="notation:BooleanValueStyle" xmi:id="_nLniwENREeiVGPeZpaYNtQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_IOwL1T0YEeiWMf5FLWfdLA" x="-12" y="20"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_IOwL1j0YEeiWMf5FLWfdLA" type="Association_SourceMultiplicityLabel">
- <styles xmi:type="notation:BooleanValueStyle" xmi:id="_nOMVoENREeiVGPeZpaYNtQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_IOwL1z0YEeiWMf5FLWfdLA" x="12" y="20"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_IOwL2D0YEeiWMf5FLWfdLA" type="Association_TargetMultiplicityLabel">
- <styles xmi:type="notation:BooleanValueStyle" xmi:id="_nRgvYENREeiVGPeZpaYNtQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_IOwL2T0YEeiWMf5FLWfdLA" x="-12" y="-20"/>
- </children>
- <styles xmi:type="notation:FontStyle" xmi:id="_IOvkwT0YEeiWMf5FLWfdLA"/>
- <element xmi:type="uml:Association" href="Service.uml#_INm8UD0YEeiWMf5FLWfdLA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_IOvkwj0YEeiWMf5FLWfdLA" points="[380, 261, -643984, -643984]$[380, 340, -643984, -643984]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_IRogsD0YEeiWMf5FLWfdLA" id="(0.46296296296296297,1.0)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_IRogsT0YEeiWMf5FLWfdLA" id="(0.4519774011299435,0.0)"/>
- </edges>
- <edges xmi:type="notation:Connector" xmi:id="_aRexcD0YEeiWMf5FLWfdLA" type="Association_Edge" source="_uHaPgD0XEeiWMf5FLWfdLA" target="_uHaPgD0XEeiWMf5FLWfdLA">
- <children xmi:type="notation:DecorationNode" xmi:id="_aRexcz0YEeiWMf5FLWfdLA" type="Association_StereotypeLabel">
- <styles xmi:type="notation:BooleanValueStyle" xmi:id="_bfigAD0YEeiWMf5FLWfdLA" name="IS_UPDATED_POSITION" booleanValue="true"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_aRexdD0YEeiWMf5FLWfdLA" x="-1" y="-18"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_aRexdT0YEeiWMf5FLWfdLA" type="Association_NameLabel">
- <styles xmi:type="notation:BooleanValueStyle" xmi:id="_bgPDkD0YEeiWMf5FLWfdLA" name="IS_UPDATED_POSITION" booleanValue="true"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_aRfYgD0YEeiWMf5FLWfdLA" x="-3" y="97"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_aRfYgT0YEeiWMf5FLWfdLA" visible="false" type="Association_TargetRoleLabel">
- <styles xmi:type="notation:BooleanValueStyle" xmi:id="_bg7AED0YEeiWMf5FLWfdLA" name="IS_UPDATED_POSITION" booleanValue="true"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_aRfYgj0YEeiWMf5FLWfdLA" x="174" y="-18"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_aRfYgz0YEeiWMf5FLWfdLA" visible="false" type="Association_SourceRoleLabel">
- <styles xmi:type="notation:BooleanValueStyle" xmi:id="_biGEwD0YEeiWMf5FLWfdLA" name="IS_UPDATED_POSITION" booleanValue="true"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_aRfYhD0YEeiWMf5FLWfdLA" x="-175" y="18"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_aRfYhT0YEeiWMf5FLWfdLA" type="Association_SourceMultiplicityLabel">
- <styles xmi:type="notation:BooleanValueStyle" xmi:id="_bjOtMD0YEeiWMf5FLWfdLA" name="IS_UPDATED_POSITION" booleanValue="true"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_aRfYhj0YEeiWMf5FLWfdLA" x="36" y="13"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_aRfYhz0YEeiWMf5FLWfdLA" type="Association_TargetMultiplicityLabel">
- <styles xmi:type="notation:BooleanValueStyle" xmi:id="_blA14D0YEeiWMf5FLWfdLA" name="IS_UPDATED_POSITION" booleanValue="true"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_aRfYiD0YEeiWMf5FLWfdLA" x="-36" y="27"/>
- </children>
- <styles xmi:type="notation:FontStyle" xmi:id="_aRexcT0YEeiWMf5FLWfdLA"/>
- <element xmi:type="uml:Association" href="Service.uml#_aQvxoD0YEeiWMf5FLWfdLA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_aRexcj0YEeiWMf5FLWfdLA" points="[300, 400, -643984, -643984]$[200, 400, -643984, -643984]$[183, 400, -643984, -643984]$[183, 430, -643984, -643984]$[183, 460, -643984, -643984]$[300, 460, -643984, -643984]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aTcgUD0YEeiWMf5FLWfdLA" id="(0.0,0.425531914893617)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aTcgUT0YEeiWMf5FLWfdLA" id="(0.0,0.851063829787234)"/>
- </edges>
</notation:Diagram>
<notation:Diagram xmi:id="_kngqQIn9EeiOe-BKGdv_Yg" type="PapyrusUMLClassDiagram" name="Service Order" measurementUnit="Pixel">
<children xmi:type="notation:Shape" xmi:id="_mrNAUIn9EeiOe-BKGdv_Yg" type="Class_Shape">
@@ -2017,40 +1909,6 @@
<element xsi:nil="true"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_ABWxjauCEeiRK6iIVq4LZA" x="200"/>
</children>
- <children xmi:type="notation:Shape" xmi:id="_OfrcQKuCEeiRK6iIVq4LZA" type="Class_Shape">
- <children xmi:type="notation:DecorationNode" xmi:id="_OfrcQquCEeiRK6iIVq4LZA" type="Class_NameLabel"/>
- <children xmi:type="notation:DecorationNode" xmi:id="_OfrcQ6uCEeiRK6iIVq4LZA" type="Class_FloatingNameLabel">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_OfrcRKuCEeiRK6iIVq4LZA" y="15"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_OfrcRauCEeiRK6iIVq4LZA" type="Class_AttributeCompartment">
- <styles xmi:type="notation:TitleStyle" xmi:id="_OfrcRquCEeiRK6iIVq4LZA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_OfrcR6uCEeiRK6iIVq4LZA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_OfrcSKuCEeiRK6iIVq4LZA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OfrcSauCEeiRK6iIVq4LZA"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_OfrcSquCEeiRK6iIVq4LZA" type="Class_OperationCompartment">
- <styles xmi:type="notation:TitleStyle" xmi:id="_OfrcS6uCEeiRK6iIVq4LZA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_OfrcTKuCEeiRK6iIVq4LZA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_OfrcTauCEeiRK6iIVq4LZA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OfrcTquCEeiRK6iIVq4LZA"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_OfrcT6uCEeiRK6iIVq4LZA" type="Class_NestedClassifierCompartment">
- <styles xmi:type="notation:TitleStyle" xmi:id="_OfrcUKuCEeiRK6iIVq4LZA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_OfrcUauCEeiRK6iIVq4LZA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_OfrcUquCEeiRK6iIVq4LZA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OfrcU6uCEeiRK6iIVq4LZA"/>
- </children>
- <element xmi:type="uml:Class" href="Service.uml#_OfhrQKuCEeiRK6iIVq4LZA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OfrcQauCEeiRK6iIVq4LZA" x="200" y="280" height="181"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_Of-XPquCEeiRK6iIVq4LZA" type="StereotypeComment">
- <styles xmi:type="notation:TitleStyle" xmi:id="_Of-XP6uCEeiRK6iIVq4LZA"/>
- <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Of-XQauCEeiRK6iIVq4LZA" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:Class" href="Service.uml#_OfhrQKuCEeiRK6iIVq4LZA"/>
- </styles>
- <element xsi:nil="true"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Of-XQKuCEeiRK6iIVq4LZA" x="200"/>
- </children>
<children xmi:type="notation:Shape" xmi:id="_XCul8quDEeiRK6iIVq4LZA" type="Class_Shape">
<children xmi:type="notation:DecorationNode" xmi:id="_XCul9KuDEeiRK6iIVq4LZA" type="Class_NameLabel"/>
<children xmi:type="notation:DecorationNode" xmi:id="_XCul9auDEeiRK6iIVq4LZA" type="Class_FloatingNameLabel">
@@ -2205,13 +2063,6 @@
<element xmi:type="uml:Property" href="Service.uml#_HLlNsD0PEeiWMf5FLWfdLA"/>
<layoutConstraint xmi:type="notation:Location" xmi:id="_nQNdkc4nEeinDdlk3ffduQ"/>
</children>
- <children xmi:type="notation:Shape" xmi:id="_nQOrsM4nEeinDdlk3ffduQ" type="Property_ClassAttributeLabel">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_nYHcb84nEeinDdlk3ffduQ" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nYHccM4nEeinDdlk3ffduQ" key="mutable" value="true"/>
- </eAnnotations>
- <element xmi:type="uml:Property" href="Service.uml#_IN86kj0YEeiWMf5FLWfdLA"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_nQOrsc4nEeinDdlk3ffduQ"/>
- </children>
<children xmi:type="notation:Shape" xmi:id="_nQPSwM4nEeinDdlk3ffduQ" type="Property_ClassAttributeLabel">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_nYHccc4nEeinDdlk3ffduQ" source="PapyrusCSSForceValue">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nYHccs4nEeinDdlk3ffduQ" key="mutable" value="true"/>
@@ -2321,6 +2172,40 @@
<element xsi:nil="true"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_SXqSZR9dEemLMI6HKP6Lbw" x="200"/>
</children>
+ <children xmi:type="notation:Shape" xmi:id="_w4JVsCC8Eemw1L3J4dNy4w" type="Class_Shape">
+ <children xmi:type="notation:DecorationNode" xmi:id="_w4J8wCC8Eemw1L3J4dNy4w" type="Class_NameLabel"/>
+ <children xmi:type="notation:DecorationNode" xmi:id="_w4J8wSC8Eemw1L3J4dNy4w" type="Class_FloatingNameLabel">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_w4J8wiC8Eemw1L3J4dNy4w" y="15"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_w4J8wyC8Eemw1L3J4dNy4w" type="Class_AttributeCompartment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_w4J8xCC8Eemw1L3J4dNy4w"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_w4J8xSC8Eemw1L3J4dNy4w"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_w4J8xiC8Eemw1L3J4dNy4w"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w4J8xyC8Eemw1L3J4dNy4w"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_w4J8yCC8Eemw1L3J4dNy4w" type="Class_OperationCompartment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_w4J8ySC8Eemw1L3J4dNy4w"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_w4J8yiC8Eemw1L3J4dNy4w"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_w4J8yyC8Eemw1L3J4dNy4w"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w4J8zCC8Eemw1L3J4dNy4w"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_w4J8zSC8Eemw1L3J4dNy4w" type="Class_NestedClassifierCompartment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_w4J8ziC8Eemw1L3J4dNy4w"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_w4J8zyC8Eemw1L3J4dNy4w"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_w4J80CC8Eemw1L3J4dNy4w"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w4J80SC8Eemw1L3J4dNy4w"/>
+ </children>
+ <element xmi:type="uml:Class" href="Service.uml#_7SrB0D0VEeiWMf5FLWfdLA"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w4JVsSC8Eemw1L3J4dNy4w" x="60" y="320"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_w4TtwCC8Eemw1L3J4dNy4w" type="StereotypeComment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_w4TtwSC8Eemw1L3J4dNy4w"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_w4TtwyC8Eemw1L3J4dNy4w" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="Service.uml#_7SrB0D0VEeiWMf5FLWfdLA"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w4TtwiC8Eemw1L3J4dNy4w" x="200"/>
+ </children>
<styles xmi:type="notation:StringValueStyle" xmi:id="_7RESUauBEeiRK6iIVq4LZA" name="diagram_compatibility_version" stringValue="1.4.0"/>
<styles xmi:type="notation:DiagramStyle" xmi:id="_7RESUquBEeiRK6iIVq4LZA"/>
<styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_7RESU6uBEeiRK6iIVq4LZA" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
@@ -2337,16 +2222,6 @@
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ABWxkquCEeiRK6iIVq4LZA"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ABWxk6uCEeiRK6iIVq4LZA"/>
</edges>
- <edges xmi:type="notation:Connector" xmi:id="_Of-XQquCEeiRK6iIVq4LZA" type="StereotypeCommentLink" source="_OfrcQKuCEeiRK6iIVq4LZA" target="_Of-XPquCEeiRK6iIVq4LZA">
- <styles xmi:type="notation:FontStyle" xmi:id="_Of-XQ6uCEeiRK6iIVq4LZA"/>
- <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Of-XR6uCEeiRK6iIVq4LZA" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:Class" href="Service.uml#_OfhrQKuCEeiRK6iIVq4LZA"/>
- </styles>
- <element xsi:nil="true"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Of-XRKuCEeiRK6iIVq4LZA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Of-XRauCEeiRK6iIVq4LZA"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Of-XRquCEeiRK6iIVq4LZA"/>
- </edges>
<edges xmi:type="notation:Connector" xmi:id="_XDBg8quDEeiRK6iIVq4LZA" type="StereotypeCommentLink" source="_XCul8quDEeiRK6iIVq4LZA" target="_XDBg7quDEeiRK6iIVq4LZA">
<styles xmi:type="notation:FontStyle" xmi:id="_XDBg86uDEeiRK6iIVq4LZA"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_XDLR4KuDEeiRK6iIVq4LZA" name="BASE_ELEMENT">
@@ -2451,7 +2326,7 @@
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mGcx4KuFEeiRK6iIVq4LZA" id="(0.2631578947368421,1.0)"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mGcx4auFEeiRK6iIVq4LZA" id="(0.14084507042253522,1.0)"/>
</edges>
- <edges xmi:type="notation:Connector" xmi:id="_AdG8kKuGEeiRK6iIVq4LZA" type="Association_Edge" source="_OfrcQKuCEeiRK6iIVq4LZA" target="_YBnQEauDEeiRK6iIVq4LZA">
+ <edges xmi:type="notation:Connector" xmi:id="_AdG8kKuGEeiRK6iIVq4LZA" type="Association_Edge" source="_w4JVsCC8Eemw1L3J4dNy4w" target="_YBnQEauDEeiRK6iIVq4LZA">
<children xmi:type="notation:DecorationNode" xmi:id="_AdG8k6uGEeiRK6iIVq4LZA" type="Association_StereotypeLabel">
<styles xmi:type="notation:BooleanValueStyle" xmi:id="_A-CfYKuGEeiRK6iIVq4LZA" name="IS_UPDATED_POSITION" booleanValue="true"/>
<layoutConstraint xmi:type="notation:Location" xmi:id="_AdG8lKuGEeiRK6iIVq4LZA" x="1" y="-18"/>
@@ -2479,7 +2354,7 @@
<styles xmi:type="notation:FontStyle" xmi:id="_AdG8kauGEeiRK6iIVq4LZA"/>
<element xmi:type="uml:Association" href="Service.uml#_AchGsKuGEeiRK6iIVq4LZA"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_AdG8kquGEeiRK6iIVq4LZA" points="[280, 461, -643984, -643984]$[280, 540, -643984, -643984]$[820, 540, -643984, -643984]$[820, 344, -643984, -643984]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_AeTPYKuGEeiRK6iIVq4LZA" id="(0.4678362573099415,1.0)"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_AeTPYKuGEeiRK6iIVq4LZA" id="(0.45977011494252873,1.0)"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_AeTPYauGEeiRK6iIVq4LZA" id="(0.4968944099378882,1.0)"/>
</edges>
<edges xmi:type="notation:Connector" xmi:id="__eHogM4mEeinDdlk3ffduQ" type="StereotypeCommentLink" source="__dJYIM4mEeinDdlk3ffduQ" target="__eGaYM4mEeinDdlk3ffduQ">
@@ -2502,14 +2377,14 @@
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xOq1UM4oEeinDdlk3ffduQ" id="(0.2631578947368421,0.0)"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xOrcYM4oEeinDdlk3ffduQ" id="(0.1423487544483986,1.0)"/>
</edges>
- <edges xmi:type="notation:Connector" xmi:id="_0K25oM4oEeinDdlk3ffduQ" type="Generalization_Edge" source="_OfrcQKuCEeiRK6iIVq4LZA" target="__dJYIM4mEeinDdlk3ffduQ">
+ <edges xmi:type="notation:Connector" xmi:id="_0K25oM4oEeinDdlk3ffduQ" type="Generalization_Edge" source="_w4JVsCC8Eemw1L3J4dNy4w" target="__dJYIM4mEeinDdlk3ffduQ">
<children xmi:type="notation:DecorationNode" xmi:id="_0K3gsM4oEeinDdlk3ffduQ" type="Generalization_StereotypeLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_0K3gsc4oEeinDdlk3ffduQ" y="40"/>
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_0K25oc4oEeinDdlk3ffduQ"/>
<element xmi:type="uml:Generalization" href="Service.uml#_0KAlEM4oEeinDdlk3ffduQ"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0K25os4oEeinDdlk3ffduQ" points="[240, 280, -643984, -643984]$[0, 190, -643984, -643984]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0M0ogM4oEeinDdlk3ffduQ" id="(0.23391812865497075,0.0)"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0M0ogM4oEeinDdlk3ffduQ" id="(0.3448275862068966,0.0)"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0M0ogc4oEeinDdlk3ffduQ" id="(0.7117437722419929,1.0)"/>
</edges>
<edges xmi:type="notation:Connector" xmi:id="_ILk18M4pEeinDdlk3ffduQ" type="Association_Edge" source="__dJYIM4mEeinDdlk3ffduQ" target="_SXhvgB9dEemLMI6HKP6Lbw">
@@ -2537,7 +2412,7 @@
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_INDcoM4pEeinDdlk3ffduQ" id="(1.0,0.4444444444444444)"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_INDcoc4pEeinDdlk3ffduQ" id="(0.0,0.38461538461538464)"/>
</edges>
- <edges xmi:type="notation:Connector" xmi:id="_eklfUM4pEeinDdlk3ffduQ" type="Association_Edge" source="_OfrcQKuCEeiRK6iIVq4LZA" target="__dJYIM4mEeinDdlk3ffduQ">
+ <edges xmi:type="notation:Connector" xmi:id="_eklfUM4pEeinDdlk3ffduQ" type="Association_Edge" source="_w4JVsCC8Eemw1L3J4dNy4w" target="__dJYIM4mEeinDdlk3ffduQ">
<children xmi:type="notation:DecorationNode" xmi:id="_ekmGYM4pEeinDdlk3ffduQ" type="Association_StereotypeLabel">
<styles xmi:type="notation:BooleanValueStyle" xmi:id="_fQ5ywM4pEeinDdlk3ffduQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
<layoutConstraint xmi:type="notation:Location" xmi:id="_ekmGYc4pEeinDdlk3ffduQ" y="-20"/>
@@ -2565,7 +2440,7 @@
<styles xmi:type="notation:FontStyle" xmi:id="_eklfUc4pEeinDdlk3ffduQ"/>
<element xmi:type="uml:Association" href="Service.uml#_ejprMM4pEeinDdlk3ffduQ"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_eklfUs4pEeinDdlk3ffduQ" points="[280, 280, -643984, -643984]$[280, 140, -643984, -643984]$[81, 140, -643984, -643984]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_el6VAM4pEeinDdlk3ffduQ" id="(0.4678362573099415,0.0)"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_el6VAM4pEeinDdlk3ffduQ" id="(0.5747126436781609,0.0)"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_el6VAc4pEeinDdlk3ffduQ" id="(1.0,0.8148148148148148)"/>
</edges>
<edges xmi:type="notation:Connector" xmi:id="_SXqSZx9dEemLMI6HKP6Lbw" type="StereotypeCommentLink" source="_SXhvgB9dEemLMI6HKP6Lbw" target="_SXqSYx9dEemLMI6HKP6Lbw">
@@ -2578,34 +2453,6 @@
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SXqSah9dEemLMI6HKP6Lbw"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SXqSax9dEemLMI6HKP6Lbw"/>
</edges>
- <edges xmi:type="notation:Connector" xmi:id="_gCGpIB9dEemLMI6HKP6Lbw" type="Association_Edge" source="__dJYIM4mEeinDdlk3ffduQ" target="_SXhvgB9dEemLMI6HKP6Lbw">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_gFAMIB9dEemLMI6HKP6Lbw" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_gFAMIR9dEemLMI6HKP6Lbw" key="mutable" value="true"/>
- </eAnnotations>
- <children xmi:type="notation:DecorationNode" xmi:id="_gCGpIx9dEemLMI6HKP6Lbw" type="Association_StereotypeLabel">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_gCHQMB9dEemLMI6HKP6Lbw" y="-20"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_gCHQMR9dEemLMI6HKP6Lbw" type="Association_NameLabel">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_gCHQMh9dEemLMI6HKP6Lbw" y="20"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_gCHQMx9dEemLMI6HKP6Lbw" type="Association_TargetRoleLabel">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_gCHQNB9dEemLMI6HKP6Lbw" y="-20"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_gCHQNR9dEemLMI6HKP6Lbw" type="Association_SourceRoleLabel">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_gCHQNh9dEemLMI6HKP6Lbw" y="20"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_gCHQNx9dEemLMI6HKP6Lbw" type="Association_SourceMultiplicityLabel">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_gCHQOB9dEemLMI6HKP6Lbw" y="20"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_gCHQOR9dEemLMI6HKP6Lbw" type="Association_TargetMultiplicityLabel">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_gCHQOh9dEemLMI6HKP6Lbw" y="-20"/>
- </children>
- <styles xmi:type="notation:FontStyle" xmi:id="_gCGpIR9dEemLMI6HKP6Lbw"/>
- <element xmi:type="uml:Association" href="Service.uml#_2PSc8D0UEeiWMf5FLWfdLA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_gCGpIh9dEemLMI6HKP6Lbw" points="[0, -80, -643984, -643984]$[600, -80, -643984, -643984]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_gCHQOx9dEemLMI6HKP6Lbw" id="(0.7117437722419929,0.0)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_gCHQPB9dEemLMI6HKP6Lbw" id="(0.0,0.0)"/>
- </edges>
<edges xmi:type="notation:Connector" xmi:id="_gCHQPR9dEemLMI6HKP6Lbw" type="Association_Edge" source="__dJYIM4mEeinDdlk3ffduQ" target="_SXhvgB9dEemLMI6HKP6Lbw">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_gFAMIh9dEemLMI6HKP6Lbw" source="PapyrusCSSForceValue">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_gFAMIx9dEemLMI6HKP6Lbw" key="mutable" value="true"/>
@@ -2634,6 +2481,57 @@
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_gCH3Sh9dEemLMI6HKP6Lbw" id="(0.7117437722419929,0.0)"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_gCH3Sx9dEemLMI6HKP6Lbw" id="(0.0,0.0)"/>
</edges>
+ <edges xmi:type="notation:Connector" xmi:id="_w4UU0CC8Eemw1L3J4dNy4w" type="StereotypeCommentLink" source="_w4JVsCC8Eemw1L3J4dNy4w" target="_w4TtwCC8Eemw1L3J4dNy4w">
+ <styles xmi:type="notation:FontStyle" xmi:id="_w4UU0SC8Eemw1L3J4dNy4w"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_w4UU1SC8Eemw1L3J4dNy4w" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="Service.uml#_7SrB0D0VEeiWMf5FLWfdLA"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_w4UU0iC8Eemw1L3J4dNy4w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_w4UU0yC8Eemw1L3J4dNy4w"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_w4UU1CC8Eemw1L3J4dNy4w"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_5ukj4SC8Eemw1L3J4dNy4w" type="Generalization_Edge" source="_w4JVsCC8Eemw1L3J4dNy4w" target="__dJYIM4mEeinDdlk3ffduQ">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_5wpnciC8Eemw1L3J4dNy4w" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_5wpncyC8Eemw1L3J4dNy4w" key="mutable" value="true"/>
+ </eAnnotations>
+ <children xmi:type="notation:DecorationNode" xmi:id="_5ukj5CC8Eemw1L3J4dNy4w" type="Generalization_StereotypeLabel">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_5ulK4CC8Eemw1L3J4dNy4w" y="40"/>
+ </children>
+ <styles xmi:type="notation:FontStyle" xmi:id="_5ukj4iC8Eemw1L3J4dNy4w"/>
+ <element xmi:type="uml:Generalization" href="Service.uml#_yX44MB9eEemLMI6HKP6Lbw"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_5ukj4yC8Eemw1L3J4dNy4w" points="[60, 320, -643984, -643984]$[-20, -80, -643984, -643984]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_5ulK4SC8Eemw1L3J4dNy4w" id="(0.0,0.0)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_5ulK4iC8Eemw1L3J4dNy4w" id="(0.6405693950177936,0.0)"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_5ulK4yC8Eemw1L3J4dNy4w" type="Association_Edge" source="_w4JVsCC8Eemw1L3J4dNy4w" target="__dJYIM4mEeinDdlk3ffduQ">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_5wpndCC8Eemw1L3J4dNy4w" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_5wpndSC8Eemw1L3J4dNy4w" key="mutable" value="true"/>
+ </eAnnotations>
+ <children xmi:type="notation:DecorationNode" xmi:id="_5ulK5iC8Eemw1L3J4dNy4w" type="Association_StereotypeLabel">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_5ulK5yC8Eemw1L3J4dNy4w" y="-20"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_5ulK6CC8Eemw1L3J4dNy4w" type="Association_NameLabel">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_5ulK6SC8Eemw1L3J4dNy4w" y="20"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_5ulK6iC8Eemw1L3J4dNy4w" type="Association_TargetRoleLabel">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_5ulK6yC8Eemw1L3J4dNy4w" y="-20"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_5ulK7CC8Eemw1L3J4dNy4w" type="Association_SourceRoleLabel">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_5ulK7SC8Eemw1L3J4dNy4w" y="20"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_5ulK7iC8Eemw1L3J4dNy4w" type="Association_SourceMultiplicityLabel">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_5ulK7yC8Eemw1L3J4dNy4w" y="20"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_5ulK8CC8Eemw1L3J4dNy4w" type="Association_TargetMultiplicityLabel">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_5ulK8SC8Eemw1L3J4dNy4w" y="-20"/>
+ </children>
+ <styles xmi:type="notation:FontStyle" xmi:id="_5ulK5CC8Eemw1L3J4dNy4w"/>
+ <element xmi:type="uml:Association" href="Service.uml#_6lxVwCC1Eemw1L3J4dNy4w"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_5ulK5SC8Eemw1L3J4dNy4w" points="[60, 320, -643984, -643984]$[-20, -80, -643984, -643984]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_5ulK8iC8Eemw1L3J4dNy4w" id="(0.0,0.0)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_5ulK8yC8Eemw1L3J4dNy4w" id="(0.6405693950177936,0.0)"/>
+ </edges>
</notation:Diagram>
<notation:Diagram xmi:id="_75kwkKzxEeiRK6iIVq4LZA" type="PapyrusUMLClassDiagram" name="ServiceDescriptor" measurementUnit="Pixel">
<children xmi:type="notation:Shape" xmi:id="_iD6bAM4rEeinDdlk3ffduQ" type="Class_Shape">
@@ -2718,20 +2616,6 @@
<element xmi:type="uml:Property" href="Service.uml#_HLlNsD0PEeiWMf5FLWfdLA"/>
<layoutConstraint xmi:type="notation:Location" xmi:id="_0rtcmc4rEeinDdlk3ffduQ"/>
</children>
- <children xmi:type="notation:Shape" xmi:id="_0rtcms4rEeinDdlk3ffduQ" type="Property_ClassAttributeLabel">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_0vvBBs4rEeinDdlk3ffduQ" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_0vvBB84rEeinDdlk3ffduQ" key="mutable" value="true"/>
- </eAnnotations>
- <element xmi:type="uml:Property" href="Service.uml#_2PU5Mj0UEeiWMf5FLWfdLA"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_0rtcm84rEeinDdlk3ffduQ"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_0rtcnM4rEeinDdlk3ffduQ" type="Property_ClassAttributeLabel">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_0vvBCM4rEeinDdlk3ffduQ" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_0vvBCc4rEeinDdlk3ffduQ" key="mutable" value="true"/>
- </eAnnotations>
- <element xmi:type="uml:Property" href="Service.uml#_IN86kj0YEeiWMf5FLWfdLA"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_0rtcnc4rEeinDdlk3ffduQ"/>
- </children>
<children xmi:type="notation:Shape" xmi:id="_0rtcns4rEeinDdlk3ffduQ" type="Property_ClassAttributeLabel">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_0vvBCs4rEeinDdlk3ffduQ" source="PapyrusCSSForceValue">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_0vvBC84rEeinDdlk3ffduQ" key="mutable" value="true"/>
@@ -3971,10 +3855,6 @@
<element xmi:type="uml:Property" href="Service.uml#_VRZfkD0UEeiWMf5FLWfdLA"/>
<layoutConstraint xmi:type="notation:Location" xmi:id="_wmF_5x9dEemLMI6HKP6Lbw"/>
</children>
- <children xmi:type="notation:Shape" xmi:id="_wmF_6B9dEemLMI6HKP6Lbw" type="Property_ClassAttributeLabel">
- <element xmi:type="uml:Property" href="Service.uml#_JuJCUj0VEeiWMf5FLWfdLA"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_wmF_6R9dEemLMI6HKP6Lbw"/>
- </children>
<children xmi:type="notation:Shape" xmi:id="_CWVHUB9eEemLMI6HKP6Lbw" type="Property_ClassAttributeLabel" fontColor="16711935">
<element xmi:type="uml:Property" href="Service.uml#_1Rt9wPL4EeiazPylpq3fUA"/>
<layoutConstraint xmi:type="notation:Location" xmi:id="_CWVHUR9eEemLMI6HKP6Lbw"/>
@@ -4567,7 +4447,12 @@
<children xmi:type="notation:Shape" xmi:id="_TP9hAB_ZEemC0a79AbY09g" type="Comment_Shape">
<children xmi:type="notation:DecorationNode" xmi:id="_TQCZgB_ZEemC0a79AbY09g" type="Comment_BodyLabel"/>
<element xmi:type="uml:Comment" href="Service.uml#_TP2MQB_ZEemC0a79AbY09g"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TP9hAR_ZEemC0a79AbY09g" x="240" y="440"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TP9hAR_ZEemC0a79AbY09g" x="160" y="560"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_9GTUoCC8Eemw1L3J4dNy4w" type="Comment_Shape">
+ <children xmi:type="notation:DecorationNode" xmi:id="_9GTUoiC8Eemw1L3J4dNy4w" type="Comment_BodyLabel"/>
+ <element xmi:type="uml:Comment" href="Service.uml#_9GRfcCC8Eemw1L3J4dNy4w"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9GTUoSC8Eemw1L3J4dNy4w" x="200" y="440" width="141" height="81"/>
</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"/>
@@ -4710,28 +4595,98 @@
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wSrpwB9fEemLMI6HKP6Lbw" id="(1.0,0.4)"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_x1WWYB9fEemLMI6HKP6Lbw" id="(1.0,0.4)"/>
</edges>
- <edges xmi:type="notation:Connector" xmi:id="_n2OlYB9gEemLMI6HKP6Lbw" type="Association_Edge" source="_nTtrAB9cEemLMI6HKP6Lbw" target="_bHBZwB9eEemLMI6HKP6Lbw">
- <children xmi:type="notation:DecorationNode" xmi:id="_n2OlYx9gEemLMI6HKP6Lbw" type="Association_StereotypeLabel">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_n2OlZB9gEemLMI6HKP6Lbw" y="-20"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_n2PMcB9gEemLMI6HKP6Lbw" type="Association_NameLabel">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_n2PMcR9gEemLMI6HKP6Lbw" y="-23"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_n2PMch9gEemLMI6HKP6Lbw" visible="false" type="Association_TargetRoleLabel">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_n2PMcx9gEemLMI6HKP6Lbw" y="-20"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_n2PMdB9gEemLMI6HKP6Lbw" visible="false" type="Association_SourceRoleLabel">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_n2PMdR9gEemLMI6HKP6Lbw" y="20"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_n2PMdh9gEemLMI6HKP6Lbw" type="Association_SourceMultiplicityLabel">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_n2PMdx9gEemLMI6HKP6Lbw" x="-27" y="-23"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_n2PMeB9gEemLMI6HKP6Lbw" type="Association_TargetMultiplicityLabel">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_n2PMeR9gEemLMI6HKP6Lbw" y="-20"/>
- </children>
- <styles xmi:type="notation:FontStyle" xmi:id="_n2OlYR9gEemLMI6HKP6Lbw"/>
- <element xmi:type="uml:Association" href="Service.uml#_2PSc8D0UEeiWMf5FLWfdLA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_n2OlYh9gEemLMI6HKP6Lbw" points="[541, 150, -643984, -643984]$[880, 150, -643984, -643984]"/>
+ <edges xmi:type="notation:Connector" xmi:id="_6uqzECC1Eemw1L3J4dNy4w" type="Association_Edge" source="_Yz45gB9eEemLMI6HKP6Lbw" target="_nTtrAB9cEemLMI6HKP6Lbw">
+ <children xmi:type="notation:DecorationNode" xmi:id="_6uqzEyC1Eemw1L3J4dNy4w" type="Association_StereotypeLabel">
+ <styles xmi:type="notation:BooleanValueStyle" xmi:id="__C8EoCC1Eemw1L3J4dNy4w" name="IS_UPDATED_POSITION" booleanValue="true"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_6uqzFCC1Eemw1L3J4dNy4w" x="-1" y="-17"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_6uqzFSC1Eemw1L3J4dNy4w" type="Association_NameLabel">
+ <styles xmi:type="notation:BooleanValueStyle" xmi:id="__MEygCC1Eemw1L3J4dNy4w" name="IS_UPDATED_POSITION" booleanValue="true"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_6uqzFiC1Eemw1L3J4dNy4w" x="53" y="61"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_6uqzFyC1Eemw1L3J4dNy4w" visible="false" type="Association_TargetRoleLabel">
+ <styles xmi:type="notation:BooleanValueStyle" xmi:id="__VIA0CC1Eemw1L3J4dNy4w" name="IS_UPDATED_POSITION" booleanValue="true"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_6uqzGCC1Eemw1L3J4dNy4w" x="64" y="-20"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_6uqzGSC1Eemw1L3J4dNy4w" visible="false" type="Association_SourceRoleLabel">
+ <styles xmi:type="notation:BooleanValueStyle" xmi:id="__d3tICC1Eemw1L3J4dNy4w" name="IS_UPDATED_POSITION" booleanValue="true"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_6uqzGiC1Eemw1L3J4dNy4w" x="-63" y="19"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_6uqzGyC1Eemw1L3J4dNy4w" type="Association_SourceMultiplicityLabel">
+ <styles xmi:type="notation:BooleanValueStyle" xmi:id="__mgrwCC1Eemw1L3J4dNy4w" name="IS_UPDATED_POSITION" booleanValue="true"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_6uqzHCC1Eemw1L3J4dNy4w" x="64" y="20"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_6uqzHSC1Eemw1L3J4dNy4w" type="Association_TargetMultiplicityLabel">
+ <styles xmi:type="notation:BooleanValueStyle" xmi:id="__vZiACC1Eemw1L3J4dNy4w" name="IS_UPDATED_POSITION" booleanValue="true"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_6uqzHiC1Eemw1L3J4dNy4w" x="-16" y="7"/>
+ </children>
+ <styles xmi:type="notation:FontStyle" xmi:id="_6uqzESC1Eemw1L3J4dNy4w"/>
+ <element xmi:type="uml:Association" href="Service.uml#_6lxVwCC1Eemw1L3J4dNy4w"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_6uqzEiC1Eemw1L3J4dNy4w" points="[240, 360, -643984, -643984]$[140, 360, -643984, -643984]$[140, 140, -643984, -643984]$[380, 140, -643984, -643984]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7AY1MCC1Eemw1L3J4dNy4w" id="(0.0,0.4)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7AZcQCC1Eemw1L3J4dNy4w" id="(0.0,0.4)"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_9v9nkCC6Eemw1L3J4dNy4w" type="Association_Edge" source="_bJ4LYB9cEemLMI6HKP6Lbw" target="_eJ8qIB9cEemLMI6HKP6Lbw">
+ <children xmi:type="notation:DecorationNode" xmi:id="_9v9nkyC6Eemw1L3J4dNy4w" type="Association_StereotypeLabel">
+ <styles xmi:type="notation:BooleanValueStyle" xmi:id="_C_2z4CC7Eemw1L3J4dNy4w" name="IS_UPDATED_POSITION" booleanValue="true"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_9v9nlCC6Eemw1L3J4dNy4w" x="1" y="-18"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_9v9nlSC6Eemw1L3J4dNy4w" type="Association_NameLabel">
+ <styles xmi:type="notation:BooleanValueStyle" xmi:id="_DIvqICC7Eemw1L3J4dNy4w" name="IS_UPDATED_POSITION" booleanValue="true"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_9v9nliC6Eemw1L3J4dNy4w" x="1" y="-13"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_9v9nlyC6Eemw1L3J4dNy4w" visible="false" type="Association_TargetRoleLabel">
+ <styles xmi:type="notation:BooleanValueStyle" xmi:id="_DRWzkCC7Eemw1L3J4dNy4w" name="IS_UPDATED_POSITION" booleanValue="true"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_9v9nmCC6Eemw1L3J4dNy4w" x="25" y="-19"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_9v9nmSC6Eemw1L3J4dNy4w" visible="false" type="Association_SourceRoleLabel">
+ <styles xmi:type="notation:BooleanValueStyle" xmi:id="_DaQ38CC7Eemw1L3J4dNy4w" name="IS_UPDATED_POSITION" booleanValue="true"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_9v9nmiC6Eemw1L3J4dNy4w" x="-26" y="20"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_9v9nmyC6Eemw1L3J4dNy4w" type="Association_SourceMultiplicityLabel">
+ <styles xmi:type="notation:BooleanValueStyle" xmi:id="_DjDnkCC7Eemw1L3J4dNy4w" name="IS_UPDATED_POSITION" booleanValue="true"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_9v9nnCC6Eemw1L3J4dNy4w" x="7" y="15"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_9v9nnSC6Eemw1L3J4dNy4w" type="Association_TargetMultiplicityLabel">
+ <styles xmi:type="notation:BooleanValueStyle" xmi:id="_DrwQkCC7Eemw1L3J4dNy4w" name="IS_UPDATED_POSITION" booleanValue="true"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_9v9nniC6Eemw1L3J4dNy4w" x="-7" y="24"/>
+ </children>
+ <styles xmi:type="notation:FontStyle" xmi:id="_9v9nkSC6Eemw1L3J4dNy4w"/>
+ <element xmi:type="uml:Association" href="Service.uml#_9m-qsCC6Eemw1L3J4dNy4w"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_9v9nkiC6Eemw1L3J4dNy4w" points="[520, 420, -643984, -643984]$[520, 460, -643984, -643984]$[900, 460, -643984, -643984]$[900, 420, -643984, -643984]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-CEEMCC6Eemw1L3J4dNy4w" id="(0.19900497512437812,1.0)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-CEEMSC6Eemw1L3J4dNy4w" id="(0.7960199004975125,1.0)"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_h6SEsCC7Eemw1L3J4dNy4w" type="Association_Edge" source="_Yz45gB9eEemLMI6HKP6Lbw" target="_jBdysB9cEemLMI6HKP6Lbw">
+ <children xmi:type="notation:DecorationNode" xmi:id="_h6SEsyC7Eemw1L3J4dNy4w" type="Association_StereotypeLabel">
+ <styles xmi:type="notation:BooleanValueStyle" xmi:id="_jGjqkCC7Eemw1L3J4dNy4w" name="IS_UPDATED_POSITION" booleanValue="true"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_h6SEtCC7Eemw1L3J4dNy4w" x="1" y="-18"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_h6SEtSC7Eemw1L3J4dNy4w" type="Association_NameLabel">
+ <styles xmi:type="notation:BooleanValueStyle" xmi:id="_jQJrcCC7Eemw1L3J4dNy4w" name="IS_UPDATED_POSITION" booleanValue="true"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_h6SEtiC7Eemw1L3J4dNy4w" x="10" y="-13"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_h6SEtyC7Eemw1L3J4dNy4w" visible="false" type="Association_TargetRoleLabel">
+ <styles xmi:type="notation:BooleanValueStyle" xmi:id="_jZnJcCC7Eemw1L3J4dNy4w" name="IS_UPDATED_POSITION" booleanValue="true"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_h6SEuCC7Eemw1L3J4dNy4w" x="-3" y="78"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_h6SEuSC7Eemw1L3J4dNy4w" visible="false" type="Association_SourceRoleLabel">
+ <styles xmi:type="notation:BooleanValueStyle" xmi:id="_jjFOgCC7Eemw1L3J4dNy4w" name="IS_UPDATED_POSITION" booleanValue="true"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_h6SEuiC7Eemw1L3J4dNy4w" x="-111" y="19"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_h6SEuyC7Eemw1L3J4dNy4w" type="Association_SourceMultiplicityLabel">
+ <styles xmi:type="notation:BooleanValueStyle" xmi:id="_jskhsCC7Eemw1L3J4dNy4w" name="IS_UPDATED_POSITION" booleanValue="true"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_h6SEvCC7Eemw1L3J4dNy4w" x="7" y="15"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_h6SEvSC7Eemw1L3J4dNy4w" type="Association_TargetMultiplicityLabel">
+ <styles xmi:type="notation:BooleanValueStyle" xmi:id="_j2FqECC7Eemw1L3J4dNy4w" name="IS_UPDATED_POSITION" booleanValue="true"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_h6SEviC7Eemw1L3J4dNy4w" x="-7" y="25"/>
+ </children>
+ <styles xmi:type="notation:FontStyle" xmi:id="_h6SEsSC7Eemw1L3J4dNy4w"/>
+ <element xmi:type="uml:Association" href="Service.uml#_hxFFYCC7Eemw1L3J4dNy4w"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_h6SEsiC7Eemw1L3J4dNy4w" points="[380, 420, -643984, -643984]$[380, 520, -643984, -643984]$[1020, 520, -643984, -643984]$[1020, 420, -643984, -643984]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_iMi5YCC7Eemw1L3J4dNy4w" id="(0.6965174129353234,1.0)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_iMi5YSC7Eemw1L3J4dNy4w" id="(0.19900497512437812,1.0)"/>
</edges>
</notation:Diagram>
</xmi:XMI>
diff --git a/papyrus/ONAP Information Model/Service.uml b/papyrus/ONAP Information Model/Service.uml
index caa89f0..aa853b4 100644
--- a/papyrus/ONAP Information Model/Service.uml
+++ b/papyrus/ONAP Information Model/Service.uml
@@ -2,39 +2,6 @@
<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:OpenModel_Profile="http:///schemas/OpenModel_Profile/_zWCisKVxEeikF6xsfT18UA/26" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http:///schemas/OpenModel_Profile/_zWCisKVxEeikF6xsfT18UA/26 OpenModel_Profile.profile.uml#_zWYg8KVxEeikF6xsfT18UA">
<uml:Package xmi:id="_Z4LYcDOHEei5Af8DcjrhIQ" name="Service" visibility="public">
<packagedElement xmi:type="uml:Package" xmi:id="_fXMl4DOHEei5Af8DcjrhIQ" name="Associations">
- <packagedElement xmi:type="uml:Association" xmi:id="_2PSc8D0UEeiWMf5FLWfdLA" name="ServiceDescriptorMadeAvailableAs" memberEnd="_2PU5Mj0UEeiWMf5FLWfdLA _2PXVcj0UEeiWMf5FLWfdLA">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_2PU5MD0UEeiWMf5FLWfdLA" source="org.eclipse.papyrus">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_2PU5MT0UEeiWMf5FLWfdLA" key="nature" value="UML_Nature"/>
- </eAnnotations>
- <ownedEnd xmi:type="uml:Property" xmi:id="_2PXVcj0UEeiWMf5FLWfdLA" name="_serviceDescriptor" type="_Jvy-QD0MEeiWMf5FLWfdLA" association="_2PSc8D0UEeiWMf5FLWfdLA"/>
- </packagedElement>
- <packagedElement xmi:type="uml:Association" xmi:id="_JuGmED0VEeiWMf5FLWfdLA" name="ServiceComposedOf" memberEnd="_JuJCUj0VEeiWMf5FLWfdLA _JuMssT0VEeiWMf5FLWfdLA">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_JuJCUD0VEeiWMf5FLWfdLA" source="org.eclipse.papyrus">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_JuJCUT0VEeiWMf5FLWfdLA" key="nature" value="UML_Nature"/>
- </eAnnotations>
- <ownedEnd xmi:type="uml:Property" xmi:id="_JuMssT0VEeiWMf5FLWfdLA" name="_serviceInstance" type="_HFfXUD0QEeiWMf5FLWfdLA" association="_JuGmED0VEeiWMf5FLWfdLA">
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_rzpvED0VEeiWMf5FLWfdLA"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_r0FM4D0VEeiWMf5FLWfdLA" value="*"/>
- </ownedEnd>
- </packagedElement>
- <packagedElement xmi:type="uml:Association" xmi:id="_INm8UD0YEeiWMf5FLWfdLA" name="ServiceComposedOf" memberEnd="_IN86kj0YEeiWMf5FLWfdLA _IN_W0j0YEeiWMf5FLWfdLA">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IN86kD0YEeiWMf5FLWfdLA" source="org.eclipse.papyrus">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IN86kT0YEeiWMf5FLWfdLA" key="nature" value="UML_Nature"/>
- </eAnnotations>
- <ownedEnd xmi:type="uml:Property" xmi:id="_IN_W0j0YEeiWMf5FLWfdLA" name="_serviceDescriptor" type="_Jvy-QD0MEeiWMf5FLWfdLA" association="_INm8UD0YEeiWMf5FLWfdLA">
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Shg1ED0YEeiWMf5FLWfdLA"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Sh9hAD0YEeiWMf5FLWfdLA" value="*"/>
- </ownedEnd>
- </packagedElement>
- <packagedElement xmi:type="uml:Association" xmi:id="_aQvxoD0YEeiWMf5FLWfdLA" name="ServiceComponentComprisedOf" memberEnd="_aQxm0j0YEeiWMf5FLWfdLA _aQ0DET0YEeiWMf5FLWfdLA">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_aQxm0D0YEeiWMf5FLWfdLA" source="org.eclipse.papyrus">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_aQxm0T0YEeiWMf5FLWfdLA" key="nature" value="UML_Nature"/>
- </eAnnotations>
- <ownedEnd xmi:type="uml:Property" xmi:id="_aQ0DET0YEeiWMf5FLWfdLA" name="_serviceComponentDescriptor" type="_7SrB0D0VEeiWMf5FLWfdLA" association="_aQvxoD0YEeiWMf5FLWfdLA">
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0HIg0D0YEeiWMf5FLWfdLA"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0HiJcD0YEeiWMf5FLWfdLA" value="*"/>
- </ownedEnd>
- </packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="_Ihl9ID25Eeiu6I5JfRTxxQ" name="DependenciesHasPrimaryProfileReference" memberEnd="_IhnyUT25Eeiu6I5JfRTxxQ _Ihq1oD25Eeiu6I5JfRTxxQ">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IhnLQD25Eeiu6I5JfRTxxQ" source="org.eclipse.papyrus">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IhnyUD25Eeiu6I5JfRTxxQ" key="nature" value="UML_Nature"/>
@@ -193,13 +160,17 @@
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_AcqQoKuGEeiRK6iIVq4LZA" source="org.eclipse.papyrus">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_AcqQoauGEeiRK6iIVq4LZA" key="nature" value="UML_Nature"/>
</eAnnotations>
- <ownedEnd xmi:type="uml:Property" xmi:id="_AcqQpquGEeiRK6iIVq4LZA" name="servicecompositedescriptor" type="_OfhrQKuCEeiRK6iIVq4LZA" association="_AchGsKuGEeiRK6iIVq4LZA"/>
+ <ownedEnd xmi:type="uml:Property" xmi:id="_AcqQpquGEeiRK6iIVq4LZA" name="servicecompositedescriptor" type="_7SrB0D0VEeiWMf5FLWfdLA" association="_AchGsKuGEeiRK6iIVq4LZA"/>
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="_L-PS4KuFEeiRK6iIVq4LZA" name="ServiceCompositeInstanceHasServiceInstance" memberEnd="_L-PS46uFEeiRK6iIVq4LZA _L-ZD4quFEeiRK6iIVq4LZA">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_L-PS4auFEeiRK6iIVq4LZA" source="org.eclipse.papyrus">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_L-PS4quFEeiRK6iIVq4LZA" key="nature" value="UML_Nature"/>
</eAnnotations>
<ownedEnd xmi:type="uml:Property" xmi:id="_L-ZD4quFEeiRK6iIVq4LZA" name="servicecompositeinstance" type="_YBdfEKuDEeiRK6iIVq4LZA" association="_L-PS4KuFEeiRK6iIVq4LZA"/>
+ <ownedEnd xmi:type="uml:Property" xmi:id="_L-PS46uFEeiRK6iIVq4LZA" name="serviceinstance" type="_HFfXUD0QEeiWMf5FLWfdLA" aggregation="shared" association="_L-PS4KuFEeiRK6iIVq4LZA">
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_L-ZD4KuFEeiRK6iIVq4LZA" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_L-ZD4auFEeiRK6iIVq4LZA" value="*"/>
+ </ownedEnd>
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="_ZzapcJDrEei9Vqs7Ti8Wxg" name="ServiceDescriptorHasAttachments" memberEnd="_Zze64JDrEei9Vqs7Ti8Wxg _ZzrIIJDrEei9Vqs7Ti8Wxg">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ZzdswJDrEei9Vqs7Ti8Wxg" source="org.eclipse.papyrus">
@@ -270,7 +241,7 @@
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ejqSQM4pEeinDdlk3ffduQ" source="org.eclipse.papyrus">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ejq5UM4pEeinDdlk3ffduQ" key="nature" value="UML_Nature"/>
</eAnnotations>
- <ownedEnd xmi:type="uml:Property" xmi:id="_ej47wM4pEeinDdlk3ffduQ" name="servicecompositedescriptor" type="_OfhrQKuCEeiRK6iIVq4LZA" association="_ejprMM4pEeinDdlk3ffduQ"/>
+ <ownedEnd xmi:type="uml:Property" xmi:id="_ej47wM4pEeinDdlk3ffduQ" name="servicecompositedescriptor" type="_7SrB0D0VEeiWMf5FLWfdLA" association="_ejprMM4pEeinDdlk3ffduQ"/>
</packagedElement>
<packagedElement xmi:type="uml:AssociationClass" xmi:id="_MnBKUMGjEeiS695oPTRE1Q" name="OrderRelationship" memberEnd="_MnE0scGjEeiS695oPTRE1Q _MnGp4MGjEeiS695oPTRE1Q">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_MnENoMGjEeiS695oPTRE1Q" source="org.eclipse.papyrus">
@@ -405,6 +376,39 @@
</eAnnotations>
<ownedEnd xmi:type="uml:Property" xmi:id="_va7aMRg_EembeqMx64UEWQ" name="internalservicedescriptor" type="_W1wF4OgIEeiNE-az-riPDQ" association="_vaul4Bg_EembeqMx64UEWQ"/>
</packagedElement>
+ <packagedElement xmi:type="uml:Association" xmi:id="_hxFFYCC7Eemw1L3J4dNy4w" name="SerivceCompositeDescriptorMadeAvailableAsServiceCompositeInstance" memberEnd="_hxFsciC7Eemw1L3J4dNy4w _hxLzECC7Eemw1L3J4dNy4w">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_hxFscCC7Eemw1L3J4dNy4w" source="org.eclipse.papyrus">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hxFscSC7Eemw1L3J4dNy4w" key="nature" value="UML_Nature"/>
+ </eAnnotations>
+ <ownedEnd xmi:type="uml:Property" xmi:id="_hxFsciC7Eemw1L3J4dNy4w" name="servicecompositeinstance" type="_YBdfEKuDEeiRK6iIVq4LZA" aggregation="shared" association="_hxFFYCC7Eemw1L3J4dNy4w">
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_HDJ0wCC8Eemw1L3J4dNy4w"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_HDaTcCC8Eemw1L3J4dNy4w" value="*"/>
+ </ownedEnd>
+ <ownedEnd xmi:type="uml:Property" xmi:id="_hxLzECC7Eemw1L3J4dNy4w" name="service compositedescriptor" type="_7SrB0D0VEeiWMf5FLWfdLA" association="_hxFFYCC7Eemw1L3J4dNy4w"/>
+ </packagedElement>
+ <packagedElement xmi:type="uml:Association" xmi:id="_6lxVwCC1Eemw1L3J4dNy4w" name="ServiceDescCompositeComprisedOfServiceDescriptor" memberEnd="_6lzyACC1Eemw1L3J4dNy4w _6l54oCC1Eemw1L3J4dNy4w">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6lzK8CC1Eemw1L3J4dNy4w" source="org.eclipse.papyrus">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6lzK8SC1Eemw1L3J4dNy4w" key="nature" value="UML_Nature"/>
+ </eAnnotations>
+ <ownedEnd xmi:type="uml:Property" xmi:id="_6l54oCC1Eemw1L3J4dNy4w" name="service compositedescriptor" type="_7SrB0D0VEeiWMf5FLWfdLA" association="_6lxVwCC1Eemw1L3J4dNy4w">
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_KkKsICC2Eemw1L3J4dNy4w"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KktesCC2Eemw1L3J4dNy4w" value="*"/>
+ </ownedEnd>
+ <ownedEnd xmi:type="uml:Property" xmi:id="_6lzyACC1Eemw1L3J4dNy4w" name="servicedescriptor" type="_Jvy-QD0MEeiWMf5FLWfdLA" aggregation="shared" association="_6lxVwCC1Eemw1L3J4dNy4w">
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_JNo-ECC2Eemw1L3J4dNy4w"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_JOddcCC2Eemw1L3J4dNy4w" value="*"/>
+ </ownedEnd>
+ </packagedElement>
+ <packagedElement xmi:type="uml:Association" xmi:id="_9m-qsCC6Eemw1L3J4dNy4w" name="ServiceAtomicDescriptorMadeAvailableAsServiceAtomicInstance" memberEnd="_9nAf4CC6Eemw1L3J4dNy4w _9nF_cCC6Eemw1L3J4dNy4w">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_9m_40CC6Eemw1L3J4dNy4w" source="org.eclipse.papyrus">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_9m_40SC6Eemw1L3J4dNy4w" key="nature" value="UML_Nature"/>
+ </eAnnotations>
+ <ownedEnd xmi:type="uml:Property" xmi:id="_9nF_cCC6Eemw1L3J4dNy4w" name="serviceatomicdescriptor" type="_AAwUkKuCEeiRK6iIVq4LZA" association="_9m-qsCC6Eemw1L3J4dNy4w"/>
+ <ownedEnd xmi:type="uml:Property" xmi:id="_9nAf4CC6Eemw1L3J4dNy4w" name="serviceatomicinstance" type="_XCul8KuDEeiRK6iIVq4LZA" aggregation="shared" association="_9m-qsCC6Eemw1L3J4dNy4w">
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_U0AK8CC7Eemw1L3J4dNy4w"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_U0YlcCC7Eemw1L3J4dNy4w" value="*"/>
+ </ownedEnd>
+ </packagedElement>
</packagedElement>
<packagedElement xmi:type="uml:Package" xmi:id="_fXNM8DOHEei5Af8DcjrhIQ" name="Diagrams">
<ownedComment xmi:type="uml:Comment" xmi:id="_eIxScJAiEei1uKE-hf_HvQ">
@@ -432,6 +436,15 @@
Chuyi to then work on service descriptor attributes next week (after papyrus model fix).&#xD;
</body>
</ownedComment>
+ <ownedComment xmi:type="uml:Comment" xmi:id="_9GRfcCC8Eemw1L3J4dNy4w">
+ <body>found 2 ServiceCompositeDescriptors - deleted down to 1</body>
+ </ownedComment>
+ <ownedComment xmi:type="uml:Comment" xmi:id="_ZFF6wCC9Eemw1L3J4dNy4w">
+ <body>Removed recursive associations, given we are using the composite/atomic pattern.</body>
+ </ownedComment>
+ <ownedComment xmi:type="uml:Comment" xmi:id="_ehLI8CC9Eemw1L3J4dNy4w">
+ <body>Do we need this diagram?</body>
+ </ownedComment>
</packagedElement>
<packagedElement xmi:type="uml:Package" xmi:id="_fXNM8TOHEei5Af8DcjrhIQ" name="Interfaces"/>
<packagedElement xmi:type="uml:Package" xmi:id="_fXN0ADOHEei5Af8DcjrhIQ" name="ObjectClasses">
@@ -494,7 +507,7 @@ NOTE: NFV Management and Orchestration functions shall instantiate VNFs from th
<general xmi:type="uml:Class" href="Common.uml#_8naVoES0EeiVGPeZpaYNtQ"/>
</generalization>
</packagedElement>
- <packagedElement xmi:type="uml:Class" xmi:id="_Jvy-QD0MEeiWMf5FLWfdLA" name="ServiceDescriptor" visibility="package">
+ <packagedElement xmi:type="uml:Class" xmi:id="_Jvy-QD0MEeiWMf5FLWfdLA" name="ServiceDescriptor" visibility="package" isAbstract="true">
<ownedComment xmi:type="uml:Comment" xmi:id="_R35GwD0MEeiWMf5FLWfdLA" annotatedElement="_Jvy-QD0MEeiWMf5FLWfdLA">
<body>ServiceDescriptor is used to model the design time representation of a service. </body>
</ownedComment>
@@ -562,14 +575,6 @@ NOTE: NFV Management and Orchestration functions shall instantiate VNFs from th
</ownedComment>
<type xmi:type="uml:PrimitiveType" href="Common.uml#_YQwQ0D0NEeiWMf5FLWfdLA"/>
</ownedAttribute>
- <ownedAttribute xmi:type="uml:Property" xmi:id="_2PU5Mj0UEeiWMf5FLWfdLA" name="_serviceInstance" type="_HFfXUD0QEeiWMf5FLWfdLA" association="_2PSc8D0UEeiWMf5FLWfdLA">
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2PXVcD0UEeiWMf5FLWfdLA"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2PXVcT0UEeiWMf5FLWfdLA" value="*"/>
- </ownedAttribute>
- <ownedAttribute xmi:type="uml:Property" xmi:id="_IN86kj0YEeiWMf5FLWfdLA" name="_serviceComponentDescriptor" type="_7SrB0D0VEeiWMf5FLWfdLA" aggregation="shared" association="_INm8UD0YEeiWMf5FLWfdLA">
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_IN_W0D0YEeiWMf5FLWfdLA" value="1"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_IN_W0T0YEeiWMf5FLWfdLA" value="*"/>
- </ownedAttribute>
<ownedAttribute xmi:type="uml:Property" xmi:id="_Zze64JDrEei9Vqs7Ti8Wxg" name="attachment" type="_nrfckI93EeiT7tMsBl6xjA" aggregation="composite" association="_ZzapcJDrEei9Vqs7Ti8Wxg">
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ZzkacJDrEei9Vqs7Ti8Wxg"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Zzm2sJDrEei9Vqs7Ti8Wxg" value="*"/>
@@ -579,7 +584,7 @@ NOTE: NFV Management and Orchestration functions shall instantiate VNFs from th
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_IKsFIM4pEeinDdlk3ffduQ" value="*"/>
</ownedAttribute>
</packagedElement>
- <packagedElement xmi:type="uml:Class" xmi:id="_HFfXUD0QEeiWMf5FLWfdLA" name="ServiceInstance">
+ <packagedElement xmi:type="uml:Class" xmi:id="_HFfXUD0QEeiWMf5FLWfdLA" name="ServiceInstance" isAbstract="true">
<ownedComment xmi:type="uml:Comment" xmi:id="_cnoqID0QEeiWMf5FLWfdLA" annotatedElement="_HFfXUD0QEeiWMf5FLWfdLA">
<body>ServiceInstance is used to model the run time representation of a service. </body>
</ownedComment>
@@ -651,10 +656,6 @@ NOTE: NFV Management and Orchestration functions shall instantiate VNFs from th
</ownedComment>
<type xmi:type="uml:DataType" href="Common.uml#_AuYtcDkBEeiWMf5FLWfdLA"/>
</ownedAttribute>
- <ownedAttribute xmi:type="uml:Property" xmi:id="_JuJCUj0VEeiWMf5FLWfdLA" name="_serviceInstance" type="_HFfXUD0QEeiWMf5FLWfdLA" aggregation="shared" association="_JuGmED0VEeiWMf5FLWfdLA">
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_JuMFoD0VEeiWMf5FLWfdLA"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_JuMssD0VEeiWMf5FLWfdLA" value="*"/>
- </ownedAttribute>
<ownedAttribute xmi:type="uml:Property" xmi:id="_1Rt9wPL4EeiazPylpq3fUA" name="vfcStatus">
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
</ownedAttribute>
@@ -664,6 +665,7 @@ NOTE: NFV Management and Orchestration functions shall instantiate VNFs from th
<body>ServcieComponentDescriptor is used to model the design time representation of a service component or network service.</body>
</ownedComment>
<generalization xmi:type="uml:Generalization" xmi:id="_yX44MB9eEemLMI6HKP6Lbw" general="_Jvy-QD0MEeiWMf5FLWfdLA"/>
+ <generalization xmi:type="uml:Generalization" xmi:id="_0KAlEM4oEeinDdlk3ffduQ" general="_Jvy-QD0MEeiWMf5FLWfdLA"/>
<ownedAttribute xmi:type="uml:Property" xmi:id="_cK6DID0WEeiWMf5FLWfdLA" name="invariantUuid" visibility="public">
<ownedComment xmi:type="uml:Comment" xmi:id="_jydDUD0WEeiWMf5FLWfdLA" annotatedElement="_cK6DID0WEeiWMf5FLWfdLA">
<body>Constant identifier of the Service Component model.</body>
@@ -700,9 +702,13 @@ NOTE: NFV Management and Orchestration functions shall instantiate VNFs from th
</ownedComment>
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
</ownedAttribute>
- <ownedAttribute xmi:type="uml:Property" xmi:id="_aQxm0j0YEeiWMf5FLWfdLA" name="_serviceComponentDescriptor" type="_7SrB0D0VEeiWMf5FLWfdLA" aggregation="shared" association="_aQvxoD0YEeiWMf5FLWfdLA">
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_aQzcAD0YEeiWMf5FLWfdLA"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_aQ0DED0YEeiWMf5FLWfdLA" value="*"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_ejq5Uc4pEeinDdlk3ffduQ" name="servicedescriptor" type="_Jvy-QD0MEeiWMf5FLWfdLA" aggregation="shared" association="_ejprMM4pEeinDdlk3ffduQ">
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ej3toM4pEeinDdlk3ffduQ" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ej4UsM4pEeinDdlk3ffduQ" value="*"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_AcqQoquGEeiRK6iIVq4LZA" name="servicecompositeinstance" type="_YBdfEKuDEeiRK6iIVq4LZA" association="_AchGsKuGEeiRK6iIVq4LZA">
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_AcqQpKuGEeiRK6iIVq4LZA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_AcqQpauGEeiRK6iIVq4LZA" value="*"/>
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="_mrJV8In9EeiOe-BKGdv_Yg" name="ServiceOrder">
@@ -910,23 +916,8 @@ NOTE: NFV Management and Orchestration functions shall instantiate VNFs from th
<body>A ServiceCatalog is a collection of ServiceCandidates representing ServiceSpecifications. ServiceCandidates define the underlying services that support a ProductOffering. ServiceCandidates are exposed to one or more Product Catalogs to be utilized to configure one or more ProductOfferings. ServiceCandidates can be exposed to one or more Service Catalogs to be utilized or incorporated in one or more ServiceCandidates. A collection may consist of similar ServiceCandidates, such as a collection of broadband ServiceCatalogCandidates or a collection of wireless ServiceCatalogCandidates. A Service Catalog contents can expose a collection of ServiceCandidates to be utilized internal/external to an enterprise.</body>
</ownedComment>
</packagedElement>
- <packagedElement xmi:type="uml:Class" xmi:id="_OfhrQKuCEeiRK6iIVq4LZA" name="ServiceCompositeDescriptor">
- <generalization xmi:type="uml:Generalization" xmi:id="_0KAlEM4oEeinDdlk3ffduQ" general="_Jvy-QD0MEeiWMf5FLWfdLA"/>
- <ownedAttribute xmi:type="uml:Property" xmi:id="_AcqQoquGEeiRK6iIVq4LZA" name="servicecompositeinstance" type="_YBdfEKuDEeiRK6iIVq4LZA" association="_AchGsKuGEeiRK6iIVq4LZA">
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_AcqQpKuGEeiRK6iIVq4LZA"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_AcqQpauGEeiRK6iIVq4LZA" value="*"/>
- </ownedAttribute>
- <ownedAttribute xmi:type="uml:Property" xmi:id="_ejq5Uc4pEeinDdlk3ffduQ" name="servicedescriptor" type="_Jvy-QD0MEeiWMf5FLWfdLA" aggregation="shared" association="_ejprMM4pEeinDdlk3ffduQ">
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ej3toM4pEeinDdlk3ffduQ" value="1"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ej4UsM4pEeinDdlk3ffduQ" value="*"/>
- </ownedAttribute>
- </packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="_YBdfEKuDEeiRK6iIVq4LZA" name="ServiceCompositeInstance">
<generalization xmi:type="uml:Generalization" xmi:id="_pmW5MKuDEeiRK6iIVq4LZA" general="_HFfXUD0QEeiWMf5FLWfdLA"/>
- <ownedAttribute xmi:type="uml:Property" xmi:id="_L-PS46uFEeiRK6iIVq4LZA" name="serviceinstance" type="_HFfXUD0QEeiWMf5FLWfdLA" aggregation="shared" association="_L-PS4KuFEeiRK6iIVq4LZA">
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_L-ZD4KuFEeiRK6iIVq4LZA" value="1"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_L-ZD4auFEeiRK6iIVq4LZA" value="*"/>
- </ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="_UWL1gMDfEeiebIKjAGZWdA" name="ServiceCharacteristic">
<ownedAttribute xmi:type="uml:Property" xmi:id="_gEq14MDfEeiebIKjAGZWdA" name="name">
@@ -1643,10 +1634,6 @@ If null, then represents to the end of time&#xD;
<OpenModel_Profile:OpenModelAttribute xmi:id="_-fa8kD0TEeiWMf5FLWfdLA" base_StructuralFeature="_-faVgD0TEeiWMf5FLWfdLA"/>
<OpenModel_Profile:OpenModelAttribute xmi:id="_GtqJUT0UEeiWMf5FLWfdLA" base_StructuralFeature="_GtqJUD0UEeiWMf5FLWfdLA"/>
<OpenModel_Profile:OpenModelAttribute xmi:id="_VRZfkT0UEeiWMf5FLWfdLA" base_StructuralFeature="_VRZfkD0UEeiWMf5FLWfdLA"/>
- <OpenModel_Profile:OpenModelAttribute xmi:id="_2PU5Mz0UEeiWMf5FLWfdLA" base_StructuralFeature="_2PU5Mj0UEeiWMf5FLWfdLA"/>
- <OpenModel_Profile:OpenModelAttribute xmi:id="_2PXVcz0UEeiWMf5FLWfdLA" base_StructuralFeature="_2PXVcj0UEeiWMf5FLWfdLA"/>
- <OpenModel_Profile:OpenModelAttribute xmi:id="_JuJpYD0VEeiWMf5FLWfdLA" base_StructuralFeature="_JuJCUj0VEeiWMf5FLWfdLA"/>
- <OpenModel_Profile:OpenModelAttribute xmi:id="_JuMssj0VEeiWMf5FLWfdLA" base_StructuralFeature="_JuMssT0VEeiWMf5FLWfdLA"/>
<OpenModel_Profile:OpenModelClass xmi:id="_7Sro4D0VEeiWMf5FLWfdLA" base_Class="_7SrB0D0VEeiWMf5FLWfdLA"/>
<OpenModel_Profile:OpenModelAttribute xmi:id="_cK6DIT0WEeiWMf5FLWfdLA" base_StructuralFeature="_cK6DID0WEeiWMf5FLWfdLA"/>
<OpenModel_Profile:OpenModelAttribute xmi:id="_2UO8cT0WEeiWMf5FLWfdLA" base_StructuralFeature="_2UO8cD0WEeiWMf5FLWfdLA"/>
@@ -1654,10 +1641,6 @@ If null, then represents to the end of time&#xD;
<OpenModel_Profile:OpenModelAttribute xmi:id="_Fg7JET0XEeiWMf5FLWfdLA" base_StructuralFeature="_Fg7JED0XEeiWMf5FLWfdLA"/>
<OpenModel_Profile:OpenModelAttribute xmi:id="_SXGKQT0XEeiWMf5FLWfdLA" base_StructuralFeature="_SXGKQD0XEeiWMf5FLWfdLA"/>
<OpenModel_Profile:OpenModelAttribute xmi:id="_aEodsD0XEeiWMf5FLWfdLA" base_StructuralFeature="_aEn2oD0XEeiWMf5FLWfdLA"/>
- <OpenModel_Profile:OpenModelAttribute xmi:id="_IN9hoD0YEeiWMf5FLWfdLA" base_StructuralFeature="_IN86kj0YEeiWMf5FLWfdLA"/>
- <OpenModel_Profile:OpenModelAttribute xmi:id="_IN_94D0YEeiWMf5FLWfdLA" base_StructuralFeature="_IN_W0j0YEeiWMf5FLWfdLA"/>
- <OpenModel_Profile:OpenModelAttribute xmi:id="_aQxm0z0YEeiWMf5FLWfdLA" base_StructuralFeature="_aQxm0j0YEeiWMf5FLWfdLA"/>
- <OpenModel_Profile:OpenModelAttribute xmi:id="_aQ0DEj0YEeiWMf5FLWfdLA" base_StructuralFeature="_aQ0DET0YEeiWMf5FLWfdLA"/>
<OpenModel_Profile:OpenModelAttribute xmi:id="_nvasYKe3Eeixw5Ke5QD1pQ">
<base_StructuralFeature xmi:type="uml:Property" href="Ns.uml#_YX8Ikj2qEeiu6I5JfRTxxQ"/>
</OpenModel_Profile:OpenModelAttribute>
@@ -1998,7 +1981,6 @@ If null, then represents to the end of time&#xD;
<base_Element xmi:type="uml:Class" href="Pnf.uml#_GYYOwDzFEeiWMf5FLWfdLA"/>
</OpenModel_Profile:Future>
<OpenModel_Profile:OpenModelClass xmi:id="_AAwUkauCEeiRK6iIVq4LZA" base_Class="_AAwUkKuCEeiRK6iIVq4LZA"/>
- <OpenModel_Profile:OpenModelClass xmi:id="_OfhrQauCEeiRK6iIVq4LZA" base_Class="_OfhrQKuCEeiRK6iIVq4LZA"/>
<OpenModel_Profile:OpenModelClass xmi:id="_XCul8auDEeiRK6iIVq4LZA" base_Class="_XCul8KuDEeiRK6iIVq4LZA"/>
<OpenModel_Profile:OpenModelClass xmi:id="_YBnQEKuDEeiRK6iIVq4LZA" base_Class="_YBdfEKuDEeiRK6iIVq4LZA"/>
<OpenModel_Profile:OpenModelAttribute xmi:id="_L-PS5KuFEeiRK6iIVq4LZA" base_StructuralFeature="_L-PS46uFEeiRK6iIVq4LZA"/>
@@ -2097,4 +2079,11 @@ If null, then represents to the end of time&#xD;
<OpenModel_Profile:OpenModelAttribute xmi:id="_MbCpwfL5EeiazPylpq3fUA" base_StructuralFeature="_MbCpwPL5EeiazPylpq3fUA"/>
<OpenModel_Profile:OpenModelAttribute xmi:id="_va5lABg_EembeqMx64UEWQ" base_StructuralFeature="_va498Bg_EembeqMx64UEWQ"/>
<OpenModel_Profile:OpenModelAttribute xmi:id="_va8BQBg_EembeqMx64UEWQ" base_StructuralFeature="_va7aMRg_EembeqMx64UEWQ"/>
+ <OpenModel_Profile:OpenModelAttribute xmi:id="_6lzyASC1Eemw1L3J4dNy4w" base_StructuralFeature="_6lzyACC1Eemw1L3J4dNy4w"/>
+ <OpenModel_Profile:OpenModelAttribute xmi:id="_6l54oSC1Eemw1L3J4dNy4w" base_StructuralFeature="_6l54oCC1Eemw1L3J4dNy4w"/>
+ <OpenModel_Profile:OpenModelAttribute xmi:id="_9nAf4SC6Eemw1L3J4dNy4w" base_StructuralFeature="_9nAf4CC6Eemw1L3J4dNy4w"/>
+ <OpenModel_Profile:OpenModelAttribute xmi:id="_9nF_cSC6Eemw1L3J4dNy4w" base_StructuralFeature="_9nF_cCC6Eemw1L3J4dNy4w"/>
+ <OpenModel_Profile:OpenModelAttribute xmi:id="_hxFscyC7Eemw1L3J4dNy4w" base_StructuralFeature="_hxFsciC7Eemw1L3J4dNy4w"/>
+ <OpenModel_Profile:OpenModelAttribute xmi:id="_hxLzESC7Eemw1L3J4dNy4w" base_StructuralFeature="_hxLzECC7Eemw1L3J4dNy4w"/>
+ <OpenModel_Profile:OpenModelAttribute xmi:id="_f1WjECC8Eemw1L3J4dNy4w" base_StructuralFeature="_yKYPgMhdEeiSA51ssKbbgA"/>
</xmi:XMI>