Merge pull request #529 from nigel-r-davis/develop

TAPI 2.4.0 final edits
Open-Network-Models-and-Interfaces-ONMI · Dec 7, 2022 · 8fe07e4 · 8fe07e4
2 parents 58eb772 + a954a4b
commit 8fe07e4
Show file tree

Hide file tree

Showing 12 changed files with 3,819 additions and 6,383 deletions.
diff --git a/OAS/ReadMe.txt b/OAS/ReadMe.txt
@@ -0,0 +1,3 @@
+Please note that the OAS has not been updated fully in TAPI v2.4.0 and does not align with the UML/YANG normative part of the model in many places. 
+
+It is the intention that the OAS be completed in TAPI v2.4.1 to fully align with the UML/YANG.
diff --git a/UML/README.md b/UML/README.md
@@ -1 +1 @@
-This copy of Transport API Information Model is a fragment of the ONF Common Information Model (CIM) that is being developed in the ONF Information Modeling Project (IMP). It includes version 1.1 of Core Information Model that was released in November 2015. The TAPI module is a December 17, 2015 snapshot of the corresponding module in the ONF CIM.
+The TAPI (Transport API) Information Model is pruned and refactored from the ONF Core Information Model (CIM) that is being developed in the ONF Open Information Model and Tooling (OIMT) Project.
diff --git a/UML/TapiEquipment.notation b/UML/TapiEquipment.notation
diff --git a/UML/TapiEquipment.uml b/UML/TapiEquipment.uml
@@ -296,6 +296,12 @@ License: This module is distributed under the Apache License 2.0</body>
       </packagedElement>
       <packagedElement xmi:type="uml:Usage" xmi:id="_KrHI4COfEe2WHJIFpywtcA" client="_wbf4APByEeyfK8MNAFoLyw" supplier="_BB_mUDmkEemDl_QGWIY6yg"/>
       <packagedElement xmi:type="uml:Usage" xmi:id="_y9eccChgEe2bKMwCJ3OnmA" client="_7n4rMEvEEemT5f_Ewhfs6A" supplier="_jqSYYEqtEemT5f_Ewhfs6A"/>
+      <packagedElement xmi:type="uml:Association" xmi:id="_4tDSEHVGEe2mfN3QclrYLQ" name="EquipmentHadGeolocation" memberEnd="_4tIKkHVGEe2mfN3QclrYLQ _4tNDEnVGEe2mfN3QclrYLQ">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4tG8cHVGEe2mfN3QclrYLQ" source="org.eclipse.papyrus">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4tG8cXVGEe2mfN3QclrYLQ" key="nature" value="UML_Nature"/>
+        </eAnnotations>
+        <ownedEnd xmi:type="uml:Property" xmi:id="_4tNDEnVGEe2mfN3QclrYLQ" name="equipment" type="_8SXNej-HEeaRI-H69PghuA" association="_4tDSEHVGEe2mfN3QclrYLQ"/>
+      </packagedElement>
     </packagedElement>
     <packagedElement xmi:type="uml:Package" xmi:id="_mlzoUEdzEeasL6dcjI1vEA" name="TypeDefinitions">
       <packagedElement xmi:type="uml:Enumeration" xmi:id="_y2WM8EQ-EeasL6dcjI1vEA" name="ConnectorAndPinOrientation">
@@ -831,7 +837,8 @@ CONDITION: Mandatory where the equipment has holders.</body>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_XOQ_AEQwEeasL6dcjI1vEA" name="geographicalLocation" isReadOnly="true">
           <ownedComment xmi:type="uml:Comment" xmi:id="_Ujc_AOvQEeyisriSvKT5Lw" annotatedElement="_XOQ_AEQwEeasL6dcjI1vEA">
             <body>The location of the equipment in a georgraphical context (e.g., lat long).&#xD;
-CONDITION: Mandatory where there is a relevant geographical location (only for equipments not in holders).</body>
+This property is deprecated.&#xD;
+CONDITION: Mandatory where there is a relevant geographical location and formal geolocation is not being used (only for equipments not in holders).</body>
           </ownedComment>
           <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_xHHCMOvPEeyisriSvKT5Lw"/>
@@ -862,6 +869,14 @@ CONDITION: Mandatory where a real equipment is to be represented.</body>
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_d2S7oEvNEemT5f_Ewhfs6A"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_d2cFkEvNEemT5f_Ewhfs6A" value="1"/>
         </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_4tIKkHVGEe2mfN3QclrYLQ" name="_geolocation" type="_9Je3kHJwEeyQOcpW7WQJ8A" aggregation="composite" association="_4tDSEHVGEe2mfN3QclrYLQ">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_PdAw8HVJEe2mfN3QclrYLQ" annotatedElement="_4tIKkHVGEe2mfN3QclrYLQ">
+            <body>The location of the equipment in a georgraphical context using formal coordinates.&#xD;
+CONDITION: Mandatory where there is a relevant geographical location using formal coordiantes (only for equipments not in holders).</body>
+          </ownedComment>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_4tNDEHVGEe2mfN3QclrYLQ"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4tNDEXVGEe2mfN3QclrYLQ" value="1"/>
+        </ownedAttribute>
       </packagedElement>
       <packagedElement xmi:type="uml:Class" xmi:id="_8SXNjj-HEeaRI-H69PghuA" name="Holder">
         <ownedComment xmi:type="uml:Comment" xmi:id="_p_ujAFMPEeaDuo8VlVeg_g" annotatedElement="_8SXNjj-HEeaRI-H69PghuA">
@@ -1215,6 +1230,33 @@ CONDITION: Mandatory where AccessPort is not used to define PhysicalRoute or whe
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_PbSJ8_BzEeyfK8MNAFoLyw" value="*"/>
         </ownedAttribute>
       </packagedElement>
+      <packagedElement xmi:type="uml:Class" xmi:id="_9Je3kHJwEeyQOcpW7WQJ8A" name="Geolocation">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_IZXmQKZMEey3YNgkqjQ8nA" annotatedElement="_9Je3kHJwEeyQOcpW7WQJ8A">
+          <body>GPS location.</body>
+        </ownedComment>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_YmbU4HJxEeyQOcpW7WQJ8A" name="altitude" isReadOnly="true">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_OJ-6AKZMEey3YNgkqjQ8nA" annotatedElement="_YmbU4HJxEeyQOcpW7WQJ8A">
+            <body>Distance above &#xD;
+CONDITION: Mandatory where altitude information is relevant and available.</body>
+          </ownedComment>
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Real"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_q2-gIBctEe2lMdzzOIdEtw"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_aG5CEHJxEeyQOcpW7WQJ8A" name="latitude" isReadOnly="true">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_UCkeAKZMEey3YNgkqjQ8nA" annotatedElement="_aG5CEHJxEeyQOcpW7WQJ8A">
+            <body>Relative position north or south on the Earth's surface, in decimal degree (DD) used to express latitude and longitude geographic coordinates. &#xD;
+Range: &quot;-90..90&quot;</body>
+          </ownedComment>
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Real"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_be2TgHJxEeyQOcpW7WQJ8A" name="longitude" isReadOnly="true">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_3CXBsKZMEey3YNgkqjQ8nA" annotatedElement="_be2TgHJxEeyQOcpW7WQJ8A">
+            <body>Angular distance east or west on the Earth's surface in decimal degree (DD) used to express latitude and longitude geographic coordinates. &#xD;
+Range: &quot;-180..180&quot;</body>
+          </ownedComment>
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Real"/>
+        </ownedAttribute>
+      </packagedElement>
     </packagedElement>
     <packagedElement xmi:type="uml:Package" xmi:id="_E6MfIE2pEemQQPVBE79CWA" name="Imports">
       <packageImport xmi:type="uml:PackageImport" xmi:id="_LnxxcE2pEemQQPVBE79CWA">
@@ -1619,4 +1661,18 @@ Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6
   <OpenModel_Profile:Specify xmi:id="_rJqzEA9gEe238Zzl-IKoew" base_Abstraction="_iROLsA9gEe238Zzl-IKoew">
     <target>/TapiNotification:Notifications:EventNotification</target>
   </OpenModel_Profile:Specify>
+  <OpenInterfaceModel_Profile:OpenInterfaceModelAttribute xmi:id="_4tIKkXVGEe2mfN3QclrYLQ" base_Property="_4tIKkHVGEe2mfN3QclrYLQ"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_4tMcAHVGEe2mfN3QclrYLQ" base_StructuralFeature="_4tIKkHVGEe2mfN3QclrYLQ" support="CONDITIONAL_MANDATORY"/>
+  <OpenInterfaceModel_Profile:OpenInterfaceModelAttribute xmi:id="_4tNDE3VGEe2mfN3QclrYLQ" base_Property="_4tNDEnVGEe2mfN3QclrYLQ"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_4tNDFHVGEe2mfN3QclrYLQ" base_StructuralFeature="_4tNDEnVGEe2mfN3QclrYLQ"/>
+  <OpenModel_Profile:StrictComposite xmi:id="_H-gC4HVHEe2mfN3QclrYLQ" base_Association="_4tDSEHVGEe2mfN3QclrYLQ"/>
+  <OpenInterfaceModel_Profile:OpenInterfaceModelClass xmi:id="_cCmDUHVHEe2mfN3QclrYLQ" base_Class="_9Je3kHJwEeyQOcpW7WQJ8A"/>
+  <OpenModel_Profile:OpenModelClass xmi:id="_ctmIIHVHEe2mfN3QclrYLQ" base_Class="_9Je3kHJwEeyQOcpW7WQJ8A"/>
+  <OpenInterfaceModel_Profile:OpenInterfaceModelAttribute xmi:id="_ho7ZsHVHEe2mfN3QclrYLQ" base_Property="_YmbU4HJxEeyQOcpW7WQJ8A"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_iUFPgHVHEe2mfN3QclrYLQ" base_StructuralFeature="_YmbU4HJxEeyQOcpW7WQJ8A" support="CONDITIONAL_MANDATORY"/>
+  <OpenInterfaceModel_Profile:OpenInterfaceModelAttribute xmi:id="_kja04HVHEe2mfN3QclrYLQ" base_Property="_aG5CEHJxEeyQOcpW7WQJ8A"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_lTCT8HVHEe2mfN3QclrYLQ" base_StructuralFeature="_aG5CEHJxEeyQOcpW7WQJ8A"/>
+  <OpenInterfaceModel_Profile:OpenInterfaceModelAttribute xmi:id="_nhw1UHVHEe2mfN3QclrYLQ" base_Property="_be2TgHJxEeyQOcpW7WQJ8A"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_oNiWMHVHEe2mfN3QclrYLQ" base_StructuralFeature="_be2TgHJxEeyQOcpW7WQJ8A"/>
+  <OpenModel_Profile:Deprecated xmi:id="_-bQqsHVJEe2mfN3QclrYLQ" base_Element="_XOQ_AEQwEeasL6dcjI1vEA"/>
 </xmi:XMI>