Merge pull request #514 from amazzini/develop

Several modifications for release 2.3
Open-Network-Models-and-Interfaces-ONMI · Aug 19, 2021 · 0bba191 · 0bba191
2 parents 9313e3e + 2c1f7d6
commit 0bba191
Show file tree

Hide file tree

Showing 63 changed files with 55,967 additions and 42,490 deletions.
diff --git a/OAS/tapi-connectivity.yaml b/OAS/tapi-connectivity.yaml
diff --git a/OAS/tapi-dsr.yaml b/OAS/tapi-dsr.yaml
diff --git a/OAS/tapi-equipment.yaml b/OAS/tapi-equipment.yaml
diff --git a/OAS/tapi-eth.yaml b/OAS/tapi-eth.yaml
diff --git a/OAS/tapi-fm.yaml b/OAS/tapi-fm.yaml
diff --git a/OAS/tapi-notification.yaml b/OAS/tapi-notification.yaml
diff --git a/OAS/tapi-oam.yaml b/OAS/tapi-oam.yaml
diff --git a/OAS/tapi-odu.yaml b/OAS/tapi-odu.yaml
diff --git a/OAS/tapi-path-computation.yaml b/OAS/tapi-path-computation.yaml
diff --git a/OAS/tapi-photonic-media.yaml b/OAS/tapi-photonic-media.yaml
diff --git a/OAS/tapi-streaming.yaml b/OAS/tapi-streaming.yaml
diff --git a/OAS/tapi-topology.yaml b/OAS/tapi-topology.yaml
diff --git a/OAS/tapi-virtual-network.yaml b/OAS/tapi-virtual-network.yaml
diff --git a/TAPI213vs23.pdf b/TAPI213vs23.pdf
diff --git a/TAPI213vs23rc1Vs23.pdf b/TAPI213vs23rc1Vs23.pdf
diff --git a/TapiUmlGendoc_v2.pdf → TapiUmlGendoc_v2_3.pdf b/TapiUmlGendoc_v2.pdf → TapiUmlGendoc_v2_3.pdf
diff --git a/UML/TapiCommon.notation b/UML/TapiCommon.notation
diff --git a/UML/TapiCommon.uml b/UML/TapiCommon.uml
@@ -28,6 +28,7 @@ License: This module is distributed under the Apache License 2.0&#xD;
         </eAnnotations>
         <ownedEnd xmi:type="uml:Property" xmi:id="_AFxuwUwDEeewALXL7BvPYw" name="serviceinterfacepoint" type="_It0sYEG-EeWMO5szP8dKiA" association="_AFtdUEwDEeewALXL7BvPYw"/>
       </packagedElement>
+      <packagedElement xmi:type="uml:Abstraction" xmi:id="_wFKwUNgrEeudANcJaTTLUg" name="PmParameterNameAugmentsConditionName" client="_Yt6WcISvEeuugLwCgMtsUg" supplier="_z8UvcNgoEeudANcJaTTLUg"/>
     </packagedElement>
     <packagedElement xmi:type="uml:Package" xmi:id="_XqBXAC5wEea0_JngOlSKcA" name="Diagrams"/>
     <packagedElement xmi:type="uml:Package" xmi:id="_ZA31MC5wEea0_JngOlSKcA" name="ObjectClasses">
@@ -164,7 +165,7 @@ Usage of layerProtocolName [>1]  in the ServiceInterfacePoint should be consider
             <body>The ServiceInterfacePoint (SIP) capacity information.</body>
           </ownedComment>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_PgncYG9NEequJuWZpC8-lA" name="direction" type="_dLDeINnjEeWIOYiRCk5bbQ">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_PgncYG9NEequJuWZpC8-lA" name="direction" type="_dLDeINnjEeWIOYiRCk5bbQ" isReadOnly="true">
           <ownedComment xmi:type="uml:Comment" xmi:id="_a_R4EG9NEequJuWZpC8-lA" annotatedElement="_PgncYG9NEequJuWZpC8-lA">
             <body>The orientation of flow at the (conceptual) port of the potentially supported ConnectivityService(s).&#xD;
 If direction attribute is missing the ServiceInterfacePoint (SIP) instance is to be intended as &quot;BIDIRECTIONAL&quot;</body>
@@ -484,7 +485,7 @@ A SINK termination function can be bound to an OUTPUT (conceptual) port of a for
           <ownedComment xmi:type="uml:Comment" xmi:id="_Ydx2t9njEeWIOYiRCk5bbQ" annotatedElement="_Ydx2ttnjEeWIOYiRCk5bbQ">
             <body>The flow is down the layer stack from the server side to the client side. &#xD;
 Considering an example of a termination function within the termination entity, a SOURCE flow:&#xD;
-1) will arrive at at the top of the termination function (the client side) where it is essentially at an INPUT to the termination function,&#xD;
+1) will arrive at the top of the termination function (the client side) where it is essentially at an INPUT to the termination function,&#xD;
 2) then will be assembled with various overheads etc and will be coded,&#xD;
 3) then the coded form of the assembly of flow will be sent out of the termination function (the server side) where it is essentially at an OUTPUT from the termination function.&#xD;
 A SOURCE termination is one that only supports a SOURCE flow.&#xD;
@@ -756,6 +757,11 @@ This extensible enumeration includes only the &quot;SERVICE_INTERFACE_POINT&quot
             <body>The ServiceInterfacePoint (SIP) class.</body>
           </ownedComment>
         </ownedLiteral>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="__wzU4O-nEeuFG_ZjnWumpQ" name="TAPI_CONTEXT">
+          <ownedComment xmi:type="uml:Comment" xmi:id="__wzU4e-nEeuFG_ZjnWumpQ" annotatedElement="__wzU4O-nEeuFG_ZjnWumpQ">
+            <body>The TapiContext class.</body>
+          </ownedComment>
+        </ownedLiteral>
       </packagedElement>
       <packagedElement xmi:type="uml:DataType" xmi:id="_gpUt0ISvEeuugLwCgMtsUg" name="PmParameterValue">
         <ownedComment xmi:type="uml:Comment" xmi:id="_k8cI0ISvEeuugLwCgMtsUg" annotatedElement="_gpUt0ISvEeuugLwCgMtsUg">
@@ -797,6 +803,19 @@ This extensible enumeration can be augmented with specific PM metric names in th
           </ownedComment>
         </ownedAttribute>
       </packagedElement>
+      <packagedElement xmi:type="uml:Enumeration" xmi:id="_z8UvcNgoEeudANcJaTTLUg" name="ConditionName">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_CP4UoNgpEeudANcJaTTLUg" annotatedElement="_z8UvcNgoEeudANcJaTTLUg">
+          <body>The Condition names.&#xD;
+This extensible enumeration can be augmented with&#xD;
+- specific PM metric names&#xD;
+- specific alarm condition names, or alarm probable causes</body>
+        </ownedComment>
+      </packagedElement>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_EuX9wPRsEeuv7vAwc_2Tug" name="AnyType">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_G5DsoPRsEeuv7vAwc_2Tug" annotatedElement="_EuX9wPRsEeuv7vAwc_2Tug">
+          <body>This primitive represents the &quot;any data&quot; mechanism.</body>
+        </ownedComment>
+      </packagedElement>
     </packagedElement>
     <packagedElement xmi:type="uml:Package" xmi:id="_FhzwMHrqEeavcODnuX7FyA" name="Interfaces">
       <packagedElement xmi:type="uml:Interface" xmi:id="_JSfMgHrqEeavcODnuX7FyA" name="ServiceInterfacePoint" visibility="public">
@@ -1004,4 +1023,5 @@ Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6
   <OpenModel_Profile:OpenModelAttribute xmi:id="_0SrTAISvEeuugLwCgMtsUg" base_StructuralFeature="_0SjXMISvEeuugLwCgMtsUg"/>
   <OpenModel_Profile:Deprecated xmi:id="_Dcw4UKdyEeu37eHxH-5cyQ" base_Element="_JSfMgHrqEeavcODnuX7FyA"/>
   <OpenModel_Profile:Deprecated xmi:id="_c7psIKmkEeu_24CNuQ9Jfw" base_Element="_p_JmsL6PEeWRz-VHgA3LJQ"/>
+  <OpenModel_Profile:Specify xmi:id="_0ppoINgrEeudANcJaTTLUg" base_Abstraction="_wFKwUNgrEeudANcJaTTLUg"/>
 </xmi:XMI>