TAPI topology consolidation - step2

[transportpce.git] / tapi / src / test / resources / otn-topology.xml

diff --git a/tapi/src/test/resources/otn-topology-with-otn-links.xml b/tapi/src/test/resources/otn-topology.xml
similarity index 59%
rename from tapi/src/test/resources/otn-topology-with-otn-links.xml
rename to tapi/src/test/resources/otn-topology.xml
index 9005a8705d7344f8186a8f7e523f3afa006d1122..bf7e734ce5a80fe915af5549a9c52e11d890ef3e 100644 (file)
--- a/tapi/src/test/resources/otn-topology-with-otn-links.xml
+++ b/tapi/src/test/resources/otn-topology.xml
@@ -3,56 +3,170 @@
 <network>
   <network-id>otn-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>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>
+      <xpdr-tp-port-connection-attributes
+        xmlns="http://org/openroadm/otn/network/topology" />
+      <tp-supported-interfaces
+        xmlns="http://org/openroadm/otn/network/topology">
+        <supported-interface-capability>
+          <if-cap-type
+            xmlns:x="http://org/openroadm/port/types">x:if-100GE</if-cap-type>
+        </supported-interface-capability>
+      </tp-supported-interfaces>
+      <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>
+      <xpdr-tp-port-connection-attributes
+        xmlns="http://org/openroadm/otn/network/topology" />
+      <tp-supported-interfaces
+        xmlns="http://org/openroadm/otn/network/topology">
+        <supported-interface-capability>
+          <if-cap-type
+            xmlns:x="http://org/openroadm/port/types">x:if-100GE</if-cap-type>
+        </supported-interface-capability>
+      </tp-supported-interfaces>
+      <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>
+      <supporting-termination-point>
+        <network-ref>openroadm-topology</network-ref>
+        <node-ref>XPDR-C1-XPDR1</node-ref>
+        <tp-ref>XPDR1-NETWORK2</tp-ref>
+      </supporting-termination-point>
+      <associated-connection-map-port
+        xmlns="http://transportpce/topology">XPDR1-CLIENT2</associated-connection-map-port>
+      <xpdr-tp-port-connection-attributes
+        xmlns="http://org/openroadm/otn/network/topology">
+        <rate xmlns:x="http://org/openroadm/otn-common-types">x:ODU4</rate>
+      </xpdr-tp-port-connection-attributes>
+      <tp-supported-interfaces
+        xmlns="http://org/openroadm/otn/network/topology">
+        <supported-interface-capability>
+          <if-cap-type
+            xmlns:x="http://org/openroadm/port/types">x:if-OCH-OTU4-ODU4</if-cap-type>
+        </supported-interface-capability>
+      </tp-supported-interfaces>
+      <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>
+      <supporting-termination-point>
+        <network-ref>openroadm-topology</network-ref>
+        <node-ref>XPDR-C1-XPDR1</node-ref>
+        <tp-ref>XPDR1-NETWORK1</tp-ref>
+      </supporting-termination-point>
+      <associated-connection-map-port
+        xmlns="http://transportpce/topology">XPDR1-CLIENT1</associated-connection-map-port>
+      <xpdr-tp-port-connection-attributes
+        xmlns="http://org/openroadm/otn/network/topology">
+        <rate xmlns:x="http://org/openroadm/otn-common-types">x:ODU4</rate>
+      </xpdr-tp-port-connection-attributes>
+      <tp-supported-interfaces
+        xmlns="http://org/openroadm/otn/network/topology">
+        <supported-interface-capability>
+          <if-cap-type
+            xmlns:x="http://org/openroadm/port/types">x:if-OCH-OTU4-ODU4</if-cap-type>
+        </supported-interface-capability>
+      </tp-supported-interfaces>
+      <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
+    </termination-point>
+    <supporting-node>
+      <network-ref>clli-network</network-ref>
+      <node-ref>NodeC</node-ref>
+    </supporting-node>
+    <supporting-node>
+      <network-ref>openroadm-network</network-ref>
+      <node-ref>XPDR-C1</node-ref>
+    </supporting-node>
+    <supporting-node>
+      <network-ref>openroadm-topology</network-ref>
+      <node-ref>XPDR-C1-XPDR1</node-ref>
+    </supporting-node>
+    <node-type xmlns="http://org/openroadm/common/network">TPDR</node-type>
+    <xpdr-attributes
+      xmlns="http://org/openroadm/otn/network/topology">
+      <xpdr-number>1</xpdr-number>
+    </xpdr-attributes>
+  </node>
   <node>
     <node-id>SPDR-SA1-XPDR1</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>XPDR1-CLIENT1</tp-id>
-      <xpdr-tp-port-connection-attributes xmlns="http://org/openroadm/otn/network/topology">
+      <xpdr-tp-port-connection-attributes
+        xmlns="http://org/openroadm/otn/network/topology">
         <rate xmlns:x="http://org/openroadm/otn-common-types">x:ODU2e</rate>
       </xpdr-tp-port-connection-attributes>
-      <tp-supported-interfaces xmlns="http://org/openroadm/otn/network/topology">
+      <tp-supported-interfaces
+        xmlns="http://org/openroadm/otn/network/topology">
         <supported-interface-capability>
-          <if-cap-type xmlns:x="http://org/openroadm/port/types">x:if-10GE-ODU2e</if-cap-type>
+          <if-cap-type
+            xmlns:x="http://org/openroadm/port/types">x:if-10GE-ODU2e</if-cap-type>
         </supported-interface-capability>
       </tp-supported-interfaces>
       <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">
+    <termination-point
+      xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>XPDR1-CLIENT3</tp-id>
-      <xpdr-tp-port-connection-attributes xmlns="http://org/openroadm/otn/network/topology">
+      <xpdr-tp-port-connection-attributes
+        xmlns="http://org/openroadm/otn/network/topology">
         <rate xmlns:x="http://org/openroadm/otn-common-types">x:ODU2e</rate>
       </xpdr-tp-port-connection-attributes>
-      <tp-supported-interfaces xmlns="http://org/openroadm/otn/network/topology">
+      <tp-supported-interfaces
+        xmlns="http://org/openroadm/otn/network/topology">
         <supported-interface-capability>
-          <if-cap-type xmlns:x="http://org/openroadm/port/types">x:if-10GE-ODU2e</if-cap-type>
+          <if-cap-type
+            xmlns:x="http://org/openroadm/port/types">x:if-10GE-ODU2e</if-cap-type>
         </supported-interface-capability>
       </tp-supported-interfaces>
       <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">
+    <termination-point
+      xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>XPDR1-CLIENT2</tp-id>
-      <xpdr-tp-port-connection-attributes xmlns="http://org/openroadm/otn/network/topology">
+      <xpdr-tp-port-connection-attributes
+        xmlns="http://org/openroadm/otn/network/topology">
         <rate xmlns:x="http://org/openroadm/otn-common-types">x:ODU2e</rate>
       </xpdr-tp-port-connection-attributes>
-      <tp-supported-interfaces xmlns="http://org/openroadm/otn/network/topology">
+      <tp-supported-interfaces
+        xmlns="http://org/openroadm/otn/network/topology">
         <supported-interface-capability>
-          <if-cap-type xmlns:x="http://org/openroadm/port/types">x:if-10GE-ODU2e</if-cap-type>
+          <if-cap-type
+            xmlns:x="http://org/openroadm/port/types">x:if-10GE-ODU2e</if-cap-type>
         </supported-interface-capability>
       </tp-supported-interfaces>
       <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">
+    <termination-point
+      xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>XPDR1-NETWORK1</tp-id>
       <supporting-termination-point>
         <network-ref>openroadm-topology</network-ref>
         <node-ref>SPDR-SA1-XPDR1</node-ref>
         <tp-ref>XPDR1-NETWORK1</tp-ref>
       </supporting-termination-point>
-      <xpdr-tp-port-connection-attributes xmlns="http://org/openroadm/otn/network/topology">
+      <xpdr-tp-port-connection-attributes
+        xmlns="http://org/openroadm/otn/network/topology">
         <odtu-tpn-pool>
-          <odtu-type xmlns:x="http://org/openroadm/otn-common-types">x:ODTU4.ts-Allocated</odtu-type>
+          <odtu-type
+            xmlns:x="http://org/openroadm/otn-common-types">x:ODTU4.ts-Allocated</odtu-type>
           <tpn-pool>2</tpn-pool>
           <tpn-pool>1</tpn-pool>
           <tpn-pool>12</tpn-pool>
@@ -216,21 +330,27 @@
         <ts-pool>26</ts-pool>
         <ts-pool>27</ts-pool>
       </xpdr-tp-port-connection-attributes>
-      <tp-supported-interfaces xmlns="http://org/openroadm/otn/network/topology">
+      <tp-supported-interfaces
+        xmlns="http://org/openroadm/otn/network/topology">
         <supported-interface-capability>
-          <if-cap-type xmlns:x="http://org/openroadm/port/types">x:if-OCH-OTU4-ODU4</if-cap-type>
+          <if-cap-type
+            xmlns:x="http://org/openroadm/port/types">x:if-OCH-OTU4-ODU4</if-cap-type>
         </supported-interface-capability>
       </tp-supported-interfaces>
       <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>XPDR1-CLIENT4</tp-id>
-      <xpdr-tp-port-connection-attributes xmlns="http://org/openroadm/otn/network/topology">
+      <xpdr-tp-port-connection-attributes
+        xmlns="http://org/openroadm/otn/network/topology">
         <rate xmlns:x="http://org/openroadm/otn-common-types">x:ODU2e</rate>
       </xpdr-tp-port-connection-attributes>
-      <tp-supported-interfaces xmlns="http://org/openroadm/otn/network/topology">
+      <tp-supported-interfaces
+        xmlns="http://org/openroadm/otn/network/topology">
         <supported-interface-capability>
-          <if-cap-type xmlns:x="http://org/openroadm/port/types">x:if-10GE-ODU2e</if-cap-type>
+          <if-cap-type
+            xmlns:x="http://org/openroadm/port/types">x:if-10GE-ODU2e</if-cap-type>
         </supported-interface-capability>
       </tp-supported-interfaces>
       <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
@@ -248,7 +368,8 @@
       <node-ref>SPDR-SA1-XPDR1</node-ref>
     </supporting-node>
     <node-type xmlns="http://org/openroadm/common/network">MUXPDR</node-type>
-    <switching-pools xmlns="http://org/openroadm/otn/network/topology">
+    <switching-pools
+      xmlns="http://org/openroadm/otn/network/topology">
       <odu-switching-pools>
         <switching-pool-number>1</switching-pool-number>
         <non-blocking-list>
@@ -290,59 +411,174 @@
         <switching-pool-type>non-blocking</switching-pool-type>
       </odu-switching-pools>
     </switching-pools>
-    <tp-bandwidth-sharing xmlns="http://org/openroadm/otn/network/topology" />
-    <xpdr-attributes xmlns="http://org/openroadm/otn/network/topology">
+    <tp-bandwidth-sharing
+      xmlns="http://org/openroadm/otn/network/topology" />
+    <xpdr-attributes
+      xmlns="http://org/openroadm/otn/network/topology">
+      <xpdr-number>1</xpdr-number>
+    </xpdr-attributes>
+  </node>
+  <node>
+    <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>
+      <xpdr-tp-port-connection-attributes
+        xmlns="http://org/openroadm/otn/network/topology" />
+      <tp-supported-interfaces
+        xmlns="http://org/openroadm/otn/network/topology">
+        <supported-interface-capability>
+          <if-cap-type
+            xmlns:x="http://org/openroadm/port/types">x:if-100GE</if-cap-type>
+        </supported-interface-capability>
+      </tp-supported-interfaces>
+      <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>
+      <xpdr-tp-port-connection-attributes
+        xmlns="http://org/openroadm/otn/network/topology" />
+      <tp-supported-interfaces
+        xmlns="http://org/openroadm/otn/network/topology">
+        <supported-interface-capability>
+          <if-cap-type
+            xmlns:x="http://org/openroadm/port/types">x:if-100GE</if-cap-type>
+        </supported-interface-capability>
+      </tp-supported-interfaces>
+      <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>
+      <supporting-termination-point>
+        <network-ref>openroadm-topology</network-ref>
+        <node-ref>XPDR-A1-XPDR1</node-ref>
+        <tp-ref>XPDR1-NETWORK2</tp-ref>
+      </supporting-termination-point>
+      <associated-connection-map-port
+        xmlns="http://transportpce/topology">XPDR1-CLIENT2</associated-connection-map-port>
+      <xpdr-tp-port-connection-attributes
+        xmlns="http://org/openroadm/otn/network/topology">
+        <rate xmlns:x="http://org/openroadm/otn-common-types">x:ODU4</rate>
+      </xpdr-tp-port-connection-attributes>
+      <tp-supported-interfaces
+        xmlns="http://org/openroadm/otn/network/topology">
+        <supported-interface-capability>
+          <if-cap-type
+            xmlns:x="http://org/openroadm/port/types">x:if-OCH-OTU4-ODU4</if-cap-type>
+        </supported-interface-capability>
+      </tp-supported-interfaces>
+      <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>
+      <supporting-termination-point>
+        <network-ref>openroadm-topology</network-ref>
+        <node-ref>XPDR-A1-XPDR1</node-ref>
+        <tp-ref>XPDR1-NETWORK1</tp-ref>
+      </supporting-termination-point>
+      <associated-connection-map-port
+        xmlns="http://transportpce/topology">XPDR1-CLIENT1</associated-connection-map-port>
+      <xpdr-tp-port-connection-attributes
+        xmlns="http://org/openroadm/otn/network/topology">
+        <rate xmlns:x="http://org/openroadm/otn-common-types">x:ODU4</rate>
+      </xpdr-tp-port-connection-attributes>
+      <tp-supported-interfaces
+        xmlns="http://org/openroadm/otn/network/topology">
+        <supported-interface-capability>
+          <if-cap-type
+            xmlns:x="http://org/openroadm/port/types">x:if-OCH-OTU4-ODU4</if-cap-type>
+        </supported-interface-capability>
+      </tp-supported-interfaces>
+      <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
+    </termination-point>
+    <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>
+    <supporting-node>
+      <network-ref>openroadm-topology</network-ref>
+      <node-ref>XPDR-A1-XPDR1</node-ref>
+    </supporting-node>
+    <node-type xmlns="http://org/openroadm/common/network">TPDR</node-type>
+    <xpdr-attributes
+      xmlns="http://org/openroadm/otn/network/topology">
       <xpdr-number>1</xpdr-number>
     </xpdr-attributes>
   </node>
   <node>
     <node-id>SPDR-SC1-XPDR1</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>XPDR1-CLIENT1</tp-id>
-      <xpdr-tp-port-connection-attributes xmlns="http://org/openroadm/otn/network/topology">
+      <xpdr-tp-port-connection-attributes
+        xmlns="http://org/openroadm/otn/network/topology">
         <rate xmlns:x="http://org/openroadm/otn-common-types">x:ODU2e</rate>
       </xpdr-tp-port-connection-attributes>
-      <tp-supported-interfaces xmlns="http://org/openroadm/otn/network/topology">
+      <tp-supported-interfaces
+        xmlns="http://org/openroadm/otn/network/topology">
         <supported-interface-capability>
-          <if-cap-type xmlns:x="http://org/openroadm/port/types">x:if-10GE-ODU2e</if-cap-type>
+          <if-cap-type
+            xmlns:x="http://org/openroadm/port/types">x:if-10GE-ODU2e</if-cap-type>
         </supported-interface-capability>
       </tp-supported-interfaces>
       <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">
+    <termination-point
+      xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>XPDR1-CLIENT3</tp-id>
-      <xpdr-tp-port-connection-attributes xmlns="http://org/openroadm/otn/network/topology">
+      <xpdr-tp-port-connection-attributes
+        xmlns="http://org/openroadm/otn/network/topology">
         <rate xmlns:x="http://org/openroadm/otn-common-types">x:ODU2e</rate>
       </xpdr-tp-port-connection-attributes>
-      <tp-supported-interfaces xmlns="http://org/openroadm/otn/network/topology">
+      <tp-supported-interfaces
+        xmlns="http://org/openroadm/otn/network/topology">
         <supported-interface-capability>
-          <if-cap-type xmlns:x="http://org/openroadm/port/types">x:if-10GE-ODU2e</if-cap-type>
+          <if-cap-type
+            xmlns:x="http://org/openroadm/port/types">x:if-10GE-ODU2e</if-cap-type>
         </supported-interface-capability>
       </tp-supported-interfaces>
       <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">
+    <termination-point
+      xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>XPDR1-CLIENT2</tp-id>
-      <xpdr-tp-port-connection-attributes xmlns="http://org/openroadm/otn/network/topology">
+      <xpdr-tp-port-connection-attributes
+        xmlns="http://org/openroadm/otn/network/topology">
         <rate xmlns:x="http://org/openroadm/otn-common-types">x:ODU2e</rate>
       </xpdr-tp-port-connection-attributes>
-      <tp-supported-interfaces xmlns="http://org/openroadm/otn/network/topology">
+      <tp-supported-interfaces
+        xmlns="http://org/openroadm/otn/network/topology">
         <supported-interface-capability>
-          <if-cap-type xmlns:x="http://org/openroadm/port/types">x:if-10GE-ODU2e</if-cap-type>
+          <if-cap-type
+            xmlns:x="http://org/openroadm/port/types">x:if-10GE-ODU2e</if-cap-type>
         </supported-interface-capability>
       </tp-supported-interfaces>
       <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">
+    <termination-point
+      xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>XPDR1-NETWORK1</tp-id>
       <supporting-termination-point>
         <network-ref>openroadm-topology</network-ref>
         <node-ref>SPDR-SC1-XPDR1</node-ref>
         <tp-ref>XPDR1-NETWORK1</tp-ref>
       </supporting-termination-point>
-      <xpdr-tp-port-connection-attributes xmlns="http://org/openroadm/otn/network/topology">
+      <xpdr-tp-port-connection-attributes
+        xmlns="http://org/openroadm/otn/network/topology">
         <odtu-tpn-pool>
-          <odtu-type xmlns:x="http://org/openroadm/otn-common-types">x:ODTU4.ts-Allocated</odtu-type>
+          <odtu-type
+            xmlns:x="http://org/openroadm/otn-common-types">x:ODTU4.ts-Allocated</odtu-type>
           <tpn-pool>2</tpn-pool>
           <tpn-pool>1</tpn-pool>
           <tpn-pool>12</tpn-pool>
@@ -506,21 +742,27 @@
         <ts-pool>26</ts-pool>
         <ts-pool>27</ts-pool>
       </xpdr-tp-port-connection-attributes>
-      <tp-supported-interfaces xmlns="http://org/openroadm/otn/network/topology">
+      <tp-supported-interfaces
+        xmlns="http://org/openroadm/otn/network/topology">
         <supported-interface-capability>
-          <if-cap-type xmlns:x="http://org/openroadm/port/types">x:if-OCH-OTU4-ODU4</if-cap-type>
+          <if-cap-type
+            xmlns:x="http://org/openroadm/port/types">x:if-OCH-OTU4-ODU4</if-cap-type>
         </supported-interface-capability>
       </tp-supported-interfaces>
       <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>XPDR1-CLIENT4</tp-id>
-      <xpdr-tp-port-connection-attributes xmlns="http://org/openroadm/otn/network/topology">
+      <xpdr-tp-port-connection-attributes
+        xmlns="http://org/openroadm/otn/network/topology">
         <rate xmlns:x="http://org/openroadm/otn-common-types">x:ODU2e</rate>
       </xpdr-tp-port-connection-attributes>
-      <tp-supported-interfaces xmlns="http://org/openroadm/otn/network/topology">
+      <tp-supported-interfaces
+        xmlns="http://org/openroadm/otn/network/topology">
         <supported-interface-capability>
-          <if-cap-type xmlns:x="http://org/openroadm/port/types">x:if-10GE-ODU2e</if-cap-type>
+          <if-cap-type
+            xmlns:x="http://org/openroadm/port/types">x:if-10GE-ODU2e</if-cap-type>
         </supported-interface-capability>
       </tp-supported-interfaces>
       <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
@@ -538,7 +780,8 @@
       <node-ref>SPDR-SC1-XPDR1</node-ref>
     </supporting-node>
     <node-type xmlns="http://org/openroadm/common/network">MUXPDR</node-type>
-    <switching-pools xmlns="http://org/openroadm/otn/network/topology">
+    <switching-pools
+      xmlns="http://org/openroadm/otn/network/topology">
       <odu-switching-pools>
         <switching-pool-number>1</switching-pool-number>
         <non-blocking-list>
@@ -580,125 +823,159 @@
         <switching-pool-type>non-blocking</switching-pool-type>
       </odu-switching-pools>
     </switching-pools>
-    <tp-bandwidth-sharing xmlns="http://org/openroadm/otn/network/topology" />
-    <xpdr-attributes xmlns="http://org/openroadm/otn/network/topology">
+    <tp-bandwidth-sharing
+      xmlns="http://org/openroadm/otn/network/topology" />
+    <xpdr-attributes
+      xmlns="http://org/openroadm/otn/network/topology">
       <xpdr-number>1</xpdr-number>
     </xpdr-attributes>
   </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>
       <supporting-termination-point>
         <network-ref>openroadm-topology</network-ref>
         <node-ref>SPDR-SA1-XPDR2</node-ref>
         <tp-ref>XPDR2-NETWORK1</tp-ref>
       </supporting-termination-point>
-      <xpdr-tp-port-connection-attributes xmlns="http://org/openroadm/otn/network/topology">
+      <xpdr-tp-port-connection-attributes
+        xmlns="http://org/openroadm/otn/network/topology">
         <rate xmlns:x="http://org/openroadm/otn-common-types">x:ODU4</rate>
       </xpdr-tp-port-connection-attributes>
-      <tp-supported-interfaces xmlns="http://org/openroadm/otn/network/topology">
+      <tp-supported-interfaces
+        xmlns="http://org/openroadm/otn/network/topology">
         <supported-interface-capability>
-          <if-cap-type xmlns:x="http://org/openroadm/port/types">x:if-OCH-OTU4-ODU4</if-cap-type>
+          <if-cap-type
+            xmlns:x="http://org/openroadm/port/types">x:if-OCH-OTU4-ODU4</if-cap-type>
         </supported-interface-capability>
       </tp-supported-interfaces>
       <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>
       <supporting-termination-point>
         <network-ref>openroadm-topology</network-ref>
         <node-ref>SPDR-SA1-XPDR2</node-ref>
         <tp-ref>XPDR2-NETWORK3</tp-ref>
       </supporting-termination-point>
-      <xpdr-tp-port-connection-attributes xmlns="http://org/openroadm/otn/network/topology">
+      <xpdr-tp-port-connection-attributes
+        xmlns="http://org/openroadm/otn/network/topology">
         <rate xmlns:x="http://org/openroadm/otn-common-types">x:ODU4</rate>
       </xpdr-tp-port-connection-attributes>
-      <tp-supported-interfaces xmlns="http://org/openroadm/otn/network/topology">
+      <tp-supported-interfaces
+        xmlns="http://org/openroadm/otn/network/topology">
         <supported-interface-capability>
-          <if-cap-type xmlns:x="http://org/openroadm/port/types">x:if-OCH-OTU4-ODU4</if-cap-type>
+          <if-cap-type
+            xmlns:x="http://org/openroadm/port/types">x:if-OCH-OTU4-ODU4</if-cap-type>
         </supported-interface-capability>
       </tp-supported-interfaces>
       <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-NETWORK2</tp-id>
       <supporting-termination-point>
         <network-ref>openroadm-topology</network-ref>
         <node-ref>SPDR-SA1-XPDR2</node-ref>
         <tp-ref>XPDR2-NETWORK2</tp-ref>
       </supporting-termination-point>
-      <xpdr-tp-port-connection-attributes xmlns="http://org/openroadm/otn/network/topology">
+      <xpdr-tp-port-connection-attributes
+        xmlns="http://org/openroadm/otn/network/topology">
         <rate xmlns:x="http://org/openroadm/otn-common-types">x:ODU4</rate>
       </xpdr-tp-port-connection-attributes>
-      <tp-supported-interfaces xmlns="http://org/openroadm/otn/network/topology">
+      <tp-supported-interfaces
+        xmlns="http://org/openroadm/otn/network/topology">
         <supported-interface-capability>
-          <if-cap-type xmlns:x="http://org/openroadm/port/types">x:if-OCH-OTU4-ODU4</if-cap-type>
+          <if-cap-type
+            xmlns:x="http://org/openroadm/port/types">x:if-OCH-OTU4-ODU4</if-cap-type>
         </supported-interface-capability>
       </tp-supported-interfaces>
       <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-NETWORK4</tp-id>
       <supporting-termination-point>
         <network-ref>openroadm-topology</network-ref>
         <node-ref>SPDR-SA1-XPDR2</node-ref>
         <tp-ref>XPDR2-NETWORK4</tp-ref>
       </supporting-termination-point>
-      <xpdr-tp-port-connection-attributes xmlns="http://org/openroadm/otn/network/topology">
+      <xpdr-tp-port-connection-attributes
+        xmlns="http://org/openroadm/otn/network/topology">
         <rate xmlns:x="http://org/openroadm/otn-common-types">x:ODU4</rate>
       </xpdr-tp-port-connection-attributes>
-      <tp-supported-interfaces xmlns="http://org/openroadm/otn/network/topology">
+      <tp-supported-interfaces
+        xmlns="http://org/openroadm/otn/network/topology">
         <supported-interface-capability>
-          <if-cap-type xmlns:x="http://org/openroadm/port/types">x:if-OCH-OTU4-ODU4</if-cap-type>
+          <if-cap-type
+            xmlns:x="http://org/openroadm/port/types">x:if-OCH-OTU4-ODU4</if-cap-type>
         </supported-interface-capability>
       </tp-supported-interfaces>
       <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-CLIENT3</tp-id>
-      <xpdr-tp-port-connection-attributes xmlns="http://org/openroadm/otn/network/topology">
+      <xpdr-tp-port-connection-attributes
+        xmlns="http://org/openroadm/otn/network/topology">
         <rate xmlns:x="http://org/openroadm/otn-common-types">x:ODU4</rate>
       </xpdr-tp-port-connection-attributes>
-      <tp-supported-interfaces xmlns="http://org/openroadm/otn/network/topology">
+      <tp-supported-interfaces
+        xmlns="http://org/openroadm/otn/network/topology">
         <supported-interface-capability>
-          <if-cap-type xmlns:x="http://org/openroadm/port/types">x:if-100GE-ODU4</if-cap-type>
+          <if-cap-type
+            xmlns:x="http://org/openroadm/port/types">x:if-100GE-ODU4</if-cap-type>
         </supported-interface-capability>
       </tp-supported-interfaces>
       <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">
+    <termination-point
+      xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>XPDR2-CLIENT4</tp-id>
-      <xpdr-tp-port-connection-attributes xmlns="http://org/openroadm/otn/network/topology">
+      <xpdr-tp-port-connection-attributes
+        xmlns="http://org/openroadm/otn/network/topology">
         <rate xmlns:x="http://org/openroadm/otn-common-types">x:ODU4</rate>
       </xpdr-tp-port-connection-attributes>
-      <tp-supported-interfaces xmlns="http://org/openroadm/otn/network/topology">
+      <tp-supported-interfaces
+        xmlns="http://org/openroadm/otn/network/topology">
         <supported-interface-capability>
-          <if-cap-type xmlns:x="http://org/openroadm/port/types">x:if-100GE-ODU4</if-cap-type>
+          <if-cap-type
+            xmlns:x="http://org/openroadm/port/types">x:if-100GE-ODU4</if-cap-type>
         </supported-interface-capability>
       </tp-supported-interfaces>
       <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">
+    <termination-point
+      xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>XPDR2-CLIENT1</tp-id>
-      <xpdr-tp-port-connection-attributes xmlns="http://org/openroadm/otn/network/topology">
+      <xpdr-tp-port-connection-attributes
+        xmlns="http://org/openroadm/otn/network/topology">
         <rate xmlns:x="http://org/openroadm/otn-common-types">x:ODU4</rate>
       </xpdr-tp-port-connection-attributes>
-      <tp-supported-interfaces xmlns="http://org/openroadm/otn/network/topology">
+      <tp-supported-interfaces
+        xmlns="http://org/openroadm/otn/network/topology">
         <supported-interface-capability>
-          <if-cap-type xmlns:x="http://org/openroadm/port/types">x:if-100GE-ODU4</if-cap-type>
+          <if-cap-type
+            xmlns:x="http://org/openroadm/port/types">x:if-100GE-ODU4</if-cap-type>
         </supported-interface-capability>
       </tp-supported-interfaces>
       <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">
+    <termination-point
+      xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>XPDR2-CLIENT2</tp-id>
-      <xpdr-tp-port-connection-attributes xmlns="http://org/openroadm/otn/network/topology">
+      <xpdr-tp-port-connection-attributes
+        xmlns="http://org/openroadm/otn/network/topology">
         <rate xmlns:x="http://org/openroadm/otn-common-types">x:ODU4</rate>
       </xpdr-tp-port-connection-attributes>
-      <tp-supported-interfaces xmlns="http://org/openroadm/otn/network/topology">
+      <tp-supported-interfaces
+        xmlns="http://org/openroadm/otn/network/topology">
         <supported-interface-capability>
-          <if-cap-type xmlns:x="http://org/openroadm/port/types">x:if-100GE-ODU4</if-cap-type>
+          <if-cap-type
+            xmlns:x="http://org/openroadm/port/types">x:if-100GE-ODU4</if-cap-type>
         </supported-interface-capability>
       </tp-supported-interfaces>
       <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
@@ -716,7 +993,8 @@
       <node-ref>SPDR-SA1-XPDR2</node-ref>
     </supporting-node>
     <node-type xmlns="http://org/openroadm/common/network">SWITCH</node-type>
-    <switching-pools xmlns="http://org/openroadm/otn/network/topology">
+    <switching-pools
+      xmlns="http://org/openroadm/otn/network/topology">
       <odu-switching-pools>
         <switching-pool-number>1</switching-pool-number>
         <non-blocking-list>
@@ -733,125 +1011,159 @@
         <switching-pool-type>non-blocking</switching-pool-type>
       </odu-switching-pools>
     </switching-pools>
-    <tp-bandwidth-sharing xmlns="http://org/openroadm/otn/network/topology" />
-    <xpdr-attributes xmlns="http://org/openroadm/otn/network/topology">
+    <tp-bandwidth-sharing
+      xmlns="http://org/openroadm/otn/network/topology" />
+    <xpdr-attributes
+      xmlns="http://org/openroadm/otn/network/topology">
       <xpdr-number>2</xpdr-number>
     </xpdr-attributes>
   </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>
       <supporting-termination-point>
         <network-ref>openroadm-topology</network-ref>
         <node-ref>SPDR-SC1-XPDR2</node-ref>
         <tp-ref>XPDR2-NETWORK1</tp-ref>
       </supporting-termination-point>
-      <xpdr-tp-port-connection-attributes xmlns="http://org/openroadm/otn/network/topology">
+      <xpdr-tp-port-connection-attributes
+        xmlns="http://org/openroadm/otn/network/topology">
         <rate xmlns:x="http://org/openroadm/otn-common-types">x:ODU4</rate>
       </xpdr-tp-port-connection-attributes>
-      <tp-supported-interfaces xmlns="http://org/openroadm/otn/network/topology">
+      <tp-supported-interfaces
+        xmlns="http://org/openroadm/otn/network/topology">
         <supported-interface-capability>
-          <if-cap-type xmlns:x="http://org/openroadm/port/types">x:if-OCH-OTU4-ODU4</if-cap-type>
+          <if-cap-type
+            xmlns:x="http://org/openroadm/port/types">x:if-OCH-OTU4-ODU4</if-cap-type>
         </supported-interface-capability>
       </tp-supported-interfaces>
       <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>
       <supporting-termination-point>
         <network-ref>openroadm-topology</network-ref>
         <node-ref>SPDR-SC1-XPDR2</node-ref>
         <tp-ref>XPDR2-NETWORK3</tp-ref>
       </supporting-termination-point>
-      <xpdr-tp-port-connection-attributes xmlns="http://org/openroadm/otn/network/topology">
+      <xpdr-tp-port-connection-attributes
+        xmlns="http://org/openroadm/otn/network/topology">
         <rate xmlns:x="http://org/openroadm/otn-common-types">x:ODU4</rate>
       </xpdr-tp-port-connection-attributes>
-      <tp-supported-interfaces xmlns="http://org/openroadm/otn/network/topology">
+      <tp-supported-interfaces
+        xmlns="http://org/openroadm/otn/network/topology">
         <supported-interface-capability>
-          <if-cap-type xmlns:x="http://org/openroadm/port/types">x:if-OCH-OTU4-ODU4</if-cap-type>
+          <if-cap-type
+            xmlns:x="http://org/openroadm/port/types">x:if-OCH-OTU4-ODU4</if-cap-type>
         </supported-interface-capability>
       </tp-supported-interfaces>
       <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-NETWORK2</tp-id>
       <supporting-termination-point>
         <network-ref>openroadm-topology</network-ref>
         <node-ref>SPDR-SC1-XPDR2</node-ref>
         <tp-ref>XPDR2-NETWORK2</tp-ref>
       </supporting-termination-point>
-      <xpdr-tp-port-connection-attributes xmlns="http://org/openroadm/otn/network/topology">
+      <xpdr-tp-port-connection-attributes
+        xmlns="http://org/openroadm/otn/network/topology">
         <rate xmlns:x="http://org/openroadm/otn-common-types">x:ODU4</rate>
       </xpdr-tp-port-connection-attributes>
-      <tp-supported-interfaces xmlns="http://org/openroadm/otn/network/topology">
+      <tp-supported-interfaces
+        xmlns="http://org/openroadm/otn/network/topology">
         <supported-interface-capability>
-          <if-cap-type xmlns:x="http://org/openroadm/port/types">x:if-OCH-OTU4-ODU4</if-cap-type>
+          <if-cap-type
+            xmlns:x="http://org/openroadm/port/types">x:if-OCH-OTU4-ODU4</if-cap-type>
         </supported-interface-capability>
       </tp-supported-interfaces>
       <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-NETWORK4</tp-id>
       <supporting-termination-point>
         <network-ref>openroadm-topology</network-ref>
         <node-ref>SPDR-SC1-XPDR2</node-ref>
         <tp-ref>XPDR2-NETWORK4</tp-ref>
       </supporting-termination-point>
-      <xpdr-tp-port-connection-attributes xmlns="http://org/openroadm/otn/network/topology">
+      <xpdr-tp-port-connection-attributes
+        xmlns="http://org/openroadm/otn/network/topology">
         <rate xmlns:x="http://org/openroadm/otn-common-types">x:ODU4</rate>
       </xpdr-tp-port-connection-attributes>
-      <tp-supported-interfaces xmlns="http://org/openroadm/otn/network/topology">
+      <tp-supported-interfaces
+        xmlns="http://org/openroadm/otn/network/topology">
         <supported-interface-capability>
-          <if-cap-type xmlns:x="http://org/openroadm/port/types">x:if-OCH-OTU4-ODU4</if-cap-type>
+          <if-cap-type
+            xmlns:x="http://org/openroadm/port/types">x:if-OCH-OTU4-ODU4</if-cap-type>
         </supported-interface-capability>
       </tp-supported-interfaces>
       <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-CLIENT3</tp-id>
-      <xpdr-tp-port-connection-attributes xmlns="http://org/openroadm/otn/network/topology">
+      <xpdr-tp-port-connection-attributes
+        xmlns="http://org/openroadm/otn/network/topology">
         <rate xmlns:x="http://org/openroadm/otn-common-types">x:ODU4</rate>
       </xpdr-tp-port-connection-attributes>
-      <tp-supported-interfaces xmlns="http://org/openroadm/otn/network/topology">
+      <tp-supported-interfaces
+        xmlns="http://org/openroadm/otn/network/topology">
         <supported-interface-capability>
-          <if-cap-type xmlns:x="http://org/openroadm/port/types">x:if-100GE-ODU4</if-cap-type>
+          <if-cap-type
+            xmlns:x="http://org/openroadm/port/types">x:if-100GE-ODU4</if-cap-type>
         </supported-interface-capability>
       </tp-supported-interfaces>
       <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">
+    <termination-point
+      xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>XPDR2-CLIENT4</tp-id>
-      <xpdr-tp-port-connection-attributes xmlns="http://org/openroadm/otn/network/topology">
+      <xpdr-tp-port-connection-attributes
+        xmlns="http://org/openroadm/otn/network/topology">
         <rate xmlns:x="http://org/openroadm/otn-common-types">x:ODU4</rate>
       </xpdr-tp-port-connection-attributes>
-      <tp-supported-interfaces xmlns="http://org/openroadm/otn/network/topology">
+      <tp-supported-interfaces
+        xmlns="http://org/openroadm/otn/network/topology">
         <supported-interface-capability>
-          <if-cap-type xmlns:x="http://org/openroadm/port/types">x:if-100GE-ODU4</if-cap-type>
+          <if-cap-type
+            xmlns:x="http://org/openroadm/port/types">x:if-100GE-ODU4</if-cap-type>
         </supported-interface-capability>
       </tp-supported-interfaces>
       <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">
+    <termination-point
+      xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>XPDR2-CLIENT1</tp-id>
-      <xpdr-tp-port-connection-attributes xmlns="http://org/openroadm/otn/network/topology">
+      <xpdr-tp-port-connection-attributes
+        xmlns="http://org/openroadm/otn/network/topology">
         <rate xmlns:x="http://org/openroadm/otn-common-types">x:ODU4</rate>
       </xpdr-tp-port-connection-attributes>
-      <tp-supported-interfaces xmlns="http://org/openroadm/otn/network/topology">
+      <tp-supported-interfaces
+        xmlns="http://org/openroadm/otn/network/topology">
         <supported-interface-capability>
-          <if-cap-type xmlns:x="http://org/openroadm/port/types">x:if-100GE-ODU4</if-cap-type>
+          <if-cap-type
+            xmlns:x="http://org/openroadm/port/types">x:if-100GE-ODU4</if-cap-type>
         </supported-interface-capability>
       </tp-supported-interfaces>
       <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">
+    <termination-point
+      xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>XPDR2-CLIENT2</tp-id>
-      <xpdr-tp-port-connection-attributes xmlns="http://org/openroadm/otn/network/topology">
+      <xpdr-tp-port-connection-attributes
+        xmlns="http://org/openroadm/otn/network/topology">
         <rate xmlns:x="http://org/openroadm/otn-common-types">x:ODU4</rate>
       </xpdr-tp-port-connection-attributes>
-      <tp-supported-interfaces xmlns="http://org/openroadm/otn/network/topology">
+      <tp-supported-interfaces
+        xmlns="http://org/openroadm/otn/network/topology">
         <supported-interface-capability>
-          <if-cap-type xmlns:x="http://org/openroadm/port/types">x:if-100GE-ODU4</if-cap-type>
+          <if-cap-type
+            xmlns:x="http://org/openroadm/port/types">x:if-100GE-ODU4</if-cap-type>
         </supported-interface-capability>
       </tp-supported-interfaces>
       <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
@@ -869,7 +1181,8 @@
       <node-ref>NodeSC</node-ref>
     </supporting-node>
     <node-type xmlns="http://org/openroadm/common/network">SWITCH</node-type>
-    <switching-pools xmlns="http://org/openroadm/otn/network/topology">
+    <switching-pools
+      xmlns="http://org/openroadm/otn/network/topology">
       <odu-switching-pools>
         <switching-pool-number>1</switching-pool-number>
         <non-blocking-list>
@@ -886,80 +1199,94 @@
         <switching-pool-type>non-blocking</switching-pool-type>
       </odu-switching-pools>
     </switching-pools>
-    <tp-bandwidth-sharing xmlns="http://org/openroadm/otn/network/topology" />
-    <xpdr-attributes xmlns="http://org/openroadm/otn/network/topology">
+    <tp-bandwidth-sharing
+      xmlns="http://org/openroadm/otn/network/topology" />
+    <xpdr-attributes
+      xmlns="http://org/openroadm/otn/network/topology">
       <xpdr-number>2</xpdr-number>
     </xpdr-attributes>
   </node>
   <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OTU4-SPDR-SA1-XPDR1-XPDR1-NETWORK1toSPDR-SC1-XPDR1-XPDR1-NETWORK1
+    <link-id>OTU4-SPDR-SC1-XPDR1-XPDR1-NETWORK1toSPDR-SA1-XPDR1-XPDR1-NETWORK1
     </link-id>
     <source>
-      <source-node>SPDR-SA1-XPDR1</source-node>
+      <source-node>SPDR-SC1-XPDR1</source-node>
       <source-tp>XPDR1-NETWORK1</source-tp>
     </source>
     <otn-link-type xmlns="http://transportpce/topology">OTU4</otn-link-type>
     <destination>
       <dest-tp>XPDR1-NETWORK1</dest-tp>
-      <dest-node>SPDR-SC1-XPDR1</dest-node>
+      <dest-node>SPDR-SA1-XPDR1</dest-node>
     </destination>
-    <available-bandwidth xmlns="http://org/openroadm/otn/network/topology">0</available-bandwidth>
-    <used-bandwidth xmlns="http://org/openroadm/otn/network/topology">100000</used-bandwidth>
-    <opposite-link xmlns="http://org/openroadm/common/network">OTU4-SPDR-SC1-XPDR1-XPDR1-NETWORK1toSPDR-SA1-XPDR1-XPDR1-NETWORK1
+    <available-bandwidth
+      xmlns="http://org/openroadm/otn/network/topology">0</available-bandwidth>
+    <used-bandwidth
+      xmlns="http://org/openroadm/otn/network/topology">100000</used-bandwidth>
+    <opposite-link
+      xmlns="http://org/openroadm/common/network">OTU4-SPDR-SA1-XPDR1-XPDR1-NETWORK1toSPDR-SC1-XPDR1-XPDR1-NETWORK1
     </opposite-link>
     <link-type xmlns="http://org/openroadm/common/network">OTN-LINK</link-type>
   </link>
   <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OTU4-SPDR-SC1-XPDR1-XPDR1-NETWORK1toSPDR-SA1-XPDR1-XPDR1-NETWORK1
+    <link-id>OTU4-SPDR-SA1-XPDR1-XPDR1-NETWORK1toSPDR-SC1-XPDR1-XPDR1-NETWORK1
     </link-id>
     <source>
-      <source-node>SPDR-SC1-XPDR1</source-node>
+      <source-node>SPDR-SA1-XPDR1</source-node>
       <source-tp>XPDR1-NETWORK1</source-tp>
     </source>
     <otn-link-type xmlns="http://transportpce/topology">OTU4</otn-link-type>
     <destination>
       <dest-tp>XPDR1-NETWORK1</dest-tp>
-      <dest-node>SPDR-SA1-XPDR1</dest-node>
+      <dest-node>SPDR-SC1-XPDR1</dest-node>
     </destination>
-    <available-bandwidth xmlns="http://org/openroadm/otn/network/topology">0</available-bandwidth>
-    <used-bandwidth xmlns="http://org/openroadm/otn/network/topology">100000</used-bandwidth>
-    <opposite-link xmlns="http://org/openroadm/common/network">OTU4-SPDR-SA1-XPDR1-XPDR1-NETWORK1toSPDR-SC1-XPDR1-XPDR1-NETWORK1
+    <available-bandwidth
+      xmlns="http://org/openroadm/otn/network/topology">0</available-bandwidth>
+    <used-bandwidth
+      xmlns="http://org/openroadm/otn/network/topology">100000</used-bandwidth>
+    <opposite-link
+      xmlns="http://org/openroadm/common/network">OTU4-SPDR-SC1-XPDR1-XPDR1-NETWORK1toSPDR-SA1-XPDR1-XPDR1-NETWORK1
     </opposite-link>
     <link-type xmlns="http://org/openroadm/common/network">OTN-LINK</link-type>
   </link>
   <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>ODU4-SPDR-SA1-XPDR1-XPDR1-NETWORK1toSPDR-SC1-XPDR1-XPDR1-NETWORK1
+    <link-id>ODU4-SPDR-SC1-XPDR1-XPDR1-NETWORK1toSPDR-SA1-XPDR1-XPDR1-NETWORK1
     </link-id>
     <source>
-      <source-node>SPDR-SA1-XPDR1</source-node>
+      <source-node>SPDR-SC1-XPDR1</source-node>
       <source-tp>XPDR1-NETWORK1</source-tp>
     </source>
     <otn-link-type xmlns="http://transportpce/topology">ODTU4</otn-link-type>
     <destination>
       <dest-tp>XPDR1-NETWORK1</dest-tp>
-      <dest-node>SPDR-SC1-XPDR1</dest-node>
+      <dest-node>SPDR-SA1-XPDR1</dest-node>
     </destination>
-    <available-bandwidth xmlns="http://org/openroadm/otn/network/topology">100000</available-bandwidth>
-    <used-bandwidth xmlns="http://org/openroadm/otn/network/topology">0</used-bandwidth>
-    <opposite-link xmlns="http://org/openroadm/common/network">ODU4-SPDR-SC1-XPDR1-XPDR1-NETWORK1toSPDR-SA1-XPDR1-XPDR1-NETWORK1
+    <available-bandwidth
+      xmlns="http://org/openroadm/otn/network/topology">100000</available-bandwidth>
+    <used-bandwidth
+      xmlns="http://org/openroadm/otn/network/topology">0</used-bandwidth>
+    <opposite-link
+      xmlns="http://org/openroadm/common/network">ODU4-SPDR-SA1-XPDR1-XPDR1-NETWORK1toSPDR-SC1-XPDR1-XPDR1-NETWORK1
     </opposite-link>
     <link-type xmlns="http://org/openroadm/common/network">OTN-LINK</link-type>
   </link>
   <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>ODU4-SPDR-SC1-XPDR1-XPDR1-NETWORK1toSPDR-SA1-XPDR1-XPDR1-NETWORK1
+    <link-id>ODU4-SPDR-SA1-XPDR1-XPDR1-NETWORK1toSPDR-SC1-XPDR1-XPDR1-NETWORK1
     </link-id>
     <source>
-      <source-node>SPDR-SC1-XPDR1</source-node>
+      <source-node>SPDR-SA1-XPDR1</source-node>
       <source-tp>XPDR1-NETWORK1</source-tp>
     </source>
     <otn-link-type xmlns="http://transportpce/topology">ODTU4</otn-link-type>
     <destination>
       <dest-tp>XPDR1-NETWORK1</dest-tp>
-      <dest-node>SPDR-SA1-XPDR1</dest-node>
+      <dest-node>SPDR-SC1-XPDR1</dest-node>
     </destination>
-    <available-bandwidth xmlns="http://org/openroadm/otn/network/topology">100000</available-bandwidth>
-    <used-bandwidth xmlns="http://org/openroadm/otn/network/topology">0</used-bandwidth>
-    <opposite-link xmlns="http://org/openroadm/common/network">ODU4-SPDR-SA1-XPDR1-XPDR1-NETWORK1toSPDR-SC1-XPDR1-XPDR1-NETWORK1
+    <available-bandwidth
+      xmlns="http://org/openroadm/otn/network/topology">100000</available-bandwidth>
+    <used-bandwidth
+      xmlns="http://org/openroadm/otn/network/topology">0</used-bandwidth>
+    <opposite-link
+      xmlns="http://org/openroadm/common/network">ODU4-SPDR-SC1-XPDR1-XPDR1-NETWORK1toSPDR-SA1-XPDR1-XPDR1-NETWORK1
     </opposite-link>
     <link-type xmlns="http://org/openroadm/common/network">OTN-LINK</link-type>
   </link>