summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--papyrus/ONAP Information Model/Common.notation95
-rw-r--r--papyrus/ONAP Information Model/Common.uml21
-rw-r--r--papyrus/ONAP Information Model/Service.notation541
-rw-r--r--papyrus/ONAP Information Model/Service.uml180
-rw-r--r--papyrus/ONAP Information Model/Vnf.notation254
-rw-r--r--papyrus/ONAP Information Model/Vnf.uml66
6 files changed, 748 insertions, 409 deletions
diff --git a/papyrus/ONAP Information Model/Common.notation b/papyrus/ONAP Information Model/Common.notation
index d5c57e8..e0e20f4 100644
--- a/papyrus/ONAP Information Model/Common.notation
+++ b/papyrus/ONAP Information Model/Common.notation
@@ -2734,7 +2734,7 @@
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_X21skonbEeiOe-BKGdv_Yg"/>
</children>
<element xmi:type="uml:Class" href="Common.uml#_PmIOkH7uEeifJIHxnlj6Cg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_X2o4QYnbEeiOe-BKGdv_Yg" x="40" y="216" height="61"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_X2o4QYnbEeiOe-BKGdv_Yg" x="920" y="160" height="61"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_X27MIInbEeiOe-BKGdv_Yg" type="StereotypeComment">
<styles xmi:type="notation:TitleStyle" xmi:id="_X27MIYnbEeiOe-BKGdv_Yg"/>
@@ -3181,6 +3181,54 @@
<element xsi:nil="true"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_dAMLQrBXEeix4eA61SHRMQ" x="1180" y="256"/>
</children>
+ <children xmi:type="notation:Shape" xmi:id="_7UCgQMGaEeiS695oPTRE1Q" type="Class_Shape">
+ <children xmi:type="notation:DecorationNode" xmi:id="_7UDHUMGaEeiS695oPTRE1Q" type="Class_NameLabel"/>
+ <children xmi:type="notation:DecorationNode" xmi:id="_7UDHUcGaEeiS695oPTRE1Q" type="Class_FloatingNameLabel">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_7UDHUsGaEeiS695oPTRE1Q" y="15"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_7UDHU8GaEeiS695oPTRE1Q" type="Class_AttributeCompartment">
+ <children xmi:type="notation:Shape" xmi:id="_COi0QMGbEeiS695oPTRE1Q" type="Property_ClassAttributeLabel">
+ <children xmi:type="notation:DecorationNode" xmi:id="_CTN44MGbEeiS695oPTRE1Q" visible="false" type="StereotypeLabel">
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_CTN44cGbEeiS695oPTRE1Q" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+ <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CTN44sGbEeiS695oPTRE1Q"/>
+ </children>
+ <element xmi:type="uml:Property" href="Common.uml#_CJjmkMGbEeiS695oPTRE1Q"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_COi0QcGbEeiS695oPTRE1Q"/>
+ </children>
+ <styles xmi:type="notation:TitleStyle" xmi:id="_7UDHVMGaEeiS695oPTRE1Q"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_7UDHVcGaEeiS695oPTRE1Q"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_7UDHVsGaEeiS695oPTRE1Q"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7UDHV8GaEeiS695oPTRE1Q"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_7UDHWMGaEeiS695oPTRE1Q" visible="false" type="Class_OperationCompartment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_7UDHWcGaEeiS695oPTRE1Q"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_7UDHWsGaEeiS695oPTRE1Q"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_7UDHW8GaEeiS695oPTRE1Q"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7UDHXMGaEeiS695oPTRE1Q"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_7UDHXcGaEeiS695oPTRE1Q" visible="false" type="Class_NestedClassifierCompartment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_7UDHXsGaEeiS695oPTRE1Q"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_7UDHX8GaEeiS695oPTRE1Q"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_7UDHYMGaEeiS695oPTRE1Q"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7UDHYcGaEeiS695oPTRE1Q"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_7UIm4MGaEeiS695oPTRE1Q" visible="false" type="StereotypeLabel">
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_7UIm4cGaEeiS695oPTRE1Q" name="stereotype" stringValue="OpenModel_Profile::OpenModelClass"/>
+ <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7UIm4sGaEeiS695oPTRE1Q"/>
+ </children>
+ <element xmi:type="uml:Class" href="Common.uml#_7SeaAMGaEeiS695oPTRE1Q"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7UCgQcGaEeiS695oPTRE1Q" x="840" y="340"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_7UIm7sGaEeiS695oPTRE1Q" type="StereotypeComment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_7UIm78GaEeiS695oPTRE1Q"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_7UIm8cGaEeiS695oPTRE1Q" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="Common.uml#_7SeaAMGaEeiS695oPTRE1Q"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7UIm8MGaEeiS695oPTRE1Q" x="200"/>
+ </children>
<styles xmi:type="notation:StringValueStyle" xmi:id="_UV4HQYnbEeiOe-BKGdv_Yg" name="diagram_compatibility_version" stringValue="1.4.0"/>
<styles xmi:type="notation:DiagramStyle" xmi:id="_UV4HQonbEeiOe-BKGdv_Yg"/>
<styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_UV4HQ4nbEeiOe-BKGdv_Yg" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
@@ -3207,6 +3255,47 @@
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dAP1o7BXEeix4eA61SHRMQ"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dAP1pLBXEeix4eA61SHRMQ"/>
</edges>
+ <edges xmi:type="notation:Connector" xmi:id="_7UJN8MGaEeiS695oPTRE1Q" type="StereotypeCommentLink" source="_7UCgQMGaEeiS695oPTRE1Q" target="_7UIm7sGaEeiS695oPTRE1Q">
+ <styles xmi:type="notation:FontStyle" xmi:id="_7UJN8cGaEeiS695oPTRE1Q"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_7UJN9cGaEeiS695oPTRE1Q" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="Common.uml#_7SeaAMGaEeiS695oPTRE1Q"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_7UJN8sGaEeiS695oPTRE1Q" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7UJN88GaEeiS695oPTRE1Q"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7UJN9MGaEeiS695oPTRE1Q"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_Tu1bMMGbEeiS695oPTRE1Q" type="Association_Edge" source="_X2o4QInbEeiOe-BKGdv_Yg" target="_7UCgQMGaEeiS695oPTRE1Q">
+ <children xmi:type="notation:DecorationNode" xmi:id="_Tu1bM8GbEeiS695oPTRE1Q" type="Association_StereotypeLabel">
+ <styles xmi:type="notation:BooleanValueStyle" xmi:id="_DLYUUMG5EeiS695oPTRE1Q" name="IS_UPDATED_POSITION" booleanValue="true"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_Tu1bNMGbEeiS695oPTRE1Q" x="-1" y="-19"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_Tu1bNcGbEeiS695oPTRE1Q" type="Association_NameLabel">
+ <styles xmi:type="notation:BooleanValueStyle" xmi:id="_DQe2wMG5EeiS695oPTRE1Q" name="IS_UPDATED_POSITION" booleanValue="true"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_Tu1bNsGbEeiS695oPTRE1Q" x="1" y="18"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_Tu1bN8GbEeiS695oPTRE1Q" type="Association_TargetRoleLabel">
+ <styles xmi:type="notation:BooleanValueStyle" xmi:id="_DVfSkMG5EeiS695oPTRE1Q" name="IS_UPDATED_POSITION" booleanValue="true"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_Tu1bOMGbEeiS695oPTRE1Q" x="21" y="-19"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_Tu1bOcGbEeiS695oPTRE1Q" type="Association_SourceRoleLabel">
+ <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Dabc8MG5EeiS695oPTRE1Q" name="IS_UPDATED_POSITION" booleanValue="true"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_Tu1bOsGbEeiS695oPTRE1Q" x="-22" y="18"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_Tu1bO8GbEeiS695oPTRE1Q" type="Association_SourceMultiplicityLabel">
+ <styles xmi:type="notation:BooleanValueStyle" xmi:id="_DfqiQMG5EeiS695oPTRE1Q" name="IS_UPDATED_POSITION" booleanValue="true"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_Tu1bPMGbEeiS695oPTRE1Q" x="23" y="18"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_Tu1bPcGbEeiS695oPTRE1Q" type="Association_TargetMultiplicityLabel">
+ <styles xmi:type="notation:BooleanValueStyle" xmi:id="_DkpI4MG5EeiS695oPTRE1Q" name="IS_UPDATED_POSITION" booleanValue="true"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_Tu1bPsGbEeiS695oPTRE1Q" x="-45" y="-26"/>
+ </children>
+ <styles xmi:type="notation:FontStyle" xmi:id="_Tu1bMcGbEeiS695oPTRE1Q"/>
+ <element xmi:type="uml:Association" href="Common.uml#_Tp2NgMGbEeiS695oPTRE1Q"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Tu1bMsGbEeiS695oPTRE1Q" points="[1040, 160, -643984, -643984]$[960, 360, -643984, -643984]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_T4rTsMGbEeiS695oPTRE1Q" id="(0.5,1.0)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_T4rTscGbEeiS695oPTRE1Q" id="(0.5681818181818182,0.0)"/>
+ </edges>
</notation:Diagram>
<notation:Diagram xmi:id="_Y2HKsIn7EeiOe-BKGdv_Yg" type="PapyrusUMLClassDiagram" name="Event Domain Types" measurementUnit="Pixel">
<children xmi:type="notation:Shape" xmi:id="_wQ6BMIn7EeiOe-BKGdv_Yg" type="DataType_Shape" fillColor="12615680">
@@ -3310,7 +3399,7 @@
<element xmi:type="uml:DataType" href="Common.uml#_r_TYsH7wEeifJIHxnlj6Cg"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_wQ6oQIn7EeiOe-BKGdv_Yg" x="20" y="20"/>
</children>
- <children xmi:type="notation:Shape" xmi:id="_AGxtsIn8EeiOe-BKGdv_Yg" type="DataType_Shape" fillColor="32768">
+ <children xmi:type="notation:Shape" xmi:id="_AGxtsIn8EeiOe-BKGdv_Yg" type="DataType_Shape" fillColor="12615680">
<children xmi:type="notation:DecorationNode" xmi:id="_AGxtson8EeiOe-BKGdv_Yg" type="DataType_NameLabel"/>
<children xmi:type="notation:DecorationNode" xmi:id="_AGxts4n8EeiOe-BKGdv_Yg" type="DataType_FloatingNameLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_AGxttIn8EeiOe-BKGdv_Yg" y="15"/>
@@ -6247,7 +6336,7 @@
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_c02CXLHVEeid-vjMcczUWA"/>
</children>
<element xmi:type="uml:DataType" href="Common.uml#_zCl6wImwEeiOe-BKGdv_Yg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_c01bQbHVEeid-vjMcczUWA" y="380"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_c01bQbHVEeid-vjMcczUWA" x="20" y="380"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_emx6ALHVEeid-vjMcczUWA" type="DataType_Shape" fillColor="32768">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_OSUjgLIWEeid-vjMcczUWA" source="PapyrusCSSForceValue">
diff --git a/papyrus/ONAP Information Model/Common.uml b/papyrus/ONAP Information Model/Common.uml
index 4f7685e..a66560f 100644
--- a/papyrus/ONAP Information Model/Common.uml
+++ b/papyrus/ONAP Information Model/Common.uml
@@ -376,6 +376,15 @@ Blue - Review Complete&#xD;
Green - Ready for Review&#xD;
White - Not Ready for Review</body>
</ownedComment>
+ <packagedElement xmi:type="uml:Class" xmi:id="_7SeaAMGaEeiS695oPTRE1Q" name="Fault">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_CJjmkMGbEeiS695oPTRE1Q" name="faultFields" type="_r_TYsH7wEeifJIHxnlj6Cg"/>
+ </packagedElement>
+ <packagedElement xmi:type="uml:Association" xmi:id="_Tp2NgMGbEeiS695oPTRE1Q" memberEnd="_Tp20ksGbEeiS695oPTRE1Q _Tp3bosGbEeiS695oPTRE1Q">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Tp20kMGbEeiS695oPTRE1Q" source="org.eclipse.papyrus">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Tp20kcGbEeiS695oPTRE1Q" key="nature" value="UML_Nature"/>
+ </eAnnotations>
+ <ownedEnd xmi:type="uml:Property" xmi:id="_Tp3bosGbEeiS695oPTRE1Q" name="event" type="_PmIOkH7uEeifJIHxnlj6Cg" association="_Tp2NgMGbEeiS695oPTRE1Q"/>
+ </packagedElement>
</packagedElement>
<packagedElement xmi:type="uml:Package" xmi:id="_Uu_4IDOHEei5Af8DcjrhIQ" name="Interfaces"/>
<packagedElement xmi:type="uml:Package" xmi:id="_W8GB0DOHEei5Af8DcjrhIQ" name="TypeDefinitions">
@@ -765,6 +774,10 @@ ONAP event messages are serialized as a unicode ASCII character string which may
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_x9KKMJGnEeiUeLUnFxb3Bg" value="1"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_x9UiQJGnEeiUeLUnFxb3Bg" value="1"/>
</ownedAttribute>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_Tp20ksGbEeiS695oPTRE1Q" name="fault" type="_7SeaAMGaEeiS695oPTRE1Q" association="_Tp2NgMGbEeiS695oPTRE1Q">
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Tp3boMGbEeiS695oPTRE1Q"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Tp3bocGbEeiS695oPTRE1Q" value="1"/>
+ </ownedAttribute>
</packagedElement>
</packagedElement>
<packagedElement xmi:type="uml:Package" xmi:id="_wZkrsIbfEei-x_BD9U-ssQ" name="EventTypeDefinitions">
@@ -1251,14 +1264,14 @@ Could contain managed object instance as separate key:value; could add probable
</body>
</ownedComment>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_D8LX8KcGEeiFp-jDq2Hw-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_D8Q3gKcGEeiFp-jDq2Hw-A" value="*"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_D8Q3gKcGEeiFp-jDq2Hw-A" value="1"/>
</ownedAttribute>
<ownedAttribute xmi:type="uml:Property" xmi:id="_fzeMcIFKEeieQ4zKGFzYtQ" name="filesystemUsageArray" type="_i-TA4IklEeiddpojVtQ0Hg">
<ownedComment xmi:type="uml:Comment" xmi:id="_hN0RkImwEeiOe-BKGdv_Yg" annotatedElement="_fzeMcIFKEeieQ4zKGFzYtQ">
<body>Filesystem usage of the VM on which the VNFC reporting the event is running.&#xD;
</body>
</ownedComment>
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_JpttEKcHEeiFp-jDq2Hw-A"/>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_JpttEKcHEeiFp-jDq2Hw-A" value="1"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_JpzzsKcHEeiFp-jDq2Hw-A" value="*"/>
</ownedAttribute>
<ownedAttribute xmi:type="uml:Property" xmi:id="_gWrAIIFKEeieQ4zKGFzYtQ" name="hugePagesArray" type="_zCl6wImwEeiOe-BKGdv_Yg">
@@ -4562,4 +4575,8 @@ Percentage of time spent handling soft irq interrupts</body>
<OpenModel_Profile:OpenModelAttribute xmi:id="_rCqW0bIgEeid-vjMcczUWA" base_StructuralFeature="_rCqW0LIgEeid-vjMcczUWA"/>
<OpenModel_Profile:OpenModelAttribute xmi:id="_rcMRIbIgEeid-vjMcczUWA" base_StructuralFeature="_rcMRILIgEeid-vjMcczUWA"/>
<OpenModel_Profile:OpenModelAttribute xmi:id="_KiGhEL0VEeiIStCQ6XYZ_w" base_StructuralFeature="_KiF6AL0VEeiIStCQ6XYZ_w"/>
+ <OpenModel_Profile:OpenModelClass xmi:id="_7T8ZoMGaEeiS695oPTRE1Q" base_Class="_7SeaAMGaEeiS695oPTRE1Q"/>
+ <OpenModel_Profile:OpenModelAttribute xmi:id="_CJjmkcGbEeiS695oPTRE1Q" base_StructuralFeature="_CJjmkMGbEeiS695oPTRE1Q"/>
+ <OpenModel_Profile:OpenModelAttribute xmi:id="_Tp20k8GbEeiS695oPTRE1Q" base_StructuralFeature="_Tp20ksGbEeiS695oPTRE1Q"/>
+ <OpenModel_Profile:OpenModelAttribute xmi:id="_Tp3bo8GbEeiS695oPTRE1Q" base_StructuralFeature="_Tp3bosGbEeiS695oPTRE1Q"/>
</xmi:XMI>
diff --git a/papyrus/ONAP Information Model/Service.notation b/papyrus/ONAP Information Model/Service.notation
index 38cdfd5..b371b58 100644
--- a/papyrus/ONAP Information Model/Service.notation
+++ b/papyrus/ONAP Information Model/Service.notation
@@ -3061,7 +3061,7 @@
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_mrU8K4n9EeiOe-BKGdv_Yg"/>
</children>
<element xmi:type="uml:Class" href="Service.uml#_mrJV8In9EeiOe-BKGdv_Yg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mrNAUYn9EeiOe-BKGdv_Yg" x="80" y="120" height="301"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mrNAUYn9EeiOe-BKGdv_Yg" x="80" y="120" height="241"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_mrVjN4n9EeiOe-BKGdv_Yg" type="StereotypeComment">
<styles xmi:type="notation:TitleStyle" xmi:id="_mrVjOIn9EeiOe-BKGdv_Yg"/>
@@ -3077,7 +3077,10 @@
<layoutConstraint xmi:type="notation:Location" xmi:id="_wnitpIn9EeiOe-BKGdv_Yg" y="15"/>
</children>
<children xmi:type="notation:BasicCompartment" xmi:id="_wnitpYn9EeiOe-BKGdv_Yg" type="Class_AttributeCompartment">
- <children xmi:type="notation:Shape" xmi:id="_tF8SUIoBEeiOe-BKGdv_Yg" type="Property_ClassAttributeLabel" fontColor="255">
+ <children xmi:type="notation:Shape" xmi:id="_tF8SUIoBEeiOe-BKGdv_Yg" type="Property_ClassAttributeLabel">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_f6vwAMA-Eei02ItngDf4ZA" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_f6vwAcA-Eei02ItngDf4ZA" key="fontColor" value="true"/>
+ </eAnnotations>
<children xmi:type="notation:DecorationNode" xmi:id="_tGDnEooBEeiOe-BKGdv_Yg" visible="false" type="StereotypeLabel">
<styles xmi:type="notation:StringValueStyle" xmi:id="_tGDnE4oBEeiOe-BKGdv_Yg" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
<element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
@@ -3095,7 +3098,10 @@
<element xmi:type="uml:Property" href="Service.uml#_ttCHgIoBEeiOe-BKGdv_Yg"/>
<layoutConstraint xmi:type="notation:Location" xmi:id="_ttMfkYoBEeiOe-BKGdv_Yg"/>
</children>
- <children xmi:type="notation:Shape" xmi:id="_uOFmIIoBEeiOe-BKGdv_Yg" type="Property_ClassAttributeLabel" fontColor="255">
+ <children xmi:type="notation:Shape" xmi:id="_uOFmIIoBEeiOe-BKGdv_Yg" type="Property_ClassAttributeLabel">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_e4bQAMBBEei02ItngDf4ZA" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_e4bQAcBBEei02ItngDf4ZA" key="fontColor" value="true"/>
+ </eAnnotations>
<children xmi:type="notation:DecorationNode" xmi:id="_uONh8ooBEeiOe-BKGdv_Yg" visible="false" type="StereotypeLabel">
<styles xmi:type="notation:StringValueStyle" xmi:id="_uONh84oBEeiOe-BKGdv_Yg" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
<element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
@@ -3113,36 +3119,6 @@
<element xmi:type="uml:Property" href="Service.uml#_up_fAIoBEeiOe-BKGdv_Yg"/>
<layoutConstraint xmi:type="notation:Location" xmi:id="_uqLsQYoBEeiOe-BKGdv_Yg"/>
</children>
- <children xmi:type="notation:Shape" xmi:id="_wUc1sIoBEeiOe-BKGdv_Yg" type="Property_ClassAttributeLabel" fontColor="255">
- <children xmi:type="notation:DecorationNode" xmi:id="_wUkKeYoBEeiOe-BKGdv_Yg" visible="false" type="StereotypeLabel">
- <styles xmi:type="notation:StringValueStyle" xmi:id="_wUkKeooBEeiOe-BKGdv_Yg" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
- <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wUkKe4oBEeiOe-BKGdv_Yg"/>
- </children>
- <element xmi:type="uml:Property" href="Service.uml#_wUQocIoBEeiOe-BKGdv_Yg"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_wUc1sYoBEeiOe-BKGdv_Yg"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_v1lTgI9TEeiT7tMsBl6xjA" type="Property_ClassAttributeLabel" fontColor="255">
- <children xmi:type="notation:DecorationNode" xmi:id="_v1yu4I9TEeiT7tMsBl6xjA" visible="false" type="StereotypeLabel">
- <styles xmi:type="notation:StringValueStyle" xmi:id="_v1yu4Y9TEeiT7tMsBl6xjA" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
- <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_v1yu4o9TEeiT7tMsBl6xjA"/>
- </children>
- <element xmi:type="uml:Property" href="Service.uml#_vltEcI9TEeiT7tMsBl6xjA"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_v1lTgY9TEeiT7tMsBl6xjA"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_xru80I9TEeiT7tMsBl6xjA" type="Property_ClassAttributeLabel" fontColor="255">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_qQTQkI9UEeiT7tMsBl6xjA" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_qQT3oI9UEeiT7tMsBl6xjA" key="fontColor" value="true"/>
- </eAnnotations>
- <children xmi:type="notation:DecorationNode" xmi:id="_xr7KFo9TEeiT7tMsBl6xjA" visible="false" type="StereotypeLabel">
- <styles xmi:type="notation:StringValueStyle" xmi:id="_xr7KF49TEeiT7tMsBl6xjA" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
- <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xr7KGI9TEeiT7tMsBl6xjA"/>
- </children>
- <element xmi:type="uml:Property" href="Service.uml#_xbTUII9TEeiT7tMsBl6xjA"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_xru80Y9TEeiT7tMsBl6xjA"/>
- </children>
<styles xmi:type="notation:TitleStyle" xmi:id="_wnitpon9EeiOe-BKGdv_Yg"/>
<styles xmi:type="notation:SortingStyle" xmi:id="_wnitp4n9EeiOe-BKGdv_Yg"/>
<styles xmi:type="notation:FilteringStyle" xmi:id="_wnitqIn9EeiOe-BKGdv_Yg"/>
@@ -3166,7 +3142,7 @@
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_wnqCYon9EeiOe-BKGdv_Yg"/>
</children>
<element xmi:type="uml:Class" href="Service.uml#_wng4cIn9EeiOe-BKGdv_Yg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wnitoYn9EeiOe-BKGdv_Yg" x="620" y="140" height="161"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wnitoYn9EeiOe-BKGdv_Yg" x="480" y="160" height="101"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_wnqCbon9EeiOe-BKGdv_Yg" type="StereotypeComment">
<styles xmi:type="notation:TitleStyle" xmi:id="_wnqCb4n9EeiOe-BKGdv_Yg"/>
@@ -3205,7 +3181,7 @@
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_B65Ewon-EeiOe-BKGdv_Yg"/>
</children>
<element xmi:type="uml:Class" href="Service.uml#_Jvy-QD0MEeiWMf5FLWfdLA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_B6n_AYn-EeiOe-BKGdv_Yg" x="260" y="500" height="61"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_B6n_AYn-EeiOe-BKGdv_Yg" x="720" y="300" height="61"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_B6_LY4n-EeiOe-BKGdv_Yg" type="StereotypeComment">
<styles xmi:type="notation:TitleStyle" xmi:id="_B6_LZIn-EeiOe-BKGdv_Yg"/>
@@ -3244,7 +3220,7 @@
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_DBs70Yn-EeiOe-BKGdv_Yg"/>
</children>
<element xmi:type="uml:Class" href="Service.uml#_HFfXUD0QEeiWMf5FLWfdLA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DBgHgYn-EeiOe-BKGdv_Yg" x="720" y="500" width="123" height="61"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DBgHgYn-EeiOe-BKGdv_Yg" x="720" y="80" width="123" height="61"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_DBwmM4n-EeiOe-BKGdv_Yg" type="StereotypeComment">
<styles xmi:type="notation:TitleStyle" xmi:id="_DBwmNIn-EeiOe-BKGdv_Yg"/>
@@ -3302,27 +3278,7 @@
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_3a8-946OEeiLSKWGMeE9mQ"/>
</children>
<element xmi:type="uml:Enumeration" href="Service.uml#_3a0cEI6OEeiLSKWGMeE9mQ"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3a4GcY6OEeiLSKWGMeE9mQ" x="80" y="480"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_OR_vcI9QEeiT7tMsBl6xjA" type="Comment_Shape">
- <children xmi:type="notation:DecorationNode" xmi:id="_OSEA4I9QEeiT7tMsBl6xjA" type="Comment_BodyLabel"/>
- <element xmi:type="uml:Comment" href="Service.uml#_OR0wUI9QEeiT7tMsBl6xjA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OR_vcY9QEeiT7tMsBl6xjA" x="80" y="20"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_Ip0JgI9REeiT7tMsBl6xjA" type="Comment_Shape">
- <children xmi:type="notation:DecorationNode" xmi:id="_Ip1XoI9REeiT7tMsBl6xjA" type="Comment_BodyLabel"/>
- <element xmi:type="uml:Comment" href="Service.uml#_IpxtQI9REeiT7tMsBl6xjA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ip0JgY9REeiT7tMsBl6xjA" x="820" y="160" height="41"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_SLbpsI9REeiT7tMsBl6xjA" type="Comment_Shape">
- <children xmi:type="notation:DecorationNode" xmi:id="_SLbpso9REeiT7tMsBl6xjA" type="Comment_BodyLabel"/>
- <element xmi:type="uml:Comment" href="Service.uml#_SLZ0gI9REeiT7tMsBl6xjA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SLbpsY9REeiT7tMsBl6xjA" x="820" y="240"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_hccRcI9YEeiT7tMsBl6xjA" type="Comment_Shape">
- <children xmi:type="notation:DecorationNode" xmi:id="_hcc4gI9YEeiT7tMsBl6xjA" type="Comment_BodyLabel"/>
- <element xmi:type="uml:Comment" href="Service.uml#_hcacQI9YEeiT7tMsBl6xjA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hccRcY9YEeiT7tMsBl6xjA" x="480" y="560" width="201"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3a4GcY6OEeiLSKWGMeE9mQ" x="880" y="480"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_DwakALwnEeifWa7EkiXrHA" type="Enumeration_Shape">
<children xmi:type="notation:DecorationNode" xmi:id="_DwakArwnEeifWa7EkiXrHA" type="Enumeration_NameLabel"/>
@@ -3356,7 +3312,254 @@
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_DwbLFLwnEeifWa7EkiXrHA"/>
</children>
<element xmi:type="uml:Enumeration" href="Service.uml#_DwZV4LwnEeifWa7EkiXrHA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DwakAbwnEeifWa7EkiXrHA" x="1120" y="100"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DwakAbwnEeifWa7EkiXrHA" x="640" y="480"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_pWZyIMA-Eei02ItngDf4ZA" type="Enumeration_Shape">
+ <children xmi:type="notation:DecorationNode" xmi:id="_pWcOYMA-Eei02ItngDf4ZA" type="Enumeration_NameLabel"/>
+ <children xmi:type="notation:DecorationNode" xmi:id="_pWc1cMA-Eei02ItngDf4ZA" type="Enumeration_FloatingNameLabel">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_pWc1ccA-Eei02ItngDf4ZA" y="15"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_pWdcgMA-Eei02ItngDf4ZA" type="Enumeration_LiteralCompartment">
+ <children xmi:type="notation:Shape" xmi:id="_3lvTwMBAEei02ItngDf4ZA" type="EnumerationLiteral_LiteralLabel">
+ <element xmi:type="uml:EnumerationLiteral" href="Service.uml#_t-VmkMA-Eei02ItngDf4ZA"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_3lvTwcBAEei02ItngDf4ZA"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_3lv60MBAEei02ItngDf4ZA" type="EnumerationLiteral_LiteralLabel">
+ <element xmi:type="uml:EnumerationLiteral" href="Service.uml#_vKPZAMA-Eei02ItngDf4ZA"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_3lv60cBAEei02ItngDf4ZA"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_3lv60sBAEei02ItngDf4ZA" type="EnumerationLiteral_LiteralLabel">
+ <element xmi:type="uml:EnumerationLiteral" href="Service.uml#_wjzM8MA-Eei02ItngDf4ZA"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_3lv608BAEei02ItngDf4ZA"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_3lv61MBAEei02ItngDf4ZA" type="EnumerationLiteral_LiteralLabel">
+ <element xmi:type="uml:EnumerationLiteral" href="Service.uml#_yj4OUMA-Eei02ItngDf4ZA"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_3lv61cBAEei02ItngDf4ZA"/>
+ </children>
+ <styles xmi:type="notation:TitleStyle" xmi:id="_pWdcgcA-Eei02ItngDf4ZA"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_pWdcgsA-Eei02ItngDf4ZA"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_pWdcg8A-Eei02ItngDf4ZA"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pWdchMA-Eei02ItngDf4ZA"/>
+ </children>
+ <element xmi:type="uml:Enumeration" href="Service.uml#_pWPaEMA-Eei02ItngDf4ZA"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pWZyIcA-Eei02ItngDf4ZA" x="760" y="480"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_UWia0MDfEeiebIKjAGZWdA" type="Class_Shape">
+ <children xmi:type="notation:DecorationNode" xmi:id="_UWmsQMDfEeiebIKjAGZWdA" type="Class_NameLabel"/>
+ <children xmi:type="notation:DecorationNode" xmi:id="_UWmsQcDfEeiebIKjAGZWdA" type="Class_FloatingNameLabel">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_UWmsQsDfEeiebIKjAGZWdA" y="15"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_UWnTUMDfEeiebIKjAGZWdA" type="Class_AttributeCompartment">
+ <children xmi:type="notation:Shape" xmi:id="_gFG6wMDfEeiebIKjAGZWdA" type="Property_ClassAttributeLabel">
+ <children xmi:type="notation:DecorationNode" xmi:id="_gFUWIMDfEeiebIKjAGZWdA" visible="false" type="StereotypeLabel">
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_gFUWIcDfEeiebIKjAGZWdA" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+ <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gFUWIsDfEeiebIKjAGZWdA"/>
+ </children>
+ <element xmi:type="uml:Property" href="Service.uml#_gEq14MDfEeiebIKjAGZWdA"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_gFG6wcDfEeiebIKjAGZWdA"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_j1A7AMDfEeiebIKjAGZWdA" type="Property_ClassAttributeLabel">
+ <children xmi:type="notation:DecorationNode" xmi:id="_j1VEEMDfEeiebIKjAGZWdA" visible="false" type="StereotypeLabel">
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_j1VEEcDfEeiebIKjAGZWdA" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+ <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_j1VEEsDfEeiebIKjAGZWdA"/>
+ </children>
+ <element xmi:type="uml:Property" href="Service.uml#_j0sK4MDfEeiebIKjAGZWdA"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_j1A7AcDfEeiebIKjAGZWdA"/>
+ </children>
+ <styles xmi:type="notation:TitleStyle" xmi:id="_UWnTUcDfEeiebIKjAGZWdA"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_UWnTUsDfEeiebIKjAGZWdA"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_UWnTU8DfEeiebIKjAGZWdA"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UWnTVMDfEeiebIKjAGZWdA"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_UWnTVcDfEeiebIKjAGZWdA" visible="false" type="Class_OperationCompartment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_UWnTVsDfEeiebIKjAGZWdA"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_UWnTV8DfEeiebIKjAGZWdA"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_UWnTWMDfEeiebIKjAGZWdA"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UWnTWcDfEeiebIKjAGZWdA"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_UWnTWsDfEeiebIKjAGZWdA" visible="false" type="Class_NestedClassifierCompartment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_UWnTW8DfEeiebIKjAGZWdA"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_UWnTXMDfEeiebIKjAGZWdA"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_UWnTXcDfEeiebIKjAGZWdA"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UWnTXsDfEeiebIKjAGZWdA"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_UW7cYMDfEeiebIKjAGZWdA" visible="false" type="StereotypeLabel">
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_UW7cYcDfEeiebIKjAGZWdA" name="stereotype" stringValue="OpenModel_Profile::OpenModelClass"/>
+ <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UW7cYsDfEeiebIKjAGZWdA"/>
+ </children>
+ <element xmi:type="uml:Class" href="Service.uml#_UWL1gMDfEeiebIKjAGZWdA"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UWia0cDfEeiebIKjAGZWdA" x="940" y="180"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_UW8qgMDfEeiebIKjAGZWdA" type="StereotypeComment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_UW8qgcDfEeiebIKjAGZWdA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_UW9RkMDfEeiebIKjAGZWdA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="Service.uml#_UWL1gMDfEeiebIKjAGZWdA"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UW8qgsDfEeiebIKjAGZWdA" x="200"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_HFpFIMDiEeiebIKjAGZWdA" type="Class_Shape">
+ <children xmi:type="notation:DecorationNode" xmi:id="_HFpsMMDiEeiebIKjAGZWdA" type="Class_NameLabel"/>
+ <children xmi:type="notation:DecorationNode" xmi:id="_HFpsMcDiEeiebIKjAGZWdA" type="Class_FloatingNameLabel">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_HFpsMsDiEeiebIKjAGZWdA" y="15"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_HFpsM8DiEeiebIKjAGZWdA" type="Class_AttributeCompartment">
+ <children xmi:type="notation:Shape" xmi:id="_2ASoUMGSEeiS695oPTRE1Q" type="Property_ClassAttributeLabel">
+ <children xmi:type="notation:DecorationNode" xmi:id="_2AnYcMGSEeiS695oPTRE1Q" visible="false" type="StereotypeLabel">
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_2AnYccGSEeiS695oPTRE1Q" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+ <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2AnYcsGSEeiS695oPTRE1Q"/>
+ </children>
+ <element xmi:type="uml:Property" href="Service.uml#_1_pvIMGSEeiS695oPTRE1Q"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_2ASoUcGSEeiS695oPTRE1Q"/>
+ </children>
+ <styles xmi:type="notation:TitleStyle" xmi:id="_HFpsNMDiEeiebIKjAGZWdA"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_HFpsNcDiEeiebIKjAGZWdA"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_HFpsNsDiEeiebIKjAGZWdA"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HFpsN8DiEeiebIKjAGZWdA"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_HFpsOMDiEeiebIKjAGZWdA" visible="false" type="Class_OperationCompartment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_HFpsOcDiEeiebIKjAGZWdA"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_HFpsOsDiEeiebIKjAGZWdA"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_HFpsO8DiEeiebIKjAGZWdA"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HFpsPMDiEeiebIKjAGZWdA"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_HFpsPcDiEeiebIKjAGZWdA" visible="false" type="Class_NestedClassifierCompartment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_HFpsPsDiEeiebIKjAGZWdA"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_HFpsP8DiEeiebIKjAGZWdA"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_HFpsQMDiEeiebIKjAGZWdA"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HFpsQcDiEeiebIKjAGZWdA"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_HFwZ4MDiEeiebIKjAGZWdA" visible="false" type="StereotypeLabel">
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_HFwZ4cDiEeiebIKjAGZWdA" name="stereotype" stringValue="OpenModel_Profile::OpenModelClass"/>
+ <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HFwZ4sDiEeiebIKjAGZWdA"/>
+ </children>
+ <element xmi:type="uml:Class" href="Service.uml#_HFmo4MDiEeiebIKjAGZWdA"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HFpFIcDiEeiebIKjAGZWdA" x="1140" y="340"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_HFxA88DiEeiebIKjAGZWdA" type="StereotypeComment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_HFxA9MDiEeiebIKjAGZWdA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_HFxA9sDiEeiebIKjAGZWdA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="Service.uml#_HFmo4MDiEeiebIKjAGZWdA"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HFxA9cDiEeiebIKjAGZWdA" x="200"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_Mv4ycMGjEeiS695oPTRE1Q" type="StereotypeComment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_Mv4yccGjEeiS695oPTRE1Q"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Mv4yc8GjEeiS695oPTRE1Q" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:AssociationClass" href="Service.uml#_MnBKUMGjEeiS695oPTRE1Q"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Mv4ycsGjEeiS695oPTRE1Q" x="280" y="20"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_M9MOoMGjEeiS695oPTRE1Q" type="AssociationClass_Shape">
+ <children xmi:type="notation:DecorationNode" xmi:id="_M9MOosGjEeiS695oPTRE1Q" type="AssociationClass_NameLabel"/>
+ <children xmi:type="notation:DecorationNode" xmi:id="_M9MOo8GjEeiS695oPTRE1Q" type="AssociationClass_FloatingNameLabel">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_M9MOpMGjEeiS695oPTRE1Q" y="15"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_M9MOpcGjEeiS695oPTRE1Q" type="AssociationClass_AttributeCompartment">
+ <children xmi:type="notation:Shape" xmi:id="_SB5pMMGkEeiS695oPTRE1Q" type="Property_ComponentAttributeLabel">
+ <children xmi:type="notation:DecorationNode" xmi:id="_SGjfsMGkEeiS695oPTRE1Q" visible="false" type="StereotypeLabel">
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_SGjfscGkEeiS695oPTRE1Q" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+ <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SGjfssGkEeiS695oPTRE1Q"/>
+ </children>
+ <element xmi:type="uml:Property" href="Service.uml#_R9Rn4MGkEeiS695oPTRE1Q"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_SB5pMcGkEeiS695oPTRE1Q"/>
+ </children>
+ <styles xmi:type="notation:TitleStyle" xmi:id="_M9MOpsGjEeiS695oPTRE1Q"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_M9MOp8GjEeiS695oPTRE1Q"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_M9MOqMGjEeiS695oPTRE1Q"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_M9MOqcGjEeiS695oPTRE1Q"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_M9MOqsGjEeiS695oPTRE1Q" visible="false" type="AssociationClass_OperationCompartment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_M9MOq8GjEeiS695oPTRE1Q"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_M9MOrMGjEeiS695oPTRE1Q"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_M9MOrcGjEeiS695oPTRE1Q"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_M9MOrsGjEeiS695oPTRE1Q"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_M9MOr8GjEeiS695oPTRE1Q" visible="false" type="AssociationClass_NestedClassifierCompartment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_M9MOsMGjEeiS695oPTRE1Q"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_M9MOscGjEeiS695oPTRE1Q"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_M9MOssGjEeiS695oPTRE1Q"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_M9MOs8GjEeiS695oPTRE1Q"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_M9nFYMGjEeiS695oPTRE1Q" visible="false" type="StereotypeLabel">
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_M9nFYcGjEeiS695oPTRE1Q" name="stereotype" stringValue="OpenModel_Profile::OpenModelClass"/>
+ <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_M9nFYsGjEeiS695oPTRE1Q"/>
+ </children>
+ <element xmi:type="uml:AssociationClass" href="Service.uml#_MnBKUMGjEeiS695oPTRE1Q"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_M9MOocGjEeiS695oPTRE1Q" x="120" y="520"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_M9nsc8GjEeiS695oPTRE1Q" type="StereotypeComment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_M9nsdMGjEeiS695oPTRE1Q"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_M9nsdsGjEeiS695oPTRE1Q" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:AssociationClass" href="Service.uml#_MnBKUMGjEeiS695oPTRE1Q"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_M9nsdcGjEeiS695oPTRE1Q" x="615" y="120"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_hViyYMGkEeiS695oPTRE1Q" type="StereotypeComment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_hViyYcGkEeiS695oPTRE1Q"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_hViyY8GkEeiS695oPTRE1Q" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:AssociationClass" href="Service.uml#_hUzLgMGkEeiS695oPTRE1Q"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hViyYsGkEeiS695oPTRE1Q" x="680" y="60"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_hWTAUMGkEeiS695oPTRE1Q" type="AssociationClass_Shape">
+ <children xmi:type="notation:DecorationNode" xmi:id="_hWTAUsGkEeiS695oPTRE1Q" type="AssociationClass_NameLabel"/>
+ <children xmi:type="notation:DecorationNode" xmi:id="_hWTAU8GkEeiS695oPTRE1Q" type="AssociationClass_FloatingNameLabel">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_hWTAVMGkEeiS695oPTRE1Q" y="15"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_hWTnYMGkEeiS695oPTRE1Q" type="AssociationClass_AttributeCompartment">
+ <children xmi:type="notation:Shape" xmi:id="__moXAMG_EeiS695oPTRE1Q" type="Property_ComponentAttributeLabel">
+ <children xmi:type="notation:DecorationNode" xmi:id="__m3nkMG_EeiS695oPTRE1Q" visible="false" type="StereotypeLabel">
+ <styles xmi:type="notation:StringValueStyle" xmi:id="__m3nkcG_EeiS695oPTRE1Q" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+ <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="__m3nksG_EeiS695oPTRE1Q"/>
+ </children>
+ <element xmi:type="uml:Property" href="Service.uml#__mP8gMG_EeiS695oPTRE1Q"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="__moXAcG_EeiS695oPTRE1Q"/>
+ </children>
+ <styles xmi:type="notation:TitleStyle" xmi:id="_hWTnYcGkEeiS695oPTRE1Q"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_hWTnYsGkEeiS695oPTRE1Q"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_hWTnY8GkEeiS695oPTRE1Q"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hWTnZMGkEeiS695oPTRE1Q"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_hWTnZcGkEeiS695oPTRE1Q" visible="false" type="AssociationClass_OperationCompartment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_hWTnZsGkEeiS695oPTRE1Q"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_hWTnZ8GkEeiS695oPTRE1Q"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_hWTnaMGkEeiS695oPTRE1Q"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hWTnacGkEeiS695oPTRE1Q"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_hWTnasGkEeiS695oPTRE1Q" visible="false" type="AssociationClass_NestedClassifierCompartment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_hWTna8GkEeiS695oPTRE1Q"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_hWTnbMGkEeiS695oPTRE1Q"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_hWTnbcGkEeiS695oPTRE1Q"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hWTnbsGkEeiS695oPTRE1Q"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_hWYf4MGkEeiS695oPTRE1Q" visible="false" type="StereotypeLabel">
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_hWYf4cGkEeiS695oPTRE1Q" name="stereotype" stringValue="OpenModel_Profile::OpenModelClass"/>
+ <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hWYf4sGkEeiS695oPTRE1Q"/>
+ </children>
+ <element xmi:type="uml:AssociationClass" href="Service.uml#_hUzLgMGkEeiS695oPTRE1Q"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hWTAUcGkEeiS695oPTRE1Q" x="400" y="380"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_hWYf7sGkEeiS695oPTRE1Q" type="StereotypeComment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_hWYf78GkEeiS695oPTRE1Q"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_hWYf8cGkEeiS695oPTRE1Q" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:AssociationClass" href="Service.uml#_hUzLgMGkEeiS695oPTRE1Q"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hWYf8MGkEeiS695oPTRE1Q" x="929" y="193"/>
</children>
<styles xmi:type="notation:StringValueStyle" xmi:id="_kngqQYn9EeiOe-BKGdv_Yg" name="diagram_compatibility_version" stringValue="1.4.0"/>
<styles xmi:type="notation:DiagramStyle" xmi:id="_kngqQon9EeiOe-BKGdv_Yg"/>
@@ -3432,8 +3635,8 @@
<styles xmi:type="notation:FontStyle" xmi:id="_rUXccYoAEeiOe-BKGdv_Yg"/>
<element xmi:type="uml:Association" href="Service.uml#_rUEhgIoAEeiOe-BKGdv_Yg"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_rUXccooAEeiOe-BKGdv_Yg" points="[316, 200, -643984, -643984]$[640, 240, -643984, -643984]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rU5A4IoAEeiOe-BKGdv_Yg" id="(1.0,0.33222591362126247)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rU5A4YoAEeiOe-BKGdv_Yg" id="(0.0,0.4968944099378882)"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rU5A4IoAEeiOe-BKGdv_Yg" id="(1.0,0.33195020746887965)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rU5A4YoAEeiOe-BKGdv_Yg" id="(0.0,0.39603960396039606)"/>
</edges>
<edges xmi:type="notation:Connector" xmi:id="_LB_2YIoCEeiOe-BKGdv_Yg" type="Association_Edge" source="_wnitoIn9EeiOe-BKGdv_Yg" target="_DBgHgIn-EeiOe-BKGdv_Yg">
<children xmi:type="notation:DecorationNode" xmi:id="_LB_2Y4oCEeiOe-BKGdv_Yg" type="Association_StereotypeLabel">
@@ -3442,7 +3645,7 @@
</children>
<children xmi:type="notation:DecorationNode" xmi:id="_LB_2ZYoCEeiOe-BKGdv_Yg" type="Association_NameLabel">
<styles xmi:type="notation:BooleanValueStyle" xmi:id="_QdA74I9YEeiT7tMsBl6xjA" name="IS_UPDATED_POSITION" booleanValue="true"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_LB_2ZooCEeiOe-BKGdv_Yg" x="7" y="-24"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_LB_2ZooCEeiOe-BKGdv_Yg" x="8" y="-13"/>
</children>
<children xmi:type="notation:DecorationNode" xmi:id="_LB_2Z4oCEeiOe-BKGdv_Yg" visible="false" type="Association_TargetRoleLabel">
<styles xmi:type="notation:BooleanValueStyle" xmi:id="_QrnYkI9YEeiT7tMsBl6xjA" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -3454,17 +3657,17 @@
</children>
<children xmi:type="notation:DecorationNode" xmi:id="_LB_2a4oCEeiOe-BKGdv_Yg" type="Association_SourceMultiplicityLabel">
<styles xmi:type="notation:BooleanValueStyle" xmi:id="_RJau4I9YEeiT7tMsBl6xjA" name="IS_UPDATED_POSITION" booleanValue="true"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_LB_2bIoCEeiOe-BKGdv_Yg" x="29" y="20"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_LB_2bIoCEeiOe-BKGdv_Yg" x="6" y="16"/>
</children>
<children xmi:type="notation:DecorationNode" xmi:id="_LB_2bYoCEeiOe-BKGdv_Yg" type="Association_TargetMultiplicityLabel">
<styles xmi:type="notation:BooleanValueStyle" xmi:id="_RYHSMI9YEeiT7tMsBl6xjA" name="IS_UPDATED_POSITION" booleanValue="true"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_LB_2booCEeiOe-BKGdv_Yg" x="-30" y="-20"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_LB_2booCEeiOe-BKGdv_Yg" x="-9" y="7"/>
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_LB_2YYoCEeiOe-BKGdv_Yg"/>
<element xmi:type="uml:Association" href="Service.uml#_LBuJkIoCEeiOe-BKGdv_Yg"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_LB_2YooCEeiOe-BKGdv_Yg" points="[720, 286, -643984, -643984]$[720, 500, -643984, -643984]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LCb7QIoCEeiOe-BKGdv_Yg" id="(0.8695652173913043,1.0)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LCb7QYoCEeiOe-BKGdv_Yg" id="(0.4878048780487805,0.0)"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_LB_2YooCEeiOe-BKGdv_Yg" points="[560, 160, -643984, -643984]$[560, 100, -643984, -643984]$[740, 120, -643984, -643984]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LCb7QIoCEeiOe-BKGdv_Yg" id="(0.5369127516778524,0.0)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LCb7QYoCEeiOe-BKGdv_Yg" id="(0.0,0.32786885245901637)"/>
</edges>
<edges xmi:type="notation:Connector" xmi:id="_IstTMI9WEeiT7tMsBl6xjA" type="Association_Edge" source="_wnitoIn9EeiOe-BKGdv_Yg" target="_B6n_AIn-EeiOe-BKGdv_Yg">
<children xmi:type="notation:DecorationNode" xmi:id="_IstTM49WEeiT7tMsBl6xjA" type="Association_StereotypeLabel">
@@ -3473,7 +3676,7 @@
</children>
<children xmi:type="notation:DecorationNode" xmi:id="_IstTNY9WEeiT7tMsBl6xjA" type="Association_NameLabel">
<styles xmi:type="notation:BooleanValueStyle" xmi:id="_NepGQI9YEeiT7tMsBl6xjA" name="IS_UPDATED_POSITION" booleanValue="true"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_IstTNo9WEeiT7tMsBl6xjA" x="83" y="13"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_IstTNo9WEeiT7tMsBl6xjA" x="62" y="-33"/>
</children>
<children xmi:type="notation:DecorationNode" xmi:id="_Ist6QI9WEeiT7tMsBl6xjA" visible="false" type="Association_TargetRoleLabel">
<styles xmi:type="notation:BooleanValueStyle" xmi:id="_NtPi8I9YEeiT7tMsBl6xjA" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -3485,17 +3688,211 @@
</children>
<children xmi:type="notation:DecorationNode" xmi:id="_Ist6RI9WEeiT7tMsBl6xjA" type="Association_SourceMultiplicityLabel">
<styles xmi:type="notation:BooleanValueStyle" xmi:id="_OK-AwI9YEeiT7tMsBl6xjA" name="IS_UPDATED_POSITION" booleanValue="true"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_Ist6RY9WEeiT7tMsBl6xjA" x="70" y="19"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_Ist6RY9WEeiT7tMsBl6xjA" x="6" y="16"/>
</children>
<children xmi:type="notation:DecorationNode" xmi:id="_Ist6Ro9WEeiT7tMsBl6xjA" type="Association_TargetMultiplicityLabel">
<styles xmi:type="notation:BooleanValueStyle" xmi:id="_OZ2xUI9YEeiT7tMsBl6xjA" name="IS_UPDATED_POSITION" booleanValue="true"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_Ist6R49WEeiT7tMsBl6xjA" x="-71" y="-20"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_Ist6R49WEeiT7tMsBl6xjA" x="-9" y="7"/>
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_IstTMY9WEeiT7tMsBl6xjA"/>
<element xmi:type="uml:Association" href="Service.uml#_IdqxoI9WEeiT7tMsBl6xjA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_IstTMo9WEeiT7tMsBl6xjA" points="[640, 301, -643984, -643984]$[640, 520, -643984, -643984]$[373, 520, -643984, -643984]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JKyWUI9WEeiT7tMsBl6xjA" id="(0.10869565217391304,1.0)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JKyWUY9WEeiT7tMsBl6xjA" id="(1.0,0.32786885245901637)"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_IstTMo9WEeiT7tMsBl6xjA" points="[560, 261, -643984, -643984]$[560, 320, -643984, -643984]$[720, 320, -643984, -643984]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JKyWUI9WEeiT7tMsBl6xjA" id="(0.5369127516778524,1.0)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JKyWUY9WEeiT7tMsBl6xjA" id="(0.0,0.32786885245901637)"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_UW9RkcDfEeiebIKjAGZWdA" type="StereotypeCommentLink" source="_UWia0MDfEeiebIKjAGZWdA" target="_UW8qgMDfEeiebIKjAGZWdA">
+ <styles xmi:type="notation:FontStyle" xmi:id="_UW9RksDfEeiebIKjAGZWdA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_UW94osDfEeiebIKjAGZWdA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="Service.uml#_UWL1gMDfEeiebIKjAGZWdA"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UW9Rk8DfEeiebIKjAGZWdA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UW94oMDfEeiebIKjAGZWdA"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UW94ocDfEeiebIKjAGZWdA"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_LwLMgMDgEeiebIKjAGZWdA" type="Association_Edge" source="_B6n_AIn-EeiOe-BKGdv_Yg" target="_UWia0MDfEeiebIKjAGZWdA">
+ <children xmi:type="notation:DecorationNode" xmi:id="_LwLMg8DgEeiebIKjAGZWdA" type="Association_StereotypeLabel">
+ <styles xmi:type="notation:BooleanValueStyle" xmi:id="_P0Q3kMDhEeiebIKjAGZWdA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_LwLMhMDgEeiebIKjAGZWdA" y="-20"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_LwLMhcDgEeiebIKjAGZWdA" type="Association_NameLabel">
+ <styles xmi:type="notation:BooleanValueStyle" xmi:id="_P0lAoMDhEeiebIKjAGZWdA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_LwLMhsDgEeiebIKjAGZWdA" x="-16" y="-13"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_LwLMh8DgEeiebIKjAGZWdA" visible="false" type="Association_TargetRoleLabel">
+ <styles xmi:type="notation:BooleanValueStyle" xmi:id="_P00RMMDhEeiebIKjAGZWdA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_LwLMiMDgEeiebIKjAGZWdA" x="34" y="-20"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_LwLMicDgEeiebIKjAGZWdA" visible="false" type="Association_SourceRoleLabel">
+ <styles xmi:type="notation:BooleanValueStyle" xmi:id="_P1Ev4MDhEeiebIKjAGZWdA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_LwLMisDgEeiebIKjAGZWdA" x="-34" y="20"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_LwLMi8DgEeiebIKjAGZWdA" type="Association_SourceMultiplicityLabel">
+ <styles xmi:type="notation:BooleanValueStyle" xmi:id="_P1V1oMDhEeiebIKjAGZWdA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_LwLMjMDgEeiebIKjAGZWdA" x="34" y="20"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_LwLMjcDgEeiebIKjAGZWdA" type="Association_TargetMultiplicityLabel">
+ <styles xmi:type="notation:BooleanValueStyle" xmi:id="_P1mUUMDhEeiebIKjAGZWdA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_LwLzkMDgEeiebIKjAGZWdA" x="-7" y="4"/>
+ </children>
+ <styles xmi:type="notation:FontStyle" xmi:id="_LwLMgcDgEeiebIKjAGZWdA"/>
+ <element xmi:type="uml:Association" href="Service.uml#_Lvny4MDgEeiebIKjAGZWdA"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_LwLMgsDgEeiebIKjAGZWdA" points="[833, 320, -643984, -643984]$[1060, 320, -643984, -643984]$[1060, 280, -643984, -643984]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LxFygMDgEeiebIKjAGZWdA" id="(1.0,0.32786885245901637)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LxGZkMDgEeiebIKjAGZWdA" id="(0.7947019867549668,1.0)"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_HFxA98DiEeiebIKjAGZWdA" type="StereotypeCommentLink" source="_HFpFIMDiEeiebIKjAGZWdA" target="_HFxA88DiEeiebIKjAGZWdA">
+ <styles xmi:type="notation:FontStyle" xmi:id="_HFxA-MDiEeiebIKjAGZWdA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_HFxA_MDiEeiebIKjAGZWdA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="Service.uml#_HFmo4MDiEeiebIKjAGZWdA"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_HFxA-cDiEeiebIKjAGZWdA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HFxA-sDiEeiebIKjAGZWdA"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HFxA-8DiEeiebIKjAGZWdA"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_OGfRsMDiEeiebIKjAGZWdA" type="Association_Edge" source="_UWia0MDfEeiebIKjAGZWdA" target="_HFpFIMDiEeiebIKjAGZWdA">
+ <children xmi:type="notation:DecorationNode" xmi:id="_OGfRs8DiEeiebIKjAGZWdA" type="Association_StereotypeLabel">
+ <styles xmi:type="notation:BooleanValueStyle" xmi:id="_OxaeAMDiEeiebIKjAGZWdA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_OGfRtMDiEeiebIKjAGZWdA" y="-20"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_OGfRtcDiEeiebIKjAGZWdA" type="Association_NameLabel">
+ <styles xmi:type="notation:BooleanValueStyle" xmi:id="_OxunEMDiEeiebIKjAGZWdA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_OGfRtsDiEeiebIKjAGZWdA" x="-19" y="19"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_OGfRt8DiEeiebIKjAGZWdA" visible="false" type="Association_TargetRoleLabel">
+ <styles xmi:type="notation:BooleanValueStyle" xmi:id="_OyAT4MDiEeiebIKjAGZWdA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_OGfRuMDiEeiebIKjAGZWdA" x="69" y="-13"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_OGfRucDiEeiebIKjAGZWdA" visible="false" type="Association_SourceRoleLabel">
+ <styles xmi:type="notation:BooleanValueStyle" xmi:id="_OyRZoMDiEeiebIKjAGZWdA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_OGfRusDiEeiebIKjAGZWdA" x="-31" y="20"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_OGfRu8DiEeiebIKjAGZWdA" type="Association_SourceMultiplicityLabel">
+ <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Oyh4UMDiEeiebIKjAGZWdA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_OGfRvMDiEeiebIKjAGZWdA" x="20" y="7"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_OGfRvcDiEeiebIKjAGZWdA" type="Association_TargetMultiplicityLabel">
+ <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Oyy-EMDiEeiebIKjAGZWdA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_OGfRvsDiEeiebIKjAGZWdA" x="-13" y="-4"/>
+ </children>
+ <styles xmi:type="notation:FontStyle" xmi:id="_OGfRscDiEeiebIKjAGZWdA"/>
+ <element xmi:type="uml:Association" href="Service.uml#_OGFpEMDiEeiebIKjAGZWdA"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_OGfRssDiEeiebIKjAGZWdA" points="[1091, 220, -643984, -643984]$[1200, 220, -643984, -643984]$[1200, 340, -643984, -643984]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OHIK4MDiEeiebIKjAGZWdA" id="(1.0,0.4)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OHIK4cDiEeiebIKjAGZWdA" id="(0.47619047619047616,0.0)"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_605xYMGTEeiS695oPTRE1Q" type="Association_Edge" source="_B6n_AIn-EeiOe-BKGdv_Yg" target="_DBgHgIn-EeiOe-BKGdv_Yg" lineColor="0">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ZGPsIMGYEeiS695oPTRE1Q" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZGQTMMGYEeiS695oPTRE1Q" key="lineColor" value="true"/>
+ </eAnnotations>
+ <children xmi:type="notation:DecorationNode" xmi:id="_606YcMGTEeiS695oPTRE1Q" type="Association_StereotypeLabel">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_606YccGTEeiS695oPTRE1Q" y="-20"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_606YcsGTEeiS695oPTRE1Q" type="Association_NameLabel">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_606Yc8GTEeiS695oPTRE1Q" x="13" y="-8"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_606YdMGTEeiS695oPTRE1Q" visible="false" type="Association_TargetRoleLabel">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_606YdcGTEeiS695oPTRE1Q" y="-20"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_606YdsGTEeiS695oPTRE1Q" visible="false" type="Association_SourceRoleLabel">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_606Yd8GTEeiS695oPTRE1Q" y="20"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_606YeMGTEeiS695oPTRE1Q" type="Association_SourceMultiplicityLabel">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_606_gMGTEeiS695oPTRE1Q" y="20"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_606_gcGTEeiS695oPTRE1Q" type="Association_TargetMultiplicityLabel">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_606_gsGTEeiS695oPTRE1Q" y="-20"/>
+ </children>
+ <styles xmi:type="notation:FontStyle" xmi:id="_605xYcGTEeiS695oPTRE1Q"/>
+ <element xmi:type="uml:Association" href="Service.uml#_6z5EwMGTEeiS695oPTRE1Q"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_605xYsGTEeiS695oPTRE1Q" points="[800, 300, -643984, -643984]$[800, 141, -643984, -643984]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_62Wi4MGTEeiS695oPTRE1Q" id="(0.7079646017699115,0.0)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_62Wi4cGTEeiS695oPTRE1Q" id="(0.6504065040650406,1.0)"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_MrpysMGjEeiS695oPTRE1Q" type="AssociationClass_Edge" source="_mrNAUIn9EeiOe-BKGdv_Yg" target="_mrNAUIn9EeiOe-BKGdv_Yg">
+ <children xmi:type="notation:DecorationNode" xmi:id="_MrqZwMGjEeiS695oPTRE1Q" visible="false" type="AssociationClass_SourceRoleLabel">
+ <styles xmi:type="notation:BooleanValueStyle" xmi:id="_PDz84MGjEeiS695oPTRE1Q" name="IS_UPDATED_POSITION" booleanValue="true"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_MrqZwcGjEeiS695oPTRE1Q" x="-79" y="-89"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_MrqZwsGjEeiS695oPTRE1Q" visible="false" type="AssociationClass_TargetRoleLabel">
+ <styles xmi:type="notation:BooleanValueStyle" xmi:id="_PIfokMGjEeiS695oPTRE1Q" name="IS_UPDATED_POSITION" booleanValue="true"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_MrqZw8GjEeiS695oPTRE1Q" y="-38"/>
+ </children>
+ <styles xmi:type="notation:FontStyle" xmi:id="_MrpyscGjEeiS695oPTRE1Q"/>
+ <element xmi:type="uml:AssociationClass" href="Service.uml#_MnBKUMGjEeiS695oPTRE1Q"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MrpyssGjEeiS695oPTRE1Q" points="[120, 361, -643984, -643984]$[120, 420, -643984, -643984]$[120, 440, -643984, -643984]$[120, 460, -643984, -643984]$[120, 500, -643984, -643984]$[220, 500, -643984, -643984]$[220, 361, -643984, -643984]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_M5ASMMGjEeiS695oPTRE1Q" id="(0.1702127659574468,1.0)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_M5ASMcGjEeiS695oPTRE1Q" id="(0.5957446808510638,1.0)"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_Mv5ZgMGjEeiS695oPTRE1Q" type="StereotypeCommentLink" source="_MrpysMGjEeiS695oPTRE1Q" target="_Mv4ycMGjEeiS695oPTRE1Q">
+ <styles xmi:type="notation:FontStyle" xmi:id="_Mv5ZgcGjEeiS695oPTRE1Q"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Mv5ZhcGjEeiS695oPTRE1Q" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:AssociationClass" href="Service.uml#_MnBKUMGjEeiS695oPTRE1Q"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Mv5ZgsGjEeiS695oPTRE1Q" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Mv5Zg8GjEeiS695oPTRE1Q"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Mv5ZhMGjEeiS695oPTRE1Q"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_M9nsd8GjEeiS695oPTRE1Q" type="StereotypeCommentLink" source="_M9MOoMGjEeiS695oPTRE1Q" target="_M9nsc8GjEeiS695oPTRE1Q">
+ <styles xmi:type="notation:FontStyle" xmi:id="_M9nseMGjEeiS695oPTRE1Q"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_M9nsfMGjEeiS695oPTRE1Q" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:AssociationClass" href="Service.uml#_MnBKUMGjEeiS695oPTRE1Q"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_M9nsecGjEeiS695oPTRE1Q" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_M9nsesGjEeiS695oPTRE1Q"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_M9nse8GjEeiS695oPTRE1Q"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_NGNAsMGjEeiS695oPTRE1Q" type="AssociationClass_TetherEdge" source="_MrpysMGjEeiS695oPTRE1Q" target="_M9MOoMGjEeiS695oPTRE1Q">
+ <styles xmi:type="notation:FontStyle" xmi:id="_NGNAscGjEeiS695oPTRE1Q"/>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_NGNAssGjEeiS695oPTRE1Q" points="[-50, -50, 0, 0]$[-50, -50, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NGNnwMGjEeiS695oPTRE1Q" id="(0.49606299212598426,0.49606299212598426)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QMvT0MGjEeiS695oPTRE1Q" id="(0.5128205128205128,0.0)"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_hVK-8MGkEeiS695oPTRE1Q" type="AssociationClass_Edge" source="_wnitoIn9EeiOe-BKGdv_Yg" target="_wnitoIn9EeiOe-BKGdv_Yg">
+ <children xmi:type="notation:DecorationNode" xmi:id="_hVLmAMGkEeiS695oPTRE1Q" visible="false" type="AssociationClass_SourceRoleLabel">
+ <styles xmi:type="notation:BooleanValueStyle" xmi:id="_jLoKQMGkEeiS695oPTRE1Q" name="IS_UPDATED_POSITION" booleanValue="true"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_hVLmAcGkEeiS695oPTRE1Q" x="-92" y="-19"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_hVLmAsGkEeiS695oPTRE1Q" visible="false" type="AssociationClass_TargetRoleLabel">
+ <styles xmi:type="notation:BooleanValueStyle" xmi:id="_jL5QAMGkEeiS695oPTRE1Q" name="IS_UPDATED_POSITION" booleanValue="true"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_hVLmA8GkEeiS695oPTRE1Q" x="93" y="18"/>
+ </children>
+ <styles xmi:type="notation:FontStyle" xmi:id="_hVK-8cGkEeiS695oPTRE1Q"/>
+ <element xmi:type="uml:AssociationClass" href="Service.uml#_hUzLgMGkEeiS695oPTRE1Q"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hVK-8sGkEeiS695oPTRE1Q" points="[480, 240, -643984, -643984]$[440, 240, -643984, -643984]$[440, 320, -643984, -643984]$[520, 320, -643984, -643984]$[520, 261, -643984, -643984]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hWChoMGkEeiS695oPTRE1Q" id="(0.0,0.7920792079207921)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hWChocGkEeiS695oPTRE1Q" id="(0.2684563758389262,1.0)"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_hViyZMGkEeiS695oPTRE1Q" type="StereotypeCommentLink" source="_hVK-8MGkEeiS695oPTRE1Q" target="_hViyYMGkEeiS695oPTRE1Q">
+ <styles xmi:type="notation:FontStyle" xmi:id="_hViyZcGkEeiS695oPTRE1Q"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_hViyacGkEeiS695oPTRE1Q" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:AssociationClass" href="Service.uml#_hUzLgMGkEeiS695oPTRE1Q"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hViyZsGkEeiS695oPTRE1Q" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hViyZ8GkEeiS695oPTRE1Q"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hViyaMGkEeiS695oPTRE1Q"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_hWYf8sGkEeiS695oPTRE1Q" type="StereotypeCommentLink" source="_hWTAUMGkEeiS695oPTRE1Q" target="_hWYf7sGkEeiS695oPTRE1Q">
+ <styles xmi:type="notation:FontStyle" xmi:id="_hWYf88GkEeiS695oPTRE1Q"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_hWYf98GkEeiS695oPTRE1Q" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:AssociationClass" href="Service.uml#_hUzLgMGkEeiS695oPTRE1Q"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hWYf9MGkEeiS695oPTRE1Q" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hWYf9cGkEeiS695oPTRE1Q"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hWYf9sGkEeiS695oPTRE1Q"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_hW-80MGkEeiS695oPTRE1Q" type="AssociationClass_TetherEdge" source="_hVK-8MGkEeiS695oPTRE1Q" target="_hWTAUMGkEeiS695oPTRE1Q">
+ <styles xmi:type="notation:FontStyle" xmi:id="_hW-80cGkEeiS695oPTRE1Q"/>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hW-80sGkEeiS695oPTRE1Q" points="[-50, -46, 0, 0]$[-50, -46, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hW_j4MGkEeiS695oPTRE1Q" id="(0.49606299212598426,0.6299212598425197)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_h5P8YMGkEeiS695oPTRE1Q" id="(0.5633802816901409,0.0)"/>
</edges>
</notation:Diagram>
<notation:Diagram xmi:id="_LKKcAI91EeiT7tMsBl6xjA" type="PapyrusUMLClassDiagram" name="Service Catalog" measurementUnit="Pixel">
diff --git a/papyrus/ONAP Information Model/Service.uml b/papyrus/ONAP Information Model/Service.uml
index 1b1ed14..9756f1e 100644
--- a/papyrus/ONAP Information Model/Service.uml
+++ b/papyrus/ONAP Information Model/Service.uml
@@ -1,6 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<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">
+ <packagedElement xmi:type="uml:Association" xmi:id="_Lvny4MDgEeiebIKjAGZWdA" name="ServiceDescriptorHasCharacteristic" memberEnd="_LvrdQMDgEeiebIKjAGZWdA _LvvusMDgEeiebIKjAGZWdA">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_LvqPIMDgEeiebIKjAGZWdA" source="org.eclipse.papyrus">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_LvqPIcDgEeiebIKjAGZWdA" key="nature" value="UML_Nature"/>
+ </eAnnotations>
+ <ownedEnd xmi:type="uml:Property" xmi:id="_LvrdQMDgEeiebIKjAGZWdA" name="servicecharacteristic" type="_UWL1gMDfEeiebIKjAGZWdA" aggregation="shared" association="_Lvny4MDgEeiebIKjAGZWdA">
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_YXtfUMDhEeiebIKjAGZWdA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_YX00EMDhEeiebIKjAGZWdA" value="*"/>
+ </ownedEnd>
+ <ownedEnd xmi:type="uml:Property" xmi:id="_LvvusMDgEeiebIKjAGZWdA" name="servicedescriptor" type="_Jvy-QD0MEeiWMf5FLWfdLA" association="_Lvny4MDgEeiebIKjAGZWdA">
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_aGIwAMDhEeiebIKjAGZWdA" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_aGNBcMDhEeiebIKjAGZWdA" value="1"/>
+ </ownedEnd>
+ </packagedElement>
+ <packagedElement xmi:type="uml:Association" xmi:id="_6z5EwMGTEeiS695oPTRE1Q" name="ServiceDescriptorMadeAvailableAsServiceInstance" memberEnd="_6z658sGTEeiS695oPTRE1Q _6z9WMMGTEeiS695oPTRE1Q">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6z658MGTEeiS695oPTRE1Q" source="org.eclipse.papyrus">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6z658cGTEeiS695oPTRE1Q" key="nature" value="UML_Nature"/>
+ </eAnnotations>
+ <ownedEnd xmi:type="uml:Property" xmi:id="_6z658sGTEeiS695oPTRE1Q" name="serviceinstance" type="_HFfXUD0QEeiWMf5FLWfdLA" aggregation="composite" association="_6z5EwMGTEeiS695oPTRE1Q">
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_GE--gMGUEeiS695oPTRE1Q"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_GFPdMMGUEeiS695oPTRE1Q" value="*"/>
+ </ownedEnd>
+ <ownedEnd xmi:type="uml:Property" xmi:id="_6z9WMMGTEeiS695oPTRE1Q" name="servicedescriptor" type="_Jvy-QD0MEeiWMf5FLWfdLA" association="_6z5EwMGTEeiS695oPTRE1Q"/>
+ </packagedElement>
<packagedElement xmi:type="uml:Package" xmi:id="_fXMl4DOHEei5Af8DcjrhIQ" name="Associations">
<packagedElement xmi:type="uml:Association" xmi:id="_qK6eYD0PEeiWMf5FLWfdLA" name="ServiceComprisedOf" memberEnd="_qK86oD0PEeiWMf5FLWfdLA _qK_W4D0PEeiWMf5FLWfdLA">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_qK8TkD0PEeiWMf5FLWfdLA" source="org.eclipse.papyrus">
@@ -417,20 +440,21 @@
<type xmi:type="uml:Class" href="Resource.uml#_13gdcDzEEeiWMf5FLWfdLA"/>
</ownedEnd>
</packagedElement>
+ <packagedElement xmi:type="uml:Association" xmi:id="_OGFpEMDiEeiebIKjAGZWdA" name="CharacteristicHasValue" memberEnd="_OGGQIsDiEeiebIKjAGZWdA _OGHeQMDiEeiebIKjAGZWdA">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_OGGQIMDiEeiebIKjAGZWdA" source="org.eclipse.papyrus">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_OGGQIcDiEeiebIKjAGZWdA" key="nature" value="UML_Nature"/>
+ </eAnnotations>
+ <ownedEnd xmi:type="uml:Property" xmi:id="_OGGQIsDiEeiebIKjAGZWdA" name="value" type="_HFmo4MDiEeiebIKjAGZWdA" association="_OGFpEMDiEeiebIKjAGZWdA">
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_oSJdUMGSEeiS695oPTRE1Q"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_oSYG0MGSEeiS695oPTRE1Q" value="*"/>
+ </ownedEnd>
+ <ownedEnd xmi:type="uml:Property" xmi:id="_OGHeQMDiEeiebIKjAGZWdA" name="servicecharacteristic" type="_UWL1gMDfEeiebIKjAGZWdA" association="_OGFpEMDiEeiebIKjAGZWdA">
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_pttcYMGSEeiS695oPTRE1Q"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_puPn4MGSEeiS695oPTRE1Q" value="1"/>
+ </ownedEnd>
+ </packagedElement>
</packagedElement>
<packagedElement xmi:type="uml:Package" xmi:id="_fXNM8DOHEei5Af8DcjrhIQ" name="Diagrams">
- <ownedComment xmi:type="uml:Comment" xmi:id="_OR0wUI9QEeiT7tMsBl6xjA">
- <body>Red items - need input from ExtAPI team.</body>
- </ownedComment>
- <ownedComment xmi:type="uml:Comment" xmi:id="_IpxtQI9REeiT7tMsBl6xjA">
- <body>action - an enumeration?</body>
- </ownedComment>
- <ownedComment xmi:type="uml:Comment" xmi:id="_SLZ0gI9REeiT7tMsBl6xjA">
- <body>Quantity an add from TMF Model</body>
- </ownedComment>
- <ownedComment xmi:type="uml:Comment" xmi:id="_hcacQI9YEeiT7tMsBl6xjA">
- <body>Discuss ServiceOrderItem to ServiceDesc / Service Insance Multiplicity</body>
- </ownedComment>
<ownedComment xmi:type="uml:Comment" xmi:id="_eIxScJAiEei1uKE-hf_HvQ">
<body>Some Questions:&#xD;
1. Do we have a business need to have multiple service catalogs?&#xD;
@@ -447,15 +471,54 @@
<ownedComment xmi:type="uml:Comment" xmi:id="_Bs8YsJDrEei9Vqs7Ti8Wxg">
<body>I don't think SDC uses the SID Characteristic patern.</body>
</ownedComment>
- <packagedElement xmi:type="uml:Enumeration" xmi:id="_DwZV4LwnEeifWa7EkiXrHA" name="OrderPriority">
- <ownedComment xmi:type="uml:Comment" xmi:id="_ShbhQLwnEeifWa7EkiXrHA" annotatedElement="_DwZV4LwnEeifWa7EkiXrHA">
- <body>A way that can be used by order requester to prioritize orders in Service Order Management system (from 0 to 4: 0 is the highest priority, and 4 the lowest). It could be for example valued by BSS based on customer order requested priority.</body>
+ <packagedElement xmi:type="uml:Class" xmi:id="_UWL1gMDfEeiebIKjAGZWdA" name="ServiceCharacteristic">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_gEq14MDfEeiebIKjAGZWdA" name="name">
+ <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_j0sK4MDfEeiebIKjAGZWdA" name="valueType">
+ <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+ </ownedAttribute>
+ </packagedElement>
+ <packagedElement xmi:type="uml:Class" xmi:id="_HFmo4MDiEeiebIKjAGZWdA" name="Value">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_1_pvIMGSEeiS695oPTRE1Q" name="value">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_nT4ykMHEEeiS695oPTRE1Q" annotatedElement="_1_pvIMGSEeiS695oPTRE1Q">
+ <body>The value of a given ServiceCharacteristic</body>
+ </ownedComment>
+ <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+ </ownedAttribute>
+ </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">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_MnE0sMGjEeiS695oPTRE1Q" key="nature" value="UML_Nature"/>
+ </eAnnotations>
+ <ownedComment xmi:type="uml:Comment" xmi:id="_SeyhEMHGEeirPIyAdej0kg" annotatedElement="_MnBKUMGjEeiS695oPTRE1Q">
+ <body>An assocation between two ServiceOrders.</body>
</ownedComment>
- <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_I95VgLwnEeifWa7EkiXrHA" name="0"/>
- <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_JzrG8LwnEeifWa7EkiXrHA" name="1"/>
- <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_K5KvYLwnEeifWa7EkiXrHA" name="2"/>
- <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_LyHJkLwnEeifWa7EkiXrHA" name="3"/>
- <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_M98qkLwnEeifWa7EkiXrHA" name="4"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_R9Rn4MGkEeiS695oPTRE1Q" name="type">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_tEYKYMNMEeik36qdAhNdCw" annotatedElement="_R9Rn4MGkEeiS695oPTRE1Q">
+ <body>A categorization of the relationship, such as bulk, parent/child, and so forth.</body>
+ </ownedComment>
+ <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+ </ownedAttribute>
+ <ownedEnd xmi:type="uml:Property" xmi:id="_MnE0scGjEeiS695oPTRE1Q" name="serviceorder" type="_mrJV8In9EeiOe-BKGdv_Yg" association="_MnBKUMGjEeiS695oPTRE1Q"/>
+ <ownedEnd xmi:type="uml:Property" xmi:id="_MnGp4MGjEeiS695oPTRE1Q" name="serviceorder" type="_mrJV8In9EeiOe-BKGdv_Yg" association="_MnBKUMGjEeiS695oPTRE1Q"/>
+ </packagedElement>
+ <packagedElement xmi:type="uml:AssociationClass" xmi:id="_hUzLgMGkEeiS695oPTRE1Q" name="OrderItemRelationship" memberEnd="_hU0ZosGkEeiS695oPTRE1Q _hU1AsMGkEeiS695oPTRE1Q">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_hU0ZoMGkEeiS695oPTRE1Q" source="org.eclipse.papyrus">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hU0ZocGkEeiS695oPTRE1Q" key="nature" value="UML_Nature"/>
+ </eAnnotations>
+ <ownedComment xmi:type="uml:Comment" xmi:id="_7KUVAMHFEeirPIyAdej0kg" annotatedElement="_hUzLgMGkEeiS695oPTRE1Q">
+ <body>Enables specifying any kind of relastionships between ServiceOrderItems</body>
+ </ownedComment>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="__mP8gMG_EeiS695oPTRE1Q" name="type">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_QqfcUMNPEeik36qdAhNdCw" annotatedElement="__mP8gMG_EeiS695oPTRE1Q">
+ <body>The type of relationship such as contains, relies on.&#xD;
+</body>
+ </ownedComment>
+ <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+ </ownedAttribute>
+ <ownedEnd xmi:type="uml:Property" xmi:id="_hU0ZosGkEeiS695oPTRE1Q" name="serviceorderitem" type="_wng4cIn9EeiOe-BKGdv_Yg" association="_hUzLgMGkEeiS695oPTRE1Q"/>
+ <ownedEnd xmi:type="uml:Property" xmi:id="_hU1AsMGkEeiS695oPTRE1Q" name="serviceorderitem" type="_wng4cIn9EeiOe-BKGdv_Yg" association="_hUzLgMGkEeiS695oPTRE1Q"/>
</packagedElement>
</packagedElement>
<packagedElement xmi:type="uml:Package" xmi:id="_fXNM8TOHEei5Af8DcjrhIQ" name="Interfaces"/>
@@ -1252,6 +1315,9 @@ NOTE: It indicates an exhaustive list of all the CP instances and SAP instances
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
</ownedAttribute>
<ownedAttribute xmi:type="uml:Property" xmi:id="_rUHk0IoAEeiOe-BKGdv_Yg" name="_serviceOrderItem" type="_wng4cIn9EeiOe-BKGdv_Yg" aggregation="composite" association="_rUEhgIoAEeiOe-BKGdv_Yg">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_iFnW4MHEEeiS695oPTRE1Q" annotatedElement="_rUHk0IoAEeiOe-BKGdv_Yg">
+ <body>Reference to ServiceOrderItem</body>
+ </ownedComment>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_rUIy8IoAEeiOe-BKGdv_Yg" value="1"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rUIy8YoAEeiOe-BKGdv_Yg" value="*"/>
</ownedAttribute>
@@ -1274,14 +1340,15 @@ NOTE: It indicates an exhaustive list of all the CP instances and SAP instances
</ownedComment>
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
</ownedAttribute>
- <ownedAttribute xmi:type="uml:Property" xmi:id="_ttCHgIoBEeiOe-BKGdv_Yg" name="action">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_ttCHgIoBEeiOe-BKGdv_Yg" name="action" type="_pWPaEMA-Eei02ItngDf4ZA">
<ownedComment xmi:type="uml:Comment" xmi:id="_LsUUcI6REeiLSKWGMeE9mQ" annotatedElement="_ttCHgIoBEeiOe-BKGdv_Yg">
<body>The action to take for an InteractionItem, such as add, change, remove.</body>
</ownedComment>
- <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
</ownedAttribute>
- <ownedAttribute xmi:type="uml:Property" xmi:id="_uN6nAIoBEeiOe-BKGdv_Yg" name="state">
- <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_uN6nAIoBEeiOe-BKGdv_Yg" name="state" type="_3a0cEI6OEeiLSKWGMeE9mQ">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_5cQbYMA-Eei02ItngDf4ZA" annotatedElement="_uN6nAIoBEeiOe-BKGdv_Yg">
+ <body>State of the order item: described in the state machine diagram. This is the requested state.</body>
+ </ownedComment>
</ownedAttribute>
<ownedAttribute xmi:type="uml:Property" xmi:id="_up_fAIoBEeiOe-BKGdv_Yg" name="Quantity">
<ownedComment xmi:type="uml:Comment" xmi:id="_ge_5MI6REeiLSKWGMeE9mQ" annotatedElement="_up_fAIoBEeiOe-BKGdv_Yg">
@@ -1289,15 +1356,6 @@ NOTE: It indicates an exhaustive list of all the CP instances and SAP instances
</ownedComment>
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
</ownedAttribute>
- <ownedAttribute xmi:type="uml:Property" xmi:id="_wUQocIoBEeiOe-BKGdv_Yg" name="type">
- <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
- </ownedAttribute>
- <ownedAttribute xmi:type="uml:Property" xmi:id="_vltEcI9TEeiT7tMsBl6xjA" name="schemaLocation">
- <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
- </ownedAttribute>
- <ownedAttribute xmi:type="uml:Property" xmi:id="_xbTUII9TEeiT7tMsBl6xjA" name="baseType">
- <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
- </ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="_iQkugJpYEeidy9iGT_F5-w" name="ServiceDescAtomic">
<generalization xmi:type="uml:Generalization" xmi:id="_5lowcJpYEeidy9iGT_F5-w" general="_Jvy-QD0MEeiWMf5FLWfdLA"/>
@@ -1666,15 +1724,15 @@ NOTE 3: When the corresponding NS level is used in the context of NS scaling, t
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Enumeration" xmi:id="_3a0cEI6OEeiLSKWGMeE9mQ" name="OrderState">
- <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_7KgZ4I6OEeiLSKWGMeE9mQ" name="Acknowledged"/>
- <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_9e8hsI6OEeiLSKWGMeE9mQ" name="InProgress"/>
- <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_A5qVEI6PEeiLSKWGMeE9mQ" name="Pending"/>
- <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_CIzBsI6PEeiLSKWGMeE9mQ" name="Held"/>
- <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Ded0II6PEeiLSKWGMeE9mQ" name="Cancelled"/>
- <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_EoLOMI6PEeiLSKWGMeE9mQ" name="Completed"/>
- <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_GBApYI6PEeiLSKWGMeE9mQ" name="Failed"/>
- <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_HE9ZsI6PEeiLSKWGMeE9mQ" name="Partial"/>
- <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_JHmm4I6PEeiLSKWGMeE9mQ" name="Rejected"/>
+ <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_7KgZ4I6OEeiLSKWGMeE9mQ" name="ACKNOWLEDGED"/>
+ <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_9e8hsI6OEeiLSKWGMeE9mQ" name="IN_PROGRESS"/>
+ <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_A5qVEI6PEeiLSKWGMeE9mQ" name="PENDING"/>
+ <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_CIzBsI6PEeiLSKWGMeE9mQ" name="HELD"/>
+ <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Ded0II6PEeiLSKWGMeE9mQ" name="CANCELLED"/>
+ <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_EoLOMI6PEeiLSKWGMeE9mQ" name="COMPLETED"/>
+ <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_GBApYI6PEeiLSKWGMeE9mQ" name="FAILED"/>
+ <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_HE9ZsI6PEeiLSKWGMeE9mQ" name="PARTIAL"/>
+ <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_JHmm4I6PEeiLSKWGMeE9mQ" name="REJECTED"/>
</packagedElement>
<packagedElement xmi:type="uml:DataType" xmi:id="_RZ1sQJAjEei1uKE-hf_HvQ" name="TimePeriod">
<ownedComment xmi:type="uml:Comment" xmi:id="_5k0icJAjEei1uKE-hf_HvQ" annotatedElement="_RZ1sQJAjEei1uKE-hf_HvQ">
@@ -1701,6 +1759,22 @@ If null, then represents to the end of time&#xD;
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EDate"/>
</ownedAttribute>
</packagedElement>
+ <packagedElement xmi:type="uml:Enumeration" xmi:id="_pWPaEMA-Eei02ItngDf4ZA" name="Action">
+ <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_t-VmkMA-Eei02ItngDf4ZA" name="ADD"/>
+ <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_vKPZAMA-Eei02ItngDf4ZA" name="MODIFY"/>
+ <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_wjzM8MA-Eei02ItngDf4ZA" name="DELETE"/>
+ <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yj4OUMA-Eei02ItngDf4ZA" name="NO_CHANGE"/>
+ </packagedElement>
+ <packagedElement xmi:type="uml:Enumeration" xmi:id="_DwZV4LwnEeifWa7EkiXrHA" name="OrderPriority">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_ShbhQLwnEeifWa7EkiXrHA" annotatedElement="_DwZV4LwnEeifWa7EkiXrHA">
+ <body>A way that can be used by order requester to prioritize orders in Service Order Management system (from 0 to 4: 0 is the highest priority, and 4 the lowest). It could be for example valued by BSS based on customer order requested priority.</body>
+ </ownedComment>
+ <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_I95VgLwnEeifWa7EkiXrHA" name="0"/>
+ <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_JzrG8LwnEeifWa7EkiXrHA" name="1"/>
+ <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_K5KvYLwnEeifWa7EkiXrHA" name="2"/>
+ <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_LyHJkLwnEeifWa7EkiXrHA" name="3"/>
+ <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_M98qkLwnEeifWa7EkiXrHA" name="4"/>
+ </packagedElement>
</packagedElement>
<profileApplication xmi:type="uml:ProfileApplication" xmi:id="_ouVZoKVwEeikF6xsfT18UA">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ouXO0KVwEeikF6xsfT18UA" source="http://www.eclipse.org/uml2/2.0.0/UML">
@@ -2049,12 +2123,9 @@ If null, then represents to the end of time&#xD;
<OpenModel_Profile:OpenModelAttribute xmi:id="_ttCHgooBEeiOe-BKGdv_Yg" base_StructuralFeature="_ttCHgIoBEeiOe-BKGdv_Yg"/>
<OpenModel_Profile:OpenModelAttribute xmi:id="_uN7OEYoBEeiOe-BKGdv_Yg" base_StructuralFeature="_uN6nAIoBEeiOe-BKGdv_Yg"/>
<OpenModel_Profile:OpenModelAttribute xmi:id="_up_fAooBEeiOe-BKGdv_Yg" base_StructuralFeature="_up_fAIoBEeiOe-BKGdv_Yg"/>
- <OpenModel_Profile:OpenModelAttribute xmi:id="_wUQocooBEeiOe-BKGdv_Yg" base_StructuralFeature="_wUQocIoBEeiOe-BKGdv_Yg"/>
<OpenModel_Profile:OpenModelAttribute xmi:id="_LBvXsooCEeiOe-BKGdv_Yg" base_StructuralFeature="_LBvXsIoCEeiOe-BKGdv_Yg"/>
<OpenModel_Profile:OpenModelAttribute xmi:id="_LBv-xIoCEeiOe-BKGdv_Yg" base_StructuralFeature="_LBv-wooCEeiOe-BKGdv_Yg"/>
<OpenModel_Profile:OpenModelAttribute xmi:id="_uattgI6OEeiLSKWGMeE9mQ" base_StructuralFeature="_uatGcI6OEeiLSKWGMeE9mQ"/>
- <OpenModel_Profile:OpenModelAttribute xmi:id="_vltrgY9TEeiT7tMsBl6xjA" base_StructuralFeature="_vltEcI9TEeiT7tMsBl6xjA"/>
- <OpenModel_Profile:OpenModelAttribute xmi:id="_xbT7MY9TEeiT7tMsBl6xjA" base_StructuralFeature="_xbTUII9TEeiT7tMsBl6xjA"/>
<OpenModel_Profile:OpenModelAttribute xmi:id="_IdvDEI9WEeiT7tMsBl6xjA" base_StructuralFeature="_IducAI9WEeiT7tMsBl6xjA"/>
<OpenModel_Profile:OpenModelAttribute xmi:id="_IdwRMo9WEeiT7tMsBl6xjA" base_StructuralFeature="_IdwRMI9WEeiT7tMsBl6xjA"/>
<OpenModel_Profile:OpenModelClass xmi:id="_efN6QY93EeiT7tMsBl6xjA" base_Class="_efN6QI93EeiT7tMsBl6xjA"/>
@@ -2287,4 +2358,23 @@ If null, then represents to the end of time&#xD;
<OpenModel_Profile:OpenModelAttribute xmi:id="_0kRp0bxOEeiMnLuHd6ALAg">
<base_StructuralFeature xmi:type="uml:Property" href="Vnf.uml#_0kRp0LxOEeiMnLuHd6ALAg"/>
</OpenModel_Profile:OpenModelAttribute>
+ <OpenModel_Profile:OpenModelClass xmi:id="_UWORwMDfEeiebIKjAGZWdA" base_Class="_UWL1gMDfEeiebIKjAGZWdA"/>
+ <OpenModel_Profile:OpenModelAttribute xmi:id="_gErc8MDfEeiebIKjAGZWdA" base_StructuralFeature="_gEq14MDfEeiebIKjAGZWdA"/>
+ <OpenModel_Profile:OpenModelAttribute xmi:id="_j0sK4cDfEeiebIKjAGZWdA" base_StructuralFeature="_j0sK4MDfEeiebIKjAGZWdA"/>
+ <OpenModel_Profile:OpenModelAttribute xmi:id="_LvrdQcDgEeiebIKjAGZWdA" base_StructuralFeature="_LvrdQMDgEeiebIKjAGZWdA"/>
+ <OpenModel_Profile:OpenModelAttribute xmi:id="_LvwVwMDgEeiebIKjAGZWdA" base_StructuralFeature="_LvvusMDgEeiebIKjAGZWdA"/>
+ <OpenModel_Profile:OpenModelClass xmi:id="_HFmo4cDiEeiebIKjAGZWdA" base_Class="_HFmo4MDiEeiebIKjAGZWdA"/>
+ <OpenModel_Profile:OpenModelAttribute xmi:id="_OGG3MMDiEeiebIKjAGZWdA" base_StructuralFeature="_OGGQIsDiEeiebIKjAGZWdA"/>
+ <OpenModel_Profile:OpenModelAttribute xmi:id="_OGHeQcDiEeiebIKjAGZWdA" base_StructuralFeature="_OGHeQMDiEeiebIKjAGZWdA"/>
+ <OpenModel_Profile:OpenModelAttribute xmi:id="_1_pvIcGSEeiS695oPTRE1Q" base_StructuralFeature="_1_pvIMGSEeiS695oPTRE1Q"/>
+ <OpenModel_Profile:OpenModelAttribute xmi:id="_6z7hAMGTEeiS695oPTRE1Q" base_StructuralFeature="_6z658sGTEeiS695oPTRE1Q"/>
+ <OpenModel_Profile:OpenModelAttribute xmi:id="_6z9WMcGTEeiS695oPTRE1Q" base_StructuralFeature="_6z9WMMGTEeiS695oPTRE1Q"/>
+ <OpenModel_Profile:OpenModelClass xmi:id="_MnBxYMGjEeiS695oPTRE1Q" base_Class="_MnBKUMGjEeiS695oPTRE1Q"/>
+ <OpenModel_Profile:OpenModelAttribute xmi:id="_MnE0ssGjEeiS695oPTRE1Q" base_StructuralFeature="_MnE0scGjEeiS695oPTRE1Q"/>
+ <OpenModel_Profile:OpenModelAttribute xmi:id="_MnGp4cGjEeiS695oPTRE1Q" base_StructuralFeature="_MnGp4MGjEeiS695oPTRE1Q"/>
+ <OpenModel_Profile:OpenModelAttribute xmi:id="_R9Rn4cGkEeiS695oPTRE1Q" base_StructuralFeature="_R9Rn4MGkEeiS695oPTRE1Q"/>
+ <OpenModel_Profile:OpenModelClass xmi:id="_hUzLgcGkEeiS695oPTRE1Q" base_Class="_hUzLgMGkEeiS695oPTRE1Q"/>
+ <OpenModel_Profile:OpenModelAttribute xmi:id="_hU0Zo8GkEeiS695oPTRE1Q" base_StructuralFeature="_hU0ZosGkEeiS695oPTRE1Q"/>
+ <OpenModel_Profile:OpenModelAttribute xmi:id="_hU1nwMGkEeiS695oPTRE1Q" base_StructuralFeature="_hU1AsMGkEeiS695oPTRE1Q"/>
+ <OpenModel_Profile:OpenModelAttribute xmi:id="__mP8gcG_EeiS695oPTRE1Q" base_StructuralFeature="__mP8gMG_EeiS695oPTRE1Q"/>
</xmi:XMI>
diff --git a/papyrus/ONAP Information Model/Vnf.notation b/papyrus/ONAP Information Model/Vnf.notation
index e2d8a1c..05865e4 100644
--- a/papyrus/ONAP Information Model/Vnf.notation
+++ b/papyrus/ONAP Information Model/Vnf.notation
@@ -4562,45 +4562,6 @@
<element xsi:nil="true"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_NGxz1UKAEeiwbqJBYHKltg" x="200"/>
</children>
- <children xmi:type="notation:Shape" xmi:id="_uncuIEKAEeiwbqJBYHKltg" type="Class_Shape">
- <children xmi:type="notation:DecorationNode" xmi:id="_uncuIkKAEeiwbqJBYHKltg" type="Class_NameLabel"/>
- <children xmi:type="notation:DecorationNode" xmi:id="_uncuI0KAEeiwbqJBYHKltg" type="Class_FloatingNameLabel">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_uncuJEKAEeiwbqJBYHKltg" y="15"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_uncuJUKAEeiwbqJBYHKltg" visible="false" type="Class_AttributeCompartment">
- <styles xmi:type="notation:TitleStyle" xmi:id="_uncuJkKAEeiwbqJBYHKltg"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_uncuJ0KAEeiwbqJBYHKltg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_uncuKEKAEeiwbqJBYHKltg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uncuKUKAEeiwbqJBYHKltg"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_uncuKkKAEeiwbqJBYHKltg" visible="false" type="Class_OperationCompartment">
- <styles xmi:type="notation:TitleStyle" xmi:id="_uncuK0KAEeiwbqJBYHKltg"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_uncuLEKAEeiwbqJBYHKltg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_uncuLUKAEeiwbqJBYHKltg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uncuLkKAEeiwbqJBYHKltg"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_uncuL0KAEeiwbqJBYHKltg" visible="false" type="Class_NestedClassifierCompartment">
- <styles xmi:type="notation:TitleStyle" xmi:id="_uncuMEKAEeiwbqJBYHKltg"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_uncuMUKAEeiwbqJBYHKltg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_uncuMkKAEeiwbqJBYHKltg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uncuM0KAEeiwbqJBYHKltg"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_unkp8EKAEeiwbqJBYHKltg" visible="false" type="StereotypeLabel">
- <styles xmi:type="notation:StringValueStyle" xmi:id="_unkp8UKAEeiwbqJBYHKltg" name="stereotype" stringValue="OpenModel_Profile::OpenModelClass"/>
- <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_unkp8kKAEeiwbqJBYHKltg"/>
- </children>
- <element xmi:type="uml:Class" href="Vnf.uml#_e5WnwDOREeiHat9KcP8uWA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uncuIUKAEeiwbqJBYHKltg" x="1080" y="800" height="73"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_unntQ0KAEeiwbqJBYHKltg" type="StereotypeComment">
- <styles xmi:type="notation:TitleStyle" xmi:id="_unntREKAEeiwbqJBYHKltg"/>
- <styles xmi:type="notation:EObjectValueStyle" xmi:id="_unntRkKAEeiwbqJBYHKltg" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:Class" href="Vnf.uml#_e5WnwDOREeiHat9KcP8uWA"/>
- </styles>
- <element xsi:nil="true"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_unntRUKAEeiwbqJBYHKltg" x="200"/>
- </children>
<styles xmi:type="notation:StringValueStyle" xmi:id="_ojifoT0JEeiuk5pWzMOpfA" name="diagram_compatibility_version" stringValue="1.4.0"/>
<styles xmi:type="notation:DiagramStyle" xmi:id="_ojifoj0JEeiuk5pWzMOpfA"/>
<styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_ojifoz0JEeiuk5pWzMOpfA" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
@@ -4754,7 +4715,7 @@
<styles xmi:type="notation:FontStyle" xmi:id="_KOp3gUJ9EeiwbqJBYHKltg"/>
<element xmi:type="uml:Association" href="Vnf.uml#_KOPAwEJ9EeiwbqJBYHKltg"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_KOp3gkJ9EeiwbqJBYHKltg" points="[660, 860, -643984, -643984]$[660, 680, -643984, -643984]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_KPVM8EJ9EeiwbqJBYHKltg" id="(0.4838709677419355,0.0)"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_KPVM8EJ9EeiwbqJBYHKltg" id="(0.6,0.0)"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_KPVM8UJ9EeiwbqJBYHKltg" id="(0.45977011494252873,1.0)"/>
</edges>
<edges xmi:type="notation:Connector" xmi:id="_YdHhV0J9EeiwbqJBYHKltg" type="StereotypeCommentLink" source="_Yc77IEJ9EeiwbqJBYHKltg" target="_YdHhU0J9EeiwbqJBYHKltg">
@@ -4879,7 +4840,7 @@
<styles xmi:type="notation:FontStyle" xmi:id="_K8vlMUKAEeiwbqJBYHKltg"/>
<element xsi:nil="true"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_K8vlMkKAEeiwbqJBYHKltg" points="[1260, -20, -643984, -643984]$[1260, 80, -643984, -643984]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_K9S-0EKAEeiwbqJBYHKltg" id="(0.7272727272727273,1.0)"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_K9S-0EKAEeiwbqJBYHKltg" id="(0.36363636363636365,1.0)"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_K9S-0UKAEeiwbqJBYHKltg" id="(0.42105263157894735,0.0)"/>
</edges>
<edges xmi:type="notation:Connector" xmi:id="_NGya4UKAEeiwbqJBYHKltg" type="StereotypeCommentLink" source="_NGlmkEKAEeiwbqJBYHKltg" target="_NGxz00KAEeiwbqJBYHKltg">
@@ -5010,16 +4971,6 @@
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_h8VGYEKAEeiwbqJBYHKltg" id="(0.6,1.0)"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_h8VGYUKAEeiwbqJBYHKltg" id="(1.0,0.6)"/>
</edges>
- <edges xmi:type="notation:Connector" xmi:id="_unntR0KAEeiwbqJBYHKltg" type="StereotypeCommentLink" source="_uncuIEKAEeiwbqJBYHKltg" target="_unntQ0KAEeiwbqJBYHKltg">
- <styles xmi:type="notation:FontStyle" xmi:id="_unntSEKAEeiwbqJBYHKltg"/>
- <styles xmi:type="notation:EObjectValueStyle" xmi:id="_unoUUEKAEeiwbqJBYHKltg" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:Class" href="Vnf.uml#_e5WnwDOREeiHat9KcP8uWA"/>
- </styles>
- <element xsi:nil="true"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_unntSUKAEeiwbqJBYHKltg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_unntSkKAEeiwbqJBYHKltg"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_unntS0KAEeiwbqJBYHKltg"/>
- </edges>
</notation:Diagram>
<notation:Diagram xmi:id="_iHSngF3PEeiwL5tPgFMcjQ" type="PapyrusUMLClassDiagram" name="VNF Instance" measurementUnit="Pixel">
<children xmi:type="notation:Shape" xmi:id="_jLU3YF3PEeiwL5tPgFMcjQ" type="Class_Shape">
@@ -6167,104 +6118,6 @@
<element xmi:type="uml:Enumeration" href="Vnf.uml#_c8RX8D3BEeiFiY3bcpqGkg"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_3y2zsXPWEeiuFfjlON-CuQ" x="400" y="160"/>
</children>
- <children xmi:type="notation:Shape" xmi:id="_4baBcHPWEeiuFfjlON-CuQ" type="DataType_Shape">
- <children xmi:type="notation:DecorationNode" xmi:id="_4baBcnPWEeiuFfjlON-CuQ" type="DataType_NameLabel"/>
- <children xmi:type="notation:DecorationNode" xmi:id="_4baBc3PWEeiuFfjlON-CuQ" type="DataType_FloatingNameLabel">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_4baBdHPWEeiuFfjlON-CuQ" y="15"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_4baBdXPWEeiuFfjlON-CuQ" type="DataType_AttributeCompartment">
- <children xmi:type="notation:Shape" xmi:id="_JxduUHPXEeiuFfjlON-CuQ" type="Property_DataTypeAttributeLabel">
- <element xmi:type="uml:Property" href="Vnf.uml#_ifaxMDdPEeiIfPeSAqyGdQ"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_JxduUXPXEeiuFfjlON-CuQ"/>
- </children>
- <styles xmi:type="notation:TitleStyle" xmi:id="_4baBdnPWEeiuFfjlON-CuQ"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_4baBd3PWEeiuFfjlON-CuQ"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_4baBeHPWEeiuFfjlON-CuQ"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4baBeXPWEeiuFfjlON-CuQ"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_4baBenPWEeiuFfjlON-CuQ" visible="false" type="DataType_OperationCompartment">
- <styles xmi:type="notation:TitleStyle" xmi:id="_4baBe3PWEeiuFfjlON-CuQ"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_4baBfHPWEeiuFfjlON-CuQ"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_4baBfXPWEeiuFfjlON-CuQ"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4baBfnPWEeiuFfjlON-CuQ"/>
- </children>
- <element xmi:type="uml:DataType" href="Vnf.uml#_X9TdUDdPEeiIfPeSAqyGdQ"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4baBcXPWEeiuFfjlON-CuQ" x="580" y="160"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_47yxsHPWEeiuFfjlON-CuQ" type="DataType_Shape">
- <children xmi:type="notation:DecorationNode" xmi:id="_47yxsnPWEeiuFfjlON-CuQ" type="DataType_NameLabel"/>
- <children xmi:type="notation:DecorationNode" xmi:id="_47yxs3PWEeiuFfjlON-CuQ" type="DataType_FloatingNameLabel">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_47yxtHPWEeiuFfjlON-CuQ" y="15"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_47yxtXPWEeiuFfjlON-CuQ" type="DataType_AttributeCompartment">
- <children xmi:type="notation:Shape" xmi:id="_LK9Q0HPXEeiuFfjlON-CuQ" type="Property_DataTypeAttributeLabel">
- <element xmi:type="uml:Property" href="Vnf.uml#_-b8GcDdPEeiIfPeSAqyGdQ"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_LK9Q0XPXEeiuFfjlON-CuQ"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_LK934HPXEeiuFfjlON-CuQ" type="Property_DataTypeAttributeLabel">
- <element xmi:type="uml:Property" href="Vnf.uml#__BqCoDdPEeiIfPeSAqyGdQ"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_LK934XPXEeiuFfjlON-CuQ"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_LK934nPXEeiuFfjlON-CuQ" type="Property_DataTypeAttributeLabel">
- <element xmi:type="uml:Property" href="Vnf.uml#__o0JQDdPEeiIfPeSAqyGdQ"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_LK9343PXEeiuFfjlON-CuQ"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_LK935HPXEeiuFfjlON-CuQ" type="Property_DataTypeAttributeLabel">
- <element xmi:type="uml:Property" href="Vnf.uml#_Ag8rIDdQEeiIfPeSAqyGdQ"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_LK935XPXEeiuFfjlON-CuQ"/>
- </children>
- <styles xmi:type="notation:TitleStyle" xmi:id="_47yxtnPWEeiuFfjlON-CuQ"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_47yxt3PWEeiuFfjlON-CuQ"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_47yxuHPWEeiuFfjlON-CuQ"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_47yxuXPWEeiuFfjlON-CuQ"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_47yxunPWEeiuFfjlON-CuQ" visible="false" type="DataType_OperationCompartment">
- <styles xmi:type="notation:TitleStyle" xmi:id="_47yxu3PWEeiuFfjlON-CuQ"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_47yxvHPWEeiuFfjlON-CuQ"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_47yxvXPWEeiuFfjlON-CuQ"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_47yxvnPWEeiuFfjlON-CuQ"/>
- </children>
- <element xmi:type="uml:DataType" href="Vnf.uml#_4oResDdPEeiIfPeSAqyGdQ"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_47yxsXPWEeiuFfjlON-CuQ" x="40" y="280" height="101"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_5iMDUHPWEeiuFfjlON-CuQ" type="Enumeration_Shape">
- <children xmi:type="notation:DecorationNode" xmi:id="_5iMqYHPWEeiuFfjlON-CuQ" type="Enumeration_NameLabel"/>
- <children xmi:type="notation:DecorationNode" xmi:id="_5iMqYXPWEeiuFfjlON-CuQ" type="Enumeration_FloatingNameLabel">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_5iMqYnPWEeiuFfjlON-CuQ" y="15"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_5iMqY3PWEeiuFfjlON-CuQ" type="Enumeration_LiteralCompartment">
- <children xmi:type="notation:Shape" xmi:id="_fnu3AHPXEeiuFfjlON-CuQ" type="EnumerationLiteral_LiteralLabel">
- <element xmi:type="uml:EnumerationLiteral" href="Vnf.uml#_0VFxQDnLEeiWMf5FLWfdLA"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_fnu3AXPXEeiuFfjlON-CuQ"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_fnveEHPXEeiuFfjlON-CuQ" type="EnumerationLiteral_LiteralLabel">
- <element xmi:type="uml:EnumerationLiteral" href="Vnf.uml#_2M_uEDnLEeiWMf5FLWfdLA"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_fnveEXPXEeiuFfjlON-CuQ"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_fnveEnPXEeiuFfjlON-CuQ" type="EnumerationLiteral_LiteralLabel">
- <element xmi:type="uml:EnumerationLiteral" href="Vnf.uml#_46OwYDnLEeiWMf5FLWfdLA"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_fnveE3PXEeiuFfjlON-CuQ"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_fnveFHPXEeiuFfjlON-CuQ" type="EnumerationLiteral_LiteralLabel">
- <element xmi:type="uml:EnumerationLiteral" href="Vnf.uml#_6gEFwDnLEeiWMf5FLWfdLA"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_fnveFXPXEeiuFfjlON-CuQ"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_fnveFnPXEeiuFfjlON-CuQ" type="EnumerationLiteral_LiteralLabel">
- <element xmi:type="uml:EnumerationLiteral" href="Vnf.uml#_95b1UDnLEeiWMf5FLWfdLA"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_fnveF3PXEeiuFfjlON-CuQ"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_fnveGHPXEeiuFfjlON-CuQ" type="EnumerationLiteral_LiteralLabel">
- <element xmi:type="uml:EnumerationLiteral" href="Vnf.uml#__bv8oDnLEeiWMf5FLWfdLA"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_fnveGXPXEeiuFfjlON-CuQ"/>
- </children>
- <styles xmi:type="notation:TitleStyle" xmi:id="_5iMqZHPWEeiuFfjlON-CuQ"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_5iMqZXPWEeiuFfjlON-CuQ"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_5iMqZnPWEeiuFfjlON-CuQ"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5iMqZ3PWEeiuFfjlON-CuQ"/>
- </children>
- <element xmi:type="uml:Enumeration" href="Vnf.uml#_tFQGcDnLEeiWMf5FLWfdLA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5iMDUXPWEeiuFfjlON-CuQ" x="420" y="280"/>
- </children>
<children xmi:type="notation:Shape" xmi:id="_58Ei8HPWEeiuFfjlON-CuQ" type="Enumeration_Shape">
<children xmi:type="notation:DecorationNode" xmi:id="_58Ei8nPWEeiuFfjlON-CuQ" type="Enumeration_NameLabel"/>
<children xmi:type="notation:DecorationNode" xmi:id="_58FKAHPWEeiuFfjlON-CuQ" type="Enumeration_FloatingNameLabel">
@@ -7669,16 +7522,6 @@
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_llOLC5UGEeiYXO5wr78TUw"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_llOLDJUGEeiYXO5wr78TUw"/>
</edges>
- <edges xmi:type="notation:Connector" xmi:id="_yR0ZcJUGEeiYXO5wr78TUw" type="StereotypeCommentLink" source="_4baBcHPWEeiuFfjlON-CuQ" target="_yRzyZ5UGEeiYXO5wr78TUw">
- <styles xmi:type="notation:FontStyle" xmi:id="_yR0ZcZUGEeiYXO5wr78TUw"/>
- <styles xmi:type="notation:EObjectValueStyle" xmi:id="_yR0ZdZUGEeiYXO5wr78TUw" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="Vnf.uml#_X9TdUDdPEeiIfPeSAqyGdQ"/>
- </styles>
- <element xsi:nil="true"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_yR0ZcpUGEeiYXO5wr78TUw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_yR0Zc5UGEeiYXO5wr78TUw"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_yR0ZdJUGEeiYXO5wr78TUw"/>
- </edges>
<edges xmi:type="notation:Connector" xmi:id="_26M525UGEeiYXO5wr78TUw" type="StereotypeCommentLink" source="_3y2zsHPWEeiuFfjlON-CuQ" target="_26M515UGEeiYXO5wr78TUw">
<styles xmi:type="notation:FontStyle" xmi:id="_26M53JUGEeiYXO5wr78TUw"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_26M54JUGEeiYXO5wr78TUw" name="BASE_ELEMENT">
@@ -7689,26 +7532,6 @@
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_26M53pUGEeiYXO5wr78TUw"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_26M535UGEeiYXO5wr78TUw"/>
</edges>
- <edges xmi:type="notation:Connector" xmi:id="_4axUtJUGEeiYXO5wr78TUw" type="StereotypeCommentLink" source="_47yxsHPWEeiuFfjlON-CuQ" target="_4axUsJUGEeiYXO5wr78TUw">
- <styles xmi:type="notation:FontStyle" xmi:id="_4axUtZUGEeiYXO5wr78TUw"/>
- <styles xmi:type="notation:EObjectValueStyle" xmi:id="_4axUuZUGEeiYXO5wr78TUw" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="Vnf.uml#_4oResDdPEeiIfPeSAqyGdQ"/>
- </styles>
- <element xsi:nil="true"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_4axUtpUGEeiYXO5wr78TUw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4axUt5UGEeiYXO5wr78TUw"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4axUuJUGEeiYXO5wr78TUw"/>
- </edges>
- <edges xmi:type="notation:Connector" xmi:id="_6Z9lSJUGEeiYXO5wr78TUw" type="StereotypeCommentLink" source="_5iMDUHPWEeiuFfjlON-CuQ" target="_6Z9lRJUGEeiYXO5wr78TUw">
- <styles xmi:type="notation:FontStyle" xmi:id="_6Z9lSZUGEeiYXO5wr78TUw"/>
- <styles xmi:type="notation:EObjectValueStyle" xmi:id="_6Z9lTZUGEeiYXO5wr78TUw" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:Enumeration" href="Vnf.uml#_tFQGcDnLEeiWMf5FLWfdLA"/>
- </styles>
- <element xsi:nil="true"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_6Z9lSpUGEeiYXO5wr78TUw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6Z9lS5UGEeiYXO5wr78TUw"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6Z9lTJUGEeiYXO5wr78TUw"/>
- </edges>
<edges xmi:type="notation:Connector" xmi:id="_AQnPmJUHEeiYXO5wr78TUw" type="StereotypeCommentLink" source="_58Ei8HPWEeiuFfjlON-CuQ" target="_AQnPlJUHEeiYXO5wr78TUw">
<styles xmi:type="notation:FontStyle" xmi:id="_AQnPmZUHEeiYXO5wr78TUw"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_AQnPnZUHEeiYXO5wr78TUw" name="BASE_ELEMENT">
@@ -8090,17 +7913,12 @@
<children xmi:type="notation:Shape" xmi:id="_ZbKxEJWXEeiBQt0DCQoFTw" type="Comment_Shape">
<children xmi:type="notation:DecorationNode" xmi:id="_ZbjLkJWXEeiBQt0DCQoFTw" type="Comment_BodyLabel"/>
<element xmi:type="uml:Comment" href="Vnf.uml#_ZbAZAJWXEeiBQt0DCQoFTw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZbKxEZWXEeiBQt0DCQoFTw" x="900" y="480"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_QKZXEJdJEei-sOl6ywWHlg" type="Comment_Shape">
- <children xmi:type="notation:DecorationNode" xmi:id="_QKalMJdJEei-sOl6ywWHlg" type="Comment_BodyLabel"/>
- <element xmi:type="uml:Comment" href="Vnf.uml#_QKT3gJdJEei-sOl6ywWHlg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QKZXEZdJEei-sOl6ywWHlg" x="200" y="620"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZbKxEZWXEeiBQt0DCQoFTw" x="940" y="260"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_YxE5AJdJEei-sOl6ywWHlg" type="Comment_Shape">
<children xmi:type="notation:DecorationNode" xmi:id="_YxFgEJdJEei-sOl6ywWHlg" type="Comment_BodyLabel"/>
<element xmi:type="uml:Comment" href="Vnf.uml#_YxDD0JdJEei-sOl6ywWHlg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YxE5AZdJEei-sOl6ywWHlg" x="680" y="640"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YxE5AZdJEei-sOl6ywWHlg" x="940" y="380"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_MewbsJddEei-sOl6ywWHlg" type="Enumeration_Shape">
<children xmi:type="notation:DecorationNode" xmi:id="_MewbspddEei-sOl6ywWHlg" type="Enumeration_NameLabel"/>
@@ -8122,7 +7940,7 @@
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_MexCxZddEei-sOl6ywWHlg"/>
</children>
<element xmi:type="uml:Enumeration" href="Vnf.uml#_MevNkJddEei-sOl6ywWHlg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MewbsZddEei-sOl6ywWHlg" x="1140" y="260"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MewbsZddEei-sOl6ywWHlg" x="940" y="120"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_2JIypJdeEei-sOl6ywWHlg" type="StereotypeComment">
<styles xmi:type="notation:TitleStyle" xmi:id="_2JIypZdeEei-sOl6ywWHlg"/>
@@ -8282,63 +8100,6 @@
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2JIyrJdeEei-sOl6ywWHlg"/>
</edges>
</notation:Diagram>
- <notation:Diagram xmi:id="_O6Y9UJXAEeitEu5uB9R53Q" type="PapyrusUMLClassDiagram" name="Network Function" measurementUnit="Pixel">
- <children xmi:type="notation:Shape" xmi:id="_TEg0YJXAEeitEu5uB9R53Q" type="Class_Shape">
- <children xmi:type="notation:DecorationNode" xmi:id="_TEkewJXAEeitEu5uB9R53Q" type="Class_NameLabel"/>
- <children xmi:type="notation:DecorationNode" xmi:id="_TElF0JXAEeitEu5uB9R53Q" type="Class_FloatingNameLabel">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_TElF0ZXAEeitEu5uB9R53Q" y="15"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_TElF0pXAEeitEu5uB9R53Q" type="Class_AttributeCompartment">
- <styles xmi:type="notation:TitleStyle" xmi:id="_TElF05XAEeitEu5uB9R53Q"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_TElF1JXAEeitEu5uB9R53Q"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_TElF1ZXAEeitEu5uB9R53Q"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TElF1pXAEeitEu5uB9R53Q"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_TElF15XAEeitEu5uB9R53Q" visible="false" type="Class_OperationCompartment">
- <styles xmi:type="notation:TitleStyle" xmi:id="_TElF2JXAEeitEu5uB9R53Q"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_TElF2ZXAEeitEu5uB9R53Q"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_TElF2pXAEeitEu5uB9R53Q"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TElF25XAEeitEu5uB9R53Q"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_TElF3JXAEeitEu5uB9R53Q" visible="false" type="Class_NestedClassifierCompartment">
- <styles xmi:type="notation:TitleStyle" xmi:id="_TElF3ZXAEeitEu5uB9R53Q"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_TElF3pXAEeitEu5uB9R53Q"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_TElF35XAEeitEu5uB9R53Q"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TElF4JXAEeitEu5uB9R53Q"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_TEsakJXAEeitEu5uB9R53Q" visible="false" type="StereotypeLabel">
- <styles xmi:type="notation:StringValueStyle" xmi:id="_TEsakZXAEeitEu5uB9R53Q" name="stereotype" stringValue="OpenModel_Profile::OpenModelClass"/>
- <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TEsakpXAEeitEu5uB9R53Q"/>
- </children>
- <element xmi:type="uml:Class" href="Common.uml#_VtzSoESyEeiVGPeZpaYNtQ"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TEg0YZXAEeitEu5uB9R53Q" x="400" y="160"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_TEx6IJXAEeitEu5uB9R53Q" type="StereotypeComment">
- <styles xmi:type="notation:TitleStyle" xmi:id="_TEx6IZXAEeitEu5uB9R53Q"/>
- <styles xmi:type="notation:EObjectValueStyle" xmi:id="_TEx6I5XAEeitEu5uB9R53Q" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:Class" href="Common.uml#_VtzSoESyEeiVGPeZpaYNtQ"/>
- </styles>
- <element xsi:nil="true"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TEx6IpXAEeitEu5uB9R53Q" x="200"/>
- </children>
- <styles xmi:type="notation:StringValueStyle" xmi:id="_O6Y9UZXAEeitEu5uB9R53Q" name="diagram_compatibility_version" stringValue="1.4.0"/>
- <styles xmi:type="notation:DiagramStyle" xmi:id="_O6Y9UpXAEeitEu5uB9R53Q"/>
- <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_O6Y9U5XAEeitEu5uB9R53Q" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
- <owner xmi:type="uml:Package" href="Vnf.uml#_zPN5MDOHEei5Af8DcjrhIQ"/>
- </styles>
- <element xmi:type="uml:Package" href="Vnf.uml#_zPN5MDOHEei5Af8DcjrhIQ"/>
- <edges xmi:type="notation:Connector" xmi:id="_TEyhMJXAEeitEu5uB9R53Q" type="StereotypeCommentLink" source="_TEg0YJXAEeitEu5uB9R53Q" target="_TEx6IJXAEeitEu5uB9R53Q">
- <styles xmi:type="notation:FontStyle" xmi:id="_TEyhMZXAEeitEu5uB9R53Q"/>
- <styles xmi:type="notation:EObjectValueStyle" xmi:id="_TEyhNZXAEeitEu5uB9R53Q" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:Class" href="Common.uml#_VtzSoESyEeiVGPeZpaYNtQ"/>
- </styles>
- <element xsi:nil="true"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_TEyhMpXAEeitEu5uB9R53Q" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_TEyhM5XAEeitEu5uB9R53Q"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_TEyhNJXAEeitEu5uB9R53Q"/>
- </edges>
- </notation:Diagram>
<notation:Diagram xmi:id="_9U7NAJpVEeidy9iGT_F5-w" type="PapyrusUMLClassDiagram" name="Allotted Resource" measurementUnit="Pixel">
<children xmi:type="notation:Shape" xmi:id="_HMZzAJpXEeidy9iGT_F5-w" type="Class_Shape">
<children xmi:type="notation:DecorationNode" xmi:id="_HMaaEJpXEeidy9iGT_F5-w" type="Class_NameLabel"/>
@@ -8725,6 +8486,11 @@
<styles xmi:type="notation:FilteringStyle" xmi:id="_mcamgrIKEeid-vjMcczUWA"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_mcamg7IKEeid-vjMcczUWA"/>
</children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_oLvNIMGvEeiS695oPTRE1Q" visible="false" type="StereotypeLabel">
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_oLvNIcGvEeiS695oPTRE1Q" name="stereotype" stringValue="OpenModel_Profile::OpenModelClass"/>
+ <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oLvNIsGvEeiS695oPTRE1Q"/>
+ </children>
<element xmi:type="uml:Class" href="Vnf.uml#_mcXjILIKEeid-vjMcczUWA"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_mcamcbIKEeid-vjMcczUWA" x="600" y="660" width="121" height="81"/>
</children>
diff --git a/papyrus/ONAP Information Model/Vnf.uml b/papyrus/ONAP Information Model/Vnf.uml
index 59e6d1a..53ae1d5 100644
--- a/papyrus/ONAP Information Model/Vnf.uml
+++ b/papyrus/ONAP Information Model/Vnf.uml
@@ -1,18 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<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="_xXjM8DOHEei5Af8DcjrhIQ" name="Vnf">
- <packagedElement xmi:type="uml:Association" xmi:id="_0kHRwLxOEeiMnLuHd6ALAg" name="ServiceProvidesAllottedLink" memberEnd="_0kN_cLxOEeiMnLuHd6ALAg _0kRp0LxOEeiMnLuHd6ALAg">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_0kMxULxOEeiMnLuHd6ALAg" source="org.eclipse.papyrus">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_0kMxUbxOEeiMnLuHd6ALAg" key="nature" value="UML_Nature"/>
- </eAnnotations>
- <ownedEnd xmi:type="uml:Property" xmi:id="_0kN_cLxOEeiMnLuHd6ALAg" name="servicedescatomic" association="_0kHRwLxOEeiMnLuHd6ALAg">
- <type xmi:type="uml:Class" href="Service.uml#_iQkugJpYEeidy9iGT_F5-w"/>
- </ownedEnd>
- <ownedEnd xmi:type="uml:Property" xmi:id="_0kRp0LxOEeiMnLuHd6ALAg" name="allottedlink" type="_mcXjILIKEeid-vjMcczUWA" association="_0kHRwLxOEeiMnLuHd6ALAg">
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_C3_nELxPEeiMnLuHd6ALAg"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_C4UXMLxPEeiMnLuHd6ALAg" value="*"/>
- </ownedEnd>
- </packagedElement>
<packagedElement xmi:type="uml:Package" xmi:id="_zPNSIDOHEei5Af8DcjrhIQ" name="Associations">
<packagedElement xmi:type="uml:Association" xmi:id="_u3e7kDOVEeiHat9KcP8uWA" name="VnfdUsesVCDesc" memberEnd="_u3gwwDOVEeiHat9KcP8uWA _u3j0EDOVEeiHat9KcP8uWA">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_u3gJsDOVEeiHat9KcP8uWA" source="org.eclipse.papyrus">
@@ -290,12 +278,6 @@ NOTE 2: virtualLinkProfile needs to be provided for all VLs that the CPs of the
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Dd-6QD5yEeijbdkIlrq2uQ" value="*"/>
</ownedEnd>
</packagedElement>
- <packagedElement xmi:type="uml:Association" xmi:id="_8cc0EES6EeiVGPeZpaYNtQ" name="VnfExposesExtCp" memberEnd="_8c1OkES6EeiVGPeZpaYNtQ _8dhyIES6EeiVGPeZpaYNtQ">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8csEoES6EeiVGPeZpaYNtQ" source="org.eclipse.papyrus">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8c0ngES6EeiVGPeZpaYNtQ" key="nature" value="UML_Nature"/>
- </eAnnotations>
- <ownedEnd xmi:type="uml:Property" xmi:id="_8dhyIES6EeiVGPeZpaYNtQ" name="_vnf" type="_Io3nQESzEeiVGPeZpaYNtQ" association="_8cc0EES6EeiVGPeZpaYNtQ"/>
- </packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="_m-GzoEJ_EeiwbqJBYHKltg" memberEnd="_m-HasUJ_EeiwbqJBYHKltg _m-RLsEJ_EeiwbqJBYHKltg">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_m-GzoUJ_EeiwbqJBYHKltg" source="org.eclipse.papyrus">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_m-HasEJ_EeiwbqJBYHKltg" key="nature" value="UML_Nature"/>
@@ -437,6 +419,18 @@ NOTE 2: virtualLinkProfile needs to be provided for all VLs that the CPs of the
<type xmi:type="uml:Class" href="Service.uml#_iQkugJpYEeidy9iGT_F5-w"/>
</ownedEnd>
</packagedElement>
+ <packagedElement xmi:type="uml:Association" xmi:id="_0kHRwLxOEeiMnLuHd6ALAg" name="ServiceProvidesAllottedLink" memberEnd="_0kN_cLxOEeiMnLuHd6ALAg _0kRp0LxOEeiMnLuHd6ALAg">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_0kMxULxOEeiMnLuHd6ALAg" source="org.eclipse.papyrus">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_0kMxUbxOEeiMnLuHd6ALAg" key="nature" value="UML_Nature"/>
+ </eAnnotations>
+ <ownedEnd xmi:type="uml:Property" xmi:id="_0kN_cLxOEeiMnLuHd6ALAg" name="servicedescatomic" association="_0kHRwLxOEeiMnLuHd6ALAg">
+ <type xmi:type="uml:Class" href="Service.uml#_iQkugJpYEeidy9iGT_F5-w"/>
+ </ownedEnd>
+ <ownedEnd xmi:type="uml:Property" xmi:id="_0kRp0LxOEeiMnLuHd6ALAg" name="allottedlink" type="_mcXjILIKEeid-vjMcczUWA" association="_0kHRwLxOEeiMnLuHd6ALAg">
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_C3_nELxPEeiMnLuHd6ALAg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_C4UXMLxPEeiMnLuHd6ALAg" value="*"/>
+ </ownedEnd>
+ </packagedElement>
</packagedElement>
<packagedElement xmi:type="uml:Package" xmi:id="_zPN5MDOHEei5Af8DcjrhIQ" name="Diagrams">
<ownedComment xmi:type="uml:Comment" xmi:id="_bphG0DTSEeiwQ6KPLHcy4g" annotatedElement="_zPN5MDOHEei5Af8DcjrhIQ">
@@ -473,9 +467,6 @@ Change L2addressData and l3addressData to 0..1 given &quot;only present....&quot
.&#xD;
onboardedVnfPkgInfoId - need class for VnfPkg? Yes - probably need more discussion - tied to vnf model and internal model. Vnf Instance related to vnf descriptor or onboarding pkg descriptor</body>
</ownedComment>
- <ownedComment xmi:type="uml:Comment" xmi:id="_QKT3gJdJEei-sOl6ywWHlg">
- <body>do we need both superclass and subclass or just one???</body>
- </ownedComment>
<ownedComment xmi:type="uml:Comment" xmi:id="_YxDD0JdJEei-sOl6ywWHlg">
<body>Will not try to push this out into R3 - save for R4</body>
</ownedComment>
@@ -488,7 +479,7 @@ A license is not a resource&#xD;
A Cp is not a resource</body>
</ownedComment>
<ownedComment xmi:type="uml:Comment" xmi:id="_HdKzwLavEeiWgvNHCpdNlg">
- <body>ONAP has VirtualLinkDesc, not NetworkLink&#xD;
+ <body>ONAP has a VirtualLinkDesc, not NetworkLink or LinkDesc&#xD;
&#xD;
This will probably need to move to common</body>
</ownedComment>
@@ -1056,7 +1047,7 @@ NOTE: Each identifier references an affinity or anti-affinity group which expres
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_aPEasDm3EeiWMf5FLWfdLA" value="1"/>
</ownedAttribute>
</packagedElement>
- <packagedElement xmi:type="uml:Class" xmi:id="_AC2eIDQUEeixv_sLOod4lQ" name="LinkDesc ">
+ <packagedElement xmi:type="uml:Class" xmi:id="_AC2eIDQUEeixv_sLOod4lQ" name="LinkDesc " isAbstract="true">
<ownedComment xmi:type="uml:Comment" xmi:id="_Ey004LeVEeiq7vtzCAMDQQ" annotatedElement="_AC2eIDQUEeixv_sLOod4lQ">
<body>A communication channel that connects two or more devices, nodes, or entities.</body>
</ownedComment>
@@ -1526,21 +1517,6 @@ Diversity - Resources are geo-diverse ( cannot be co-located).&#xD;
<general xmi:type="uml:Class" href="Common.uml#_8naVoES0EeiVGPeZpaYNtQ"/>
</generalization>
</packagedElement>
- <packagedElement xmi:type="uml:Class" xmi:id="_Io3nQESzEeiVGPeZpaYNtQ" name="Vnf">
- <ownedComment xmi:type="uml:Comment" xmi:id="_g9jTIESzEeiVGPeZpaYNtQ" annotatedElement="_Io3nQESzEeiVGPeZpaYNtQ">
- <body>An implementation of an NF that can be deployed on a Network Function Virtualisation Infrastructure (NFVI).</body>
- </ownedComment>
- <generalization xmi:type="uml:Generalization" xmi:id="_WZrrwESzEeiVGPeZpaYNtQ">
- <general xmi:type="uml:Class" href="Common.uml#_VtzSoESyEeiVGPeZpaYNtQ"/>
- </generalization>
- <ownedAttribute xmi:type="uml:Property" xmi:id="_8c1OkES6EeiVGPeZpaYNtQ" name="_vnfExtCp" type="_fMPCUES6EeiVGPeZpaYNtQ" aggregation="composite" association="_8cc0EES6EeiVGPeZpaYNtQ">
- <ownedComment xmi:type="uml:Comment" xmi:id="_djlNAES7EeiVGPeZpaYNtQ" annotatedElement="_8c1OkES6EeiVGPeZpaYNtQ">
- <body>External CP of the VNF.</body>
- </ownedComment>
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_8dJ-sES6EeiVGPeZpaYNtQ" value="1"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8dhLEES6EeiVGPeZpaYNtQ" value="*"/>
- </ownedAttribute>
- </packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="_jH_PgF3PEeiwL5tPgFMcjQ" name="Vnf">
<ownedComment xmi:type="uml:Comment" xmi:id="_Qzli4F4CEei-d9bwZwcVEw" annotatedElement="_jH_PgF3PEeiwL5tPgFMcjQ">
<body>An implementation of an NF that can be deployed on a Network Function Virtualisation Infrastructure (NFVI).</body>
@@ -1867,7 +1843,14 @@ Diversity - Resources are geo-diverse ( cannot be co-located).&#xD;
<general xmi:type="uml:Class" href="Common.uml#_Tw5PIES0EeiVGPeZpaYNtQ"/>
</generalization>
</packagedElement>
- <packagedElement xmi:type="uml:Class" xmi:id="_DAQisJpXEeidy9iGT_F5-w" name="ResourceDesc (ResourceSpecification)"/>
+ <packagedElement xmi:type="uml:Class" xmi:id="_DAQisJpXEeidy9iGT_F5-w" name="ResourceDesc (ResourceSpecification)" isAbstract="true">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_psrJgMGxEeiS695oPTRE1Q" annotatedElement="_DAQisJpXEeidy9iGT_F5-w">
+ <body>ResourceDesc represents physical and non-physical (virtual) components which are owned / managed by the business or provided by a Supplier and are used (directly or indirectly) to construct services.&#xD;
+&#xD;
+In this context, a resource is something that goes into a resource catalog from which services are composed.&#xD;
+ </body>
+ </ownedComment>
+ </packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="_xVaLUJs3EeiPBvbfaqSLYg" name="Anfd">
<ownedComment xmi:type="uml:Comment" xmi:id="_2qM6sKY4Eeily5uFlujj3Q" annotatedElement="_xVaLUJs3EeiPBvbfaqSLYg">
<body>An Anfd (Allotted Network Function) is a network function provided (or allotted) by some service instance. The allotted network function may be incorporated into the topology of some consuming service like other network functions. Note: the allotted network function is no longer derived from some allotted resource parent.&#xD;
@@ -1875,7 +1858,7 @@ Diversity - Resources are geo-diverse ( cannot be co-located).&#xD;
</ownedComment>
<generalization xmi:type="uml:Generalization" xmi:id="_7DhPYJs3EeiPBvbfaqSLYg" general="_O385oJssEeiPBvbfaqSLYg"/>
</packagedElement>
- <packagedElement xmi:type="uml:Class" xmi:id="_O385oJssEeiPBvbfaqSLYg" name="NetworkFunctionDesc">
+ <packagedElement xmi:type="uml:Class" xmi:id="_O385oJssEeiPBvbfaqSLYg" name="NetworkFunctionDesc" isAbstract="true">
<ownedComment xmi:type="uml:Comment" xmi:id="_vrMhMKY4Eeily5uFlujj3Q" annotatedElement="_O385oJssEeiPBvbfaqSLYg">
<body>A NetworkFunction is a functional block within a network infrastructure that has well-defined external interfaces and well-defined functional behaviour.</body>
</ownedComment>
@@ -2473,7 +2456,6 @@ NOTE: The MANO or NFVI may not support the recommended collectionPeriod based on
<OpenModel_Profile:OpenModelAttribute xmi:id="_oUjqgjm-EeiWMf5FLWfdLA" base_StructuralFeature="_oUjqgTm-EeiWMf5FLWfdLA"/>
<OpenModel_Profile:OpenModelAttribute xmi:id="_PJnV8DnHEeiWMf5FLWfdLA" base_StructuralFeature="_PJmu4jnHEeiWMf5FLWfdLA"/>
<OpenModel_Profile:OpenModelAttribute xmi:id="_8qIn4j5xEeijbdkIlrq2uQ" base_StructuralFeature="_8qIn4T5xEeijbdkIlrq2uQ"/>
- <OpenModel_Profile:OpenModelAttribute xmi:id="_wjgxMEdtEei3KMAUV7YMMQ" base_StructuralFeature="_8dhyIES6EeiVGPeZpaYNtQ"/>
<OpenModel_Profile:OpenModelAttribute xmi:id="_KOSrIEJ9EeiwbqJBYHKltg" base_StructuralFeature="_KOSEEEJ9EeiwbqJBYHKltg"/>
<OpenModel_Profile:OpenModelAttribute xmi:id="_KOYxwUJ9EeiwbqJBYHKltg" base_StructuralFeature="_KOYxwEJ9EeiwbqJBYHKltg"/>
<OpenModel_Profile:OpenModelAttribute xmi:id="_oVpgQUJ9EeiwbqJBYHKltg" base_StructuralFeature="_oVpgQEJ9EeiwbqJBYHKltg"/>
@@ -3146,8 +3128,6 @@ NOTE: The MANO or NFVI may not support the recommended collectionPeriod based on
<OpenModel_Profile:Experimental xmi:id="_zAqbEJwaEeiPD5fN_oRNAg" base_Element="_PG3MwGkCEeip9umi7zNprw"/>
<OpenModel_Profile:Experimental xmi:id="_0gpnIJwaEeiPD5fN_oRNAg" base_Element="_inPiUH7eEei4v5WRHqfM1Q"/>
<OpenModel_Profile:OpenModelClass xmi:id="_p_Z_8KVwEeikF6xsfT18UA" base_Class="_fMPCUES6EeiVGPeZpaYNtQ"/>
- <OpenModel_Profile:OpenModelClass xmi:id="_p_bOEKVwEeikF6xsfT18UA" base_Class="_Io3nQESzEeiVGPeZpaYNtQ"/>
- <OpenModel_Profile:OpenModelAttribute xmi:id="_p_ccMKVwEeikF6xsfT18UA" base_StructuralFeature="_8c1OkES6EeiVGPeZpaYNtQ"/>
<OpenModel_Profile:OpenModelClass xmi:id="_f72YgKeuEeixw5Ke5QD1pQ">
<base_Class xmi:type="uml:Class" href="Service.uml#_iQkugJpYEeidy9iGT_F5-w"/>
</OpenModel_Profile:OpenModelClass>