X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=tapi%2Fsrc%2Ftest%2Fresources%2Fopenroadm-topology.xml;fp=tapi%2Fsrc%2Ftest%2Fresources%2Fget_openroadm-topology2.xml;h=053f56d7cbeed0144a6db18ad7f6d334ff0d708b;hb=d68f21ba371246f1749bb61e629e26d79bf17187;hp=2a9c9b24a88329297bcad87d8a5f1121831693c7;hpb=60be2f9eca6d48db9efd1db876d846c60fddc2b6;p=transportpce.git

diff --git a/tapi/src/test/resources/get_openroadm-topology2.xml b/tapi/src/test/resources/openroadm-topology.xml
similarity index 85%
rename from tapi/src/test/resources/get_openroadm-topology2.xml
rename to tapi/src/test/resources/openroadm-topology.xml
index 2a9c9b24a..053f56d7c 100644
--- a/tapi/src/test/resources/get_openroadm-topology2.xml
+++ b/tapi/src/test/resources/openroadm-topology.xml
@@ -3,11 +3,38 @@
 <network>
   <network-id>openroadm-topology</network-id>
   <network-types>
-    <openroadm-common-network xmlns="http://org/openroadm/common/network" />
+    <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">
+    <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/common/network">SRG-TXRX-PP</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/common/network">SRG-TXRX-PP</tp-type>
+    </termination-point>
+    <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/common/network">SRG-TXRX-CP</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/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/common/network">SRG-TXRX-PP</tp-type>
+    </termination-point>
+    <srg-attributes
+      xmlns="http://org/openroadm/network/topology">
       <available-wavelengths>
         <index>95</index>
       </available-wavelengths>
@@ -297,39 +324,90 @@
         <index>16</index>
       </available-wavelengths>
     </srg-attributes>
-    <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/common/network">SRG-TXRX-PP</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/common/network">SRG-TXRX-PP</tp-type>
+    <supporting-node>
+      <network-ref>clli-network</network-ref>
+      <node-ref>NodeA</node-ref>
+    </supporting-node>
+    <supporting-node>
+      <network-ref>openroadm-network</network-ref>
+      <node-ref>ROADM-A1</node-ref>
+    </supporting-node>
+    <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
+  </node>
+  <node>
+    <node-id>XPDR-C1-XPDR1</node-id>
+    <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>
+      <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>SRG3-CP-TXRX</tp-id>
-      <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-CP</tp-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>
+      <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>SRG3-PP1-TXRX</tp-id>
-      <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
+    <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/common/network">XPONDER-NETWORK</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/common/network">SRG-TXRX-PP</tp-type>
+    <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>
+      <xpdr-network-attributes
+        xmlns="http://org/openroadm/network/topology">
+        <tail-equipment-id>ROADM-C1-SRG1--SRG1-PP1-TXRX
+        </tail-equipment-id>
+      </xpdr-network-attributes>
+      <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
     </termination-point>
     <supporting-node>
       <network-ref>clli-network</network-ref>
-      <node-ref>NodeA</node-ref>
+      <node-ref>NodeC</node-ref>
     </supporting-node>
     <supporting-node>
       <network-ref>openroadm-network</network-ref>
-      <node-ref>ROADM-A1</node-ref>
+      <node-ref>XPDR-C1</node-ref>
     </supporting-node>
-    <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
+    <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
   </node>
   <node>
-    <node-id>ROADM-C1-SRG1</node-id>
-    <srg-attributes xmlns="http://org/openroadm/network/topology">
+    <node-id>ROADM-A1-SRG1</node-id>
+    <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/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/common/network">SRG-TXRX-PP</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/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/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/common/network">SRG-TXRX-CP</tp-type>
+    </termination-point>
+    <srg-attributes
+      xmlns="http://org/openroadm/network/topology">
       <available-wavelengths>
         <index>95</index>
       </available-wavelengths>
@@ -619,39 +697,31 @@
         <index>16</index>
       </available-wavelengths>
     </srg-attributes>
-    <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/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/common/network">SRG-TXRX-PP</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/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/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/common/network">SRG-TXRX-CP</tp-type>
-    </termination-point>
     <supporting-node>
       <network-ref>clli-network</network-ref>
-      <node-ref>NodeC</node-ref>
+      <node-ref>NodeA</node-ref>
     </supporting-node>
     <supporting-node>
       <network-ref>openroadm-network</network-ref>
-      <node-ref>ROADM-C1</node-ref>
+      <node-ref>ROADM-A1</node-ref>
     </supporting-node>
     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
   </node>
   <node>
-    <node-id>ROADM-A1-SRG1</node-id>
-    <srg-attributes xmlns="http://org/openroadm/network/topology">
+    <node-id>ROADM-A1-DEG1</node-id>
+    <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/common/network">DEGREE-TXRX-CTP</tp-type>
+    </termination-point>
+    <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/common/network">DEGREE-TXRX-TTP</tp-type>
+    </termination-point>
+    <degree-attributes
+      xmlns="http://org/openroadm/network/topology">
+      <degree-number>1</degree-number>
       <available-wavelengths>
         <index>95</index>
       </available-wavelengths>
@@ -940,27 +1010,7 @@
       <available-wavelengths>
         <index>16</index>
       </available-wavelengths>
-    </srg-attributes>
-    <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/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/common/network">SRG-TXRX-PP</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/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/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/common/network">SRG-TXRX-CP</tp-type>
-    </termination-point>
+    </degree-attributes>
     <supporting-node>
       <network-ref>clli-network</network-ref>
       <node-ref>NodeA</node-ref>
@@ -969,33 +1019,68 @@
       <network-ref>openroadm-network</network-ref>
       <node-ref>ROADM-A1</node-ref>
     </supporting-node>
-    <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
+    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
   </node>
   <node>
-    <node-id>SPDR-SA1-XPDR1</node-id>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-      <tp-id>XPDR1-NETWORK1</tp-id>
+    <node-id>XPDR-A1-XPDR1</node-id>
+    <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>
+      <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-CLIENT2</tp-id>
+      <associated-connection-map-port
+        xmlns="http://transportpce/topology">XPDR1-NETWORK2</associated-connection-map-port>
+      <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/common/network">XPONDER-NETWORK</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>
       <xpdr-network-attributes
         xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>ROADM-A1-SRG1--SRG1-PP2-TXRX
+        <tail-equipment-id>ROADM-A1-SRG1--SRG1-PP1-TXRX
         </tail-equipment-id>
       </xpdr-network-attributes>
+      <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
     </termination-point>
     <supporting-node>
       <network-ref>openroadm-network</network-ref>
-      <node-ref>SPDR-SA1</node-ref>
+      <node-ref>XPDR-A1</node-ref>
     </supporting-node>
     <supporting-node>
       <network-ref>clli-network</network-ref>
-      <node-ref>NodeSA</node-ref>
+      <node-ref>NodeA</node-ref>
     </supporting-node>
     <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
   </node>
   <node>
-    <node-id>ROADM-A1-DEG1</node-id>
-    <degree-attributes xmlns="http://org/openroadm/network/topology">
-      <degree-number>1</degree-number>
+    <node-id>ROADM-A1-DEG2</node-id>
+    <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/common/network">DEGREE-TXRX-TTP</tp-type>
+    </termination-point>
+    <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/common/network">DEGREE-TXRX-CTP</tp-type>
+    </termination-point>
+    <degree-attributes
+      xmlns="http://org/openroadm/network/topology">
+      <degree-number>2</degree-number>
       <available-wavelengths>
         <index>95</index>
       </available-wavelengths>
@@ -1285,14 +1370,6 @@
         <index>16</index>
       </available-wavelengths>
     </degree-attributes>
-    <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/common/network">DEGREE-TXRX-CTP</tp-type>
-    </termination-point>
-    <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/common/network">DEGREE-TXRX-TTP</tp-type>
-    </termination-point>
     <supporting-node>
       <network-ref>clli-network</network-ref>
       <node-ref>NodeA</node-ref>
@@ -1304,9 +1381,34 @@
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
   </node>
   <node>
-    <node-id>ROADM-A1-DEG2</node-id>
-    <degree-attributes xmlns="http://org/openroadm/network/topology">
-      <degree-number>2</degree-number>
+    <node-id>ROADM-C1-SRG1</node-id>
+    <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/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/common/network">SRG-TXRX-PP</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/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/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/common/network">SRG-TXRX-CP</tp-type>
+    </termination-point>
+    <srg-attributes
+      xmlns="http://org/openroadm/network/topology">
       <available-wavelengths>
         <index>95</index>
       </available-wavelengths>
@@ -1595,49 +1697,53 @@
       <available-wavelengths>
         <index>16</index>
       </available-wavelengths>
-    </degree-attributes>
-    <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/common/network">DEGREE-TXRX-TTP</tp-type>
-    </termination-point>
-    <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/common/network">DEGREE-TXRX-CTP</tp-type>
-    </termination-point>
+    </srg-attributes>
     <supporting-node>
       <network-ref>clli-network</network-ref>
-      <node-ref>NodeA</node-ref>
+      <node-ref>NodeC</node-ref>
     </supporting-node>
     <supporting-node>
       <network-ref>openroadm-network</network-ref>
-      <node-ref>ROADM-A1</node-ref>
+      <node-ref>ROADM-C1</node-ref>
     </supporting-node>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+    <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
   </node>
   <node>
-    <node-id>SPDR-SC1-XPDR1</node-id>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <node-id>SPDR-SA1-XPDR1</node-id>
+    <termination-point
+      xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>XPDR1-NETWORK1</tp-id>
       <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
       <xpdr-network-attributes
         xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>ROADM-C1-SRG1--SRG1-PP2-TXRX
+        <tail-equipment-id>ROADM-A1-SRG1--SRG1-PP2-TXRX
         </tail-equipment-id>
       </xpdr-network-attributes>
     </termination-point>
     <supporting-node>
       <network-ref>openroadm-network</network-ref>
-      <node-ref>SPDR-SC1</node-ref>
+      <node-ref>SPDR-SA1</node-ref>
     </supporting-node>
     <supporting-node>
       <network-ref>clli-network</network-ref>
-      <node-ref>NodeSC</node-ref>
+      <node-ref>NodeSA</node-ref>
     </supporting-node>
     <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
   </node>
   <node>
     <node-id>ROADM-C1-DEG1</node-id>
-    <degree-attributes xmlns="http://org/openroadm/network/topology">
+    <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/common/network">DEGREE-TXRX-CTP</tp-type>
+    </termination-point>
+    <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/common/network">DEGREE-TXRX-TTP</tp-type>
+    </termination-point>
+    <degree-attributes
+      xmlns="http://org/openroadm/network/topology">
       <degree-number>1</degree-number>
       <available-wavelengths>
         <index>95</index>
@@ -1928,14 +2034,6 @@
         <index>16</index>
       </available-wavelengths>
     </degree-attributes>
-    <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/common/network">DEGREE-TXRX-CTP</tp-type>
-    </termination-point>
-    <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/common/network">DEGREE-TXRX-TTP</tp-type>
-    </termination-point>
     <supporting-node>
       <network-ref>clli-network</network-ref>
       <node-ref>NodeC</node-ref>
@@ -1946,9 +2044,42 @@
     </supporting-node>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
   </node>
+  <node>
+    <node-id>SPDR-SC1-XPDR1</node-id>
+    <termination-point
+      xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+      <tp-id>XPDR1-NETWORK1</tp-id>
+      <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
+      <xpdr-network-attributes
+        xmlns="http://org/openroadm/network/topology">
+        <tail-equipment-id>ROADM-C1-SRG1--SRG1-PP2-TXRX
+        </tail-equipment-id>
+      </xpdr-network-attributes>
+    </termination-point>
+    <supporting-node>
+      <network-ref>openroadm-network</network-ref>
+      <node-ref>SPDR-SC1</node-ref>
+    </supporting-node>
+    <supporting-node>
+      <network-ref>clli-network</network-ref>
+      <node-ref>NodeSC</node-ref>
+    </supporting-node>
+    <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+  </node>
   <node>
     <node-id>ROADM-C1-DEG2</node-id>
-    <degree-attributes xmlns="http://org/openroadm/network/topology">
+    <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/common/network">DEGREE-TXRX-TTP</tp-type>
+    </termination-point>
+    <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/common/network">DEGREE-TXRX-CTP</tp-type>
+    </termination-point>
+    <degree-attributes
+      xmlns="http://org/openroadm/network/topology">
       <degree-number>2</degree-number>
       <available-wavelengths>
         <index>95</index>
@@ -2239,14 +2370,6 @@
         <index>16</index>
       </available-wavelengths>
     </degree-attributes>
-    <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/common/network">DEGREE-TXRX-TTP</tp-type>
-    </termination-point>
-    <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/common/network">DEGREE-TXRX-CTP</tp-type>
-    </termination-point>
     <supporting-node>
       <network-ref>clli-network</network-ref>
       <node-ref>NodeC</node-ref>
@@ -2259,11 +2382,13 @@
   </node>
   <node>
     <node-id>SPDR-SA1-XPDR2</node-id>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <termination-point
+      xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>XPDR2-NETWORK1</tp-id>
       <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">
+    <termination-point
+      xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>XPDR2-NETWORK3</tp-id>
       <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
       <xpdr-network-attributes
@@ -2272,7 +2397,8 @@
         </tail-equipment-id>
       </xpdr-network-attributes>
     </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <termination-point
+      xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>XPDR2-NETWORK2</tp-id>
       <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
       <xpdr-network-attributes
@@ -2281,7 +2407,8 @@
         </tail-equipment-id>
       </xpdr-network-attributes>
     </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <termination-point
+      xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>XPDR2-NETWORK4</tp-id>
       <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
     </termination-point>
@@ -2297,11 +2424,13 @@
   </node>
   <node>
     <node-id>SPDR-SC1-XPDR2</node-id>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <termination-point
+      xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>XPDR2-NETWORK1</tp-id>
       <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">
+    <termination-point
+      xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>XPDR2-NETWORK3</tp-id>
       <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
       <xpdr-network-attributes
@@ -2310,7 +2439,8 @@
         </tail-equipment-id>
       </xpdr-network-attributes>
     </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <termination-point
+      xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>XPDR2-NETWORK2</tp-id>
       <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
       <xpdr-network-attributes
@@ -2319,7 +2449,8 @@
         </tail-equipment-id>
       </xpdr-network-attributes>
     </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <termination-point
+      xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>XPDR2-NETWORK4</tp-id>
       <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
     </termination-point>
@@ -2344,7 +2475,8 @@
       <dest-tp>XPDR1-NETWORK1</dest-tp>
       <dest-node>SPDR-SC1-XPDR1</dest-node>
     </destination>
-    <opposite-link xmlns="http://org/openroadm/common/network">SPDR-SC1-XPDR1-XPDR1-NETWORK1toROADM-C1-SRG1-SRG1-PP2-TXRX
+    <opposite-link
+      xmlns="http://org/openroadm/common/network">SPDR-SC1-XPDR1-XPDR1-NETWORK1toROADM-C1-SRG1-SRG1-PP2-TXRX
     </opposite-link>
     <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
   </link>
@@ -2355,7 +2487,8 @@
       <source-node>ROADM-A1-DEG2</source-node>
       <source-tp>DEG2-TTP-TXRX</source-tp>
     </source>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
+    <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>
@@ -2363,10 +2496,27 @@
       <dest-tp>DEG1-TTP-TXRX</dest-tp>
       <dest-node>ROADM-C1-DEG1</dest-node>
     </destination>
-    <opposite-link xmlns="http://org/openroadm/common/network">ROADM-C1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG2-DEG2-TTP-TXRX
+    <opposite-link
+      xmlns="http://org/openroadm/common/network">ROADM-C1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG2-DEG2-TTP-TXRX
     </opposite-link>
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
   </link>
+  <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <link-id>XPDR-C1-XPDR1-XPDR1-NETWORK1toROADM-C1-SRG1-SRG1-PP1-TXRX
+    </link-id>
+    <source>
+      <source-node>XPDR-C1-XPDR1</source-node>
+      <source-tp>XPDR1-NETWORK1</source-tp>
+    </source>
+    <destination>
+      <dest-tp>SRG1-PP1-TXRX</dest-tp>
+      <dest-node>ROADM-C1-SRG1</dest-node>
+    </destination>
+    <opposite-link
+      xmlns="http://org/openroadm/common/network">ROADM-C1-SRG1-SRG1-PP1-TXRXtoXPDR-C1-XPDR1-XPDR1-NETWORK1
+    </opposite-link>
+    <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+  </link>
   <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
     <link-id>ROADM-C1-SRG1-SRG1-PP3-TXRXtoSPDR-SC1-XPDR2-XPDR2-NETWORK2
     </link-id>
@@ -2378,7 +2528,8 @@
       <dest-tp>XPDR2-NETWORK2</dest-tp>
       <dest-node>SPDR-SC1-XPDR2</dest-node>
     </destination>
-    <opposite-link xmlns="http://org/openroadm/common/network">SPDR-SC1-XPDR2-XPDR2-NETWORK2toROADM-C1-SRG1-SRG1-PP3-TXRX
+    <opposite-link
+      xmlns="http://org/openroadm/common/network">SPDR-SC1-XPDR2-XPDR2-NETWORK2toROADM-C1-SRG1-SRG1-PP3-TXRX
     </opposite-link>
     <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
   </link>
@@ -2393,7 +2544,8 @@
       <dest-tp>XPDR2-NETWORK3</dest-tp>
       <dest-node>SPDR-SA1-XPDR2</dest-node>
     </destination>
-    <opposite-link xmlns="http://org/openroadm/common/network">SPDR-SA1-XPDR2-XPDR2-NETWORK3toROADM-A1-SRG1-SRG1-PP4-TXRX
+    <opposite-link
+      xmlns="http://org/openroadm/common/network">SPDR-SA1-XPDR2-XPDR2-NETWORK3toROADM-A1-SRG1-SRG1-PP4-TXRX
     </opposite-link>
     <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
   </link>
@@ -2408,7 +2560,8 @@
       <dest-tp>SRG1-CP-TXRX</dest-tp>
       <dest-node>ROADM-C1-SRG1</dest-node>
     </destination>
-    <opposite-link xmlns="http://org/openroadm/common/network">ROADM-C1-SRG1-SRG1-CP-TXRXtoROADM-C1-DEG1-DEG1-CTP-TXRX
+    <opposite-link
+      xmlns="http://org/openroadm/common/network">ROADM-C1-SRG1-SRG1-CP-TXRXtoROADM-C1-DEG1-DEG1-CTP-TXRX
     </opposite-link>
     <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
   </link>
@@ -2423,7 +2576,8 @@
       <dest-tp>SRG1-PP4-TXRX</dest-tp>
       <dest-node>ROADM-A1-SRG1</dest-node>
     </destination>
-    <opposite-link xmlns="http://org/openroadm/common/network">ROADM-A1-SRG1-SRG1-PP4-TXRXtoSPDR-SA1-XPDR2-XPDR2-NETWORK3
+    <opposite-link
+      xmlns="http://org/openroadm/common/network">ROADM-A1-SRG1-SRG1-PP4-TXRXtoSPDR-SA1-XPDR2-XPDR2-NETWORK3
     </opposite-link>
     <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
   </link>
@@ -2438,7 +2592,8 @@
       <dest-tp>SRG1-PP2-TXRX</dest-tp>
       <dest-node>ROADM-C1-SRG1</dest-node>
     </destination>
-    <opposite-link xmlns="http://org/openroadm/common/network">ROADM-C1-SRG1-SRG1-PP2-TXRXtoSPDR-SC1-XPDR1-XPDR1-NETWORK1
+    <opposite-link
+      xmlns="http://org/openroadm/common/network">ROADM-C1-SRG1-SRG1-PP2-TXRXtoSPDR-SC1-XPDR1-XPDR1-NETWORK1
     </opposite-link>
     <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
   </link>
@@ -2453,7 +2608,8 @@
       <dest-tp>DEG1-CTP-TXRX</dest-tp>
       <dest-node>ROADM-A1-DEG1</dest-node>
     </destination>
-    <opposite-link xmlns="http://org/openroadm/common/network">ROADM-A1-DEG1-DEG1-CTP-TXRXtoROADM-A1-SRG3-SRG3-CP-TXRX
+    <opposite-link
+      xmlns="http://org/openroadm/common/network">ROADM-A1-DEG1-DEG1-CTP-TXRXtoROADM-A1-SRG3-SRG3-CP-TXRX
     </opposite-link>
     <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
   </link>
@@ -2468,7 +2624,8 @@
       <dest-tp>SRG1-PP3-TXRX</dest-tp>
       <dest-node>ROADM-C1-SRG1</dest-node>
     </destination>
-    <opposite-link xmlns="http://org/openroadm/common/network">ROADM-C1-SRG1-SRG1-PP3-TXRXtoSPDR-SC1-XPDR2-XPDR2-NETWORK2
+    <opposite-link
+      xmlns="http://org/openroadm/common/network">ROADM-C1-SRG1-SRG1-PP3-TXRXtoSPDR-SC1-XPDR2-XPDR2-NETWORK2
     </opposite-link>
     <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
   </link>
@@ -2483,7 +2640,8 @@
       <dest-tp>DEG2-CTP-TXRX</dest-tp>
       <dest-node>ROADM-A1-DEG2</dest-node>
     </destination>
-    <opposite-link xmlns="http://org/openroadm/common/network">ROADM-A1-DEG2-DEG2-CTP-TXRXtoROADM-A1-SRG3-SRG3-CP-TXRX
+    <opposite-link
+      xmlns="http://org/openroadm/common/network">ROADM-A1-DEG2-DEG2-CTP-TXRXtoROADM-A1-SRG3-SRG3-CP-TXRX
     </opposite-link>
     <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
   </link>
@@ -2498,7 +2656,8 @@
       <dest-tp>XPDR2-NETWORK3</dest-tp>
       <dest-node>SPDR-SC1-XPDR2</dest-node>
     </destination>
-    <opposite-link xmlns="http://org/openroadm/common/network">SPDR-SC1-XPDR2-XPDR2-NETWORK3toROADM-C1-SRG1-SRG1-PP4-TXRX
+    <opposite-link
+      xmlns="http://org/openroadm/common/network">SPDR-SC1-XPDR2-XPDR2-NETWORK3toROADM-C1-SRG1-SRG1-PP4-TXRX
     </opposite-link>
     <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
   </link>
@@ -2513,39 +2672,42 @@
       <dest-tp>SRG3-CP-TXRX</dest-tp>
       <dest-node>ROADM-A1-SRG3</dest-node>
     </destination>
-    <opposite-link xmlns="http://org/openroadm/common/network">ROADM-A1-SRG3-SRG3-CP-TXRXtoROADM-A1-DEG1-DEG1-CTP-TXRX
+    <opposite-link
+      xmlns="http://org/openroadm/common/network">ROADM-A1-SRG3-SRG3-CP-TXRXtoROADM-A1-DEG1-DEG1-CTP-TXRX
     </opposite-link>
     <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
   </link>
   <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>SPDR-SA1-XPDR1-XPDR1-NETWORK1toROADM-A1-SRG1-SRG1-PP2-TXRX
+    <link-id>ROADM-A1-SRG1-SRG1-PP1-TXRXtoXPDR-A1-XPDR1-XPDR1-NETWORK1
     </link-id>
     <source>
-      <source-node>SPDR-SA1-XPDR1</source-node>
-      <source-tp>XPDR1-NETWORK1</source-tp>
+      <source-node>ROADM-A1-SRG1</source-node>
+      <source-tp>SRG1-PP1-TXRX</source-tp>
     </source>
     <destination>
-      <dest-tp>SRG1-PP2-TXRX</dest-tp>
-      <dest-node>ROADM-A1-SRG1</dest-node>
+      <dest-tp>XPDR1-NETWORK1</dest-tp>
+      <dest-node>XPDR-A1-XPDR1</dest-node>
     </destination>
-    <opposite-link xmlns="http://org/openroadm/common/network">ROADM-A1-SRG1-SRG1-PP2-TXRXtoSPDR-SA1-XPDR1-XPDR1-NETWORK1
+    <opposite-link
+      xmlns="http://org/openroadm/common/network">XPDR-A1-XPDR1-XPDR1-NETWORK1toROADM-A1-SRG1-SRG1-PP1-TXRX
     </opposite-link>
-    <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+    <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
   </link>
   <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>ROADM-A1-SRG1-SRG1-PP2-TXRXtoSPDR-SA1-XPDR1-XPDR1-NETWORK1
+    <link-id>SPDR-SA1-XPDR1-XPDR1-NETWORK1toROADM-A1-SRG1-SRG1-PP2-TXRX
     </link-id>
     <source>
-      <source-node>ROADM-A1-SRG1</source-node>
-      <source-tp>SRG1-PP2-TXRX</source-tp>
+      <source-node>SPDR-SA1-XPDR1</source-node>
+      <source-tp>XPDR1-NETWORK1</source-tp>
     </source>
     <destination>
-      <dest-tp>XPDR1-NETWORK1</dest-tp>
-      <dest-node>SPDR-SA1-XPDR1</dest-node>
+      <dest-tp>SRG1-PP2-TXRX</dest-tp>
+      <dest-node>ROADM-A1-SRG1</dest-node>
     </destination>
-    <opposite-link xmlns="http://org/openroadm/common/network">SPDR-SA1-XPDR1-XPDR1-NETWORK1toROADM-A1-SRG1-SRG1-PP2-TXRX
+    <opposite-link
+      xmlns="http://org/openroadm/common/network">ROADM-A1-SRG1-SRG1-PP2-TXRXtoSPDR-SA1-XPDR1-XPDR1-NETWORK1
     </opposite-link>
-    <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+    <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
   </link>
   <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
     <link-id>ROADM-C1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG2-DEG2-TTP-TXRX
@@ -2554,7 +2716,8 @@
       <source-node>ROADM-C1-DEG1</source-node>
       <source-tp>DEG1-TTP-TXRX</source-tp>
     </source>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
+    <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>
@@ -2562,10 +2725,27 @@
       <dest-tp>DEG2-TTP-TXRX</dest-tp>
       <dest-node>ROADM-A1-DEG2</dest-node>
     </destination>
-    <opposite-link xmlns="http://org/openroadm/common/network">ROADM-A1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG1-DEG1-TTP-TXRX
+    <opposite-link
+      xmlns="http://org/openroadm/common/network">ROADM-A1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG1-DEG1-TTP-TXRX
     </opposite-link>
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
   </link>
+  <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <link-id>ROADM-A1-SRG1-SRG1-PP2-TXRXtoSPDR-SA1-XPDR1-XPDR1-NETWORK1
+    </link-id>
+    <source>
+      <source-node>ROADM-A1-SRG1</source-node>
+      <source-tp>SRG1-PP2-TXRX</source-tp>
+    </source>
+    <destination>
+      <dest-tp>XPDR1-NETWORK1</dest-tp>
+      <dest-node>SPDR-SA1-XPDR1</dest-node>
+    </destination>
+    <opposite-link
+      xmlns="http://org/openroadm/common/network">SPDR-SA1-XPDR1-XPDR1-NETWORK1toROADM-A1-SRG1-SRG1-PP2-TXRX
+    </opposite-link>
+    <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+  </link>
   <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
     <link-id>ROADM-C1-DEG2-DEG2-CTP-TXRXtoROADM-C1-DEG1-DEG1-CTP-TXRX
     </link-id>
@@ -2577,7 +2757,8 @@
       <dest-tp>DEG1-CTP-TXRX</dest-tp>
       <dest-node>ROADM-C1-DEG1</dest-node>
     </destination>
-    <opposite-link xmlns="http://org/openroadm/common/network">ROADM-C1-DEG1-DEG1-CTP-TXRXtoROADM-C1-DEG2-DEG2-CTP-TXRX
+    <opposite-link
+      xmlns="http://org/openroadm/common/network">ROADM-C1-DEG1-DEG1-CTP-TXRXtoROADM-C1-DEG2-DEG2-CTP-TXRX
     </opposite-link>
     <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
   </link>
@@ -2592,7 +2773,8 @@
       <dest-tp>SRG1-CP-TXRX</dest-tp>
       <dest-node>ROADM-C1-SRG1</dest-node>
     </destination>
-    <opposite-link xmlns="http://org/openroadm/common/network">ROADM-C1-SRG1-SRG1-CP-TXRXtoROADM-C1-DEG2-DEG2-CTP-TXRX
+    <opposite-link
+      xmlns="http://org/openroadm/common/network">ROADM-C1-SRG1-SRG1-CP-TXRXtoROADM-C1-DEG2-DEG2-CTP-TXRX
     </opposite-link>
     <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
   </link>
@@ -2607,7 +2789,8 @@
       <dest-tp>SRG1-CP-TXRX</dest-tp>
       <dest-node>ROADM-A1-SRG1</dest-node>
     </destination>
-    <opposite-link xmlns="http://org/openroadm/common/network">ROADM-A1-SRG1-SRG1-CP-TXRXtoROADM-A1-DEG2-DEG2-CTP-TXRX
+    <opposite-link
+      xmlns="http://org/openroadm/common/network">ROADM-A1-SRG1-SRG1-CP-TXRXtoROADM-A1-DEG2-DEG2-CTP-TXRX
     </opposite-link>
     <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
   </link>
@@ -2622,7 +2805,8 @@
       <dest-tp>DEG2-CTP-TXRX</dest-tp>
       <dest-node>ROADM-C1-DEG2</dest-node>
     </destination>
-    <opposite-link xmlns="http://org/openroadm/common/network">ROADM-C1-DEG2-DEG2-CTP-TXRXtoROADM-C1-DEG1-DEG1-CTP-TXRX
+    <opposite-link
+      xmlns="http://org/openroadm/common/network">ROADM-C1-DEG2-DEG2-CTP-TXRXtoROADM-C1-DEG1-DEG1-CTP-TXRX
     </opposite-link>
     <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
   </link>
@@ -2637,7 +2821,24 @@
       <dest-tp>SRG1-PP4-TXRX</dest-tp>
       <dest-node>ROADM-C1-SRG1</dest-node>
     </destination>
-    <opposite-link xmlns="http://org/openroadm/common/network">ROADM-C1-SRG1-SRG1-PP4-TXRXtoSPDR-SC1-XPDR2-XPDR2-NETWORK3
+    <opposite-link
+      xmlns="http://org/openroadm/common/network">ROADM-C1-SRG1-SRG1-PP4-TXRXtoSPDR-SC1-XPDR2-XPDR2-NETWORK3
+    </opposite-link>
+    <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+  </link>
+  <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <link-id>XPDR-A1-XPDR1-XPDR1-NETWORK1toROADM-A1-SRG1-SRG1-PP1-TXRX
+    </link-id>
+    <source>
+      <source-node>XPDR-A1-XPDR1</source-node>
+      <source-tp>XPDR1-NETWORK1</source-tp>
+    </source>
+    <destination>
+      <dest-tp>SRG1-PP1-TXRX</dest-tp>
+      <dest-node>ROADM-A1-SRG1</dest-node>
+    </destination>
+    <opposite-link
+      xmlns="http://org/openroadm/common/network">ROADM-A1-SRG1-SRG1-PP1-TXRXtoXPDR-A1-XPDR1-XPDR1-NETWORK1
     </opposite-link>
     <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
   </link>
@@ -2652,7 +2853,8 @@
       <dest-tp>DEG1-CTP-TXRX</dest-tp>
       <dest-node>ROADM-A1-DEG1</dest-node>
     </destination>
-    <opposite-link xmlns="http://org/openroadm/common/network">ROADM-A1-DEG1-DEG1-CTP-TXRXtoROADM-A1-DEG2-DEG2-CTP-TXRX
+    <opposite-link
+      xmlns="http://org/openroadm/common/network">ROADM-A1-DEG1-DEG1-CTP-TXRXtoROADM-A1-DEG2-DEG2-CTP-TXRX
     </opposite-link>
     <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
   </link>
@@ -2667,10 +2869,27 @@
       <dest-tp>DEG1-CTP-TXRX</dest-tp>
       <dest-node>ROADM-A1-DEG1</dest-node>
     </destination>
-    <opposite-link xmlns="http://org/openroadm/common/network">ROADM-A1-DEG1-DEG1-CTP-TXRXtoROADM-A1-SRG1-SRG1-CP-TXRX
+    <opposite-link
+      xmlns="http://org/openroadm/common/network">ROADM-A1-DEG1-DEG1-CTP-TXRXtoROADM-A1-SRG1-SRG1-CP-TXRX
     </opposite-link>
     <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
   </link>
+  <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <link-id>ROADM-C1-SRG1-SRG1-PP1-TXRXtoXPDR-C1-XPDR1-XPDR1-NETWORK1
+    </link-id>
+    <source>
+      <source-node>ROADM-C1-SRG1</source-node>
+      <source-tp>SRG1-PP1-TXRX</source-tp>
+    </source>
+    <destination>
+      <dest-tp>XPDR1-NETWORK1</dest-tp>
+      <dest-node>XPDR-C1-XPDR1</dest-node>
+    </destination>
+    <opposite-link
+      xmlns="http://org/openroadm/common/network">XPDR-C1-XPDR1-XPDR1-NETWORK1toROADM-C1-SRG1-SRG1-PP1-TXRX
+    </opposite-link>
+    <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+  </link>
   <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
     <link-id>ROADM-A1-DEG2-DEG2-CTP-TXRXtoROADM-A1-SRG3-SRG3-CP-TXRX
     </link-id>
@@ -2682,7 +2901,8 @@
       <dest-tp>SRG3-CP-TXRX</dest-tp>
       <dest-node>ROADM-A1-SRG3</dest-node>
     </destination>
-    <opposite-link xmlns="http://org/openroadm/common/network">ROADM-A1-SRG3-SRG3-CP-TXRXtoROADM-A1-DEG2-DEG2-CTP-TXRX
+    <opposite-link
+      xmlns="http://org/openroadm/common/network">ROADM-A1-SRG3-SRG3-CP-TXRXtoROADM-A1-DEG2-DEG2-CTP-TXRX
     </opposite-link>
     <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
   </link>
@@ -2697,7 +2917,8 @@
       <dest-tp>DEG2-CTP-TXRX</dest-tp>
       <dest-node>ROADM-A1-DEG2</dest-node>
     </destination>
-    <opposite-link xmlns="http://org/openroadm/common/network">ROADM-A1-DEG2-DEG2-CTP-TXRXtoROADM-A1-SRG1-SRG1-CP-TXRX
+    <opposite-link
+      xmlns="http://org/openroadm/common/network">ROADM-A1-DEG2-DEG2-CTP-TXRXtoROADM-A1-SRG1-SRG1-CP-TXRX
     </opposite-link>
     <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
   </link>
@@ -2712,7 +2933,8 @@
       <dest-tp>SRG1-PP3-TXRX</dest-tp>
       <dest-node>ROADM-A1-SRG1</dest-node>
     </destination>
-    <opposite-link xmlns="http://org/openroadm/common/network">ROADM-A1-SRG1-SRG1-PP3-TXRXtoSPDR-SA1-XPDR2-XPDR2-NETWORK2
+    <opposite-link
+      xmlns="http://org/openroadm/common/network">ROADM-A1-SRG1-SRG1-PP3-TXRXtoSPDR-SA1-XPDR2-XPDR2-NETWORK2
     </opposite-link>
     <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
   </link>
@@ -2727,7 +2949,8 @@
       <dest-tp>XPDR2-NETWORK2</dest-tp>
       <dest-node>SPDR-SA1-XPDR2</dest-node>
     </destination>
-    <opposite-link xmlns="http://org/openroadm/common/network">SPDR-SA1-XPDR2-XPDR2-NETWORK2toROADM-A1-SRG1-SRG1-PP3-TXRX
+    <opposite-link
+      xmlns="http://org/openroadm/common/network">SPDR-SA1-XPDR2-XPDR2-NETWORK2toROADM-A1-SRG1-SRG1-PP3-TXRX
     </opposite-link>
     <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
   </link>
@@ -2742,7 +2965,8 @@
       <dest-tp>DEG2-CTP-TXRX</dest-tp>
       <dest-node>ROADM-C1-DEG2</dest-node>
     </destination>
-    <opposite-link xmlns="http://org/openroadm/common/network">ROADM-C1-DEG2-DEG2-CTP-TXRXtoROADM-C1-SRG1-SRG1-CP-TXRX
+    <opposite-link
+      xmlns="http://org/openroadm/common/network">ROADM-C1-DEG2-DEG2-CTP-TXRXtoROADM-C1-SRG1-SRG1-CP-TXRX
     </opposite-link>
     <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
   </link>
@@ -2757,7 +2981,8 @@
       <dest-tp>SRG1-CP-TXRX</dest-tp>
       <dest-node>ROADM-A1-SRG1</dest-node>
     </destination>
-    <opposite-link xmlns="http://org/openroadm/common/network">ROADM-A1-SRG1-SRG1-CP-TXRXtoROADM-A1-DEG1-DEG1-CTP-TXRX
+    <opposite-link
+      xmlns="http://org/openroadm/common/network">ROADM-A1-SRG1-SRG1-CP-TXRXtoROADM-A1-DEG1-DEG1-CTP-TXRX
     </opposite-link>
     <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
   </link>
@@ -2772,7 +2997,8 @@
       <dest-tp>DEG1-CTP-TXRX</dest-tp>
       <dest-node>ROADM-C1-DEG1</dest-node>
     </destination>
-    <opposite-link xmlns="http://org/openroadm/common/network">ROADM-C1-DEG1-DEG1-CTP-TXRXtoROADM-C1-SRG1-SRG1-CP-TXRX
+    <opposite-link
+      xmlns="http://org/openroadm/common/network">ROADM-C1-DEG1-DEG1-CTP-TXRXtoROADM-C1-SRG1-SRG1-CP-TXRX
     </opposite-link>
     <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
   </link>
@@ -2787,7 +3013,8 @@
       <dest-tp>DEG2-CTP-TXRX</dest-tp>
       <dest-node>ROADM-A1-DEG2</dest-node>
     </destination>
-    <opposite-link xmlns="http://org/openroadm/common/network">ROADM-A1-DEG2-DEG2-CTP-TXRXtoROADM-A1-DEG1-DEG1-CTP-TXRX
+    <opposite-link
+      xmlns="http://org/openroadm/common/network">ROADM-A1-DEG2-DEG2-CTP-TXRXtoROADM-A1-DEG1-DEG1-CTP-TXRX
     </opposite-link>
     <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
   </link>