Adjustments agreed at TAPI call 2020-06-16:

1) supportable-central-frequency-spectrum-band instead of supportable-lower-central-frequency, supportable-upper-central-frequency 1.1) added keys lower/upper frequency to CentralFrequencyBand type 2) removed redundant association between MediaChannelConnectivityServiceEndPointSpec and PowerManagementConfigPac 3) renamed (through Papyrus) the YANG/OAS modules which have been modified with respect to RC1 ones (connectivity, notification, photonic media, streaming, virtual ntw)
Open-Network-Models-and-Interfaces-ONMI · Jun 17, 2020 · b37d792 · b37d792
1 parent 9a4b0f0
commit b37d792
Show file tree

Hide file tree

Showing 27 changed files with 49,496 additions and 46,578 deletions.
diff --git a/OAS/tapi-common@2020-04-23.yaml b/OAS/tapi-common@2020-04-23.yaml
diff --git a/OAS/tapi-connectivity@2020-04-23.yaml → OAS/tapi-connectivity@2020-06-16.yaml b/OAS/tapi-connectivity@2020-04-23.yaml → OAS/tapi-connectivity@2020-06-16.yaml
diff --git a/OAS/tapi-dsr@2020-04-23.yaml b/OAS/tapi-dsr@2020-04-23.yaml
diff --git a/OAS/tapi-equipment@2020-04-23.yaml b/OAS/tapi-equipment@2020-04-23.yaml
diff --git a/OAS/tapi-eth@2020-04-23.yaml b/OAS/tapi-eth@2020-04-23.yaml
diff --git a/OAS/tapi-notification@2020-04-23.yaml → OAS/tapi-notification@2020-06-16.yaml b/OAS/tapi-notification@2020-04-23.yaml → OAS/tapi-notification@2020-06-16.yaml
diff --git a/OAS/tapi-oam@2020-04-23.yaml b/OAS/tapi-oam@2020-04-23.yaml
diff --git a/OAS/tapi-odu@2020-04-23.yaml b/OAS/tapi-odu@2020-04-23.yaml
diff --git a/OAS/tapi-path-computation@2020-04-23.yaml b/OAS/tapi-path-computation@2020-04-23.yaml
diff --git a/OAS/tapi-photonic-media@2020-04-23.yaml → OAS/tapi-photonic-media@2020-06-16.yaml b/OAS/tapi-photonic-media@2020-04-23.yaml → OAS/tapi-photonic-media@2020-06-16.yaml
diff --git a/OAS/tapi-streaming@2020-04-23.yaml → OAS/tapi-streaming@2020-06-16.yaml b/OAS/tapi-streaming@2020-04-23.yaml → OAS/tapi-streaming@2020-06-16.yaml
diff --git a/OAS/tapi-topology@2020-04-23.yaml b/OAS/tapi-topology@2020-04-23.yaml
diff --git a/OAS/tapi-virtual-network@2020-04-23.yaml → OAS/tapi-virtual-network@2020-06-16.yaml b/OAS/tapi-virtual-network@2020-04-23.yaml → OAS/tapi-virtual-network@2020-06-16.yaml
diff --git a/UML/TapiConnectivity.notation b/UML/TapiConnectivity.notation
diff --git a/UML/TapiPhotonicMedia.notation b/UML/TapiPhotonicMedia.notation
diff --git a/UML/TapiPhotonicMedia.uml b/UML/TapiPhotonicMedia.uml
@@ -39,7 +39,7 @@ License: This module is distributed under the Apache License 2.0</body>
         </ownedComment>
         <supplier xmi:type="uml:Class" href="TapiTopology.uml#_i1UzkD-3EeWNAdBR30aJhw"/>
       </packagedElement>
-      <packagedElement xmi:type="uml:Abstraction" xmi:id="_XCHpEHZpEeiPPoPDo3q5jA" name="OtsiGCepSpecAugmentsCep" client="_UyBxsBKOEeajhbtskMXJfw">
+      <packagedElement xmi:type="uml:Abstraction" xmi:id="_XCHpEHZpEeiPPoPDo3q5jA" name="OtsiGCepSpecAugmentsCep" client="_mXvsEHZlEeiPPoPDo3q5jA">
         <supplier xmi:type="uml:Class" href="TapiConnectivity.uml#_oC2ZEEG_EeWAMMFKXSVi-w"/>
       </packagedElement>
       <packagedElement xmi:type="uml:Association" xmi:id="_fhWN4HiHEeiPPoPDo3q5jA" name="OtsiSipHasOtsiCapabilityPac" memberEnd="_fhbGYHiHEeiPPoPDo3q5jA _fhbtcHiHEeiPPoPDo3q5jA">
@@ -90,7 +90,7 @@ License: This module is distributed under the Apache License 2.0</body>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_uzBycJmoEeiOmuqNbykpsw" value="1"/>
         </ownedEnd>
       </packagedElement>
-      <packagedElement xmi:type="uml:Abstraction" xmi:id="_ObUMoJmaEeiOmuqNbykpsw" name="McCsepSpecAugmentsCsep" client="_UyBxsBKOEeajhbtskMXJfw">
+      <packagedElement xmi:type="uml:Abstraction" xmi:id="_ObUMoJmaEeiOmuqNbykpsw" name="McCsepSpecAugmentsCsep" client="_Es15AJmWEeiOmuqNbykpsw">
         <supplier xmi:type="uml:Class" href="TapiConnectivity.uml#_MIWTIGh5EeWZEqTYAF8eqA"/>
       </packagedElement>
       <packagedElement xmi:type="uml:Abstraction" xmi:id="_c-z5wJozEeiOmuqNbykpsw" name="McCepSpecAugmentsCep" client="_aiExkJozEeiOmuqNbykpsw">
@@ -235,12 +235,6 @@ License: This module is distributed under the Apache License 2.0</body>
       <packagedElement xmi:type="uml:Abstraction" xmi:id="_z7sXYPPnEeinaYo1FpF9OA" name="OtsiCepSpecAugmentsCepDetailsOutput" client="_KjQ3rRKOEeajhbtskMXJfw">
         <supplier xmi:type="uml:Operation" href="TapiConnectivity.uml#_ARtOoPPkEeinaYo1FpF9OA"/>
       </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_1vwGkG9xEeqLWtFsc04LIg" name="McCsepHasPowerConfigPac" memberEnd="_1vzJ4G9xEeqLWtFsc04LIg _1v20QW9xEeqLWtFsc04LIg">
-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1vx7wG9xEeqLWtFsc04LIg" source="org.eclipse.papyrus">
-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1vx7wW9xEeqLWtFsc04LIg" key="nature" value="UML_Nature"/>
-        </eAnnotations>
-        <ownedEnd xmi:type="uml:Property" xmi:id="_1v20QW9xEeqLWtFsc04LIg" name="mediachannelconnectivityserviceendpointspec" type="_Es15AJmWEeiOmuqNbykpsw" association="_1vwGkG9xEeqLWtFsc04LIg"/>
-      </packagedElement>
       <packagedElement xmi:type="uml:Association" xmi:id="_7KK18G9zEeqLWtFsc04LIg" name="McSipHasPowerCapabilityPac" memberEnd="_7KLdAm9zEeqLWtFsc04LIg _7KPucW9zEeqLWtFsc04LIg">
         <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_7KLdAG9zEeqLWtFsc04LIg" source="org.eclipse.papyrus">
           <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_7KLdAW9zEeqLWtFsc04LIg" key="nature" value="UML_Nature"/>
@@ -388,20 +382,16 @@ License: This module is distributed under the Apache License 2.0</body>
         <ownedComment xmi:type="uml:Comment" xmi:id="_CosS4LKjEei69qzpcujF2A" annotatedElement="_NhrjUHiHEeiPPoPDo3q5jA">
           <body>Can read the status of the warning for the upper value that the power can reach.</body>
         </ownedComment>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_x9XaUJJmEee26o4qs2D5Ig" name="supportableLowerCentralFrequency" type="_KjQ3xBKOEeajhbtskMXJfw" isReadOnly="true">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_x9XaUJJmEee26o4qs2D5Ig" name="supportableCentralFrequencySpectrumBand" type="_-2hW8LAhEeq6S5EiV0C3pg" isReadOnly="true">
           <ownedComment xmi:type="uml:Comment" xmi:id="_pXy3ULDqEeiUZaG2JnNtGQ" annotatedElement="_x9XaUJJmEee26o4qs2D5Ig">
-            <body>The lower frequency of the channel spectrum</body>
+            <body>Each spectrum band supported for otsi trasmitter to be tuned on,&#xD;
+is specified as per it's lower and upper central frequencies supported and its frequency constraints,&#xD;
+consisting in the frequency Grid and the AdjustmentGranularity,&#xD;
+used to uniquely identify all central frequencies supported within the band.</body>
           </ownedComment>
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_KgckgM4xEeehIvzuBRCtZQ"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KgdyoM4xEeehIvzuBRCtZQ" value="*"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_t2oxcI50EeeyZasfnNSonw" name="supportableUpperCentralFrequency" type="_KjQ3xBKOEeajhbtskMXJfw" isReadOnly="true">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_qWfUMLDqEeiUZaG2JnNtGQ" annotatedElement="_t2oxcI50EeeyZasfnNSonw">
-            <body>The Upper frequency of the channel spectrum</body>
-          </ownedComment>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_LI65wM4xEeehIvzuBRCtZQ"/>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LI8H4M4xEeehIvzuBRCtZQ" value="*"/>
-        </ownedAttribute>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_7gkK0I50EeeyZasfnNSonw" name="supportableApplicationIdentifier" type="_KjQ3vRKOEeajhbtskMXJfw" isReadOnly="true">
           <ownedComment xmi:type="uml:Comment" xmi:id="_Jh7cgLDrEeiUZaG2JnNtGQ" annotatedElement="_7gkK0I50EeeyZasfnNSonw">
             <body>The list of supportable ApplicationIdentifiers.</body>
@@ -550,10 +540,6 @@ In case it is not instantiated (see [0..*] with OtsiAConnectivityServiceEndPoint
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_nWzrxpmYEeiOmuqNbykpsw" value="1"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_nWzrx5mYEeiOmuqNbykpsw" value="1"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_1vzJ4G9xEeqLWtFsc04LIg" name="_powerManagementConfig" type="_hZGL8G9wEeqLWtFsc04LIg" aggregation="composite" association="_1vwGkG9xEeqLWtFsc04LIg">
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_1v2NMW9xEeqLWtFsc04LIg"/>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1v20QG9xEeqLWtFsc04LIg" value="1"/>
-        </ownedAttribute>
       </packagedElement>
       <packagedElement xmi:type="uml:Class" xmi:id="_awx_YJmYEeiOmuqNbykpsw" name="MediaChannelConfigPac">
         <ownedComment xmi:type="uml:Comment" xmi:id="_zP1YkKr7EeqiJu55eR3W2w" annotatedElement="_awx_YJmYEeiOmuqNbykpsw">
@@ -715,7 +701,7 @@ at the Logical-Termination-Point (LTP) associated to the SIP.</body>
           </ownedComment>
         </ownedAttribute>
       </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_pqLs8KE3EeqPrpdMOOTlbQ" name="MediaChannelAConnectivityServiceEndPointSpec">
+      <packagedElement xmi:type="uml:Class" xmi:id="_pqLs8KE3EeqPrpdMOOTlbQ" name="McaConnectivityServiceEndPointSpec">
         <ownedComment xmi:type="uml:Comment" xmi:id="_tTqKgKr6EeqiJu55eR3W2w" annotatedElement="_pqLs8KE3EeqPrpdMOOTlbQ">
           <body>This class allows the provisioning of MCA/OTSiMCA (*) ConnectivityService.&#xD;
 It is possible to provision either&#xD;
@@ -743,7 +729,7 @@ Capacity cannot be omitted if spectrum is not specified.</body>
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_I2SboKGQEeqPrpdMOOTlbQ"/>
         </ownedAttribute>
       </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_j1MmMJCGEeq3cZ7vVOAmSw" name="OtsiAConnectivityServiceEndPointSpec">
+      <packagedElement xmi:type="uml:Class" xmi:id="_j1MmMJCGEeq3cZ7vVOAmSw" name="OtsiaConnectivityServiceEndPointSpec">
         <ownedComment xmi:type="uml:Comment" xmi:id="_un5ZkKr6EeqiJu55eR3W2w" annotatedElement="_j1MmMJCGEeq3cZ7vVOAmSw">
           <body>This class allows the provisioning of OTSiA (*) ConnectivityService.&#xD;
 It is possible to either &#xD;
@@ -989,6 +975,27 @@ Tag as deprecated SMCA, replace by MCA</body>
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ep3ToG9yEeqLWtFsc04LIg"/>
         </ownedAttribute>
       </packagedElement>
+      <packagedElement xmi:type="uml:DataType" xmi:id="_-2hW8LAhEeq6S5EiV0C3pg" name="CentralFrequencyBand">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_D8VaMLAiEeq6S5EiV0C3pg" annotatedElement="_-2hW8LAhEeq6S5EiV0C3pg">
+          <body>This data-type represents a range of central frequency spectrum band specified as lower and upper bounds, inclusive of the bound values.&#xD;
+It also holds frequency constraints in terms of GridType ( FIXED grid (DWDM or CWDM) or FLEX grid) and AdjustmentGranularity.</body>
+        </ownedComment>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_PGx5YLAiEeq6S5EiV0C3pg" name="lowerCentralFrequency">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_PGx5YbAiEeq6S5EiV0C3pg" annotatedElement="_PGx5YLAiEeq6S5EiV0C3pg">
+            <body>The lower central frequency that can be tuned in the laser specified in MHz.&#xD;
+It is the oscillation frequency of the corresponding electromagnetic wave. </body>
+          </ownedComment>
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_XL3xMLAiEeq6S5EiV0C3pg" name="upperCentralFrequency">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_XL3xMbAiEeq6S5EiV0C3pg" annotatedElement="_XL3xMLAiEeq6S5EiV0C3pg">
+            <body>The upper central frequency that can be tuned in the laser specified in MHz.&#xD;
+ It is the oscillation frequency of the corresponding electromagnetic wave. </body>
+          </ownedComment>
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_jmZ_QLAiEeq6S5EiV0C3pg" name="frequencyConstraint" type="_nCmdAMG-EeiAg83ctgK3eQ"/>
+      </packagedElement>
     </packagedElement>
     <packagedElement xmi:type="uml:Package" xmi:id="_MSvNkBMEEeaOevPmmmHXcA" name="Imports">
       <packageImport xmi:type="uml:PackageImport" xmi:id="_eTzcwDK1Eeau3Z0jZdArnw">
@@ -1069,8 +1076,6 @@ Tag as deprecated SMCA, replace by MCA</body>
   <OpenInterfaceModel_Profile:OpenInterfaceModelClass xmi:id="_YKbQA1qoEeexvMtO2oNM9g" base_Class="_PKMDsEUIEead1bezhJG4aw"/>
   <OpenModel_Profile:OpenModelClass xmi:id="_KjT68BKOEeajhbtskMXJfw" base_Class="_KjQ3tBKOEeajhbtskMXJfw"/>
   <OpenInterfaceModel_Profile:OpenInterfaceModelClass xmi:id="_YKbQAlqoEeexvMtO2oNM9g" base_Class="_KjQ3tBKOEeajhbtskMXJfw"/>
-  <OpenInterfaceModel_Profile:OpenInterfaceModelAttribute xmi:id="_t2pYgI50EeeyZasfnNSonw" base_Property="_t2oxcI50EeeyZasfnNSonw" attributeValueChangeNotification="YES" bitLength="LENGTH_64_BIT"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_t2p_kI50EeeyZasfnNSonw" base_StructuralFeature="_t2oxcI50EeeyZasfnNSonw" valueRange="" unit=""/>
   <OpenInterfaceModel_Profile:OpenInterfaceModelAttribute xmi:id="_7gkx4I50EeeyZasfnNSonw" base_Property="_7gkK0I50EeeyZasfnNSonw" attributeValueChangeNotification="YES"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_7gkx4Y50EeeyZasfnNSonw" base_StructuralFeature="_7gkK0I50EeeyZasfnNSonw" valueRange="255"/>
   <OpenInterfaceModel_Profile:OpenInterfaceModelAttribute xmi:id="_MpI1UI51EeeyZasfnNSonw" base_Property="_MpIOQI51EeeyZasfnNSonw"/>
@@ -1406,10 +1411,6 @@ Tag as deprecated SMCA, replace by MCA</body>
   <OpenInterfaceModel_Profile:OpenInterfaceModelAttribute xmi:id="__XhHgG9wEeqLWtFsc04LIg" base_Property="__XcPAG9wEeqLWtFsc04LIg"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_SLxQsm9xEeqLWtFsc04LIg" base_StructuralFeature="_SLxQsG9xEeqLWtFsc04LIg"/>
   <OpenInterfaceModel_Profile:OpenInterfaceModelAttribute xmi:id="_SL2JMG9xEeqLWtFsc04LIg" base_Property="_SLxQsG9xEeqLWtFsc04LIg"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_1vzJ4W9xEeqLWtFsc04LIg" base_StructuralFeature="_1vzJ4G9xEeqLWtFsc04LIg"/>
-  <OpenInterfaceModel_Profile:OpenInterfaceModelAttribute xmi:id="_1v2NMG9xEeqLWtFsc04LIg" base_Property="_1vzJ4G9xEeqLWtFsc04LIg"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_1v20Qm9xEeqLWtFsc04LIg" base_StructuralFeature="_1v20QW9xEeqLWtFsc04LIg"/>
-  <OpenInterfaceModel_Profile:OpenInterfaceModelAttribute xmi:id="_1v20Q29xEeqLWtFsc04LIg" base_Property="_1v20QW9xEeqLWtFsc04LIg"/>
   <OpenModel_Profile:Experimental xmi:id="_YpiI4G9yEeqLWtFsc04LIg" base_Element="_05Y7wG9wEeqLWtFsc04LIg"/>
   <OpenModel_Profile:OpenModelClass xmi:id="_YHwcEW9zEeqLWtFsc04LIg" base_Class="_YHwcEG9zEeqLWtFsc04LIg"/>
   <OpenInterfaceModel_Profile:OpenInterfaceModelClass xmi:id="_YHzfYG9zEeqLWtFsc04LIg" base_Class="_YHwcEG9zEeqLWtFsc04LIg"/>
@@ -1429,7 +1430,6 @@ Tag as deprecated SMCA, replace by MCA</body>
   <OpenInterfaceModel_Profile:OpenInterfaceModelAttribute xmi:id="_G9WwIG90EeqLWtFsc04LIg" base_Property="_G9Ts0m90EeqLWtFsc04LIg"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_G9hIMW90EeqLWtFsc04LIg" base_StructuralFeature="_G9hIMG90EeqLWtFsc04LIg"/>
   <OpenInterfaceModel_Profile:OpenInterfaceModelAttribute xmi:id="_G9hvQG90EeqLWtFsc04LIg" base_Property="_G9hIMG90EeqLWtFsc04LIg"/>
-  <OpenModel_Profile:StrictComposite xmi:id="_ERfi4IJkEeqLl4tIPv2RCg" base_Association="_1vwGkG9xEeqLWtFsc04LIg"/>
   <OpenModel_Profile:StrictComposite xmi:id="_H2D10IJkEeqLl4tIPv2RCg" base_Association="_7KK18G9zEeqLWtFsc04LIg"/>
   <OpenModel_Profile:StrictComposite xmi:id="_L6UVcIJkEeqLl4tIPv2RCg" base_Association="_G9TFwG90EeqLWtFsc04LIg"/>
   <OpenInterfaceModel_Profile:OpenInterfaceModelClass xmi:id="_j1N0UJCGEeq3cZ7vVOAmSw" base_Class="_j1MmMJCGEeq3cZ7vVOAmSw"/>
@@ -1469,4 +1469,11 @@ Tag as deprecated SMCA, replace by MCA</body>
   <OpenModel_Profile:Deprecated xmi:id="_1OGnEKWgEeqJcvXkREZ1XQ" base_Element="_mXvsEHZlEeiPPoPDo3q5jA"/>
   <OpenModel_Profile:Deprecated xmi:id="_HyxcIKWhEeqJcvXkREZ1XQ" base_Element="_qzTdgHk7EeiO-c_khjKlFQ"/>
   <OpenModel_Profile:Deprecated xmi:id="_L-qNwKWhEeqJcvXkREZ1XQ" base_Element="_KjQ3qhKOEeajhbtskMXJfw"/>
+  <OpenInterfaceModel_Profile:OpenInterfaceModelAttribute xmi:id="_PGzHgLAiEeq6S5EiV0C3pg" base_Property="_PGx5YLAiEeq6S5EiV0C3pg"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_PHFbYLAiEeq6S5EiV0C3pg" base_StructuralFeature="_PGx5YLAiEeq6S5EiV0C3pg" partOfObjectKey="1"/>
+  <OpenInterfaceModel_Profile:OpenInterfaceModelAttribute xmi:id="_XL4YQLAiEeq6S5EiV0C3pg" base_Property="_XL3xMLAiEeq6S5EiV0C3pg"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_XMI28LAiEeq6S5EiV0C3pg" base_StructuralFeature="_XL3xMLAiEeq6S5EiV0C3pg" partOfObjectKey="2"/>
+  <OpenInterfaceModel_Profile:OpenInterfaceModelAttribute xmi:id="_jmamULAiEeq6S5EiV0C3pg" base_Property="_jmZ_QLAiEeq6S5EiV0C3pg"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_jmrFALAiEeq6S5EiV0C3pg" base_StructuralFeature="_jmZ_QLAiEeq6S5EiV0C3pg"/>
+  <OpenModel_Profile:Experimental xmi:id="_4_eOkLAiEeq6S5EiV0C3pg" base_Element="_-2hW8LAhEeq6S5EiV0C3pg"/>
 </xmi:XMI>