summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Scaggs <ks0567@att.com>2019-05-31 10:29:51 -0500
committerKevin Scaggs <ks0567@att.com>2019-05-31 10:29:51 -0500
commit1ac88410cbd96072397b976714acf6a003f12b3d (patch)
tree1fa1121d682fef7514e2c5f5d900d67a8e79c235
parent062c1db888f4b98cbd8cb7e6a722762093ec3366 (diff)
Updates to Service
Updated Network Slicing Model diagram, renaming filter to SelectionCriteria, and moving SelectionCriteria to Common. ALso renamed ServiceConfigurableProperties to ConfigurableProperties and moved to common. Issue-ID: MODELING-104 Change-Id: I2ef2fcb7bdcd705c25c096c99644e24b946ca0a7 Signed-off-by: Kevin Scaggs <ks0567@att.com>
Diffstat
-rw-r--r--ONAP Information Model/Service.notation537
-rw-r--r--ONAP Information Model/Service.uml95
2 files changed, 534 insertions, 98 deletions
diff --git a/ONAP Information Model/Service.notation b/ONAP Information Model/Service.notation
index 0b08317..6292261 100644
--- a/ONAP Information Model/Service.notation
+++ b/ONAP Information Model/Service.notation
@@ -3268,7 +3268,7 @@
<element xmi:type="uml:Property" href="Service.uml#_biWkcD0NEeiWMf5FLWfdLA"/>
<layoutConstraint xmi:type="notation:Location" xmi:id="_6xsNsS9iEemMV6PO6VJAGw"/>
</children>
- <children xmi:type="notation:Shape" xmi:id="_-UuPkC9iEemMV6PO6VJAGw" type="Property_ClassAttributeLabel">
+ <children xmi:type="notation:Shape" xmi:id="_-UuPkC9iEemMV6PO6VJAGw" type="Property_ClassAttributeLabel" fontColor="10265827">
<children xmi:type="notation:DecorationNode" xmi:id="_-U4noC9iEemMV6PO6VJAGw" visible="false" type="StereotypeLabel">
<styles xmi:type="notation:StringValueStyle" xmi:id="_-U4noS9iEemMV6PO6VJAGw" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
<element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
@@ -3277,7 +3277,7 @@
<element xmi:type="uml:Property" href="Service.uml#_rj6jkD0NEeiWMf5FLWfdLA"/>
<layoutConstraint xmi:type="notation:Location" xmi:id="_-UuPkS9iEemMV6PO6VJAGw"/>
</children>
- <children xmi:type="notation:Shape" xmi:id="_Dd_2gC9jEemMV6PO6VJAGw" type="Property_ClassAttributeLabel">
+ <children xmi:type="notation:Shape" xmi:id="_Dd_2gC9jEemMV6PO6VJAGw" type="Property_ClassAttributeLabel" fontColor="10265827">
<children xmi:type="notation:DecorationNode" xmi:id="_DeJngC9jEemMV6PO6VJAGw" visible="false" type="StereotypeLabel">
<styles xmi:type="notation:StringValueStyle" xmi:id="_DeJngS9jEemMV6PO6VJAGw" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
<element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
@@ -3286,7 +3286,7 @@
<element xmi:type="uml:Property" href="Service.uml#_0_MLMD0NEeiWMf5FLWfdLA"/>
<layoutConstraint xmi:type="notation:Location" xmi:id="_Dd_2gS9jEemMV6PO6VJAGw"/>
</children>
- <children xmi:type="notation:Shape" xmi:id="_G2bx8C9jEemMV6PO6VJAGw" type="Property_ClassAttributeLabel">
+ <children xmi:type="notation:Shape" xmi:id="_G2bx8C9jEemMV6PO6VJAGw" type="Property_ClassAttributeLabel" fontColor="10265827">
<children xmi:type="notation:DecorationNode" xmi:id="_G2mxEC9jEemMV6PO6VJAGw" visible="false" type="StereotypeLabel">
<styles xmi:type="notation:StringValueStyle" xmi:id="_G2mxES9jEemMV6PO6VJAGw" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
<element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
@@ -3340,6 +3340,69 @@
<element xmi:type="uml:Property" href="Service.uml#_5tq3ED0OEeiWMf5FLWfdLA"/>
<layoutConstraint xmi:type="notation:Location" xmi:id="_swjYwS9jEemMV6PO6VJAGw"/>
</children>
+ <children xmi:type="notation:Shape" xmi:id="_MA-j8IMEEemyVus8T4NvCQ" type="Property_ClassAttributeLabel">
+ <children xmi:type="notation:DecorationNode" xmi:id="_MBFRoIMEEemyVus8T4NvCQ" visible="false" type="StereotypeLabel">
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_MBFRoYMEEemyVus8T4NvCQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+ <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MBFRooMEEemyVus8T4NvCQ"/>
+ </children>
+ <element xmi:type="uml:Property" href="Service.uml#_Zze64JDrEei9Vqs7Ti8Wxg"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_MA-j8YMEEemyVus8T4NvCQ"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_MA_LAIMEEemyVus8T4NvCQ" type="Property_ClassAttributeLabel">
+ <children xmi:type="notation:DecorationNode" xmi:id="_MBHG0IMEEemyVus8T4NvCQ" visible="false" type="StereotypeLabel">
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_MBHG0YMEEemyVus8T4NvCQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+ <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MBHG0oMEEemyVus8T4NvCQ"/>
+ </children>
+ <element xmi:type="uml:Property" href="Common.uml#_Td26cOLNEeiKy5JVrA0UGA"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_MA_LAYMEEemyVus8T4NvCQ"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_MA_LAoMEEemyVus8T4NvCQ" type="Property_ClassAttributeLabel">
+ <children xmi:type="notation:DecorationNode" xmi:id="_MBJjEIMEEemyVus8T4NvCQ" visible="false" type="StereotypeLabel">
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_MBJjEYMEEemyVus8T4NvCQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+ <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MBJjEoMEEemyVus8T4NvCQ"/>
+ </children>
+ <element xmi:type="uml:Property" href="Common.uml#_T6QikOLNEeiKy5JVrA0UGA"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_MA_LA4MEEemyVus8T4NvCQ"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_MA_LBIMEEemyVus8T4NvCQ" type="Property_ClassAttributeLabel">
+ <children xmi:type="notation:DecorationNode" xmi:id="_MBL_UIMEEemyVus8T4NvCQ" visible="false" type="StereotypeLabel">
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_MBL_UYMEEemyVus8T4NvCQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+ <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MBL_UoMEEemyVus8T4NvCQ"/>
+ </children>
+ <element xmi:type="uml:Property" href="Common.uml#_eoc6EDYQEemvTc8tEY2xig"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_MA_LBYMEEemyVus8T4NvCQ"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_MA_LBoMEEemyVus8T4NvCQ" type="Property_ClassAttributeLabel">
+ <children xmi:type="notation:DecorationNode" xmi:id="_MBPCoIMEEemyVus8T4NvCQ" visible="false" type="StereotypeLabel">
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_MBPCoYMEEemyVus8T4NvCQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+ <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MBPCooMEEemyVus8T4NvCQ"/>
+ </children>
+ <element xmi:type="uml:Property" href="Common.uml#_E4CakDYREemvTc8tEY2xig"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_MA_LB4MEEemyVus8T4NvCQ"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_MA_LCIMEEemyVus8T4NvCQ" type="Property_ClassAttributeLabel">
+ <children xmi:type="notation:DecorationNode" xmi:id="_MBQ30IMEEemyVus8T4NvCQ" visible="false" type="StereotypeLabel">
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_MBQ30YMEEemyVus8T4NvCQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+ <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MBQ30oMEEemyVus8T4NvCQ"/>
+ </children>
+ <element xmi:type="uml:Property" href="Common.uml#_wj9DsOLJEeiKy5JVrA0UGA"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_MA_LCYMEEemyVus8T4NvCQ"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_E2tDsIMGEemyVus8T4NvCQ" type="Property_ClassAttributeLabel">
+ <children xmi:type="notation:DecorationNode" xmi:id="_E2zKUIMGEemyVus8T4NvCQ" visible="false" type="StereotypeLabel">
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_E2zKUYMGEemyVus8T4NvCQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+ <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_E2zKUoMGEemyVus8T4NvCQ"/>
+ </children>
+ <element xmi:type="uml:Property" href="Service.uml#_E2FYoIMGEemyVus8T4NvCQ"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_E2tDsYMGEemyVus8T4NvCQ"/>
+ </children>
<styles xmi:type="notation:TitleStyle" xmi:id="_nTu5Ih9cEemLMI6HKP6Lbw"/>
<styles xmi:type="notation:SortingStyle" xmi:id="_nTu5Ix9cEemLMI6HKP6Lbw"/>
<styles xmi:type="notation:FilteringStyle" xmi:id="_nTu5JB9cEemLMI6HKP6Lbw"/>
@@ -3363,7 +3426,7 @@
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_nT6fUh9cEemLMI6HKP6Lbw"/>
</children>
<element xmi:type="uml:Class" href="Service.uml#_Jvy-QD0MEeiWMf5FLWfdLA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nTtrAR9cEemLMI6HKP6Lbw" x="340" y="-40" width="281" height="241"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nTtrAR9cEemLMI6HKP6Lbw" x="340" y="-60" width="421" height="301"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_nT-Jsx9cEemLMI6HKP6Lbw" type="StereotypeComment">
<styles xmi:type="notation:TitleStyle" xmi:id="_nT-JtB9cEemLMI6HKP6Lbw"/>
@@ -3418,7 +3481,7 @@
<layoutConstraint xmi:type="notation:Location" xmi:id="_bHBZxB9eEemLMI6HKP6Lbw" y="15"/>
</children>
<children xmi:type="notation:BasicCompartment" xmi:id="_bHBZxR9eEemLMI6HKP6Lbw" type="Class_AttributeCompartment">
- <children xmi:type="notation:Shape" xmi:id="_PvEwEDAzEemfJIA7XFfVEg" type="Property_ClassAttributeLabel">
+ <children xmi:type="notation:Shape" xmi:id="_PvEwEDAzEemfJIA7XFfVEg" type="Property_ClassAttributeLabel" fontColor="10265827">
<children xmi:type="notation:DecorationNode" xmi:id="_Pw-0kDAzEemfJIA7XFfVEg" visible="false" type="StereotypeLabel">
<styles xmi:type="notation:StringValueStyle" xmi:id="_Pw-0kTAzEemfJIA7XFfVEg" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
<element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
@@ -3427,7 +3490,7 @@
<element xmi:type="uml:Property" href="Service.uml#_mDZZ8D0QEeiWMf5FLWfdLA"/>
<layoutConstraint xmi:type="notation:Location" xmi:id="_PvEwETAzEemfJIA7XFfVEg"/>
</children>
- <children xmi:type="notation:Shape" xmi:id="_p6O_8DA0EemfJIA7XFfVEg" type="Property_ClassAttributeLabel">
+ <children xmi:type="notation:Shape" xmi:id="_p6O_8DA0EemfJIA7XFfVEg" type="Property_ClassAttributeLabel" fontColor="10265827">
<children xmi:type="notation:DecorationNode" xmi:id="_p8nlkDA0EemfJIA7XFfVEg" visible="false" type="StereotypeLabel">
<styles xmi:type="notation:StringValueStyle" xmi:id="_p8nlkTA0EemfJIA7XFfVEg" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
<element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
@@ -3487,6 +3550,33 @@
<element xmi:type="uml:Property" href="Service.uml#_1Rt9wPL4EeiazPylpq3fUA"/>
<layoutConstraint xmi:type="notation:Location" xmi:id="_nviNgTA1EemfJIA7XFfVEg"/>
</children>
+ <children xmi:type="notation:Shape" xmi:id="_YJmpAIMMEemIU81rY2FFFw" type="Property_ClassAttributeLabel">
+ <children xmi:type="notation:DecorationNode" xmi:id="_YJ91YIMMEemIU81rY2FFFw" visible="false" type="StereotypeLabel">
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_YJ91YYMMEemIU81rY2FFFw" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+ <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YJ91YoMMEemIU81rY2FFFw"/>
+ </children>
+ <element xmi:type="uml:Property" href="Common.uml#_vi4oQOLJEeiKy5JVrA0UGA"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_YJnQEIMMEemIU81rY2FFFw"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_YJpsUIMMEemIU81rY2FFFw" type="Property_ClassAttributeLabel">
+ <children xmi:type="notation:DecorationNode" xmi:id="_YKCG0IMMEemIU81rY2FFFw" visible="false" type="StereotypeLabel">
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_YKCG0YMMEemIU81rY2FFFw" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+ <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YKCG0oMMEemIU81rY2FFFw"/>
+ </children>
+ <element xmi:type="uml:Property" href="Common.uml#_wEHtEOLJEeiKy5JVrA0UGA"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_YJpsUYMMEemIU81rY2FFFw"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_YJpsUoMMEemIU81rY2FFFw" type="Property_ClassAttributeLabel">
+ <children xmi:type="notation:DecorationNode" xmi:id="_YKG_UIMMEemIU81rY2FFFw" visible="false" type="StereotypeLabel">
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_YKG_UYMMEemIU81rY2FFFw" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+ <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YKG_UoMMEemIU81rY2FFFw"/>
+ </children>
+ <element xmi:type="uml:Property" href="Common.uml#_wj9DsOLJEeiKy5JVrA0UGA"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_YJpsU4MMEemIU81rY2FFFw"/>
+ </children>
<styles xmi:type="notation:TitleStyle" xmi:id="_bHBZxh9eEemLMI6HKP6Lbw"/>
<styles xmi:type="notation:SortingStyle" xmi:id="_bHBZxx9eEemLMI6HKP6Lbw"/>
<styles xmi:type="notation:FilteringStyle" xmi:id="_bHBZyB9eEemLMI6HKP6Lbw"/>
@@ -3708,6 +3798,15 @@
<layoutConstraint xmi:type="notation:Location" xmi:id="_AkYqhF0VEemiOP02o5T8tA" y="15"/>
</children>
<children xmi:type="notation:BasicCompartment" xmi:id="_AkYqhV0VEemiOP02o5T8tA" type="Class_AttributeCompartment">
+ <children xmi:type="notation:Shape" xmi:id="_h8ozsILoEemyVus8T4NvCQ" type="Property_ClassAttributeLabel">
+ <children xmi:type="notation:DecorationNode" xmi:id="_h86ggILoEemyVus8T4NvCQ" visible="false" type="StereotypeLabel">
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_h86ggYLoEemyVus8T4NvCQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+ <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_h86ggoLoEemyVus8T4NvCQ"/>
+ </children>
+ <element xmi:type="uml:Property" href="Common.uml#_h8AhkILoEemyVus8T4NvCQ"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_h8ozsYLoEemyVus8T4NvCQ"/>
+ </children>
<styles xmi:type="notation:TitleStyle" xmi:id="_AkYqhl0VEemiOP02o5T8tA"/>
<styles xmi:type="notation:SortingStyle" xmi:id="_AkYqh10VEemiOP02o5T8tA"/>
<styles xmi:type="notation:FilteringStyle" xmi:id="_AkYqiF0VEemiOP02o5T8tA"/>
@@ -3725,13 +3824,18 @@
<styles xmi:type="notation:FilteringStyle" xmi:id="_AkYqkl0VEemiOP02o5T8tA"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_AkYqk10VEemiOP02o5T8tA"/>
</children>
- <element xmi:type="uml:Class" href="Service.uml#_AkO5gF0VEemiOP02o5T8tA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AkYqgV0VEemiOP02o5T8tA" x="-60" y="440"/>
+ <children xmi:type="notation:DecorationNode" xmi:id="_Y6XYYILcEemyVus8T4NvCQ" visible="false" type="StereotypeLabel">
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_Y6XYYYLcEemyVus8T4NvCQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelClass"/>
+ <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Y6XYYoLcEemyVus8T4NvCQ"/>
+ </children>
+ <element xmi:type="uml:Class" href="Common.uml#_AkO5gF0VEemiOP02o5T8tA"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AkYqgV0VEemiOP02o5T8tA" x="-340" y="-60" width="241" height="81"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_AkYqol0VEemiOP02o5T8tA" type="StereotypeComment">
<styles xmi:type="notation:TitleStyle" xmi:id="_AkYqo10VEemiOP02o5T8tA"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_AkYqpV0VEemiOP02o5T8tA" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:Class" href="Service.uml#_AkO5gF0VEemiOP02o5T8tA"/>
+ <eObjectValue xmi:type="uml:Class" href="Common.uml#_AkO5gF0VEemiOP02o5T8tA"/>
</styles>
<element xsi:nil="true"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_AkYqpF0VEemiOP02o5T8tA" x="200"/>
@@ -3742,6 +3846,15 @@
<layoutConstraint xmi:type="notation:Location" xmi:id="_A_9MNl0VEemiOP02o5T8tA" y="15"/>
</children>
<children xmi:type="notation:BasicCompartment" xmi:id="_A_9MN10VEemiOP02o5T8tA" type="Class_AttributeCompartment">
+ <children xmi:type="notation:Shape" xmi:id="_lpx00ILdEemyVus8T4NvCQ" type="Property_ClassAttributeLabel">
+ <children xmi:type="notation:DecorationNode" xmi:id="_lqN5sILdEemyVus8T4NvCQ" visible="false" type="StereotypeLabel">
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_lqN5sYLdEemyVus8T4NvCQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+ <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lqN5soLdEemyVus8T4NvCQ"/>
+ </children>
+ <element xmi:type="uml:Property" href="Common.uml#_lo6SIILdEemyVus8T4NvCQ"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_lpx00YLdEemyVus8T4NvCQ"/>
+ </children>
<styles xmi:type="notation:TitleStyle" xmi:id="_A_9MOF0VEemiOP02o5T8tA"/>
<styles xmi:type="notation:SortingStyle" xmi:id="_A_9MOV0VEemiOP02o5T8tA"/>
<styles xmi:type="notation:FilteringStyle" xmi:id="_A_9MOl0VEemiOP02o5T8tA"/>
@@ -3759,13 +3872,18 @@
<styles xmi:type="notation:FilteringStyle" xmi:id="_BAGWI10VEemiOP02o5T8tA"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_BAGWJF0VEemiOP02o5T8tA"/>
</children>
- <element xmi:type="uml:Class" href="Service.uml#_A_9MMF0VEemiOP02o5T8tA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_A_9MM10VEemiOP02o5T8tA" x="-160" y="600"/>
+ <children xmi:type="notation:DecorationNode" xmi:id="_Y6f7QILcEemyVus8T4NvCQ" visible="false" type="StereotypeLabel">
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_Y6f7QYLcEemyVus8T4NvCQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelClass"/>
+ <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Y6f7QoLcEemyVus8T4NvCQ"/>
+ </children>
+ <element xmi:type="uml:Class" href="Common.uml#_A_9MMF0VEemiOP02o5T8tA"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_A_9MM10VEemiOP02o5T8tA" x="-520" y="100" width="281"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_BAGWM10VEemiOP02o5T8tA" type="StereotypeComment">
<styles xmi:type="notation:TitleStyle" xmi:id="_BAGWNF0VEemiOP02o5T8tA"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_BAGWNl0VEemiOP02o5T8tA" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:Class" href="Service.uml#_A_9MMF0VEemiOP02o5T8tA"/>
+ <eObjectValue xmi:type="uml:Class" href="Common.uml#_A_9MMF0VEemiOP02o5T8tA"/>
</styles>
<element xsi:nil="true"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_BAGWNV0VEemiOP02o5T8tA" x="200"/>
@@ -3776,6 +3894,33 @@
<layoutConstraint xmi:type="notation:Location" xmi:id="_BZSSNl0VEemiOP02o5T8tA" y="15"/>
</children>
<children xmi:type="notation:BasicCompartment" xmi:id="_BZSSN10VEemiOP02o5T8tA" type="Class_AttributeCompartment">
+ <children xmi:type="notation:Shape" xmi:id="_U-XpoILsEemyVus8T4NvCQ" type="Property_ClassAttributeLabel">
+ <children xmi:type="notation:DecorationNode" xmi:id="_U-qkkILsEemyVus8T4NvCQ" visible="false" type="StereotypeLabel">
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_U-qkkYLsEemyVus8T4NvCQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+ <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_U-qkkoLsEemyVus8T4NvCQ"/>
+ </children>
+ <element xmi:type="uml:Property" href="Common.uml#_U92FMILsEemyVus8T4NvCQ"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_U-XpoYLsEemyVus8T4NvCQ"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_VpecIILsEemyVus8T4NvCQ" type="Property_ClassAttributeLabel">
+ <children xmi:type="notation:DecorationNode" xmi:id="_VpwwAILsEemyVus8T4NvCQ" visible="false" type="StereotypeLabel">
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_VpwwAYLsEemyVus8T4NvCQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+ <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VpwwAoLsEemyVus8T4NvCQ"/>
+ </children>
+ <element xmi:type="uml:Property" href="Common.uml#_VorK4ILsEemyVus8T4NvCQ"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_VpecIYLsEemyVus8T4NvCQ"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_W2GAQILsEemyVus8T4NvCQ" type="Property_ClassAttributeLabel">
+ <children xmi:type="notation:DecorationNode" xmi:id="_W3Gs4ILsEemyVus8T4NvCQ" visible="false" type="StereotypeLabel">
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_W3Gs4YLsEemyVus8T4NvCQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+ <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_W3Gs4oLsEemyVus8T4NvCQ"/>
+ </children>
+ <element xmi:type="uml:Property" href="Common.uml#_W1j0wILsEemyVus8T4NvCQ"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_W2GAQYLsEemyVus8T4NvCQ"/>
+ </children>
<styles xmi:type="notation:TitleStyle" xmi:id="_BZSSOF0VEemiOP02o5T8tA"/>
<styles xmi:type="notation:SortingStyle" xmi:id="_BZSSOV0VEemiOP02o5T8tA"/>
<styles xmi:type="notation:FilteringStyle" xmi:id="_BZSSOl0VEemiOP02o5T8tA"/>
@@ -3793,13 +3938,18 @@
<styles xmi:type="notation:FilteringStyle" xmi:id="_BZSSRF0VEemiOP02o5T8tA"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_BZSSRV0VEemiOP02o5T8tA"/>
</children>
- <element xmi:type="uml:Class" href="Service.uml#_BZSSMF0VEemiOP02o5T8tA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BZSSM10VEemiOP02o5T8tA" x="60" y="600"/>
+ <children xmi:type="notation:DecorationNode" xmi:id="_Y6mo8ILcEemyVus8T4NvCQ" visible="false" type="StereotypeLabel">
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_Y6mo8YLcEemyVus8T4NvCQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelClass"/>
+ <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Y6mo8oLcEemyVus8T4NvCQ"/>
+ </children>
+ <element xmi:type="uml:Class" href="Common.uml#_BZSSMF0VEemiOP02o5T8tA"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BZSSM10VEemiOP02o5T8tA" x="-200" y="100" width="261" height="101"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_BZSSVF0VEemiOP02o5T8tA" type="StereotypeComment">
<styles xmi:type="notation:TitleStyle" xmi:id="_BZSSVV0VEemiOP02o5T8tA"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_BZSSV10VEemiOP02o5T8tA" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:Class" href="Service.uml#_BZSSMF0VEemiOP02o5T8tA"/>
+ <eObjectValue xmi:type="uml:Class" href="Common.uml#_BZSSMF0VEemiOP02o5T8tA"/>
</styles>
<element xsi:nil="true"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_BZSSVl0VEemiOP02o5T8tA" x="200"/>
@@ -3828,7 +3978,7 @@
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_EwL8oV0VEemiOP02o5T8tA"/>
</children>
<element xmi:type="uml:Class" href="Service.uml#_EwCLkF0VEemiOP02o5T8tA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EwCLk10VEemiOP02o5T8tA" x="700" y="-240"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EwCLk10VEemiOP02o5T8tA" x="800" y="-240"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_EwL8sF0VEemiOP02o5T8tA" type="StereotypeComment">
<styles xmi:type="notation:TitleStyle" xmi:id="_EwL8sV0VEemiOP02o5T8tA"/>
@@ -3862,7 +4012,7 @@
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_FEKBhV0VEemiOP02o5T8tA"/>
</children>
<element xmi:type="uml:Class" href="Service.uml#_FEKBcF0VEemiOP02o5T8tA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FEKBc10VEemiOP02o5T8tA" x="700" y="-60"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FEKBc10VEemiOP02o5T8tA" x="820" y="-60"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_FETyfl0VEemiOP02o5T8tA" type="StereotypeComment">
<styles xmi:type="notation:TitleStyle" xmi:id="_FETyf10VEemiOP02o5T8tA"/>
@@ -3872,6 +4022,195 @@
<element xsi:nil="true"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_FETygF0VEemiOP02o5T8tA" x="200"/>
</children>
+ <children xmi:type="notation:Shape" xmi:id="_rMLGYILdEemyVus8T4NvCQ" type="Enumeration_Shape">
+ <children xmi:type="notation:DecorationNode" xmi:id="_rMOwwILdEemyVus8T4NvCQ" type="Enumeration_NameLabel"/>
+ <children xmi:type="notation:DecorationNode" xmi:id="_rMOwwYLdEemyVus8T4NvCQ" type="Enumeration_FloatingNameLabel">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_rMOwwoLdEemyVus8T4NvCQ" y="15"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_rMOww4LdEemyVus8T4NvCQ" type="Enumeration_LiteralCompartment">
+ <children xmi:type="notation:Shape" xmi:id="_3gbGQILdEemyVus8T4NvCQ" type="EnumerationLiteral_LiteralLabel">
+ <element xmi:type="uml:EnumerationLiteral" href="Common.uml#_zobhAILdEemyVus8T4NvCQ"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_3gbGQYLdEemyVus8T4NvCQ"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_3gbtUILdEemyVus8T4NvCQ" type="EnumerationLiteral_LiteralLabel">
+ <element xmi:type="uml:EnumerationLiteral" href="Common.uml#_1lXHwILdEemyVus8T4NvCQ"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_3gbtUYLdEemyVus8T4NvCQ"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_3gbtUoLdEemyVus8T4NvCQ" type="EnumerationLiteral_LiteralLabel">
+ <element xmi:type="uml:EnumerationLiteral" href="Common.uml#_2r4q8ILdEemyVus8T4NvCQ"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_3gbtU4LdEemyVus8T4NvCQ"/>
+ </children>
+ <styles xmi:type="notation:TitleStyle" xmi:id="_rMOwxILdEemyVus8T4NvCQ"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_rMOwxYLdEemyVus8T4NvCQ"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_rMOwxoLdEemyVus8T4NvCQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rMOwx4LdEemyVus8T4NvCQ"/>
+ </children>
+ <element xmi:type="uml:Enumeration" href="Common.uml#_rMIDEILdEemyVus8T4NvCQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rMLGYYLdEemyVus8T4NvCQ" x="-500" y="280"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_5XyQgILdEemyVus8T4NvCQ" type="StereotypeComment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_5XyQgYLdEemyVus8T4NvCQ"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_5XyQg4LdEemyVus8T4NvCQ" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Enumeration" href="Common.uml#_rMIDEILdEemyVus8T4NvCQ"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5XyQgoLdEemyVus8T4NvCQ" x="-120" y="360"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_1k2XIILtEemyVus8T4NvCQ" type="Enumeration_Shape">
+ <children xmi:type="notation:DecorationNode" xmi:id="_1k2-MILtEemyVus8T4NvCQ" type="Enumeration_NameLabel"/>
+ <children xmi:type="notation:DecorationNode" xmi:id="_1k2-MYLtEemyVus8T4NvCQ" type="Enumeration_FloatingNameLabel">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_1k2-MoLtEemyVus8T4NvCQ" y="15"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_1k2-M4LtEemyVus8T4NvCQ" type="Enumeration_LiteralCompartment">
+ <children xmi:type="notation:Shape" xmi:id="_9u2kIILtEemyVus8T4NvCQ" type="EnumerationLiteral_LiteralLabel">
+ <element xmi:type="uml:EnumerationLiteral" href="Common.uml#_65Yy4ILtEemyVus8T4NvCQ"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_9u2kIYLtEemyVus8T4NvCQ"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_9u3LMILtEemyVus8T4NvCQ" type="EnumerationLiteral_LiteralLabel">
+ <element xmi:type="uml:EnumerationLiteral" href="Common.uml#_8E0EMILtEemyVus8T4NvCQ"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_9u3LMYLtEemyVus8T4NvCQ"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_9u3yQILtEemyVus8T4NvCQ" type="EnumerationLiteral_LiteralLabel">
+ <element xmi:type="uml:EnumerationLiteral" href="Common.uml#_8_vbYILtEemyVus8T4NvCQ"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_9u3yQYLtEemyVus8T4NvCQ"/>
+ </children>
+ <styles xmi:type="notation:TitleStyle" xmi:id="_1k3lQILtEemyVus8T4NvCQ"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_1k3lQYLtEemyVus8T4NvCQ"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_1k3lQoLtEemyVus8T4NvCQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1k3lQ4LtEemyVus8T4NvCQ"/>
+ </children>
+ <element xmi:type="uml:Enumeration" href="Common.uml#_1kyswILtEemyVus8T4NvCQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1k2XIYLtEemyVus8T4NvCQ" x="-320" y="280"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_AFymVILuEemyVus8T4NvCQ" type="StereotypeComment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_AFymVYLuEemyVus8T4NvCQ"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_AFymV4LuEemyVus8T4NvCQ" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Enumeration" href="Common.uml#_1kyswILtEemyVus8T4NvCQ"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AFymVoLuEemyVus8T4NvCQ" x="-100" y="320"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_z7-GEILzEemyVus8T4NvCQ" type="Class_Shape">
+ <children xmi:type="notation:DecorationNode" xmi:id="_z7_UMILzEemyVus8T4NvCQ" type="Class_NameLabel"/>
+ <children xmi:type="notation:DecorationNode" xmi:id="_z7_UMYLzEemyVus8T4NvCQ" type="Class_FloatingNameLabel">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_z7_UMoLzEemyVus8T4NvCQ" y="15"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_z7_UM4LzEemyVus8T4NvCQ" type="Class_AttributeCompartment">
+ <children xmi:type="notation:Shape" xmi:id="_BYqhcIMEEemyVus8T4NvCQ" type="Property_ClassAttributeLabel">
+ <children xmi:type="notation:DecorationNode" xmi:id="_BZBt0IMEEemyVus8T4NvCQ" visible="false" type="StereotypeLabel">
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_BZBt0YMEEemyVus8T4NvCQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+ <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BZBt0oMEEemyVus8T4NvCQ"/>
+ </children>
+ <element xmi:type="uml:Property" href="Common.uml#_Td26cOLNEeiKy5JVrA0UGA"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_BYqhcYMEEemyVus8T4NvCQ"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_BYrIgIMEEemyVus8T4NvCQ" type="Property_ClassAttributeLabel">
+ <children xmi:type="notation:DecorationNode" xmi:id="_BZExIIMEEemyVus8T4NvCQ" visible="false" type="StereotypeLabel">
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_BZExIYMEEemyVus8T4NvCQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+ <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BZExIoMEEemyVus8T4NvCQ"/>
+ </children>
+ <element xmi:type="uml:Property" href="Common.uml#_T6QikOLNEeiKy5JVrA0UGA"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_BYrIgYMEEemyVus8T4NvCQ"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_BYrIgoMEEemyVus8T4NvCQ" type="Property_ClassAttributeLabel">
+ <children xmi:type="notation:DecorationNode" xmi:id="_BZIbgIMEEemyVus8T4NvCQ" visible="false" type="StereotypeLabel">
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_BZIbgYMEEemyVus8T4NvCQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+ <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BZIbgoMEEemyVus8T4NvCQ"/>
+ </children>
+ <element xmi:type="uml:Property" href="Common.uml#_eoc6EDYQEemvTc8tEY2xig"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_BYrIg4MEEemyVus8T4NvCQ"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_BYrIhIMEEemyVus8T4NvCQ" type="Property_ClassAttributeLabel">
+ <children xmi:type="notation:DecorationNode" xmi:id="_BZK3wIMEEemyVus8T4NvCQ" visible="false" type="StereotypeLabel">
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_BZK3wYMEEemyVus8T4NvCQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+ <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BZK3woMEEemyVus8T4NvCQ"/>
+ </children>
+ <element xmi:type="uml:Property" href="Common.uml#_E4CakDYREemvTc8tEY2xig"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_BYrIhYMEEemyVus8T4NvCQ"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_BYrIhoMEEemyVus8T4NvCQ" type="Property_ClassAttributeLabel">
+ <children xmi:type="notation:DecorationNode" xmi:id="_BZNUAIMEEemyVus8T4NvCQ" visible="false" type="StereotypeLabel">
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_BZNUAYMEEemyVus8T4NvCQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+ <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BZNUAoMEEemyVus8T4NvCQ"/>
+ </children>
+ <element xmi:type="uml:Property" href="Common.uml#_wj9DsOLJEeiKy5JVrA0UGA"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_BYrIh4MEEemyVus8T4NvCQ"/>
+ </children>
+ <styles xmi:type="notation:TitleStyle" xmi:id="_z7_UNILzEemyVus8T4NvCQ"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_z7_UNYLzEemyVus8T4NvCQ"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_z7_UNoLzEemyVus8T4NvCQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_z7_UN4LzEemyVus8T4NvCQ"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_z7_UOILzEemyVus8T4NvCQ" visible="false" type="Class_OperationCompartment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_z7_UOYLzEemyVus8T4NvCQ"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_z7_UOoLzEemyVus8T4NvCQ"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_z7_UO4LzEemyVus8T4NvCQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_z7_UPILzEemyVus8T4NvCQ"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_z7_UPYLzEemyVus8T4NvCQ" visible="false" type="Class_NestedClassifierCompartment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_z7_UPoLzEemyVus8T4NvCQ"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_z7_UP4LzEemyVus8T4NvCQ"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_z7_UQILzEemyVus8T4NvCQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_z7_UQYLzEemyVus8T4NvCQ"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_z8XHoILzEemyVus8T4NvCQ" visible="false" type="StereotypeLabel">
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_z8XHoYLzEemyVus8T4NvCQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelClass"/>
+ <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_z8XHooLzEemyVus8T4NvCQ"/>
+ </children>
+ <element xmi:type="uml:Class" href="Common.uml#_v04t4DFPEemw1_Ys6rcLWw"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_z7-GEYLzEemyVus8T4NvCQ" x="180" y="-240" height="121"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_z8ayA4LzEemyVus8T4NvCQ" type="StereotypeComment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_z8ayBILzEemyVus8T4NvCQ"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_z8ayBoLzEemyVus8T4NvCQ" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="Common.uml#_v04t4DFPEemw1_Ys6rcLWw"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_z8ayBYLzEemyVus8T4NvCQ" x="200"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_txie8IMFEemyVus8T4NvCQ" type="DataType_Shape">
+ <children xmi:type="notation:DecorationNode" xmi:id="_txjGAIMFEemyVus8T4NvCQ" type="DataType_NameLabel"/>
+ <children xmi:type="notation:DecorationNode" xmi:id="_txjGAYMFEemyVus8T4NvCQ" type="DataType_FloatingNameLabel">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_txjGAoMFEemyVus8T4NvCQ" y="15"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_txjGA4MFEemyVus8T4NvCQ" type="DataType_AttributeCompartment">
+ <children xmi:type="notation:Shape" xmi:id="_1p7XgIMFEemyVus8T4NvCQ" type="Property_DataTypeAttributeLabel">
+ <children xmi:type="notation:DecorationNode" xmi:id="_1qxFAIMFEemyVus8T4NvCQ" visible="false" type="StereotypeLabel">
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_1qxFAYMFEemyVus8T4NvCQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+ <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1qxFAoMFEemyVus8T4NvCQ"/>
+ </children>
+ <element xmi:type="uml:Property" href="Common.uml#_1pWIsIMFEemyVus8T4NvCQ"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_1p7XgYMFEemyVus8T4NvCQ"/>
+ </children>
+ <styles xmi:type="notation:TitleStyle" xmi:id="_txjGBIMFEemyVus8T4NvCQ"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_txjGBYMFEemyVus8T4NvCQ"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_txjGBoMFEemyVus8T4NvCQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_txjGB4MFEemyVus8T4NvCQ"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_txjGCIMFEemyVus8T4NvCQ" visible="false" type="DataType_OperationCompartment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_txjGCYMFEemyVus8T4NvCQ"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_txjGCoMFEemyVus8T4NvCQ"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_txjGC4MFEemyVus8T4NvCQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_txjGDIMFEemyVus8T4NvCQ"/>
+ </children>
+ <element xmi:type="uml:DataType" href="Common.uml#_e6hnYIMFEemyVus8T4NvCQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_txie8YMFEemyVus8T4NvCQ" x="-660" y="-200"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_ty_Qc4MFEemyVus8T4NvCQ" type="StereotypeComment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_ty_QdIMFEemyVus8T4NvCQ"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_ty_QdoMFEemyVus8T4NvCQ" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:DataType" href="Common.uml#_e6hnYIMFEemyVus8T4NvCQ"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ty_QdYMFEemyVus8T4NvCQ" x="200"/>
+ </children>
<styles xmi:type="notation:StringValueStyle" xmi:id="_Y0oyUR9cEemLMI6HKP6Lbw" name="diagram_compatibility_version" stringValue="1.4.0"/>
<styles xmi:type="notation:DiagramStyle" xmi:id="_Y0oyUh9cEemLMI6HKP6Lbw"/>
<styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_Y0oyUx9cEemLMI6HKP6Lbw" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
@@ -3947,7 +4286,7 @@
<element xmi:type="uml:Generalization" href="Service.uml#_xMGpgM4oEeinDdlk3ffduQ"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ta_gYh9eEemLMI6HKP6Lbw" points="[580, 320, -643984, -643984]$[580, 260, -643984, -643984]$[460, 260, -643984, -643984]$[460, 200, -643984, -643984]"/>
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uN3HwB9eEemLMI6HKP6Lbw" id="(0.4975124378109453,0.0)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_w2YCIB9eEemLMI6HKP6Lbw" id="(0.42704626334519574,1.0)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_w2YCIB9eEemLMI6HKP6Lbw" id="(0.2850356294536817,1.0)"/>
</edges>
<edges xmi:type="notation:Connector" xmi:id="_yclyAB9eEemLMI6HKP6Lbw" type="Generalization_Edge" source="_Yz45gB9eEemLMI6HKP6Lbw" target="_nTtrAB9cEemLMI6HKP6Lbw">
<children xmi:type="notation:DecorationNode" xmi:id="_yclyAx9eEemLMI6HKP6Lbw" type="Generalization_StereotypeLabel">
@@ -3958,7 +4297,7 @@
<element xmi:type="uml:Generalization" href="Service.uml#_yX44MB9eEemLMI6HKP6Lbw"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_yclyAh9eEemLMI6HKP6Lbw" points="[320, 320, -643984, -643984]$[320, 260, -643984, -643984]$[460, 260, -643984, -643984]$[460, 201, -643984, -643984]"/>
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ykvBYB9eEemLMI6HKP6Lbw" id="(0.45248868778280543,0.0)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ykvBYR9eEemLMI6HKP6Lbw" id="(0.42704626334519574,1.0)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ykvBYR9eEemLMI6HKP6Lbw" id="(0.2850356294536817,1.0)"/>
</edges>
<edges xmi:type="notation:Connector" xmi:id="_KVp44B9fEemLMI6HKP6Lbw" type="Generalization_Edge" source="_eJ8qIB9cEemLMI6HKP6Lbw" target="_bHBZwB9eEemLMI6HKP6Lbw">
<children xmi:type="notation:DecorationNode" xmi:id="_KVp44x9fEemLMI6HKP6Lbw" type="Generalization_StereotypeLabel">
@@ -4020,7 +4359,7 @@
</children>
<children xmi:type="notation:DecorationNode" xmi:id="_6uqzFSC1Eemw1L3J4dNy4w" type="Association_NameLabel">
<styles xmi:type="notation:BooleanValueStyle" xmi:id="__MEygCC1Eemw1L3J4dNy4w" name="IS_UPDATED_POSITION" booleanValue="true"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_6uqzFiC1Eemw1L3J4dNy4w" x="43" y="41"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_6uqzFiC1Eemw1L3J4dNy4w" x="93" y="36"/>
</children>
<children xmi:type="notation:DecorationNode" xmi:id="_6uqzFyC1Eemw1L3J4dNy4w" visible="false" type="Association_TargetRoleLabel">
<styles xmi:type="notation:BooleanValueStyle" xmi:id="__VIA0CC1Eemw1L3J4dNy4w" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -4042,7 +4381,7 @@
<element xmi:type="uml:Association" href="Service.uml#_6lxVwCC1Eemw1L3J4dNy4w"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_6uqzEiC1Eemw1L3J4dNy4w" points="[240, 360, -643984, -643984]$[140, 360, -643984, -643984]$[140, 80, -643984, -643984]$[340, 80, -643984, -643984]"/>
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7AY1MCC1Eemw1L3J4dNy4w" id="(0.0,0.4)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7AZcQCC1Eemw1L3J4dNy4w" id="(0.0,0.4979253112033195)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7AZcQCC1Eemw1L3J4dNy4w" id="(0.0,0.46511627906976744)"/>
</edges>
<edges xmi:type="notation:Connector" xmi:id="_9v9nkCC6Eemw1L3J4dNy4w" type="Association_Edge" source="_bJ4LYB9cEemLMI6HKP6Lbw" target="_eJ8qIB9cEemLMI6HKP6Lbw">
<children xmi:type="notation:DecorationNode" xmi:id="_9v9nkyC6Eemw1L3J4dNy4w" type="Association_StereotypeLabel">
@@ -4373,7 +4712,7 @@
<edges xmi:type="notation:Connector" xmi:id="_AkYqpl0VEemiOP02o5T8tA" type="StereotypeCommentLink" source="_AkYqgF0VEemiOP02o5T8tA" target="_AkYqol0VEemiOP02o5T8tA">
<styles xmi:type="notation:FontStyle" xmi:id="_AkYqp10VEemiOP02o5T8tA"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_AkYqq10VEemiOP02o5T8tA" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:Class" href="Service.uml#_AkO5gF0VEemiOP02o5T8tA"/>
+ <eObjectValue xmi:type="uml:Class" href="Common.uml#_AkO5gF0VEemiOP02o5T8tA"/>
</styles>
<element xsi:nil="true"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_AkYqqF0VEemiOP02o5T8tA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
@@ -4383,7 +4722,7 @@
<edges xmi:type="notation:Connector" xmi:id="_BAGWN10VEemiOP02o5T8tA" type="StereotypeCommentLink" source="_A_9MMl0VEemiOP02o5T8tA" target="_BAGWM10VEemiOP02o5T8tA">
<styles xmi:type="notation:FontStyle" xmi:id="_BAGWOF0VEemiOP02o5T8tA"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_BAGWPF0VEemiOP02o5T8tA" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:Class" href="Service.uml#_A_9MMF0VEemiOP02o5T8tA"/>
+ <eObjectValue xmi:type="uml:Class" href="Common.uml#_A_9MMF0VEemiOP02o5T8tA"/>
</styles>
<element xsi:nil="true"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_BAGWOV0VEemiOP02o5T8tA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
@@ -4393,7 +4732,7 @@
<edges xmi:type="notation:Connector" xmi:id="_BZSSWF0VEemiOP02o5T8tA" type="StereotypeCommentLink" source="_BZSSMl0VEemiOP02o5T8tA" target="_BZSSVF0VEemiOP02o5T8tA">
<styles xmi:type="notation:FontStyle" xmi:id="_BZSSWV0VEemiOP02o5T8tA"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_BZSSXV0VEemiOP02o5T8tA" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:Class" href="Service.uml#_BZSSMF0VEemiOP02o5T8tA"/>
+ <eObjectValue xmi:type="uml:Class" href="Common.uml#_BZSSMF0VEemiOP02o5T8tA"/>
</styles>
<element xsi:nil="true"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_BZSSWl0VEemiOP02o5T8tA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
@@ -4447,50 +4786,20 @@
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_XB9DwV0VEemiOP02o5T8tA"/>
<element xmi:type="uml:Association" href="Service.uml#_XBqI0F0VEemiOP02o5T8tA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_XB9Dwl0VEemiOP02o5T8tA" points="[700, -180, -643984, -643984]$[460, -180, -643984, -643984]$[460, -40, -643984, -643984]"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_XB9Dwl0VEemiOP02o5T8tA" points="[700, -180, -643984, -643984]$[540, -180, -643984, -643984]$[540, -40, -643984, -643984]"/>
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XCsqoF0VEemiOP02o5T8tA" id="(0.0,0.6)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XCsqoV0VEemiOP02o5T8tA" id="(0.42704626334519574,0.0)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XCsqoV0VEemiOP02o5T8tA" id="(0.4750593824228028,0.0)"/>
</edges>
<edges xmi:type="notation:Connector" xmi:id="_H7beoF0XEemiOP02o5T8tA" type="Generalization_Edge" source="_FEKBcl0VEemiOP02o5T8tA" target="_EwCLkl0VEemiOP02o5T8tA">
<children xmi:type="notation:DecorationNode" xmi:id="_H7beo10XEemiOP02o5T8tA" type="Generalization_StereotypeLabel">
+ <styles xmi:type="notation:BooleanValueStyle" xmi:id="_SqFUAIMGEemyVus8T4NvCQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
<layoutConstraint xmi:type="notation:Location" xmi:id="_H7bepF0XEemiOP02o5T8tA" y="40"/>
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_H7beoV0XEemiOP02o5T8tA"/>
<element xmi:type="uml:Generalization" href="Service.uml#_H61BsF0XEemiOP02o5T8tA"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_H7beol0XEemiOP02o5T8tA" points="[720, -60, -643984, -643984]$[720, -140, -643984, -643984]"/>
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_H8BUgF0XEemiOP02o5T8tA" id="(0.38095238095238093,0.0)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_H8BUgV0XEemiOP02o5T8tA" id="(0.38095238095238093,1.0)"/>
- </edges>
- <edges xmi:type="notation:Connector" xmi:id="_QeY-MF0XEemiOP02o5T8tA" type="Association_Edge" source="_Yz45gB9eEemLMI6HKP6Lbw" target="_AkYqgF0VEemiOP02o5T8tA">
- <children xmi:type="notation:DecorationNode" xmi:id="_QeY-M10XEemiOP02o5T8tA" type="Association_StereotypeLabel">
- <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QuMUwF0XEemiOP02o5T8tA" name="IS_UPDATED_POSITION" booleanValue="true"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_QeY-NF0XEemiOP02o5T8tA" y="-19"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_QeY-NV0XEemiOP02o5T8tA" type="Association_NameLabel">
- <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QufPsF0XEemiOP02o5T8tA" name="IS_UPDATED_POSITION" booleanValue="true"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_QeY-Nl0XEemiOP02o5T8tA" x="12" y="13"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_QeY-N10XEemiOP02o5T8tA" visible="false" type="Association_TargetRoleLabel">
- <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QuyKoF0XEemiOP02o5T8tA" name="IS_UPDATED_POSITION" booleanValue="true"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_QeY-OF0XEemiOP02o5T8tA" x="39" y="-19"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_QeY-OV0XEemiOP02o5T8tA" visible="false" type="Association_SourceRoleLabel">
- <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QvFFkF0XEemiOP02o5T8tA" name="IS_UPDATED_POSITION" booleanValue="true"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_QeY-Ol0XEemiOP02o5T8tA" x="-39" y="18"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_QeY-O10XEemiOP02o5T8tA" type="Association_SourceMultiplicityLabel">
- <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QvYnkF0XEemiOP02o5T8tA" name="IS_UPDATED_POSITION" booleanValue="true"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_QeY-PF0XEemiOP02o5T8tA" x="35" y="-7"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_QeY-PV0XEemiOP02o5T8tA" type="Association_TargetMultiplicityLabel">
- <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QvrigF0XEemiOP02o5T8tA" name="IS_UPDATED_POSITION" booleanValue="true"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_QeY-Pl0XEemiOP02o5T8tA" x="-13" y="-31"/>
- </children>
- <styles xmi:type="notation:FontStyle" xmi:id="_QeY-MV0XEemiOP02o5T8tA"/>
- <element xmi:type="uml:Association" href="Service.uml#_QdpXUF0XEemiOP02o5T8tA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_QeY-Ml0XEemiOP02o5T8tA" points="[220, 400, -643984, -643984]$[0, 400, -643984, -643984]$[0, 440, -643984, -643984]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QfIlEF0XEemiOP02o5T8tA" id="(0.0,0.8)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QfIlEV0XEemiOP02o5T8tA" id="(0.5714285714285714,0.0)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_H8BUgV0XEemiOP02o5T8tA" id="(0.5825242718446602,1.0)"/>
</edges>
<edges xmi:type="notation:Connector" xmi:id="_qQzMUF0XEemiOP02o5T8tA" type="Generalization_Edge" source="_A_9MMl0VEemiOP02o5T8tA" target="_AkYqgF0VEemiOP02o5T8tA">
<children xmi:type="notation:DecorationNode" xmi:id="_qQzMU10XEemiOP02o5T8tA" type="Generalization_StereotypeLabel">
@@ -4498,10 +4807,10 @@
<layoutConstraint xmi:type="notation:Location" xmi:id="_qQzMVF0XEemiOP02o5T8tA" x="-1" y="40"/>
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_qQzMUV0XEemiOP02o5T8tA"/>
- <element xmi:type="uml:Generalization" href="Service.uml#_qQWgYF0XEemiOP02o5T8tA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_qQzMUl0XEemiOP02o5T8tA" points="[-120, 600, -643984, -643984]$[-120, 580, -643984, -643984]$[0, 580, -643984, -643984]$[0, 520, -643984, -643984]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_qRZpQF0XEemiOP02o5T8tA" id="(0.3448275862068966,0.0)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_qRZpQV0XEemiOP02o5T8tA" id="(0.5714285714285714,1.0)"/>
+ <element xmi:type="uml:Generalization" href="Common.uml#_qQWgYF0XEemiOP02o5T8tA"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_qQzMUl0XEemiOP02o5T8tA" points="[-360, 100, -643984, -643984]$[-360, 80, -643984, -643984]$[-220, 80, -643984, -643984]$[-220, 20, -643984, -643984]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_qRZpQF0XEemiOP02o5T8tA" id="(0.5693950177935944,0.0)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_qRZpQV0XEemiOP02o5T8tA" id="(0.4979253112033195,0.9876543209876543)"/>
</edges>
<edges xmi:type="notation:Connector" xmi:id="_6L4wAF0XEemiOP02o5T8tA" type="Generalization_Edge" source="_BZSSMl0VEemiOP02o5T8tA" target="_AkYqgF0VEemiOP02o5T8tA">
<children xmi:type="notation:DecorationNode" xmi:id="_6L4wA10XEemiOP02o5T8tA" type="Generalization_StereotypeLabel">
@@ -4509,10 +4818,10 @@
<layoutConstraint xmi:type="notation:Location" xmi:id="_6L4wBF0XEemiOP02o5T8tA" x="-1" y="38"/>
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_6L4wAV0XEemiOP02o5T8tA"/>
- <element xmi:type="uml:Generalization" href="Service.uml#_6LSTEF0XEemiOP02o5T8tA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_6L4wAl0XEemiOP02o5T8tA" points="[120, 600, -643984, -643984]$[120, 580, -643984, -643984]$[0, 580, -643984, -643984]$[0, 520, -643984, -643984]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6Mel4F0XEemiOP02o5T8tA" id="(0.5714285714285714,0.0)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6Mel4V0XEemiOP02o5T8tA" id="(0.5714285714285714,1.0)"/>
+ <element xmi:type="uml:Generalization" href="Common.uml#_6LSTEF0XEemiOP02o5T8tA"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_6L4wAl0XEemiOP02o5T8tA" points="[-60, 100, -643984, -643984]$[-60, 80, -643984, -643984]$[-220, 80, -643984, -643984]$[-220, 20, -643984, -643984]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6Mel4F0XEemiOP02o5T8tA" id="(0.5363984674329502,0.0)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6Mel4V0XEemiOP02o5T8tA" id="(0.4979253112033195,0.9876543209876543)"/>
</edges>
<edges xmi:type="notation:Connector" xmi:id="_KAZxoF0YEemiOP02o5T8tA" type="Association_Edge" source="_AkYqgF0VEemiOP02o5T8tA" target="_A_9MMl0VEemiOP02o5T8tA">
<children xmi:type="notation:DecorationNode" xmi:id="_KAZxo10YEemiOP02o5T8tA" type="Association_StereotypeLabel">
@@ -4521,7 +4830,7 @@
</children>
<children xmi:type="notation:DecorationNode" xmi:id="_KAZxpV0YEemiOP02o5T8tA" type="Association_NameLabel">
<styles xmi:type="notation:BooleanValueStyle" xmi:id="_K8BFUF0YEemiOP02o5T8tA" name="IS_UPDATED_POSITION" booleanValue="true"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_KAZxpl0YEemiOP02o5T8tA" x="2" y="17"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_KAZxpl0YEemiOP02o5T8tA" x="-1" y="-47"/>
</children>
<children xmi:type="notation:DecorationNode" xmi:id="_KAZxp10YEemiOP02o5T8tA" visible="false" type="Association_TargetRoleLabel">
<styles xmi:type="notation:BooleanValueStyle" xmi:id="_K8UnUF0YEemiOP02o5T8tA" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -4533,7 +4842,7 @@
</children>
<children xmi:type="notation:DecorationNode" xmi:id="_KAZxq10YEemiOP02o5T8tA" type="Association_SourceMultiplicityLabel">
<styles xmi:type="notation:BooleanValueStyle" xmi:id="_K86dMF0YEemiOP02o5T8tA" name="IS_UPDATED_POSITION" booleanValue="true"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_KAZxrF0YEemiOP02o5T8tA" x="34" y="17"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_KAZxrF0YEemiOP02o5T8tA" x="10" y="-7"/>
</children>
<children xmi:type="notation:DecorationNode" xmi:id="_KAZxrV0YEemiOP02o5T8tA" type="Association_TargetMultiplicityLabel">
<styles xmi:type="notation:BooleanValueStyle" xmi:id="_K9NYIF0YEemiOP02o5T8tA" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -4541,10 +4850,98 @@
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_KAZxoV0YEemiOP02o5T8tA"/>
<element xmi:type="uml:Association" href="Service.uml#_J_zUsF0YEemiOP02o5T8tA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_KAZxol0YEemiOP02o5T8tA" points="[-60, 500, -643984, -643984]$[-200, 500, -643984, -643984]$[-200, 640, -643984, -643984]$[-160, 640, -643984, -643984]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_KA_ngF0YEemiOP02o5T8tA" id="(0.0,0.6)"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_KAZxol0YEemiOP02o5T8tA" points="[-340, 0, -643984, -643984]$[-580, 0, -643984, -643984]$[-580, 140, -643984, -643984]$[-520, 140, -643984, -643984]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_KA_ngF0YEemiOP02o5T8tA" id="(0.0,0.7407407407407407)"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_KA_ngV0YEemiOP02o5T8tA" id="(0.0,0.4)"/>
</edges>
+ <edges xmi:type="notation:Connector" xmi:id="_5Xy3kILdEemyVus8T4NvCQ" type="StereotypeCommentLink" source="_rMLGYILdEemyVus8T4NvCQ" target="_5XyQgILdEemyVus8T4NvCQ">
+ <styles xmi:type="notation:FontStyle" xmi:id="_5Xy3kYLdEemyVus8T4NvCQ"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_5XzeooLdEemyVus8T4NvCQ" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Enumeration" href="Common.uml#_rMIDEILdEemyVus8T4NvCQ"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_5Xy3koLdEemyVus8T4NvCQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_5XzeoILdEemyVus8T4NvCQ"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_5XzeoYLdEemyVus8T4NvCQ"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_AFzNYILuEemyVus8T4NvCQ" type="StereotypeCommentLink" source="_1k2XIILtEemyVus8T4NvCQ" target="_AFymVILuEemyVus8T4NvCQ">
+ <styles xmi:type="notation:FontStyle" xmi:id="_AFzNYYLuEemyVus8T4NvCQ"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_AFz0cYLuEemyVus8T4NvCQ" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Enumeration" href="Common.uml#_1kyswILtEemyVus8T4NvCQ"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_AFzNYoLuEemyVus8T4NvCQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_AFzNY4LuEemyVus8T4NvCQ"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_AFz0cILuEemyVus8T4NvCQ"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_z8ayB4LzEemyVus8T4NvCQ" type="StereotypeCommentLink" source="_z7-GEILzEemyVus8T4NvCQ" target="_z8ayA4LzEemyVus8T4NvCQ">
+ <styles xmi:type="notation:FontStyle" xmi:id="_z8ayCILzEemyVus8T4NvCQ"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_z8ayDILzEemyVus8T4NvCQ" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="Common.uml#_v04t4DFPEemw1_Ys6rcLWw"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_z8ayCYLzEemyVus8T4NvCQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_z8ayCoLzEemyVus8T4NvCQ"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_z8ayC4LzEemyVus8T4NvCQ"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_knSAwIMDEemyVus8T4NvCQ" type="Association_Edge" source="_AkYqgF0VEemiOP02o5T8tA" target="_z7-GEILzEemyVus8T4NvCQ">
+ <children xmi:type="notation:DecorationNode" xmi:id="_knSAw4MDEemyVus8T4NvCQ" type="Association_StereotypeLabel">
+ <styles xmi:type="notation:BooleanValueStyle" xmi:id="_mxwUQIMDEemyVus8T4NvCQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_knSAxIMDEemyVus8T4NvCQ" y="-20"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_knSAxYMDEemyVus8T4NvCQ" type="Association_NameLabel">
+ <styles xmi:type="notation:BooleanValueStyle" xmi:id="_myOOUIMDEemyVus8T4NvCQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_knSAxoMDEemyVus8T4NvCQ" x="6" y="-13"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_knSAx4MDEemyVus8T4NvCQ" visible="false" type="Association_TargetRoleLabel">
+ <styles xmi:type="notation:BooleanValueStyle" xmi:id="_myq6QIMDEemyVus8T4NvCQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_knSAyIMDEemyVus8T4NvCQ" x="66" y="-20"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_knSAyYMDEemyVus8T4NvCQ" visible="false" type="Association_SourceRoleLabel">
+ <styles xmi:type="notation:BooleanValueStyle" xmi:id="_mzI0UIMDEemyVus8T4NvCQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_knSAyoMDEemyVus8T4NvCQ" x="-66" y="20"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_knSAy4MDEemyVus8T4NvCQ" type="Association_SourceMultiplicityLabel">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-qfrAYMDEemyVus8T4NvCQ" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-qfrAoMDEemyVus8T4NvCQ" key="visible" value="true"/>
+ </eAnnotations>
+ <styles xmi:type="notation:BooleanValueStyle" xmi:id="_mzkSIIMDEemyVus8T4NvCQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_knSAzIMDEemyVus8T4NvCQ" x="13" y="24"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_knSAzYMDEemyVus8T4NvCQ" type="Association_TargetMultiplicityLabel">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-qfD8IMDEemyVus8T4NvCQ" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-qfrAIMDEemyVus8T4NvCQ" key="visible" value="true"/>
+ </eAnnotations>
+ <styles xmi:type="notation:BooleanValueStyle" xmi:id="_m0BlIIMDEemyVus8T4NvCQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_knSAzoMDEemyVus8T4NvCQ" x="-16" y="-13"/>
+ </children>
+ <styles xmi:type="notation:FontStyle" xmi:id="_knSAwYMDEemyVus8T4NvCQ"/>
+ <element xmi:type="uml:Association" href="Service.uml#_kmmEQIMDEemyVus8T4NvCQ"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_knSAwoMDEemyVus8T4NvCQ" points="[-140, -60, -643984, -643984]$[-140, -180, -643984, -643984]$[180, -180, -643984, -643984]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_koYM8IMDEemyVus8T4NvCQ" id="(0.8298755186721992,0.0)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_koYM8YMDEemyVus8T4NvCQ" id="(0.0,0.49586776859504134)"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_JGGuQIMEEemyVus8T4NvCQ" type="Generalization_Edge" source="_nTtrAB9cEemLMI6HKP6Lbw" target="_z7-GEILzEemyVus8T4NvCQ">
+ <children xmi:type="notation:DecorationNode" xmi:id="_JGHVUIMEEemyVus8T4NvCQ" type="Generalization_StereotypeLabel">
+ <styles xmi:type="notation:BooleanValueStyle" xmi:id="_DiWacIO3EemYd8NEwnS9kQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_JGHVUYMEEemyVus8T4NvCQ" y="40"/>
+ </children>
+ <styles xmi:type="notation:FontStyle" xmi:id="_JGGuQYMEEemyVus8T4NvCQ"/>
+ <element xmi:type="uml:Generalization" href="Service.uml#_JFlw4IMEEemyVus8T4NvCQ"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_JGGuQoMEEemyVus8T4NvCQ" points="[380, -40, -643984, -643984]$[380, -79, -643984, -643984]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JHJQEIMEEemyVus8T4NvCQ" id="(0.09501187648456057,0.0)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JHJQEYMEEemyVus8T4NvCQ" id="(0.819672131147541,1.0)"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_ty_Qd4MFEemyVus8T4NvCQ" type="StereotypeCommentLink" source="_txie8IMFEemyVus8T4NvCQ" target="_ty_Qc4MFEemyVus8T4NvCQ">
+ <styles xmi:type="notation:FontStyle" xmi:id="_ty_QeIMFEemyVus8T4NvCQ"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_ty_3goMFEemyVus8T4NvCQ" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:DataType" href="Common.uml#_e6hnYIMFEemyVus8T4NvCQ"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ty_QeYMFEemyVus8T4NvCQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ty_3gIMFEemyVus8T4NvCQ"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ty_3gYMFEemyVus8T4NvCQ"/>
+ </edges>
</notation:Diagram>
<notation:Diagram xmi:id="_OMM7IF0BEemn7e9Q1aGp7A" type="PapyrusUMLClassDiagram" name="Atomic / Composite Service View" measurementUnit="Pixel">
<children xmi:type="notation:Shape" xmi:id="_OMM7IV0BEemn7e9Q1aGp7A" type="Class_Shape">
diff --git a/ONAP Information Model/Service.uml b/ONAP Information Model/Service.uml
index 51c3d6f..d6410db 100644
--- a/ONAP Information Model/Service.uml
+++ b/ONAP Information Model/Service.uml
@@ -464,24 +464,17 @@
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ekq20F0aEemiOP02o5T8tA" value="*"/>
</ownedEnd>
</packagedElement>
- <packagedElement xmi:type="uml:Association" xmi:id="_QdpXUF0XEemiOP02o5T8tA" name="ServiceCompositeDescriptorHasFilter" memberEnd="_QdpXU10XEemiOP02o5T8tA _QdpXV10XEemiOP02o5T8tA">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_QdpXUV0XEemiOP02o5T8tA" source="org.eclipse.papyrus">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_QdpXUl0XEemiOP02o5T8tA" key="nature" value="UML_Nature"/>
- </eAnnotations>
- <ownedEnd xmi:type="uml:Property" xmi:id="_QdpXV10XEemiOP02o5T8tA" name="servicecompositedescriptor" type="_7SrB0D0VEeiWMf5FLWfdLA" association="_QdpXUF0XEemiOP02o5T8tA">
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_W-sNAF0YEemiOP02o5T8tA"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_W-_H8F0YEemiOP02o5T8tA" value="*"/>
- </ownedEnd>
- </packagedElement>
- <packagedElement xmi:type="uml:Association" xmi:id="_J_zUsF0YEemiOP02o5T8tA" name="FilterCompositeComprisedOfFilter" memberEnd="_J_9Fsl0YEemiOP02o5T8tA _J_9Ftl0YEemiOP02o5T8tA">
+ <packagedElement xmi:type="uml:Association" xmi:id="_J_zUsF0YEemiOP02o5T8tA" name="SelectionCriteriaCompositeComprisedOfSelectionCriteria" memberEnd="_J_9Fsl0YEemiOP02o5T8tA _J_9Ftl0YEemiOP02o5T8tA">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_J_9FsF0YEemiOP02o5T8tA" source="org.eclipse.papyrus">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_J_9FsV0YEemiOP02o5T8tA" key="nature" value="UML_Nature"/>
</eAnnotations>
- <ownedEnd xmi:type="uml:Property" xmi:id="_J_9Ftl0YEemiOP02o5T8tA" name="filter" type="_AkO5gF0VEemiOP02o5T8tA" aggregation="shared" association="_J_zUsF0YEemiOP02o5T8tA">
+ <ownedEnd xmi:type="uml:Property" xmi:id="_J_9Ftl0YEemiOP02o5T8tA" name="filter" aggregation="shared" association="_J_zUsF0YEemiOP02o5T8tA">
+ <type xmi:type="uml:Class" href="Common.uml#_AkO5gF0VEemiOP02o5T8tA"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_cmAa0F0YEemiOP02o5T8tA" value="2"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_cmJkwF0YEemiOP02o5T8tA" value="*"/>
</ownedEnd>
- <ownedEnd xmi:type="uml:Property" xmi:id="_J_9Fsl0YEemiOP02o5T8tA" name="filtercomposite" type="_A_9MMF0VEemiOP02o5T8tA" association="_J_zUsF0YEemiOP02o5T8tA">
+ <ownedEnd xmi:type="uml:Property" xmi:id="_J_9Fsl0YEemiOP02o5T8tA" name="filtercomposite" association="_J_zUsF0YEemiOP02o5T8tA">
+ <type xmi:type="uml:Class" href="Common.uml#_A_9MMF0VEemiOP02o5T8tA"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_J_9FtF0YEemiOP02o5T8tA"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_J_9FtV0YEemiOP02o5T8tA" value="*"/>
</ownedEnd>
@@ -510,6 +503,21 @@
<ownedComment xmi:type="uml:Comment" xmi:id="_ehLI8CC9Eemw1L3J4dNy4w">
<body>Do we need this diagram?</body>
</ownedComment>
+ <packagedElement xmi:type="uml:Association" xmi:id="_kmmEQIMDEemyVus8T4NvCQ" name="DesignEntityHasSelectionCriteria" memberEnd="_kmpHkIMDEemyVus8T4NvCQ _kmpuoIMDEemyVus8T4NvCQ">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kmn5cIMDEemyVus8T4NvCQ" source="org.eclipse.papyrus">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kmn5cYMDEemyVus8T4NvCQ" key="nature" value="UML_Nature"/>
+ </eAnnotations>
+ <ownedEnd xmi:type="uml:Property" xmi:id="_kmpHkIMDEemyVus8T4NvCQ" name="designentity" association="_kmmEQIMDEemyVus8T4NvCQ">
+ <type xmi:type="uml:Class" href="Common.uml#_v04t4DFPEemw1_Ys6rcLWw"/>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_7KP3YIMDEemyVus8T4NvCQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_7Kl1oIMDEemyVus8T4NvCQ" value="*"/>
+ </ownedEnd>
+ <ownedEnd xmi:type="uml:Property" xmi:id="_kmpuoIMDEemyVus8T4NvCQ" name="selectioncriteria" association="_kmmEQIMDEemyVus8T4NvCQ">
+ <type xmi:type="uml:Class" href="Common.uml#_AkO5gF0VEemiOP02o5T8tA"/>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_8VoFYIMDEemyVus8T4NvCQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8WC8IIMDEemyVus8T4NvCQ" value="*"/>
+ </ownedEnd>
+ </packagedElement>
</packagedElement>
<packagedElement xmi:type="uml:Package" xmi:id="_fXNM8TOHEei5Af8DcjrhIQ" name="Interfaces">
<packagedElement xmi:type="uml:Package" xmi:id="_-6ecYEYpEem7INgoaq_j-g" name="Interfaces"/>
@@ -579,6 +587,9 @@ NOTE: NFV Management and Orchestration functions shall instantiate VNFs from th
<ownedComment xmi:type="uml:Comment" xmi:id="_R35GwD0MEeiWMf5FLWfdLA" annotatedElement="_Jvy-QD0MEeiWMf5FLWfdLA">
<body>ServiceDescriptor is used to model the design time representation of a service. </body>
</ownedComment>
+ <generalization xmi:type="uml:Generalization" xmi:id="_JFlw4IMEEemyVus8T4NvCQ">
+ <general xmi:type="uml:Class" href="Common.uml#_v04t4DFPEemw1_Ys6rcLWw"/>
+ </generalization>
<ownedAttribute xmi:type="uml:Property" xmi:id="_biWkcD0NEeiWMf5FLWfdLA" name="serviceInvariantId" visibility="public">
<ownedComment xmi:type="uml:Comment" xmi:id="_nieHYD0NEeiWMf5FLWfdLA" annotatedElement="_biWkcD0NEeiWMf5FLWfdLA">
<body> Constant identifier of the service model.</body>
@@ -643,11 +654,23 @@ NOTE: NFV Management and Orchestration functions shall instantiate VNFs from th
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ZzkacJDrEei9Vqs7Ti8Wxg"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Zzm2sJDrEei9Vqs7Ti8Wxg" value="*"/>
</ownedAttribute>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_E2FYoIMGEemyVus8T4NvCQ" name="configurableProperties">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_f4O54IMSEemIU81rY2FFFw" annotatedElement="_E2FYoIMGEemyVus8T4NvCQ">
+ <body>Describes the configurable properties of the service.&#xD;
+</body>
+ </ownedComment>
+ <type xmi:type="uml:DataType" href="Common.uml#_e6hnYIMFEemyVus8T4NvCQ"/>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_YP8JQIMGEemyVus8T4NvCQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_YQF6QIMGEemyVus8T4NvCQ" value="1"/>
+ </ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="_HFfXUD0QEeiWMf5FLWfdLA" name="ServiceInstance" isAbstract="true">
<ownedComment xmi:type="uml:Comment" xmi:id="_cnoqID0QEeiWMf5FLWfdLA" annotatedElement="_HFfXUD0QEeiWMf5FLWfdLA">
<body>ServiceInstance is used to model the run time representation of a service. </body>
</ownedComment>
+ <generalization xmi:type="uml:Generalization" xmi:id="_xnyJAIMLEemyVus8T4NvCQ">
+ <general xmi:type="uml:Class" href="Common.uml#_0Zik0DFPEemw1_Ys6rcLWw"/>
+ </generalization>
<ownedAttribute xmi:type="uml:Property" xmi:id="_mDZZ8D0QEeiWMf5FLWfdLA" name="serviceInstanceId" visibility="public">
<ownedComment xmi:type="uml:Comment" xmi:id="_uP_n8D0QEeiWMf5FLWfdLA" annotatedElement="_mDZZ8D0QEeiWMf5FLWfdLA">
<body>Uniquely identifies this instance of a service.</body>
@@ -723,10 +746,6 @@ NOTE: NFV Management and Orchestration functions shall instantiate VNFs from th
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_qdIu9TJ0EembsLjrwaSXHQ"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_qdIu9jJ0EembsLjrwaSXHQ" value="*"/>
</ownedAttribute>
- <ownedAttribute xmi:type="uml:Property" xmi:id="_QdpXU10XEemiOP02o5T8tA" name="filter" type="_AkO5gF0VEemiOP02o5T8tA" association="_QdpXUF0XEemiOP02o5T8tA">
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_QdpXVV0XEemiOP02o5T8tA"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_QdpXVl0XEemiOP02o5T8tA" value="*"/>
- </ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="_mrJV8In9EeiOe-BKGdv_Yg" name="ServiceOrder">
<ownedComment xmi:type="uml:Comment" xmi:id="_u8BdMI9yEeiT7tMsBl6xjA" annotatedElement="_mrJV8In9EeiOe-BKGdv_Yg">
@@ -1285,13 +1304,6 @@ NOTE: Cardinality of zero is only valid for a non-instantiated NS.&#xD;
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_bnGZkUS4EeiVGPeZpaYNtQ" value="*"/>
</ownedAttribute>
</packagedElement>
- <packagedElement xmi:type="uml:Class" xmi:id="_AkO5gF0VEemiOP02o5T8tA" name="Filter"/>
- <packagedElement xmi:type="uml:Class" xmi:id="_A_9MMF0VEemiOP02o5T8tA" name="FilterComposite">
- <generalization xmi:type="uml:Generalization" xmi:id="_qQWgYF0XEemiOP02o5T8tA" general="_AkO5gF0VEemiOP02o5T8tA"/>
- </packagedElement>
- <packagedElement xmi:type="uml:Class" xmi:id="_BZSSMF0VEemiOP02o5T8tA" name="FilterAtomic">
- <generalization xmi:type="uml:Generalization" xmi:id="_6LSTEF0XEemiOP02o5T8tA" general="_AkO5gF0VEemiOP02o5T8tA"/>
- </packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="_EwCLkF0VEemiOP02o5T8tA" name="ServiceProfile">
<ownedAttribute xmi:type="uml:Property" xmi:id="_XBqI010VEemiOP02o5T8tA" name="servicedescriptor" type="_Jvy-QD0MEeiWMf5FLWfdLA" association="_XBqI0F0VEemiOP02o5T8tA">
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_XBqI1V0VEemiOP02o5T8tA"/>
@@ -1701,15 +1713,42 @@ If null, then represents to the end of time&#xD;
<OpenModel_Profile:Preliminary xmi:id="_Q5paQFoLEemSNe5QiI5UBQ" base_Element="_Lvny4MDgEeiebIKjAGZWdA"/>
<OpenModel_Profile:Preliminary xmi:id="_xyntQFrNEem07dac9irJSQ" base_Element="_IdqxoI9WEeiT7tMsBl6xjA"/>
<OpenModel_Profile:Preliminary xmi:id="_1OLh4F0BEemiOP02o5T8tA" base_Element="_1Rt9wPL4EeiazPylpq3fUA"/>
- <OpenModel_Profile:OpenModelClass xmi:id="_AkO5gV0VEemiOP02o5T8tA" base_Class="_AkO5gF0VEemiOP02o5T8tA"/>
- <OpenModel_Profile:OpenModelClass xmi:id="_A_9MMV0VEemiOP02o5T8tA" base_Class="_A_9MMF0VEemiOP02o5T8tA"/>
- <OpenModel_Profile:OpenModelClass xmi:id="_BZSSMV0VEemiOP02o5T8tA" base_Class="_BZSSMF0VEemiOP02o5T8tA"/>
<OpenModel_Profile:OpenModelClass xmi:id="_EwCLkV0VEemiOP02o5T8tA" base_Class="_EwCLkF0VEemiOP02o5T8tA"/>
<OpenModel_Profile:OpenModelClass xmi:id="_FEKBcV0VEemiOP02o5T8tA" base_Class="_FEKBcF0VEemiOP02o5T8tA"/>
<OpenModel_Profile:OpenModelAttribute xmi:id="_XBqI1F0VEemiOP02o5T8tA" base_StructuralFeature="_XBqI010VEemiOP02o5T8tA"/>
<OpenModel_Profile:OpenModelAttribute xmi:id="_XBqI2F0VEemiOP02o5T8tA" base_StructuralFeature="_XBqI110VEemiOP02o5T8tA"/>
- <OpenModel_Profile:OpenModelAttribute xmi:id="_QdpXVF0XEemiOP02o5T8tA" base_StructuralFeature="_QdpXU10XEemiOP02o5T8tA"/>
- <OpenModel_Profile:OpenModelAttribute xmi:id="_QdpXWF0XEemiOP02o5T8tA" base_StructuralFeature="_QdpXV10XEemiOP02o5T8tA"/>
<OpenModel_Profile:OpenModelAttribute xmi:id="_J_9Fs10YEemiOP02o5T8tA" base_StructuralFeature="_J_9Fsl0YEemiOP02o5T8tA"/>
<OpenModel_Profile:OpenModelAttribute xmi:id="_J_9Ft10YEemiOP02o5T8tA" base_StructuralFeature="_J_9Ftl0YEemiOP02o5T8tA"/>
+ <OpenModel_Profile:OpenModelAttribute xmi:id="_lpEDIILdEemyVus8T4NvCQ">
+ <base_StructuralFeature xmi:type="uml:Property" href="Common.uml#_lo6SIILdEemyVus8T4NvCQ"/>
+ </OpenModel_Profile:OpenModelAttribute>
+ <OpenModel_Profile:OpenModelAttribute xmi:id="_h8AhkYLoEemyVus8T4NvCQ">
+ <base_StructuralFeature xmi:type="uml:Property" href="Common.uml#_h8AhkILoEemyVus8T4NvCQ"/>
+ </OpenModel_Profile:OpenModelAttribute>
+ <OpenModel_Profile:Experimental xmi:id="_smVWQILoEemyVus8T4NvCQ">
+ <base_Element xmi:type="uml:Property" href="Common.uml#_h8AhkILoEemyVus8T4NvCQ"/>
+ </OpenModel_Profile:Experimental>
+ <ActionLanguage:TextualRepresentation xmi:id="_093-EILqEemyVus8T4NvCQ" language="org.eclipse.papyrus.uml.textedit.property.xtext.UmlProperty">
+ <base_Comment xmi:type="uml:Comment" href="Common.uml#_09MBkILqEemyVus8T4NvCQ"/>
+ </ActionLanguage:TextualRepresentation>
+ <OpenModel_Profile:OpenModelAttribute xmi:id="_U92FMYLsEemyVus8T4NvCQ">
+ <base_StructuralFeature xmi:type="uml:Property" href="Common.uml#_U92FMILsEemyVus8T4NvCQ"/>
+ </OpenModel_Profile:OpenModelAttribute>
+ <OpenModel_Profile:OpenModelAttribute xmi:id="_VorK4YLsEemyVus8T4NvCQ">
+ <base_StructuralFeature xmi:type="uml:Property" href="Common.uml#_VorK4ILsEemyVus8T4NvCQ"/>
+ </OpenModel_Profile:OpenModelAttribute>
+ <OpenModel_Profile:OpenModelAttribute xmi:id="_W1j0wYLsEemyVus8T4NvCQ">
+ <base_StructuralFeature xmi:type="uml:Property" href="Common.uml#_W1j0wILsEemyVus8T4NvCQ"/>
+ </OpenModel_Profile:OpenModelAttribute>
+ <OpenModel_Profile:Experimental xmi:id="_GGe9cILuEemyVus8T4NvCQ">
+ <base_Element xmi:type="uml:Property" href="Common.uml#_U92FMILsEemyVus8T4NvCQ"/>
+ </OpenModel_Profile:Experimental>
+ <OpenModel_Profile:Experimental xmi:id="_G_vgsILuEemyVus8T4NvCQ">
+ <base_Element xmi:type="uml:Property" href="Common.uml#_VorK4ILsEemyVus8T4NvCQ"/>
+ </OpenModel_Profile:Experimental>
+ <OpenModel_Profile:Experimental xmi:id="_H_r6wILuEemyVus8T4NvCQ">
+ <base_Element xmi:type="uml:Property" href="Common.uml#_W1j0wILsEemyVus8T4NvCQ"/>
+ </OpenModel_Profile:Experimental>
+ <OpenModel_Profile:OpenModelAttribute xmi:id="_E2F_sIMGEemyVus8T4NvCQ" base_StructuralFeature="_E2FYoIMGEemyVus8T4NvCQ"/>
+ <OpenModel_Profile:Experimental xmi:id="_QCAegIMGEemyVus8T4NvCQ" base_Element="_E2FYoIMGEemyVus8T4NvCQ"/>
</xmi:XMI>