upgrade portmapping YANG to introduce OTN

[transportpce.git] / tapi / src / test / resources / openroadm-topology2.xml

diff --git a/tapi/src/test/resources/openroadm-topology2.xml b/tapi/src/test/resources/openroadm-topology2.xml
index 88459e9621968b578e1a3463803ef802e4ddbd66..6227643cd8b415164042ea12a15620e00c2f9e15 100644 (file)
--- a/tapi/src/test/resources/openroadm-topology2.xml
+++ b/tapi/src/test/resources/openroadm-topology2.xml
@@ -1,7 +1,10 @@
 <data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
- <networks xmlns="urn:ietf:params:xml:ns:yang:ietf-network">
-  <network>
+<networks xmlns="urn:ietf:params:xml:ns:yang:ietf-network">
+<network>
   <network-id>openroadm-topology</network-id>
+  <network-types>
+    <openroadm-common-network xmlns="http://org/openroadm/common/network"/>
+  </network-types>
   <node>
     <node-id>ROADM-A1-SRG3</node-id>
     <srg-attributes xmlns="http://org/openroadm/network/topology">
@@ -294,31 +297,35 @@
         <index>15</index>
       </available-wavelengths>
     </srg-attributes>
-    <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>SRG3-CP-TXRX</tp-id>
-      <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-CP</tp-type>
+      <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-CP</tp-type>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>SRG3-PP2-TXRX</tp-id>
-      <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-PP</tp-type>
+      <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>SRG3-PP4-TXRX</tp-id>
-      <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-PP</tp-type>
+      <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>SRG3-PP1-TXRX</tp-id>
-      <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-PP</tp-type>
+      <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>SRG3-PP3-TXRX</tp-id>
-      <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-PP</tp-type>
+      <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
     </termination-point>
+    <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
     <supporting-node>
       <network-ref>openroadm-network</network-ref>
       <node-ref>ROADM-A1</node-ref>
     </supporting-node>
+    <supporting-node>
+      <network-ref>clli-network</network-ref>
+      <node-ref>NodeA</node-ref>
+    </supporting-node>
   </node>
   <node>
     <node-id>ROADM-C1-DEG2</node-id>
@@ -613,19 +620,23 @@
         <index>15</index>
       </available-wavelengths>
     </degree-attributes>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>DEG2-CTP-TXRX</tp-id>
-      <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TXRX-CTP</tp-type>
+      <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TXRX-CTP</tp-type>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>DEG2-TTP-TXRX</tp-id>
-      <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TXRX-TTP</tp-type>
+      <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TXRX-TTP</tp-type>
     </termination-point>
+    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
     <supporting-node>
       <network-ref>openroadm-network</network-ref>
       <node-ref>ROADM-C1</node-ref>
     </supporting-node>
+    <supporting-node>
+      <network-ref>clli-network</network-ref>
+      <node-ref>NodeC</node-ref>
+    </supporting-node>
   </node>
   <node>
     <node-id>ROADM-C1-SRG1</node-id>
@@ -919,31 +930,35 @@
         <index>15</index>
       </available-wavelengths>
     </srg-attributes>
-    <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>SRG1-PP4-TXRX</tp-id>
-      <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-PP</tp-type>
+      <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>SRG1-CP-TXRX</tp-id>
-      <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-CP</tp-type>
+      <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-CP</tp-type>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>SRG1-PP2-TXRX</tp-id>
-      <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-PP</tp-type>
+      <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>SRG1-PP1-TXRX</tp-id>
-      <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-PP</tp-type>
+      <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>SRG1-PP3-TXRX</tp-id>
-      <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-PP</tp-type>
+      <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
     </termination-point>
+    <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
     <supporting-node>
       <network-ref>openroadm-network</network-ref>
       <node-ref>ROADM-C1</node-ref>
     </supporting-node>
+    <supporting-node>
+      <network-ref>clli-network</network-ref>
+      <node-ref>NodeC</node-ref>
+    </supporting-node>
   </node>
   <node>
     <node-id>ROADM-A1-SRG1</node-id>
@@ -1237,71 +1252,70 @@
         <index>15</index>
       </available-wavelengths>
     </srg-attributes>
-    <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>SRG1-PP4-TXRX</tp-id>
-      <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-PP</tp-type>
+      <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>SRG1-CP-TXRX</tp-id>
-      <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-CP</tp-type>
+      <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-CP</tp-type>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>SRG1-PP2-TXRX</tp-id>
-      <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-PP</tp-type>
+      <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>SRG1-PP1-TXRX</tp-id>
-      <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-PP</tp-type>
+      <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>SRG1-PP3-TXRX</tp-id>
-      <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-PP</tp-type>
+      <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
     </termination-point>
+    <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
     <supporting-node>
       <network-ref>openroadm-network</network-ref>
       <node-ref>ROADM-A1</node-ref>
     </supporting-node>
+    <supporting-node>
+      <network-ref>clli-network</network-ref>
+      <node-ref>NodeA</node-ref>
+    </supporting-node>
   </node>
   <node>
     <node-id>XPDR-A1-XPDR1</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>XPDR1-CLIENT2</tp-id>
       <associated-connection-map-port xmlns="http://transportpce/topology">XPDR1-NETWORK2</associated-connection-map-port>
-      <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>XPDR1-NETWORK2</tail-equipment-id>
-      </xpdr-client-attributes>
-      <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+      <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>XPDR1-NETWORK2</tp-id>
       <associated-connection-map-port xmlns="http://transportpce/topology">XPDR1-CLIENT2</associated-connection-map-port>
-      <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-      <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>XPDR1-CLIENT2</tail-equipment-id>
-      </xpdr-network-attributes>
+      <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>XPDR1-CLIENT1</tp-id>
       <associated-connection-map-port xmlns="http://transportpce/topology">XPDR1-NETWORK1</associated-connection-map-port>
-      <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>XPDR1-NETWORK1</tail-equipment-id>
-      </xpdr-client-attributes>
-      <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+      <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>XPDR1-NETWORK1</tp-id>
-      <associated-connection-map-port xmlns="http://transportpce/topology">XPDR1-CLIENT1</associated-connection-map-port>
-      <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
       <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>XPDR1-CLIENT1</tail-equipment-id>
+        <tail-equipment-id>ROADM-A1-SRG1--SRG1-PP1-TXRX</tail-equipment-id>
       </xpdr-network-attributes>
+      <associated-connection-map-port xmlns="http://transportpce/topology">XPDR1-CLIENT1</associated-connection-map-port>
+      <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
     </termination-point>
+    <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
     <supporting-node>
       <network-ref>openroadm-network</network-ref>
       <node-ref>XPDR-A1</node-ref>
     </supporting-node>
+    <supporting-node>
+      <network-ref>clli-network</network-ref>
+      <node-ref>NodeA</node-ref>
+    </supporting-node>
   </node>
   <node>
     <node-id>ROADM-A1-DEG2</node-id>
@@ -1596,19 +1610,23 @@
         <index>15</index>
       </available-wavelengths>
     </degree-attributes>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>DEG2-CTP-TXRX</tp-id>
-      <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TXRX-CTP</tp-type>
+      <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TXRX-CTP</tp-type>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>DEG2-TTP-TXRX</tp-id>
-      <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TXRX-TTP</tp-type>
+      <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TXRX-TTP</tp-type>
     </termination-point>
+    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
     <supporting-node>
       <network-ref>openroadm-network</network-ref>
       <node-ref>ROADM-A1</node-ref>
     </supporting-node>
+    <supporting-node>
+      <network-ref>clli-network</network-ref>
+      <node-ref>NodeA</node-ref>
+    </supporting-node>
   </node>
   <node>
     <node-id>ROADM-A1-DEG1</node-id>
@@ -1903,59 +1921,58 @@
         <index>15</index>
       </available-wavelengths>
     </degree-attributes>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>DEG1-TTP-TXRX</tp-id>
-      <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TXRX-TTP</tp-type>
+      <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TXRX-TTP</tp-type>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>DEG1-CTP-TXRX</tp-id>
-      <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TXRX-CTP</tp-type>
+      <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TXRX-CTP</tp-type>
     </termination-point>
+    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
     <supporting-node>
       <network-ref>openroadm-network</network-ref>
       <node-ref>ROADM-A1</node-ref>
     </supporting-node>
+    <supporting-node>
+      <network-ref>clli-network</network-ref>
+      <node-ref>NodeA</node-ref>
+    </supporting-node>
   </node>
   <node>
     <node-id>XPDR-C1-XPDR1</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>XPDR1-CLIENT2</tp-id>
       <associated-connection-map-port xmlns="http://transportpce/topology">XPDR1-NETWORK2</associated-connection-map-port>
-      <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>XPDR1-NETWORK2</tail-equipment-id>
-      </xpdr-client-attributes>
-      <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+      <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>XPDR1-NETWORK2</tp-id>
       <associated-connection-map-port xmlns="http://transportpce/topology">XPDR1-CLIENT2</associated-connection-map-port>
-      <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-      <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>XPDR1-CLIENT2</tail-equipment-id>
-      </xpdr-network-attributes>
+      <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>XPDR1-CLIENT1</tp-id>
       <associated-connection-map-port xmlns="http://transportpce/topology">XPDR1-NETWORK1</associated-connection-map-port>
-      <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>XPDR1-NETWORK1</tail-equipment-id>
-      </xpdr-client-attributes>
-      <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+      <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>XPDR1-NETWORK1</tp-id>
-      <associated-connection-map-port xmlns="http://transportpce/topology">XPDR1-CLIENT1</associated-connection-map-port>
-      <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
       <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>XPDR1-CLIENT1</tail-equipment-id>
+        <tail-equipment-id>ROADM-C1-SRG1--SRG1-PP1-TXRX</tail-equipment-id>
       </xpdr-network-attributes>
+      <associated-connection-map-port xmlns="http://transportpce/topology">XPDR1-CLIENT1</associated-connection-map-port>
+      <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
     </termination-point>
+    <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
     <supporting-node>
       <network-ref>openroadm-network</network-ref>
       <node-ref>XPDR-C1</node-ref>
     </supporting-node>
+    <supporting-node>
+      <network-ref>clli-network</network-ref>
+      <node-ref>NodeC</node-ref>
+    </supporting-node>
   </node>
   <node>
     <node-id>ROADM-C1-DEG1</node-id>
@@ -2250,34 +2267,35 @@
         <index>15</index>
       </available-wavelengths>
     </degree-attributes>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>DEG1-TTP-TXRX</tp-id>
-      <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TXRX-TTP</tp-type>
+      <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TXRX-TTP</tp-type>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>DEG1-CTP-TXRX</tp-id>
-      <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TXRX-CTP</tp-type>
+      <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TXRX-CTP</tp-type>
     </termination-point>
+    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
     <supporting-node>
       <network-ref>openroadm-network</network-ref>
       <node-ref>ROADM-C1</node-ref>
     </supporting-node>
+    <supporting-node>
+      <network-ref>clli-network</network-ref>
+      <node-ref>NodeC</node-ref>
+    </supporting-node>
   </node>
-  <network-types>
-    <openroadm-common-network xmlns="http://org/openroadm/common/network"/>
-  </network-types>
   <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
     <link-id>ROADM-A1-DEG1-DEG1-CTP-TXRXtoROADM-A1-SRG3-SRG3-CP-TXRX</link-id>
     <source>
       <source-node>ROADM-A1-DEG1</source-node>
       <source-tp>DEG1-CTP-TXRX</source-tp>
     </source>
-    <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type>
     <destination>
       <dest-node>ROADM-A1-SRG3</dest-node>
       <dest-tp>SRG3-CP-TXRX</dest-tp>
     </destination>
+    <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
     <opposite-link xmlns="http://org/openroadm/common/network">ROADM-A1-SRG3-SRG3-CP-TXRXtoROADM-A1-DEG1-DEG1-CTP-TXRX</opposite-link>
   </link>
   <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
@@ -2286,11 +2304,11 @@
       <source-node>ROADM-A1-SRG3</source-node>
       <source-tp>SRG3-CP-TXRX</source-tp>
     </source>
-    <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type>
     <destination>
       <dest-node>ROADM-A1-DEG2</dest-node>
       <dest-tp>DEG2-CTP-TXRX</dest-tp>
     </destination>
+    <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
     <opposite-link xmlns="http://org/openroadm/common/network">ROADM-A1-DEG2-DEG2-CTP-TXRXtoROADM-A1-SRG3-SRG3-CP-TXRX</opposite-link>
   </link>
   <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
@@ -2302,11 +2320,11 @@
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
       <opposite-link>ROADM-A1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG1-DEG1-TTP-TXRX</opposite-link>
     </OMS-attributes>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
     <destination>
       <dest-node>ROADM-A1-DEG2</dest-node>
       <dest-tp>DEG2-TTP-TXRX</dest-tp>
     </destination>
+    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <opposite-link xmlns="http://org/openroadm/common/network">ROADM-A1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG1-DEG1-TTP-TXRX</opposite-link>
   </link>
   <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
@@ -2315,11 +2333,11 @@
       <source-node>ROADM-C1-DEG2</source-node>
       <source-tp>DEG2-CTP-TXRX</source-tp>
     </source>
-    <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type>
     <destination>
       <dest-node>ROADM-C1-SRG1</dest-node>
       <dest-tp>SRG1-CP-TXRX</dest-tp>
     </destination>
+    <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
     <opposite-link xmlns="http://org/openroadm/common/network">ROADM-C1-SRG1-SRG1-CP-TXRXtoROADM-C1-DEG2-DEG2-CTP-TXRX</opposite-link>
   </link>
   <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
@@ -2331,11 +2349,11 @@
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
       <opposite-link>ROADM-C1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG2-DEG2-TTP-TXRX</opposite-link>
     </OMS-attributes>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
     <destination>
       <dest-node>ROADM-C1-DEG1</dest-node>
       <dest-tp>DEG1-TTP-TXRX</dest-tp>
     </destination>
+    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <opposite-link xmlns="http://org/openroadm/common/network">ROADM-C1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG2-DEG2-TTP-TXRX</opposite-link>
   </link>
   <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
@@ -2344,11 +2362,11 @@
       <source-node>ROADM-C1-DEG2</source-node>
       <source-tp>DEG2-CTP-TXRX</source-tp>
     </source>
-    <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type>
     <destination>
       <dest-node>ROADM-C1-DEG1</dest-node>
       <dest-tp>DEG1-CTP-TXRX</dest-tp>
     </destination>
+    <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
     <opposite-link xmlns="http://org/openroadm/common/network">ROADM-C1-DEG1-DEG1-CTP-TXRXtoROADM-C1-DEG2-DEG2-CTP-TXRX</opposite-link>
   </link>
   <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
@@ -2357,12 +2375,11 @@
       <source-node>XPDR-A1-XPDR1</source-node>
       <source-tp>XPDR1-NETWORK1</source-tp>
     </source>
-    <opposite-link xmlns="http://org/openroadm/network/topology">ROADM-A1-SRG1-SRG1-PP1-TXRXtoXPDR-A1-XPDR1-XPDR1-NETWORK1</opposite-link>
-    <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type>
     <destination>
       <dest-node>ROADM-A1-SRG1</dest-node>
       <dest-tp>SRG1-PP1-TXRX</dest-tp>
     </destination>
+    <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
     <opposite-link xmlns="http://org/openroadm/common/network">ROADM-A1-SRG1-SRG1-PP1-TXRXtoXPDR-A1-XPDR1-XPDR1-NETWORK1</opposite-link>
   </link>
   <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
@@ -2371,12 +2388,11 @@
       <source-node>XPDR-C1-XPDR1</source-node>
       <source-tp>XPDR1-NETWORK1</source-tp>
     </source>
-    <opposite-link xmlns="http://org/openroadm/network/topology">ROADM-C1-SRG1-SRG1-PP1-TXRXtoXPDR-C1-XPDR1-XPDR1-NETWORK1</opposite-link>
-    <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type>
     <destination>
       <dest-node>ROADM-C1-SRG1</dest-node>
       <dest-tp>SRG1-PP1-TXRX</dest-tp>
     </destination>
+    <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
     <opposite-link xmlns="http://org/openroadm/common/network">ROADM-C1-SRG1-SRG1-PP1-TXRXtoXPDR-C1-XPDR1-XPDR1-NETWORK1</opposite-link>
   </link>
   <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
@@ -2385,12 +2401,11 @@
       <source-node>ROADM-C1-SRG1</source-node>
       <source-tp>SRG1-PP1-TXRX</source-tp>
     </source>
-    <opposite-link xmlns="http://org/openroadm/network/topology">XPDR-C1-XPDR1-XPDR1-NETWORK1toROADM-C1-SRG1-SRG1-PP1-TXRX</opposite-link>
-    <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type>
     <destination>
       <dest-node>XPDR-C1-XPDR1</dest-node>
       <dest-tp>XPDR1-NETWORK1</dest-tp>
     </destination>
+    <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
     <opposite-link xmlns="http://org/openroadm/common/network">XPDR-C1-XPDR1-XPDR1-NETWORK1toROADM-C1-SRG1-SRG1-PP1-TXRX</opposite-link>
   </link>
   <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
@@ -2399,11 +2414,11 @@
       <source-node>ROADM-A1-DEG2</source-node>
       <source-tp>DEG2-CTP-TXRX</source-tp>
     </source>
-    <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type>
     <destination>
       <dest-node>ROADM-A1-SRG1</dest-node>
       <dest-tp>SRG1-CP-TXRX</dest-tp>
     </destination>
+    <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
     <opposite-link xmlns="http://org/openroadm/common/network">ROADM-A1-SRG1-SRG1-CP-TXRXtoROADM-A1-DEG2-DEG2-CTP-TXRX</opposite-link>
   </link>
   <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
@@ -2412,11 +2427,11 @@
       <source-node>ROADM-C1-DEG1</source-node>
       <source-tp>DEG1-CTP-TXRX</source-tp>
     </source>
-    <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type>
     <destination>
       <dest-node>ROADM-C1-DEG2</dest-node>
       <dest-tp>DEG2-CTP-TXRX</dest-tp>
     </destination>
+    <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
     <opposite-link xmlns="http://org/openroadm/common/network">ROADM-C1-DEG2-DEG2-CTP-TXRXtoROADM-C1-DEG1-DEG1-CTP-TXRX</opposite-link>
   </link>
   <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
@@ -2425,11 +2440,11 @@
       <source-node>ROADM-A1-DEG2</source-node>
       <source-tp>DEG2-CTP-TXRX</source-tp>
     </source>
-    <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type>
     <destination>
       <dest-node>ROADM-A1-SRG3</dest-node>
       <dest-tp>SRG3-CP-TXRX</dest-tp>
     </destination>
+    <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
     <opposite-link xmlns="http://org/openroadm/common/network">ROADM-A1-SRG3-SRG3-CP-TXRXtoROADM-A1-DEG2-DEG2-CTP-TXRX</opposite-link>
   </link>
   <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
@@ -2438,11 +2453,11 @@
       <source-node>ROADM-A1-DEG2</source-node>
       <source-tp>DEG2-CTP-TXRX</source-tp>
     </source>
-    <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type>
     <destination>
       <dest-node>ROADM-A1-DEG1</dest-node>
       <dest-tp>DEG1-CTP-TXRX</dest-tp>
     </destination>
+    <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
     <opposite-link xmlns="http://org/openroadm/common/network">ROADM-A1-DEG1-DEG1-CTP-TXRXtoROADM-A1-DEG2-DEG2-CTP-TXRX</opposite-link>
   </link>
   <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
@@ -2451,11 +2466,11 @@
       <source-node>ROADM-A1-SRG1</source-node>
       <source-tp>SRG1-CP-TXRX</source-tp>
     </source>
-    <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type>
     <destination>
       <dest-node>ROADM-A1-DEG1</dest-node>
       <dest-tp>DEG1-CTP-TXRX</dest-tp>
     </destination>
+    <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
     <opposite-link xmlns="http://org/openroadm/common/network">ROADM-A1-DEG1-DEG1-CTP-TXRXtoROADM-A1-SRG1-SRG1-CP-TXRX</opposite-link>
   </link>
   <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
@@ -2464,11 +2479,11 @@
       <source-node>ROADM-C1-DEG1</source-node>
       <source-tp>DEG1-CTP-TXRX</source-tp>
     </source>
-    <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type>
     <destination>
       <dest-node>ROADM-C1-SRG1</dest-node>
       <dest-tp>SRG1-CP-TXRX</dest-tp>
     </destination>
+    <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
     <opposite-link xmlns="http://org/openroadm/common/network">ROADM-C1-SRG1-SRG1-CP-TXRXtoROADM-C1-DEG1-DEG1-CTP-TXRX</opposite-link>
   </link>
   <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
@@ -2477,11 +2492,11 @@
       <source-node>ROADM-C1-SRG1</source-node>
       <source-tp>SRG1-CP-TXRX</source-tp>
     </source>
-    <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type>
     <destination>
       <dest-node>ROADM-C1-DEG2</dest-node>
       <dest-tp>DEG2-CTP-TXRX</dest-tp>
     </destination>
+    <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
     <opposite-link xmlns="http://org/openroadm/common/network">ROADM-C1-DEG2-DEG2-CTP-TXRXtoROADM-C1-SRG1-SRG1-CP-TXRX</opposite-link>
   </link>
   <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
@@ -2490,11 +2505,11 @@
       <source-node>ROADM-A1-SRG1</source-node>
       <source-tp>SRG1-CP-TXRX</source-tp>
     </source>
-    <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type>
     <destination>
       <dest-node>ROADM-A1-DEG2</dest-node>
       <dest-tp>DEG2-CTP-TXRX</dest-tp>
     </destination>
+    <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
     <opposite-link xmlns="http://org/openroadm/common/network">ROADM-A1-DEG2-DEG2-CTP-TXRXtoROADM-A1-SRG1-SRG1-CP-TXRX</opposite-link>
   </link>
   <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
@@ -2503,12 +2518,11 @@
       <source-node>ROADM-A1-SRG1</source-node>
       <source-tp>SRG1-PP1-TXRX</source-tp>
     </source>
-    <opposite-link xmlns="http://org/openroadm/network/topology">XPDR-A1-XPDR1-XPDR1-NETWORK1toROADM-A1-SRG1-SRG1-PP1-TXRX</opposite-link>
-    <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type>
     <destination>
       <dest-node>XPDR-A1-XPDR1</dest-node>
       <dest-tp>XPDR1-NETWORK1</dest-tp>
     </destination>
+    <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
     <opposite-link xmlns="http://org/openroadm/common/network">XPDR-A1-XPDR1-XPDR1-NETWORK1toROADM-A1-SRG1-SRG1-PP1-TXRX</opposite-link>
   </link>
   <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
@@ -2517,11 +2531,11 @@
       <source-node>ROADM-A1-DEG1</source-node>
       <source-tp>DEG1-CTP-TXRX</source-tp>
     </source>
-    <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type>
     <destination>
       <dest-node>ROADM-A1-DEG2</dest-node>
       <dest-tp>DEG2-CTP-TXRX</dest-tp>
     </destination>
+    <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
     <opposite-link xmlns="http://org/openroadm/common/network">ROADM-A1-DEG2-DEG2-CTP-TXRXtoROADM-A1-DEG1-DEG1-CTP-TXRX</opposite-link>
   </link>
   <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
@@ -2530,11 +2544,11 @@
       <source-node>ROADM-A1-SRG3</source-node>
       <source-tp>SRG3-CP-TXRX</source-tp>
     </source>
-    <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type>
     <destination>
       <dest-node>ROADM-A1-DEG1</dest-node>
       <dest-tp>DEG1-CTP-TXRX</dest-tp>
     </destination>
+    <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
     <opposite-link xmlns="http://org/openroadm/common/network">ROADM-A1-DEG1-DEG1-CTP-TXRXtoROADM-A1-SRG3-SRG3-CP-TXRX</opposite-link>
   </link>
   <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
@@ -2543,11 +2557,11 @@
       <source-node>ROADM-A1-DEG1</source-node>
       <source-tp>DEG1-CTP-TXRX</source-tp>
     </source>
-    <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type>
     <destination>
       <dest-node>ROADM-A1-SRG1</dest-node>
       <dest-tp>SRG1-CP-TXRX</dest-tp>
     </destination>
+    <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
     <opposite-link xmlns="http://org/openroadm/common/network">ROADM-A1-SRG1-SRG1-CP-TXRXtoROADM-A1-DEG1-DEG1-CTP-TXRX</opposite-link>
   </link>
   <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
@@ -2556,11 +2570,11 @@
       <source-node>ROADM-C1-SRG1</source-node>
       <source-tp>SRG1-CP-TXRX</source-tp>
     </source>
-    <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type>
     <destination>
       <dest-node>ROADM-C1-DEG1</dest-node>
       <dest-tp>DEG1-CTP-TXRX</dest-tp>
     </destination>
+    <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
     <opposite-link xmlns="http://org/openroadm/common/network">ROADM-C1-DEG1-DEG1-CTP-TXRXtoROADM-C1-SRG1-SRG1-CP-TXRX</opposite-link>
   </link>
 </network>