Merge pull request #486 from amazzini/develop_v2_1

Develop v2 1
Open-Network-Models-and-Interfaces-ONMI · Jun 19, 2020 · abed972 · abed972
2 parents aa19776 + b37d792
commit abed972
Show file tree

Hide file tree

Showing 38 changed files with 58,087 additions and 47,192 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/TapiCommon.notation b/UML/TapiCommon.notation
diff --git a/UML/TapiCommon.uml b/UML/TapiCommon.uml
@@ -622,7 +622,7 @@ Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_fiaKsF6lEeitO-Stqhyn1g" value="5"/>
         </ownedAttribute>
       </packagedElement>
-      <packagedElement xmi:type="uml:Enumeration" xmi:id="_-eq88Ik2Eeil5oKL3Vgl-g" name="LayerProtocolQualifier">
+      <packagedElement xmi:type="uml:Enumeration" xmi:id="_-eq88Ik2Eeil5oKL3Vgl-g" name="LayerProtocolQualifier" visibility="public">
         <ownedComment xmi:type="uml:Comment" xmi:id="_0n5PoIk3Eeil5oKL3Vgl-g" annotatedElement="_-eq88Ik2Eeil5oKL3Vgl-g">
           <body>This enumeration is used to qualify the sub-layers (if applicable) for a specific LayerProtocol.&#xD;
 This extensible enumeration is intentionally empty in the common module and will be augmented with layer-specific values in the respective technology-specific modules.&#xD;

diff --git a/UML/TapiConnectivity.notation b/UML/TapiConnectivity.notation
diff --git a/UML/TapiConnectivity.uml b/UML/TapiConnectivity.uml
@@ -754,9 +754,8 @@ The ForwadingConstruct can be considered as a component and the EndPoint as a Po
       </packagedElement>
       <packagedElement xmi:type="uml:Class" xmi:id="_kkzTEEUbEeWKAbXi7_SowQ" name="Route" isLeaf="true">
         <ownedComment xmi:type="uml:Comment" xmi:id="_kkzTEUUbEeWKAbXi7_SowQ" annotatedElement="_kkzTEEUbEeWKAbXi7_SowQ">
-          <body>The FC Route (FcRoute) object class models the individual routes of an FC. &#xD;
-The route of an FC object is represented by a list of FCs at a lower level. &#xD;
-Note that depending on the service supported by an FC, an the FC can have multiple routes.</body>
+          <body>The Route of a Connection is modeled as a collection of Connection End Points.&#xD;
+The logical order of the Connection End Points within the Route object can be inferred by the TAPI client by the knowledge of the Topology information.</body>
         </ownedComment>
         <generalization xmi:type="uml:Generalization" xmi:id="_HOnysN8rEeWT9tG0gGLRFw">
           <general xmi:type="uml:Class" href="TapiCommon.uml#_UhrZoN8qEeWT9tG0gGLRFw"/>
@@ -937,7 +936,7 @@ All administrative controls of any aspect of protection are rejected.</body>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_HRhzYHIZEeeSiaQ95-6r9w" value="*"/>
         </ownedAttribute>
       </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="__RAuEHJpEeq3NYg-TXSAxQ" name="ResilienceRoute">
+      <packagedElement xmi:type="uml:Class" xmi:id="__RAuEHJpEeq3NYg-TXSAxQ" name="ResilienceRoute" visibility="public">
         <ownedComment xmi:type="uml:Comment" xmi:id="__RAuEXJpEeq3NYg-TXSAxQ" annotatedElement="__RAuEHJpEeq3NYg-TXSAxQ">
           <body>This object adds resilience and state attributes to the Route.&#xD;
 When this object is not present, then the Route is intendend as &quot;current&quot; Route of the Connection.</body>
@@ -946,7 +945,7 @@ When this object is not present, then the Route is intendend as &quot;current&qu
           <ownedComment xmi:type="uml:Comment" xmi:id="__RAuE3JpEeq3NYg-TXSAxQ" annotatedElement="__RAuEnJpEeq3NYg-TXSAxQ">
             <body>Value of 0 (zero) means &quot;unspecified priority&quot;.&#xD;
 Highest priority is 1, sometimes referred as &quot;preferred&quot; or &quot;main&quot; or &quot;intended&quot; route.&#xD;
-Then 2 has lower priory than 1, 3 has lower priory than 2, etc.</body>
+2 has lower priority than 1, 3 has lower priority than 2, etc.</body>
           </ownedComment>
           <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
           <defaultValue xmi:type="uml:LiteralInteger" xmi:id="__RAuFHJpEeq3NYg-TXSAxQ"/>

diff --git a/UML/TapiEquipment.notation b/UML/TapiEquipment.notation
diff --git a/UML/TapiEquipment.uml b/UML/TapiEquipment.uml
@@ -117,9 +117,6 @@
       <packagedElement xmi:type="uml:Abstraction" xmi:id="_Tt0usE2tEemQQPVBE79CWA" client="_8PYHQE2sEemQQPVBE79CWA">
         <supplier xmi:type="uml:Class" href="TapiTopology.uml#_i1UzkD-3EeWNAdBR30aJhw"/>
       </packagedElement>
-      <packagedElement xmi:type="uml:Abstraction" xmi:id="_K2ClIFojEemu443YKSGnxQ" client="_BQiK0FogEemu443YKSGnxQ">
-        <supplier xmi:type="uml:Enumeration" href="TapiCommon.uml#_FFtS8CzeEeaYO8M_h7XJ5A"/>
-      </packagedElement>
       <packagedElement xmi:type="uml:Usage" xmi:id="_TqIEIHh8EeqVN_GB3rPx7g" client="_BB_mUDmkEemDl_QGWIY6yg" supplier="_350koG20Eeqjr-4srHPKHw"/>
     </packagedElement>
     <packagedElement xmi:type="uml:Package" xmi:id="_mlzoUEdzEeasL6dcjI1vEA" name="TypeDefinitions">
@@ -991,7 +988,6 @@ Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6
   <OpenModel_Profile:StrictComposite xmi:id="_-UAXUFFjEemgMYGocegK5A" base_Association="_S0vuMEvXEemT5f_Ewhfs6A"/>
   <OpenModel_Profile:StrictComposite xmi:id="_Auv7cFFkEemgMYGocegK5A" base_Association="_V181YEvXEemT5f_Ewhfs6A"/>
   <OpenModel_Profile:Experimental xmi:id="_EeSgQFogEemu443YKSGnxQ" base_Element="_BQiK0FogEemu443YKSGnxQ"/>
-  <OpenModel_Profile:Specify xmi:id="_MruUYFojEemu443YKSGnxQ" base_Abstraction="_K2ClIFojEemu443YKSGnxQ"/>
   <OpenModel_Profile:OpenModelInterface xmi:id="_EMuGQHspEemfSIWqmJMEQA" base_Interface="_EMk8UHspEemfSIWqmJMEQA"/>
   <OpenModel_Profile:OpenModelOperation xmi:id="_FCC50XsrEemfSIWqmJMEQA" base_Operation="_FCC50HsrEemfSIWqmJMEQA"/>
   <OpenModel_Profile:OpenModelParameter xmi:id="_SrGJcXsrEemfSIWqmJMEQA" base_Parameter="_SrGJcHsrEemfSIWqmJMEQA"/>
@@ -1016,4 +1012,5 @@ Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6
   <OpenModel_Profile:OpenModelAttribute xmi:id="_kGNzEW27Eeqjr-4srHPKHw" base_StructuralFeature="_kGNzEG27Eeqjr-4srHPKHw"/>
   <OpenInterfaceModel_Profile:OpenInterfaceModelAttribute xmi:id="_kGOaIG27Eeqjr-4srHPKHw" base_Property="_kGNzEG27Eeqjr-4srHPKHw"/>
   <OpenModel_Profile:Experimental xmi:id="__Hu4oG27Eeqjr-4srHPKHw" base_Element="_kGNzEG27Eeqjr-4srHPKHw"/>
+  <OpenModel_Profile:Deprecated xmi:id="_46IQYKayEeqJcvXkREZ1XQ" base_Element="_BQiK0FogEemu443YKSGnxQ"/>
 </xmi:XMI>