Update topology input files for Tapi topology UT

[transportpce.git] / tapi / src / test / resources / portmapping.xml

diff --git a/tapi/src/test/resources/portmapping.xml b/tapi/src/test/resources/portmapping.xml
index d165489a1b640511cc07430a3f409e181bcbf572..ef5e307446fe95d7c0703f2a20240fdecb7582cc 100644 (file)
--- a/tapi/src/test/resources/portmapping.xml
+++ b/tapi/src/test/resources/portmapping.xml
@@ -1,696 +1,740 @@
 <data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
 <network xmlns="http://org/opendaylight/transportpce/portmapping">
   <nodes>
-    <node-id>XPDR-C1</node-id>
+    <node-id>XPDR-A1</node-id>
     <mapping>
-      <logical-connection-point>XPDR1-CLIENT2</logical-connection-point>
-      <port-qual>xpdr-client</port-qual>
+      <logical-connection-point>XPDR1-NETWORK1</logical-connection-point>
+      <supporting-circuit-pack-name>1/0/1-PLUG-NET</supporting-circuit-pack-name>
+      <supported-interface-capability xmlns:x="http://org/openroadm/port/types">x:if-OCH</supported-interface-capability>
+      <lcp-hash-val>AMkDwQ7xTmRI</lcp-hash-val>
+      <port-direction>bidirectional</port-direction>
+      <supporting-port>1</supporting-port>
+      <port-qual>xpdr-network</port-qual>
+      <connection-map-lcp>XPDR1-CLIENT1</connection-map-lcp>
+    </mapping>
+    <mapping>
+      <logical-connection-point>XPDR1-NETWORK2</logical-connection-point>
+      <supporting-circuit-pack-name>1/0/2-PLUG-NET</supporting-circuit-pack-name>
+      <supported-interface-capability xmlns:x="http://org/openroadm/port/types">x:if-OCH</supported-interface-capability>
+      <lcp-hash-val>AMkDwQ7xTmRL</lcp-hash-val>
+      <port-direction>bidirectional</port-direction>
+      <supporting-port>1</supporting-port>
+      <port-qual>xpdr-network</port-qual>
+      <connection-map-lcp>XPDR1-CLIENT2</connection-map-lcp>
+    </mapping>
+    <mapping>
+      <logical-connection-point>XPDR1-CLIENT1</logical-connection-point>
+      <supporting-circuit-pack-name>1/0/1-PLUG-CLIENT</supporting-circuit-pack-name>
+      <supported-interface-capability xmlns:x="http://org/openroadm/port/types">x:if-100GE</supported-interface-capability>
+      <lcp-hash-val>AJUUr6I5fALj</lcp-hash-val>
+      <port-direction>bidirectional</port-direction>
       <supporting-port>C1</supporting-port>
+      <port-qual>xpdr-client</port-qual>
+      <connection-map-lcp>XPDR1-NETWORK1</connection-map-lcp>
+    </mapping>
+    <mapping>
+      <logical-connection-point>XPDR1-CLIENT2</logical-connection-point>
+      <supporting-circuit-pack-name>1/0/2-PLUG-CLIENT</supporting-circuit-pack-name>
+      <supported-interface-capability xmlns:x="http://org/openroadm/port/types">x:if-100GE</supported-interface-capability>
+      <lcp-hash-val>AJUUr6I5fALg</lcp-hash-val>
       <port-direction>bidirectional</port-direction>
-      <supported-interface-capability
-        xmlns:x="http://org/openroadm/port/types">x:if-100GE</supported-interface-capability>
+      <supporting-port>C1</supporting-port>
+      <port-qual>xpdr-client</port-qual>
       <connection-map-lcp>XPDR1-NETWORK2</connection-map-lcp>
-      <lcp-hash-val>fHpE8JbDyn4=</lcp-hash-val>
-      <supporting-circuit-pack-name>1/0/2-PLUG-CLIENT
-      </supporting-circuit-pack-name>
     </mapping>
+    <node-info>
+      <node-type>xpdr</node-type>
+      <node-model>model2</node-model>
+      <node-ip-address>1.2.3.4</node-ip-address>
+      <node-clli>NodeA</node-clli>
+      <openroadm-version>2.2.1</openroadm-version>
+      <node-vendor>vendorA</node-vendor>
+    </node-info>
+  </nodes>
+  <nodes>
+    <node-id>XPDR-C1</node-id>
     <mapping>
-      <logical-connection-point>XPDR1-NETWORK2
-      </logical-connection-point>
-      <port-qual>xpdr-network</port-qual>
+      <logical-connection-point>XPDR1-NETWORK1</logical-connection-point>
+      <supporting-circuit-pack-name>1/0/1-PLUG-NET</supporting-circuit-pack-name>
+      <supported-interface-capability xmlns:x="http://org/openroadm/port/types">x:if-OCH</supported-interface-capability>
+      <lcp-hash-val>AJUlmCIYKpQi</lcp-hash-val>
+      <port-direction>bidirectional</port-direction>
       <supporting-port>1</supporting-port>
+      <port-qual>xpdr-network</port-qual>
+      <connection-map-lcp>XPDR1-CLIENT1</connection-map-lcp>
+    </mapping>
+    <mapping>
+      <logical-connection-point>XPDR1-NETWORK2</logical-connection-point>
+      <supporting-circuit-pack-name>1/0/2-PLUG-NET</supporting-circuit-pack-name>
+      <supported-interface-capability xmlns:x="http://org/openroadm/port/types">x:if-OCH</supported-interface-capability>
+      <lcp-hash-val>AJUlmCIYKpQh</lcp-hash-val>
       <port-direction>bidirectional</port-direction>
-      <supported-interface-capability
-        xmlns:x="http://org/openroadm/port/types">x:if-OCH</supported-interface-capability>
+      <supporting-port>1</supporting-port>
+      <port-qual>xpdr-network</port-qual>
       <connection-map-lcp>XPDR1-CLIENT2</connection-map-lcp>
-      <lcp-hash-val>AJUlmCIYKpQh</lcp-hash-val>
-      <supporting-circuit-pack-name>1/0/2-PLUG-NET
-      </supporting-circuit-pack-name>
     </mapping>
     <mapping>
       <logical-connection-point>XPDR1-CLIENT1</logical-connection-point>
-      <port-qual>xpdr-client</port-qual>
-      <supporting-port>C1</supporting-port>
+      <supporting-circuit-pack-name>1/0/1-PLUG-CLIENT</supporting-circuit-pack-name>
+      <supported-interface-capability xmlns:x="http://org/openroadm/port/types">x:if-100GE</supported-interface-capability>
+      <lcp-hash-val>fHpE8JbDyn0=</lcp-hash-val>
       <port-direction>bidirectional</port-direction>
-      <supported-interface-capability
-        xmlns:x="http://org/openroadm/port/types">x:if-100GE</supported-interface-capability>
+      <supporting-port>C1</supporting-port>
+      <port-qual>xpdr-client</port-qual>
       <connection-map-lcp>XPDR1-NETWORK1</connection-map-lcp>
-      <lcp-hash-val>fHpE8JbDyn0=</lcp-hash-val>
-      <supporting-circuit-pack-name>1/0/1-PLUG-CLIENT
-      </supporting-circuit-pack-name>
     </mapping>
     <mapping>
-      <logical-connection-point>XPDR1-NETWORK1
-      </logical-connection-point>
-      <port-qual>xpdr-network</port-qual>
-      <supporting-port>1</supporting-port>
+      <logical-connection-point>XPDR1-CLIENT2</logical-connection-point>
+      <supporting-circuit-pack-name>1/0/2-PLUG-CLIENT</supporting-circuit-pack-name>
+      <supported-interface-capability xmlns:x="http://org/openroadm/port/types">x:if-100GE</supported-interface-capability>
+      <lcp-hash-val>fHpE8JbDyn4=</lcp-hash-val>
       <port-direction>bidirectional</port-direction>
-      <supported-interface-capability
-        xmlns:x="http://org/openroadm/port/types">x:if-OCH</supported-interface-capability>
-      <connection-map-lcp>XPDR1-CLIENT1</connection-map-lcp>
-      <lcp-hash-val>AJUlmCIYKpQi</lcp-hash-val>
-      <supporting-circuit-pack-name>1/0/1-PLUG-NET
-      </supporting-circuit-pack-name>
+      <supporting-port>C1</supporting-port>
+      <port-qual>xpdr-client</port-qual>
+      <connection-map-lcp>XPDR1-NETWORK2</connection-map-lcp>
     </mapping>
     <node-info>
+      <node-type>xpdr</node-type>
+      <node-model>model2</node-model>
+      <node-ip-address>1.2.3.5</node-ip-address>
       <node-clli>NodeC</node-clli>
+      <openroadm-version>2.2.1</openroadm-version>
       <node-vendor>vendorA</node-vendor>
+    </node-info>
+  </nodes>
+  <nodes>
+    <node-id>ROADM-C1</node-id>
+    <node-info>
+      <node-type>rdm</node-type>
       <node-model>model2</node-model>
-      <node-ip-address>1.2.3.5</node-ip-address>
-      <node-type>xpdr</node-type>
+      <node-ip-address>127.0.0.13</node-ip-address>
+      <node-clli>NodeC</node-clli>
       <openroadm-version>2.2.1</openroadm-version>
+      <node-vendor>vendorA</node-vendor>
     </node-info>
+    <cp-to-degree>
+      <circuit-pack-name>1/0/ETH-PLUG</circuit-pack-name>
+      <degree-number>1</degree-number>
+      <interface-name>1GE-interface-1</interface-name>
+    </cp-to-degree>
+    <cp-to-degree>
+      <circuit-pack-name>2/0</circuit-pack-name>
+      <degree-number>2</degree-number>
+      <interface-name>1GE-interface-2</interface-name>
+    </cp-to-degree>
+    <cp-to-degree>
+      <circuit-pack-name>2/0/ETH-PLUG</circuit-pack-name>
+      <degree-number>2</degree-number>
+      <interface-name>1GE-interface-2</interface-name>
+    </cp-to-degree>
+    <cp-to-degree>
+      <circuit-pack-name>1/0</circuit-pack-name>
+      <degree-number>1</degree-number>
+      <interface-name>1GE-interface-1</interface-name>
+    </cp-to-degree>
+    <mapping>
+      <logical-connection-point>SRG1-PP3-TXRX</logical-connection-point>
+      <supporting-circuit-pack-name>3/0</supporting-circuit-pack-name>
+      <port-direction>bidirectional</port-direction>
+      <supporting-port>C3</supporting-port>
+    </mapping>
+    <mapping>
+      <logical-connection-point>SRG1-PP1-TXRX</logical-connection-point>
+      <supporting-circuit-pack-name>3/0</supporting-circuit-pack-name>
+      <port-direction>bidirectional</port-direction>
+      <supporting-port>C1</supporting-port>
+    </mapping>
+    <mapping>
+      <logical-connection-point>DEG1-TTP-TXRX</logical-connection-point>
+      <supporting-oms>OMS-DEG1-TTP-TXRX</supporting-oms>
+      <supporting-circuit-pack-name>1/0</supporting-circuit-pack-name>
+      <supporting-ots>OTS-DEG1-TTP-TXRX</supporting-ots>
+      <port-direction>bidirectional</port-direction>
+      <supporting-port>L1</supporting-port>
+    </mapping>
+    <mapping>
+      <logical-connection-point>SRG1-PP2-TXRX</logical-connection-point>
+      <supporting-circuit-pack-name>3/0</supporting-circuit-pack-name>
+      <port-direction>bidirectional</port-direction>
+      <supporting-port>C2</supporting-port>
+    </mapping>
+    <mapping>
+      <logical-connection-point>SRG1-PP4-TXRX</logical-connection-point>
+      <supporting-circuit-pack-name>3/0</supporting-circuit-pack-name>
+      <port-direction>bidirectional</port-direction>
+      <supporting-port>C4</supporting-port>
+    </mapping>
+    <mapping>
+      <logical-connection-point>DEG2-TTP-TXRX</logical-connection-point>
+      <supporting-circuit-pack-name>2/0</supporting-circuit-pack-name>
+      <port-direction>bidirectional</port-direction>
+      <supporting-port>L1</supporting-port>
+    </mapping>
+    <mc-capabilities>
+      <mc-node-name>DEG2-TTP</mc-node-name>
+      <center-freq-granularity>50</center-freq-granularity>
+      <slot-width-granularity>50</slot-width-granularity>
+    </mc-capabilities>
+    <mc-capabilities>
+      <mc-node-name>DEG1-TTP</mc-node-name>
+      <center-freq-granularity>50</center-freq-granularity>
+      <slot-width-granularity>50</slot-width-granularity>
+    </mc-capabilities>
+    <mc-capabilities>
+      <mc-node-name>SRG1-PP</mc-node-name>
+      <center-freq-granularity>50</center-freq-granularity>
+      <slot-width-granularity>50</slot-width-granularity>
+    </mc-capabilities>
   </nodes>
   <nodes>
     <node-id>SPDR-SC1</node-id>
     <node-info>
-      <node-clli>NodeSC</node-clli>
-      <node-vendor>vendorC</node-vendor>
+      <node-type>xpdr</node-type>
       <node-model>universal-switchponder</node-model>
       <node-ip-address>1.2.3.6</node-ip-address>
-      <node-type>xpdr</node-type>
+      <node-clli>NodeSC</node-clli>
       <openroadm-version>2.2.1</openroadm-version>
+      <node-vendor>vendorC</node-vendor>
     </node-info>
     <switching-pool-lcp>
-      <switching-pool-number>1</switching-pool-number>
-      <switching-pool-type>non-blocking</switching-pool-type>
+      <switching-pool-number>3</switching-pool-number>
       <non-blocking-list>
-        <nbl-number>11</nbl-number>
-        <lcp-list>XPDR1-NETWORK1</lcp-list>
-        <lcp-list>XPDR1-CLIENT1</lcp-list>
+        <nbl-number>83</nbl-number>
+        <lcp-list>XPDR3-NETWORK1</lcp-list>
+        <lcp-list>XPDR3-CLIENT3</lcp-list>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
         <interconnect-bandwidth>0</interconnect-bandwidth>
-        <interconnect-bandwidth-unit>1000000000
-        </interconnect-bandwidth-unit>
       </non-blocking-list>
       <non-blocking-list>
-        <nbl-number>12</nbl-number>
-        <lcp-list>XPDR1-NETWORK1</lcp-list>
-        <lcp-list>XPDR1-CLIENT2</lcp-list>
+        <nbl-number>82</nbl-number>
+        <lcp-list>XPDR3-CLIENT2</lcp-list>
+        <lcp-list>XPDR3-NETWORK1</lcp-list>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
         <interconnect-bandwidth>0</interconnect-bandwidth>
-        <interconnect-bandwidth-unit>1000000000
-        </interconnect-bandwidth-unit>
       </non-blocking-list>
       <non-blocking-list>
-        <nbl-number>13</nbl-number>
-        <lcp-list>XPDR1-NETWORK1</lcp-list>
-        <lcp-list>XPDR1-CLIENT3</lcp-list>
+        <nbl-number>81</nbl-number>
+        <lcp-list>XPDR3-CLIENT1</lcp-list>
+        <lcp-list>XPDR3-NETWORK1</lcp-list>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
         <interconnect-bandwidth>0</interconnect-bandwidth>
-        <interconnect-bandwidth-unit>1000000000
-        </interconnect-bandwidth-unit>
       </non-blocking-list>
       <non-blocking-list>
-        <nbl-number>14</nbl-number>
-        <lcp-list>XPDR1-CLIENT4</lcp-list>
-        <lcp-list>XPDR1-NETWORK1</lcp-list>
+        <nbl-number>84</nbl-number>
+        <lcp-list>XPDR3-NETWORK1</lcp-list>
+        <lcp-list>XPDR3-CLIENT4</lcp-list>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
         <interconnect-bandwidth>0</interconnect-bandwidth>
-        <interconnect-bandwidth-unit>1000000000
-        </interconnect-bandwidth-unit>
       </non-blocking-list>
+      <switching-pool-type>non-blocking</switching-pool-type>
     </switching-pool-lcp>
     <switching-pool-lcp>
       <switching-pool-number>2</switching-pool-number>
-      <switching-pool-type>non-blocking</switching-pool-type>
       <non-blocking-list>
         <nbl-number>2</nbl-number>
-        <lcp-list>XPDR2-NETWORK1</lcp-list>
         <lcp-list>XPDR2-CLIENT4</lcp-list>
-        <lcp-list>XPDR2-CLIENT3</lcp-list>
-        <lcp-list>XPDR2-CLIENT2</lcp-list>
-        <lcp-list>XPDR2-CLIENT1</lcp-list>
-        <lcp-list>XPDR2-NETWORK3</lcp-list>
+        <lcp-list>XPDR2-NETWORK1</lcp-list>
         <lcp-list>XPDR2-NETWORK2</lcp-list>
+        <lcp-list>XPDR2-NETWORK3</lcp-list>
         <lcp-list>XPDR2-NETWORK4</lcp-list>
+        <lcp-list>XPDR2-CLIENT1</lcp-list>
+        <lcp-list>XPDR2-CLIENT3</lcp-list>
+        <lcp-list>XPDR2-CLIENT2</lcp-list>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
         <interconnect-bandwidth>0</interconnect-bandwidth>
-        <interconnect-bandwidth-unit>1000000000
-        </interconnect-bandwidth-unit>
       </non-blocking-list>
+      <switching-pool-type>non-blocking</switching-pool-type>
+    </switching-pool-lcp>
+    <switching-pool-lcp>
+      <switching-pool-number>1</switching-pool-number>
+      <non-blocking-list>
+        <nbl-number>11</nbl-number>
+        <lcp-list>XPDR1-CLIENT1</lcp-list>
+        <lcp-list>XPDR1-NETWORK1</lcp-list>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>14</nbl-number>
+        <lcp-list>XPDR1-CLIENT4</lcp-list>
+        <lcp-list>XPDR1-NETWORK1</lcp-list>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>13</nbl-number>
+        <lcp-list>XPDR1-NETWORK1</lcp-list>
+        <lcp-list>XPDR1-CLIENT3</lcp-list>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>12</nbl-number>
+        <lcp-list>XPDR1-CLIENT2</lcp-list>
+        <lcp-list>XPDR1-NETWORK1</lcp-list>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+      </non-blocking-list>
+      <switching-pool-type>non-blocking</switching-pool-type>
     </switching-pool-lcp>
     <mapping>
-      <logical-connection-point>XPDR2-CLIENT3</logical-connection-point>
-      <port-qual>switch-client</port-qual>
-      <supporting-port>CP2-QSFP3-P1</supporting-port>
+      <logical-connection-point>XPDR2-CLIENT2</logical-connection-point>
+      <supporting-circuit-pack-name>CP2-QSFP2</supporting-circuit-pack-name>
+      <supported-interface-capability xmlns:x="http://org/openroadm/port/types">x:if-100GE-ODU4</supported-interface-capability>
+      <supported-interface-capability xmlns:x="http://org/openroadm/port/types">x:if-100GE</supported-interface-capability>
+      <lcp-hash-val>BVSiXSSYUCM=</lcp-hash-val>
       <port-direction>bidirectional</port-direction>
-      <supported-interface-capability
-        xmlns:x="http://org/openroadm/port/types">x:if-100GE-ODU4</supported-interface-capability>
-      <supported-interface-capability
-        xmlns:x="http://org/openroadm/port/types">x:if-100GE</supported-interface-capability>
-      <lcp-hash-val>BVSiXSSYUCI=</lcp-hash-val>
-      <supporting-circuit-pack-name>CP2-QSFP3
-      </supporting-circuit-pack-name>
+      <supporting-port>CP2-QSFP2-P1</supporting-port>
+      <port-qual>switch-client</port-qual>
     </mapping>
     <mapping>
-      <logical-connection-point>XPDR2-CLIENT4</logical-connection-point>
-      <port-qual>switch-client</port-qual>
-      <supporting-port>CP2-QSFP4-P1</supporting-port>
+      <logical-connection-point>XPDR3-CLIENT4</logical-connection-point>
+      <supporting-circuit-pack-name>CP3-SFP4</supporting-circuit-pack-name>
+      <supported-interface-capability xmlns:x="http://org/openroadm/port/types">x:if-1GE-ODU0</supported-interface-capability>
+      <lcp-hash-val>E4PhpLpbz0Q=</lcp-hash-val>
       <port-direction>bidirectional</port-direction>
-      <supported-interface-capability
-        xmlns:x="http://org/openroadm/port/types">x:if-100GE-ODU4</supported-interface-capability>
-      <supported-interface-capability
-        xmlns:x="http://org/openroadm/port/types">x:if-100GE</supported-interface-capability>
-      <lcp-hash-val>BVSiXSSYUCU=</lcp-hash-val>
-      <supporting-circuit-pack-name>CP2-QSFP4
-      </supporting-circuit-pack-name>
+      <supporting-port>CP3-SFP4-P1</supporting-port>
+      <port-qual>xpdr-client</port-qual>
     </mapping>
     <mapping>
       <logical-connection-point>XPDR2-CLIENT1</logical-connection-point>
-      <port-qual>switch-client</port-qual>
-      <supporting-port>CP2-QSFP1-P1</supporting-port>
-      <port-direction>bidirectional</port-direction>
-      <supported-interface-capability
-        xmlns:x="http://org/openroadm/port/types">x:if-100GE-ODU4</supported-interface-capability>
-      <supported-interface-capability
-        xmlns:x="http://org/openroadm/port/types">x:if-100GE</supported-interface-capability>
+      <supporting-circuit-pack-name>CP2-QSFP1</supporting-circuit-pack-name>
+      <supported-interface-capability xmlns:x="http://org/openroadm/port/types">x:if-100GE-ODU4</supported-interface-capability>
+      <supported-interface-capability xmlns:x="http://org/openroadm/port/types">x:if-100GE</supported-interface-capability>
       <lcp-hash-val>BVSiXSSYUCA=</lcp-hash-val>
-      <supporting-circuit-pack-name>CP2-QSFP1
-      </supporting-circuit-pack-name>
+      <port-direction>bidirectional</port-direction>
+      <supporting-port>CP2-QSFP1-P1</supporting-port>
+      <port-qual>switch-client</port-qual>
     </mapping>
     <mapping>
-      <logical-connection-point>XPDR2-CLIENT2</logical-connection-point>
-      <port-qual>switch-client</port-qual>
-      <supporting-port>CP2-QSFP2-P1</supporting-port>
+      <logical-connection-point>XPDR2-CLIENT4</logical-connection-point>
+      <supporting-circuit-pack-name>CP2-QSFP4</supporting-circuit-pack-name>
+      <supported-interface-capability xmlns:x="http://org/openroadm/port/types">x:if-100GE-ODU4</supported-interface-capability>
+      <supported-interface-capability xmlns:x="http://org/openroadm/port/types">x:if-100GE</supported-interface-capability>
+      <lcp-hash-val>BVSiXSSYUCU=</lcp-hash-val>
       <port-direction>bidirectional</port-direction>
-      <supported-interface-capability
-        xmlns:x="http://org/openroadm/port/types">x:if-100GE-ODU4</supported-interface-capability>
-      <supported-interface-capability
-        xmlns:x="http://org/openroadm/port/types">x:if-100GE</supported-interface-capability>
-      <lcp-hash-val>BVSiXSSYUCM=</lcp-hash-val>
-      <supporting-circuit-pack-name>CP2-QSFP2
-      </supporting-circuit-pack-name>
+      <supporting-port>CP2-QSFP4-P1</supporting-port>
+      <port-qual>switch-client</port-qual>
     </mapping>
     <mapping>
-      <logical-connection-point>XPDR1-CLIENT3</logical-connection-point>
-      <port-qual>xpdr-client</port-qual>
-      <supporting-port>CP1-SFP3-P1</supporting-port>
+      <logical-connection-point>XPDR3-NETWORK1</logical-connection-point>
+      <supporting-circuit-pack-name>CP3-CFP0</supporting-circuit-pack-name>
+      <supported-interface-capability xmlns:x="http://org/openroadm/port/types">x:if-OCH-OTU4-ODU4</supported-interface-capability>
+      <lcp-hash-val>FBhfaeWn4kY=</lcp-hash-val>
       <port-direction>bidirectional</port-direction>
-      <supported-interface-capability
-        xmlns:x="http://org/openroadm/port/types">x:if-10GE-ODU2</supported-interface-capability>
-      <supported-interface-capability
-        xmlns:x="http://org/openroadm/port/types">x:if-10GE-ODU2e</supported-interface-capability>
-      <supported-interface-capability
-        xmlns:x="http://org/openroadm/port/types">x:if-10GE</supported-interface-capability>
-      <lcp-hash-val>L0PHYLgz3+E=</lcp-hash-val>
-      <supporting-circuit-pack-name>CP1-SFP3
-      </supporting-circuit-pack-name>
+      <xponder-type>mpdr</xponder-type>
+      <supporting-port>CP3-CFP0-P1</supporting-port>
+      <port-qual>xpdr-network</port-qual>
     </mapping>
     <mapping>
-      <logical-connection-point>XPDR1-CLIENT2</logical-connection-point>
-      <port-qual>xpdr-client</port-qual>
-      <supporting-port>CP1-SFP2-P1</supporting-port>
+      <logical-connection-point>XPDR2-CLIENT3</logical-connection-point>
+      <supporting-circuit-pack-name>CP2-QSFP3</supporting-circuit-pack-name>
+      <supported-interface-capability xmlns:x="http://org/openroadm/port/types">x:if-100GE-ODU4</supported-interface-capability>
+      <supported-interface-capability xmlns:x="http://org/openroadm/port/types">x:if-100GE</supported-interface-capability>
+      <lcp-hash-val>BVSiXSSYUCI=</lcp-hash-val>
       <port-direction>bidirectional</port-direction>
-      <supported-interface-capability
-        xmlns:x="http://org/openroadm/port/types">x:if-10GE-ODU2</supported-interface-capability>
-      <supported-interface-capability
-        xmlns:x="http://org/openroadm/port/types">x:if-10GE-ODU2e</supported-interface-capability>
-      <lcp-hash-val>L0PHYLgz3+A=</lcp-hash-val>
-      <supporting-circuit-pack-name>CP1-SFP2
-      </supporting-circuit-pack-name>
+      <supporting-port>CP2-QSFP3-P1</supporting-port>
+      <port-qual>switch-client</port-qual>
     </mapping>
     <mapping>
-      <logical-connection-point>XPDR1-CLIENT4</logical-connection-point>
+      <logical-connection-point>XPDR1-CLIENT1</logical-connection-point>
+      <supporting-circuit-pack-name>CP1-SFP1</supporting-circuit-pack-name>
+      <supported-interface-capability xmlns:x="http://org/openroadm/port/types">x:if-10GE-ODU2e</supported-interface-capability>
+      <supported-interface-capability xmlns:x="http://org/openroadm/port/types">x:if-10GE-ODU2</supported-interface-capability>
+      <lcp-hash-val>L0PHYLgz3+M=</lcp-hash-val>
+      <port-direction>bidirectional</port-direction>
+      <supporting-port>CP1-SFP1-P1</supporting-port>
       <port-qual>xpdr-client</port-qual>
-      <supporting-port>CP1-SFP4-P1</supporting-port>
+    </mapping>
+    <mapping>
+      <logical-connection-point>XPDR1-CLIENT2</logical-connection-point>
+      <supporting-circuit-pack-name>CP1-SFP2</supporting-circuit-pack-name>
+      <supported-interface-capability xmlns:x="http://org/openroadm/port/types">x:if-10GE-ODU2e</supported-interface-capability>
+      <supported-interface-capability xmlns:x="http://org/openroadm/port/types">x:if-10GE-ODU2</supported-interface-capability>
+      <lcp-hash-val>L0PHYLgz3+A=</lcp-hash-val>
       <port-direction>bidirectional</port-direction>
-      <supported-interface-capability
-        xmlns:x="http://org/openroadm/port/types">x:if-10GE-ODU2</supported-interface-capability>
-      <supported-interface-capability
-        xmlns:x="http://org/openroadm/port/types">x:if-10GE-ODU2e</supported-interface-capability>
-      <supported-interface-capability
-        xmlns:x="http://org/openroadm/port/types">x:if-10GE</supported-interface-capability>
-      <lcp-hash-val>L0PHYLgz3+Y=</lcp-hash-val>
-      <supporting-circuit-pack-name>CP1-SFP4
-      </supporting-circuit-pack-name>
+      <supporting-port>CP1-SFP2-P1</supporting-port>
+      <port-qual>xpdr-client</port-qual>
     </mapping>
     <mapping>
-      <logical-connection-point>XPDR1-CLIENT1</logical-connection-point>
+      <logical-connection-point>XPDR1-CLIENT3</logical-connection-point>
+      <supporting-circuit-pack-name>CP1-SFP3</supporting-circuit-pack-name>
+      <supported-interface-capability xmlns:x="http://org/openroadm/port/types">x:if-10GE</supported-interface-capability>
+      <supported-interface-capability xmlns:x="http://org/openroadm/port/types">x:if-10GE-ODU2</supported-interface-capability>
+      <supported-interface-capability xmlns:x="http://org/openroadm/port/types">x:if-10GE-ODU2e</supported-interface-capability>
+      <lcp-hash-val>L0PHYLgz3+E=</lcp-hash-val>
+      <port-direction>bidirectional</port-direction>
+      <supporting-port>CP1-SFP3-P1</supporting-port>
       <port-qual>xpdr-client</port-qual>
-      <supporting-port>CP1-SFP1-P1</supporting-port>
+    </mapping>
+    <mapping>
+      <logical-connection-point>XPDR1-CLIENT4</logical-connection-point>
+      <supporting-circuit-pack-name>CP1-SFP4</supporting-circuit-pack-name>
+      <supported-interface-capability xmlns:x="http://org/openroadm/port/types">x:if-10GE</supported-interface-capability>
+      <supported-interface-capability xmlns:x="http://org/openroadm/port/types">x:if-10GE-ODU2</supported-interface-capability>
+      <supported-interface-capability xmlns:x="http://org/openroadm/port/types">x:if-10GE-ODU2e</supported-interface-capability>
+      <lcp-hash-val>L0PHYLgz3+Y=</lcp-hash-val>
       <port-direction>bidirectional</port-direction>
-      <supported-interface-capability
-        xmlns:x="http://org/openroadm/port/types">x:if-10GE-ODU2</supported-interface-capability>
-      <supported-interface-capability
-        xmlns:x="http://org/openroadm/port/types">x:if-10GE-ODU2e</supported-interface-capability>
-      <lcp-hash-val>L0PHYLgz3+M=</lcp-hash-val>
-      <supporting-circuit-pack-name>CP1-SFP1
-      </supporting-circuit-pack-name>
+      <supporting-port>CP1-SFP4-P1</supporting-port>
+      <port-qual>xpdr-client</port-qual>
     </mapping>
     <mapping>
-      <logical-connection-point>XPDR2-NETWORK3
-      </logical-connection-point>
-      <port-qual>switch-network</port-qual>
-      <supporting-port>CP8-CFP-P1</supporting-port>
+      <logical-connection-point>XPDR2-NETWORK1</logical-connection-point>
+      <supporting-circuit-pack-name>CP6-CFP</supporting-circuit-pack-name>
+      <supported-interface-capability xmlns:x="http://org/openroadm/port/types">x:if-OCH-OTU4-ODU4</supported-interface-capability>
+      <lcp-hash-val>ALx70DYYfGTx</lcp-hash-val>
       <port-direction>bidirectional</port-direction>
-      <supported-interface-capability
-        xmlns:x="http://org/openroadm/port/types">x:if-OCH-OTU4-ODU4</supported-interface-capability>
-      <lcp-hash-val>ALx70DYYfGTz</lcp-hash-val>
       <xponder-type>switch</xponder-type>
-      <supporting-circuit-pack-name>CP8-CFP
-      </supporting-circuit-pack-name>
+      <supporting-port>CP6-CFP-P1</supporting-port>
+      <port-qual>switch-network</port-qual>
     </mapping>
     <mapping>
-      <logical-connection-point>XPDR2-NETWORK2
-      </logical-connection-point>
-      <port-qual>switch-network</port-qual>
-      <supporting-port>CP7-CFP-P1</supporting-port>
-      <port-direction>bidirectional</port-direction>
-      <supported-interface-capability
-        xmlns:x="http://org/openroadm/port/types">x:if-OCH-OTU4-ODU4</supported-interface-capability>
+      <logical-connection-point>XPDR2-NETWORK2</logical-connection-point>
+      <supporting-circuit-pack-name>CP7-CFP</supporting-circuit-pack-name>
+      <supported-interface-capability xmlns:x="http://org/openroadm/port/types">x:if-OCH-OTU4-ODU4</supported-interface-capability>
       <lcp-hash-val>ALx70DYYfGTy</lcp-hash-val>
+      <port-direction>bidirectional</port-direction>
       <xponder-type>switch</xponder-type>
-      <supporting-circuit-pack-name>CP7-CFP
-      </supporting-circuit-pack-name>
+      <supporting-port>CP7-CFP-P1</supporting-port>
+      <port-qual>switch-network</port-qual>
     </mapping>
     <mapping>
-      <logical-connection-point>XPDR2-NETWORK4
-      </logical-connection-point>
-      <port-qual>switch-network</port-qual>
-      <supporting-port>CP5-CFP-P1</supporting-port>
+      <logical-connection-point>XPDR2-NETWORK3</logical-connection-point>
+      <supporting-circuit-pack-name>CP8-CFP</supporting-circuit-pack-name>
+      <supported-interface-capability xmlns:x="http://org/openroadm/port/types">x:if-OCH-OTU4-ODU4</supported-interface-capability>
+      <lcp-hash-val>ALx70DYYfGTz</lcp-hash-val>
       <port-direction>bidirectional</port-direction>
-      <supported-interface-capability
-        xmlns:x="http://org/openroadm/port/types">x:if-OCH-OTU4-ODU4</supported-interface-capability>
-      <lcp-hash-val>ALx70DYYfGT0</lcp-hash-val>
       <xponder-type>switch</xponder-type>
-      <supporting-circuit-pack-name>CP5-CFP
-      </supporting-circuit-pack-name>
+      <supporting-port>CP8-CFP-P1</supporting-port>
+      <port-qual>switch-network</port-qual>
     </mapping>
     <mapping>
-      <logical-connection-point>XPDR2-NETWORK1
-      </logical-connection-point>
-      <port-qual>switch-network</port-qual>
-      <supporting-port>CP6-CFP-P1</supporting-port>
+      <logical-connection-point>XPDR2-NETWORK4</logical-connection-point>
+      <supporting-circuit-pack-name>CP5-CFP</supporting-circuit-pack-name>
+      <supported-interface-capability xmlns:x="http://org/openroadm/port/types">x:if-OCH-OTU4-ODU4</supported-interface-capability>
+      <lcp-hash-val>ALx70DYYfGT0</lcp-hash-val>
       <port-direction>bidirectional</port-direction>
-      <supported-interface-capability
-        xmlns:x="http://org/openroadm/port/types">x:if-OCH-OTU4-ODU4</supported-interface-capability>
-      <lcp-hash-val>ALx70DYYfGTx</lcp-hash-val>
       <xponder-type>switch</xponder-type>
-      <supporting-circuit-pack-name>CP6-CFP
-      </supporting-circuit-pack-name>
+      <supporting-port>CP5-CFP-P1</supporting-port>
+      <port-qual>switch-network</port-qual>
     </mapping>
     <mapping>
-      <logical-connection-point>XPDR1-NETWORK1
-      </logical-connection-point>
-      <port-qual>xpdr-network</port-qual>
-      <supporting-port>CP1-CFP0-P1</supporting-port>
-      <port-direction>bidirectional</port-direction>
-      <supported-interface-capability
-        xmlns:x="http://org/openroadm/port/types">x:if-OCH-OTU4-ODU4</supported-interface-capability>
+      <logical-connection-point>XPDR1-NETWORK1</logical-connection-point>
+      <supporting-circuit-pack-name>CP1-CFP0</supporting-circuit-pack-name>
+      <supported-interface-capability xmlns:x="http://org/openroadm/port/types">x:if-OCH-OTU4-ODU4</supported-interface-capability>
       <lcp-hash-val>fuYZwEO660g=</lcp-hash-val>
+      <port-direction>bidirectional</port-direction>
       <xponder-type>mpdr</xponder-type>
-      <supporting-circuit-pack-name>CP1-CFP0
-      </supporting-circuit-pack-name>
+      <supporting-port>CP1-CFP0-P1</supporting-port>
+      <port-qual>xpdr-network</port-qual>
+    </mapping>
+    <mapping>
+      <logical-connection-point>XPDR3-CLIENT1</logical-connection-point>
+      <supporting-circuit-pack-name>CP3-SFP1</supporting-circuit-pack-name>
+      <supported-interface-capability xmlns:x="http://org/openroadm/port/types">x:if-1GE-ODU0</supported-interface-capability>
+      <lcp-hash-val>E4PhpLpbz0E=</lcp-hash-val>
+      <port-direction>bidirectional</port-direction>
+      <supporting-port>CP3-SFP1-P1</supporting-port>
+      <port-qual>xpdr-client</port-qual>
+    </mapping>
+    <mapping>
+      <logical-connection-point>XPDR3-CLIENT3</logical-connection-point>
+      <supporting-circuit-pack-name>CP3-SFP3</supporting-circuit-pack-name>
+      <supported-interface-capability xmlns:x="http://org/openroadm/port/types">x:if-1GE-ODU0</supported-interface-capability>
+      <lcp-hash-val>E4PhpLpbz0M=</lcp-hash-val>
+      <port-direction>bidirectional</port-direction>
+      <supporting-port>CP3-SFP3-P1</supporting-port>
+      <port-qual>xpdr-client</port-qual>
+    </mapping>
+    <mapping>
+      <logical-connection-point>XPDR3-CLIENT2</logical-connection-point>
+      <supporting-circuit-pack-name>CP3-SFP2</supporting-circuit-pack-name>
+      <supported-interface-capability xmlns:x="http://org/openroadm/port/types">x:if-1GE-ODU0</supported-interface-capability>
+      <lcp-hash-val>E4PhpLpbz0I=</lcp-hash-val>
+      <port-direction>bidirectional</port-direction>
+      <supporting-port>CP3-SFP2-P1</supporting-port>
+      <port-qual>xpdr-client</port-qual>
     </mapping>
   </nodes>
   <nodes>
     <node-id>SPDR-SA1</node-id>
     <node-info>
-      <node-clli>NodeSA</node-clli>
-      <node-vendor>vendorA</node-vendor>
-      <node-model>universal-switchponder</node-model>
-      <node-ip-address>1.2.3.4</node-ip-address>
       <node-type>xpdr</node-type>
+      <node-model>universal-switchponder</node-model>
+      <node-ip-address>1.2.3.6</node-ip-address>
+      <node-clli>NodeSC</node-clli>
       <openroadm-version>2.2.1</openroadm-version>
+      <node-vendor>vendorC</node-vendor>
     </node-info>
     <switching-pool-lcp>
-      <switching-pool-number>1</switching-pool-number>
-      <switching-pool-type>non-blocking</switching-pool-type>
+      <switching-pool-number>3</switching-pool-number>
       <non-blocking-list>
-        <nbl-number>11</nbl-number>
-        <lcp-list>XPDR1-NETWORK1</lcp-list>
-        <lcp-list>XPDR1-CLIENT1</lcp-list>
+        <nbl-number>83</nbl-number>
+        <lcp-list>XPDR3-NETWORK1</lcp-list>
+        <lcp-list>XPDR3-CLIENT3</lcp-list>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
         <interconnect-bandwidth>0</interconnect-bandwidth>
-        <interconnect-bandwidth-unit>1000000000
-        </interconnect-bandwidth-unit>
       </non-blocking-list>
       <non-blocking-list>
-        <nbl-number>12</nbl-number>
-        <lcp-list>XPDR1-NETWORK1</lcp-list>
-        <lcp-list>XPDR1-CLIENT2</lcp-list>
+        <nbl-number>82</nbl-number>
+        <lcp-list>XPDR3-CLIENT2</lcp-list>
+        <lcp-list>XPDR3-NETWORK1</lcp-list>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
         <interconnect-bandwidth>0</interconnect-bandwidth>
-        <interconnect-bandwidth-unit>1000000000
-        </interconnect-bandwidth-unit>
       </non-blocking-list>
       <non-blocking-list>
-        <nbl-number>13</nbl-number>
-        <lcp-list>XPDR1-NETWORK1</lcp-list>
-        <lcp-list>XPDR1-CLIENT3</lcp-list>
+        <nbl-number>81</nbl-number>
+        <lcp-list>XPDR3-CLIENT1</lcp-list>
+        <lcp-list>XPDR3-NETWORK1</lcp-list>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
         <interconnect-bandwidth>0</interconnect-bandwidth>
-        <interconnect-bandwidth-unit>1000000000
-        </interconnect-bandwidth-unit>
       </non-blocking-list>
       <non-blocking-list>
-        <nbl-number>14</nbl-number>
-        <lcp-list>XPDR1-CLIENT4</lcp-list>
-        <lcp-list>XPDR1-NETWORK1</lcp-list>
+        <nbl-number>84</nbl-number>
+        <lcp-list>XPDR3-NETWORK1</lcp-list>
+        <lcp-list>XPDR3-CLIENT4</lcp-list>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
         <interconnect-bandwidth>0</interconnect-bandwidth>
-        <interconnect-bandwidth-unit>1000000000
-        </interconnect-bandwidth-unit>
       </non-blocking-list>
+      <switching-pool-type>non-blocking</switching-pool-type>
     </switching-pool-lcp>
     <switching-pool-lcp>
       <switching-pool-number>2</switching-pool-number>
-      <switching-pool-type>non-blocking</switching-pool-type>
       <non-blocking-list>
         <nbl-number>2</nbl-number>
-        <lcp-list>XPDR2-NETWORK1</lcp-list>
         <lcp-list>XPDR2-CLIENT4</lcp-list>
-        <lcp-list>XPDR2-CLIENT3</lcp-list>
-        <lcp-list>XPDR2-CLIENT2</lcp-list>
-        <lcp-list>XPDR2-CLIENT1</lcp-list>
-        <lcp-list>XPDR2-NETWORK3</lcp-list>
+        <lcp-list>XPDR2-NETWORK1</lcp-list>
         <lcp-list>XPDR2-NETWORK2</lcp-list>
+        <lcp-list>XPDR2-NETWORK3</lcp-list>
         <lcp-list>XPDR2-NETWORK4</lcp-list>
+        <lcp-list>XPDR2-CLIENT1</lcp-list>
+        <lcp-list>XPDR2-CLIENT3</lcp-list>
+        <lcp-list>XPDR2-CLIENT2</lcp-list>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
         <interconnect-bandwidth>0</interconnect-bandwidth>
-        <interconnect-bandwidth-unit>1000000000
-        </interconnect-bandwidth-unit>
       </non-blocking-list>
+      <switching-pool-type>non-blocking</switching-pool-type>
+    </switching-pool-lcp>
+    <switching-pool-lcp>
+      <switching-pool-number>1</switching-pool-number>
+      <non-blocking-list>
+        <nbl-number>11</nbl-number>
+        <lcp-list>XPDR1-CLIENT1</lcp-list>
+        <lcp-list>XPDR1-NETWORK1</lcp-list>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>14</nbl-number>
+        <lcp-list>XPDR1-CLIENT4</lcp-list>
+        <lcp-list>XPDR1-NETWORK1</lcp-list>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>13</nbl-number>
+        <lcp-list>XPDR1-NETWORK1</lcp-list>
+        <lcp-list>XPDR1-CLIENT3</lcp-list>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+      </non-blocking-list>
+      <non-blocking-list>
+        <nbl-number>12</nbl-number>
+        <lcp-list>XPDR1-CLIENT2</lcp-list>
+        <lcp-list>XPDR1-NETWORK1</lcp-list>
+        <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+        <interconnect-bandwidth>0</interconnect-bandwidth>
+      </non-blocking-list>
+      <switching-pool-type>non-blocking</switching-pool-type>
     </switching-pool-lcp>
     <mapping>
-      <logical-connection-point>XPDR2-CLIENT3</logical-connection-point>
-      <port-qual>switch-client</port-qual>
-      <supporting-port>CP2-QSFP3-P1</supporting-port>
-      <port-direction>bidirectional</port-direction>
-      <supported-interface-capability
-        xmlns:x="http://org/openroadm/port/types">x:if-100GE-ODU4</supported-interface-capability>
-      <supported-interface-capability
-        xmlns:x="http://org/openroadm/port/types">x:if-100GE</supported-interface-capability>
-      <lcp-hash-val>AN/WSSRXne3s</lcp-hash-val>
-      <supporting-circuit-pack-name>CP2-QSFP3
-      </supporting-circuit-pack-name>
-    </mapping>
-    <mapping>
-      <logical-connection-point>XPDR2-CLIENT4</logical-connection-point>
-      <port-qual>switch-client</port-qual>
-      <supporting-port>CP2-QSFP4-P1</supporting-port>
-      <port-direction>bidirectional</port-direction>
-      <supported-interface-capability
-        xmlns:x="http://org/openroadm/port/types">x:if-100GE-ODU4</supported-interface-capability>
-      <supported-interface-capability
-        xmlns:x="http://org/openroadm/port/types">x:if-100GE</supported-interface-capability>
-      <lcp-hash-val>AN/WSSRXne3r</lcp-hash-val>
-      <supporting-circuit-pack-name>CP2-QSFP4
-      </supporting-circuit-pack-name>
-    </mapping>
-    <mapping>
-      <logical-connection-point>XPDR2-CLIENT1</logical-connection-point>
-      <port-qual>switch-client</port-qual>
-      <supporting-port>CP2-QSFP1-P1</supporting-port>
-      <port-direction>bidirectional</port-direction>
-      <supported-interface-capability
-        xmlns:x="http://org/openroadm/port/types">x:if-100GE-ODU4</supported-interface-capability>
-      <supported-interface-capability
-        xmlns:x="http://org/openroadm/port/types">x:if-100GE</supported-interface-capability>
-      <lcp-hash-val>AN/WSSRXne3u</lcp-hash-val>
-      <supporting-circuit-pack-name>CP2-QSFP1
-      </supporting-circuit-pack-name>
-    </mapping>
-    <mapping>
-      <logical-connection-point>XPDR2-CLIENT2</logical-connection-point>
-      <port-qual>switch-client</port-qual>
-      <supporting-port>CP2-QSFP2-P1</supporting-port>
-      <port-direction>bidirectional</port-direction>
-      <supported-interface-capability
-        xmlns:x="http://org/openroadm/port/types">x:if-100GE-ODU4</supported-interface-capability>
-      <supported-interface-capability
-        xmlns:x="http://org/openroadm/port/types">x:if-100GE</supported-interface-capability>
-      <lcp-hash-val>AN/WSSRXne3t</lcp-hash-val>
-      <supporting-circuit-pack-name>CP2-QSFP2
-      </supporting-circuit-pack-name>
-    </mapping>
-    <mapping>
-      <logical-connection-point>XPDR1-CLIENT3</logical-connection-point>
-      <port-qual>xpdr-client</port-qual>
-      <supporting-port>CP1-SFP3-P1</supporting-port>
-      <port-direction>bidirectional</port-direction>
-      <supported-interface-capability
-        xmlns:x="http://org/openroadm/port/types">x:if-10GE-ODU2</supported-interface-capability>
-      <supported-interface-capability
-        xmlns:x="http://org/openroadm/port/types">x:if-10GE-ODU2e</supported-interface-capability>
-      <supported-interface-capability
-        xmlns:x="http://org/openroadm/port/types">x:if-10GE</supported-interface-capability>
-      <lcp-hash-val>FqlcrxV7p38=</lcp-hash-val>
-      <supporting-circuit-pack-name>CP1-SFP3
-      </supporting-circuit-pack-name>
-    </mapping>
-    <mapping>
-      <logical-connection-point>XPDR1-CLIENT2</logical-connection-point>
-      <port-qual>xpdr-client</port-qual>
-      <supporting-port>CP1-SFP2-P1</supporting-port>
-      <port-direction>bidirectional</port-direction>
-      <supported-interface-capability
-        xmlns:x="http://org/openroadm/port/types">x:if-10GE-ODU2</supported-interface-capability>
-      <supported-interface-capability
-        xmlns:x="http://org/openroadm/port/types">x:if-10GE-ODU2e</supported-interface-capability>
-      <lcp-hash-val>FqlcrxV7p34=</lcp-hash-val>
-      <supporting-circuit-pack-name>CP1-SFP2
-      </supporting-circuit-pack-name>
-    </mapping>
-    <mapping>
-      <logical-connection-point>XPDR1-CLIENT4</logical-connection-point>
-      <port-qual>xpdr-client</port-qual>
-      <supporting-port>CP1-SFP4-P1</supporting-port>
+      <logical-connection-point>XPDR2-CLIENT2</logical-connection-point>
+      <supporting-circuit-pack-name>CP2-QSFP2</supporting-circuit-pack-name>
+      <supported-interface-capability xmlns:x="http://org/openroadm/port/types">x:if-100GE-ODU4</supported-interface-capability>
+      <supported-interface-capability xmlns:x="http://org/openroadm/port/types">x:if-100GE</supported-interface-capability>
+      <lcp-hash-val>AN/WSSRXne3t</lcp-hash-val>
       <port-direction>bidirectional</port-direction>
-      <supported-interface-capability
-        xmlns:x="http://org/openroadm/port/types">x:if-10GE-ODU2</supported-interface-capability>
-      <supported-interface-capability
-        xmlns:x="http://org/openroadm/port/types">x:if-10GE-ODU2e</supported-interface-capability>
-      <supported-interface-capability
-        xmlns:x="http://org/openroadm/port/types">x:if-10GE</supported-interface-capability>
-      <lcp-hash-val>FqlcrxV7p3g=</lcp-hash-val>
-      <supporting-circuit-pack-name>CP1-SFP4
-      </supporting-circuit-pack-name>
+      <supporting-port>CP2-QSFP2-P1</supporting-port>
+      <port-qual>switch-client</port-qual>
     </mapping>
     <mapping>
-      <logical-connection-point>XPDR1-CLIENT1</logical-connection-point>
-      <port-qual>xpdr-client</port-qual>
-      <supporting-port>CP1-SFP1-P1</supporting-port>
+      <logical-connection-point>XPDR3-CLIENT4</logical-connection-point>
+      <supporting-circuit-pack-name>CP3-SFP4</supporting-circuit-pack-name>
+      <supported-interface-capability xmlns:x="http://org/openroadm/port/types">x:if-1GE-ODU0</supported-interface-capability>
+      <lcp-hash-val>AKsQ/HRQdtdK</lcp-hash-val>
       <port-direction>bidirectional</port-direction>
-      <supported-interface-capability
-        xmlns:x="http://org/openroadm/port/types">x:if-10GE-ODU2</supported-interface-capability>
-      <supported-interface-capability
-        xmlns:x="http://org/openroadm/port/types">x:if-10GE-ODU2e</supported-interface-capability>
-      <lcp-hash-val>FqlcrxV7p30=</lcp-hash-val>
-      <supporting-circuit-pack-name>CP1-SFP1
-      </supporting-circuit-pack-name>
+      <supporting-port>CP3-SFP4-P1</supporting-port>
+      <port-qual>xpdr-client</port-qual>
     </mapping>
     <mapping>
-      <logical-connection-point>XPDR2-NETWORK3
-      </logical-connection-point>
-      <port-qual>switch-network</port-qual>
-      <supporting-port>CP8-CFP-P1</supporting-port>
+      <logical-connection-point>XPDR2-CLIENT1</logical-connection-point>
+      <supporting-circuit-pack-name>CP2-QSFP1</supporting-circuit-pack-name>
+      <supported-interface-capability xmlns:x="http://org/openroadm/port/types">x:if-100GE-ODU4</supported-interface-capability>
+      <supported-interface-capability xmlns:x="http://org/openroadm/port/types">x:if-100GE</supported-interface-capability>
+      <lcp-hash-val>AN/WSSRXne3u</lcp-hash-val>
       <port-direction>bidirectional</port-direction>
-      <supported-interface-capability
-        xmlns:x="http://org/openroadm/port/types">x:if-OCH-OTU4-ODU4</supported-interface-capability>
-      <lcp-hash-val>exT821pFtOU=</lcp-hash-val>
-      <xponder-type>switch</xponder-type>
-      <supporting-circuit-pack-name>CP8-CFP
-      </supporting-circuit-pack-name>
+      <supporting-port>CP2-QSFP1-P1</supporting-port>
+      <port-qual>switch-client</port-qual>
     </mapping>
     <mapping>
-      <logical-connection-point>XPDR2-NETWORK2
-      </logical-connection-point>
-      <port-qual>switch-network</port-qual>
-      <supporting-port>CP7-CFP-P1</supporting-port>
+      <logical-connection-point>XPDR2-CLIENT4</logical-connection-point>
+      <supporting-circuit-pack-name>CP2-QSFP4</supporting-circuit-pack-name>
+      <supported-interface-capability xmlns:x="http://org/openroadm/port/types">x:if-100GE-ODU4</supported-interface-capability>
+      <supported-interface-capability xmlns:x="http://org/openroadm/port/types">x:if-100GE</supported-interface-capability>
+      <lcp-hash-val>AN/WSSRXne3r</lcp-hash-val>
       <port-direction>bidirectional</port-direction>
-      <supported-interface-capability
-        xmlns:x="http://org/openroadm/port/types">x:if-OCH-OTU4-ODU4</supported-interface-capability>
-      <lcp-hash-val>exT821pFtOQ=</lcp-hash-val>
-      <xponder-type>switch</xponder-type>
-      <supporting-circuit-pack-name>CP7-CFP
-      </supporting-circuit-pack-name>
+      <supporting-port>CP2-QSFP4-P1</supporting-port>
+      <port-qual>switch-client</port-qual>
     </mapping>
     <mapping>
-      <logical-connection-point>XPDR2-NETWORK4
-      </logical-connection-point>
-      <port-qual>switch-network</port-qual>
-      <supporting-port>CP5-CFP-P1</supporting-port>
+      <logical-connection-point>XPDR3-NETWORK1</logical-connection-point>
+      <supporting-circuit-pack-name>CP3-CFP0</supporting-circuit-pack-name>
+      <supported-interface-capability xmlns:x="http://org/openroadm/port/types">x:if-OCH-OTU4-ODU4</supported-interface-capability>
+      <lcp-hash-val>ANnxoi7K8q30</lcp-hash-val>
       <port-direction>bidirectional</port-direction>
-      <supported-interface-capability
-        xmlns:x="http://org/openroadm/port/types">x:if-OCH-OTU4-ODU4</supported-interface-capability>
-      <lcp-hash-val>exT821pFtOI=</lcp-hash-val>
-      <xponder-type>switch</xponder-type>
-      <supporting-circuit-pack-name>CP5-CFP
-      </supporting-circuit-pack-name>
+      <xponder-type>mpdr</xponder-type>
+      <supporting-port>CP3-CFP0-P1</supporting-port>
+      <port-qual>xpdr-network</port-qual>
     </mapping>
     <mapping>
-      <logical-connection-point>XPDR2-NETWORK1
-      </logical-connection-point>
-      <port-qual>switch-network</port-qual>
-      <supporting-port>CP6-CFP-P1</supporting-port>
+      <logical-connection-point>XPDR2-CLIENT3</logical-connection-point>
+      <supporting-circuit-pack-name>CP2-QSFP3</supporting-circuit-pack-name>
+      <supported-interface-capability xmlns:x="http://org/openroadm/port/types">x:if-100GE-ODU4</supported-interface-capability>
+      <supported-interface-capability xmlns:x="http://org/openroadm/port/types">x:if-100GE</supported-interface-capability>
+      <lcp-hash-val>AN/WSSRXne3s</lcp-hash-val>
       <port-direction>bidirectional</port-direction>
-      <supported-interface-capability
-        xmlns:x="http://org/openroadm/port/types">x:if-OCH-OTU4-ODU4</supported-interface-capability>
-      <lcp-hash-val>exT821pFtOc=</lcp-hash-val>
-      <xponder-type>switch</xponder-type>
-      <supporting-circuit-pack-name>CP6-CFP
-      </supporting-circuit-pack-name>
+      <supporting-port>CP2-QSFP3-P1</supporting-port>
+      <port-qual>switch-client</port-qual>
     </mapping>
     <mapping>
-      <logical-connection-point>XPDR1-NETWORK1
-      </logical-connection-point>
-      <port-qual>xpdr-network</port-qual>
-      <supporting-port>CP1-CFP0-P1</supporting-port>
+      <logical-connection-point>XPDR1-CLIENT1</logical-connection-point>
+      <supporting-circuit-pack-name>CP1-SFP1</supporting-circuit-pack-name>
+      <supported-interface-capability xmlns:x="http://org/openroadm/port/types">x:if-10GE-ODU2e</supported-interface-capability>
+      <supported-interface-capability xmlns:x="http://org/openroadm/port/types">x:if-10GE-ODU2</supported-interface-capability>
+      <lcp-hash-val>FqlcrxV7p30=</lcp-hash-val>
       <port-direction>bidirectional</port-direction>
-      <supported-interface-capability
-        xmlns:x="http://org/openroadm/port/types">x:if-OCH-OTU4-ODU4</supported-interface-capability>
-      <lcp-hash-val>Swfw02qXGyI=</lcp-hash-val>
-      <xponder-type>mpdr</xponder-type>
-      <supporting-circuit-pack-name>CP1-CFP0
-      </supporting-circuit-pack-name>
+      <supporting-port>CP1-SFP1-P1</supporting-port>
+      <port-qual>xpdr-client</port-qual>
     </mapping>
-  </nodes>
-  <nodes>
-    <node-id>XPDR-A1</node-id>
     <mapping>
       <logical-connection-point>XPDR1-CLIENT2</logical-connection-point>
-      <port-qual>xpdr-client</port-qual>
-      <supporting-port>C1</supporting-port>
+      <supporting-circuit-pack-name>CP1-SFP2</supporting-circuit-pack-name>
+      <supported-interface-capability xmlns:x="http://org/openroadm/port/types">x:if-10GE-ODU2e</supported-interface-capability>
+      <supported-interface-capability xmlns:x="http://org/openroadm/port/types">x:if-10GE-ODU2</supported-interface-capability>
+      <lcp-hash-val>FqlcrxV7p34=</lcp-hash-val>
       <port-direction>bidirectional</port-direction>
-      <supported-interface-capability
-        xmlns:x="http://org/openroadm/port/types">x:if-100GE</supported-interface-capability>
-      <connection-map-lcp>XPDR1-NETWORK2</connection-map-lcp>
-      <lcp-hash-val>AJUUr6I5fALg</lcp-hash-val>
-      <supporting-circuit-pack-name>1/0/2-PLUG-CLIENT
-      </supporting-circuit-pack-name>
+      <supporting-port>CP1-SFP2-P1</supporting-port>
+      <port-qual>xpdr-client</port-qual>
     </mapping>
     <mapping>
-      <logical-connection-point>XPDR1-NETWORK2
-      </logical-connection-point>
-      <port-qual>xpdr-network</port-qual>
-      <supporting-port>1</supporting-port>
+      <logical-connection-point>XPDR1-CLIENT3</logical-connection-point>
+      <supporting-circuit-pack-name>CP1-SFP3</supporting-circuit-pack-name>
+      <supported-interface-capability xmlns:x="http://org/openroadm/port/types">x:if-10GE</supported-interface-capability>
+      <supported-interface-capability xmlns:x="http://org/openroadm/port/types">x:if-10GE-ODU2</supported-interface-capability>
+      <supported-interface-capability xmlns:x="http://org/openroadm/port/types">x:if-10GE-ODU2e</supported-interface-capability>
+      <lcp-hash-val>FqlcrxV7p38=</lcp-hash-val>
       <port-direction>bidirectional</port-direction>
-      <supported-interface-capability
-        xmlns:x="http://org/openroadm/port/types">x:if-OCH</supported-interface-capability>
-      <connection-map-lcp>XPDR1-CLIENT2</connection-map-lcp>
-      <lcp-hash-val>AMkDwQ7xTmRL</lcp-hash-val>
-      <supporting-circuit-pack-name>1/0/2-PLUG-NET
-      </supporting-circuit-pack-name>
+      <supporting-port>CP1-SFP3-P1</supporting-port>
+      <port-qual>xpdr-client</port-qual>
     </mapping>
     <mapping>
-      <logical-connection-point>XPDR1-CLIENT1</logical-connection-point>
+      <logical-connection-point>XPDR1-CLIENT4</logical-connection-point>
+      <supporting-circuit-pack-name>CP1-SFP4</supporting-circuit-pack-name>
+      <supported-interface-capability xmlns:x="http://org/openroadm/port/types">x:if-10GE</supported-interface-capability>
+      <supported-interface-capability xmlns:x="http://org/openroadm/port/types">x:if-10GE-ODU2</supported-interface-capability>
+      <supported-interface-capability xmlns:x="http://org/openroadm/port/types">x:if-10GE-ODU2e</supported-interface-capability>
+      <lcp-hash-val>FqlcrxV7p3g=</lcp-hash-val>
+      <port-direction>bidirectional</port-direction>
+      <supporting-port>CP1-SFP4-P1</supporting-port>
       <port-qual>xpdr-client</port-qual>
-      <supporting-port>C1</supporting-port>
+    </mapping>
+    <mapping>
+      <logical-connection-point>XPDR2-NETWORK1</logical-connection-point>
+      <supporting-circuit-pack-name>CP6-CFP</supporting-circuit-pack-name>
+      <supported-interface-capability xmlns:x="http://org/openroadm/port/types">x:if-OCH-OTU4-ODU4</supported-interface-capability>
+      <lcp-hash-val>exT821pFtOc=</lcp-hash-val>
       <port-direction>bidirectional</port-direction>
-      <supported-interface-capability
-        xmlns:x="http://org/openroadm/port/types">x:if-100GE</supported-interface-capability>
-      <connection-map-lcp>XPDR1-NETWORK1</connection-map-lcp>
-      <lcp-hash-val>AJUUr6I5fALj</lcp-hash-val>
-      <supporting-circuit-pack-name>1/0/1-PLUG-CLIENT
-      </supporting-circuit-pack-name>
+      <xponder-type>switch</xponder-type>
+      <supporting-port>CP6-CFP-P1</supporting-port>
+      <port-qual>switch-network</port-qual>
     </mapping>
     <mapping>
-      <logical-connection-point>XPDR1-NETWORK1
-      </logical-connection-point>
-      <port-qual>xpdr-network</port-qual>
-      <supporting-port>1</supporting-port>
+      <logical-connection-point>XPDR2-NETWORK2</logical-connection-point>
+      <supporting-circuit-pack-name>CP7-CFP</supporting-circuit-pack-name>
+      <supported-interface-capability xmlns:x="http://org/openroadm/port/types">x:if-OCH-OTU4-ODU4</supported-interface-capability>
+      <lcp-hash-val>exT821pFtOQ=</lcp-hash-val>
       <port-direction>bidirectional</port-direction>
-      <supported-interface-capability
-        xmlns:x="http://org/openroadm/port/types">x:if-OCH</supported-interface-capability>
-      <connection-map-lcp>XPDR1-CLIENT1</connection-map-lcp>
-      <lcp-hash-val>AMkDwQ7xTmRI</lcp-hash-val>
-      <supporting-circuit-pack-name>1/0/1-PLUG-NET
-      </supporting-circuit-pack-name>
+      <xponder-type>switch</xponder-type>
+      <supporting-port>CP7-CFP-P1</supporting-port>
+      <port-qual>switch-network</port-qual>
     </mapping>
-    <node-info>
-      <node-clli>NodeA</node-clli>
-      <node-vendor>vendorA</node-vendor>
-      <node-model>model2</node-model>
-      <node-ip-address>1.2.3.4</node-ip-address>
-      <node-type>xpdr</node-type>
-      <openroadm-version>2.2.1</openroadm-version>
-    </node-info>
-  </nodes>
-  <nodes>
-    <node-id>ROADM-C1</node-id>
-    <node-info>
-      <node-clli>NodeC</node-clli>
-      <node-vendor>vendorA</node-vendor>
-      <node-model>model2</node-model>
-      <node-ip-address>127.0.0.13</node-ip-address>
-      <node-type>rdm</node-type>
-      <openroadm-version>2.2.1</openroadm-version>
-    </node-info>
-    <cp-to-degree>
-      <circuit-pack-name>1/0/ETH-PLUG</circuit-pack-name>
-      <degree-number>1</degree-number>
-      <interface-name>1GE-interface-1</interface-name>
-    </cp-to-degree>
-    <cp-to-degree>
-      <circuit-pack-name>2/0</circuit-pack-name>
-      <degree-number>2</degree-number>
-      <interface-name>1GE-interface-2</interface-name>
-    </cp-to-degree>
-    <cp-to-degree>
-      <circuit-pack-name>2/0/ETH-PLUG</circuit-pack-name>
-      <degree-number>2</degree-number>
-      <interface-name>1GE-interface-2</interface-name>
-    </cp-to-degree>
-    <cp-to-degree>
-      <circuit-pack-name>1/0</circuit-pack-name>
-      <degree-number>1</degree-number>
-      <interface-name>1GE-interface-1</interface-name>
-    </cp-to-degree>
     <mapping>
-      <logical-connection-point>DEG2-TTP-TXRX</logical-connection-point>
-      <supporting-circuit-pack-name>2/0</supporting-circuit-pack-name>
-      <supporting-port>L1</supporting-port>
+      <logical-connection-point>XPDR2-NETWORK3</logical-connection-point>
+      <supporting-circuit-pack-name>CP8-CFP</supporting-circuit-pack-name>
+      <supported-interface-capability xmlns:x="http://org/openroadm/port/types">x:if-OCH-OTU4-ODU4</supported-interface-capability>
+      <lcp-hash-val>exT821pFtOU=</lcp-hash-val>
       <port-direction>bidirectional</port-direction>
+      <xponder-type>switch</xponder-type>
+      <supporting-port>CP8-CFP-P1</supporting-port>
+      <port-qual>switch-network</port-qual>
     </mapping>
     <mapping>
-      <logical-connection-point>SRG1-PP3-TXRX</logical-connection-point>
-      <supporting-circuit-pack-name>3/0</supporting-circuit-pack-name>
-      <supporting-port>C3</supporting-port>
+      <logical-connection-point>XPDR2-NETWORK4</logical-connection-point>
+      <supporting-circuit-pack-name>CP5-CFP</supporting-circuit-pack-name>
+      <supported-interface-capability xmlns:x="http://org/openroadm/port/types">x:if-OCH-OTU4-ODU4</supported-interface-capability>
+      <lcp-hash-val>exT821pFtOI=</lcp-hash-val>
       <port-direction>bidirectional</port-direction>
+      <xponder-type>switch</xponder-type>
+      <supporting-port>CP5-CFP-P1</supporting-port>
+      <port-qual>switch-network</port-qual>
     </mapping>
     <mapping>
-      <logical-connection-point>DEG1-TTP-TXRX</logical-connection-point>
-      <supporting-ots>OTS-DEG1-TTP-TXRX</supporting-ots>
-      <supporting-oms>OMS-DEG1-TTP-TXRX</supporting-oms>
-      <supporting-circuit-pack-name>1/0</supporting-circuit-pack-name>
-      <supporting-port>L1</supporting-port>
+      <logical-connection-point>XPDR1-NETWORK1</logical-connection-point>
+      <supporting-circuit-pack-name>CP1-CFP0</supporting-circuit-pack-name>
+      <supported-interface-capability xmlns:x="http://org/openroadm/port/types">x:if-OCH-OTU4-ODU4</supported-interface-capability>
+      <lcp-hash-val>Swfw02qXGyI=</lcp-hash-val>
       <port-direction>bidirectional</port-direction>
+      <xponder-type>mpdr</xponder-type>
+      <supporting-port>CP1-CFP0-P1</supporting-port>
+      <port-qual>xpdr-network</port-qual>
     </mapping>
     <mapping>
-      <logical-connection-point>SRG1-PP1-TXRX</logical-connection-point>
-      <supporting-circuit-pack-name>3/0</supporting-circuit-pack-name>
-      <supporting-port>C1</supporting-port>
+      <logical-connection-point>XPDR3-CLIENT1</logical-connection-point>
+      <supporting-circuit-pack-name>CP3-SFP1</supporting-circuit-pack-name>
+      <supported-interface-capability xmlns:x="http://org/openroadm/port/types">x:if-1GE-ODU0</supported-interface-capability>
+      <lcp-hash-val>AKsQ/HRQdtdP</lcp-hash-val>
       <port-direction>bidirectional</port-direction>
+      <supporting-port>CP3-SFP1-P1</supporting-port>
+      <port-qual>xpdr-client</port-qual>
     </mapping>
     <mapping>
-      <logical-connection-point>SRG1-PP2-TXRX</logical-connection-point>
-      <supporting-circuit-pack-name>3/0</supporting-circuit-pack-name>
-      <supporting-port>C2</supporting-port>
+      <logical-connection-point>XPDR3-CLIENT3</logical-connection-point>
+      <supporting-circuit-pack-name>CP3-SFP3</supporting-circuit-pack-name>
+      <supported-interface-capability xmlns:x="http://org/openroadm/port/types">x:if-1GE-ODU0</supported-interface-capability>
+      <lcp-hash-val>AKsQ/HRQdtdN</lcp-hash-val>
       <port-direction>bidirectional</port-direction>
+      <supporting-port>CP3-SFP3-P1</supporting-port>
+      <port-qual>xpdr-client</port-qual>
     </mapping>
     <mapping>
-      <logical-connection-point>SRG1-PP4-TXRX</logical-connection-point>
-      <supporting-circuit-pack-name>3/0</supporting-circuit-pack-name>
-      <supporting-port>C4</supporting-port>
+      <logical-connection-point>XPDR3-CLIENT2</logical-connection-point>
+      <supporting-circuit-pack-name>CP3-SFP2</supporting-circuit-pack-name>
+      <supported-interface-capability xmlns:x="http://org/openroadm/port/types">x:if-1GE-ODU0</supported-interface-capability>
+      <lcp-hash-val>AKsQ/HRQdtdM</lcp-hash-val>
       <port-direction>bidirectional</port-direction>
+      <supporting-port>CP3-SFP2-P1</supporting-port>
+      <port-qual>xpdr-client</port-qual>
     </mapping>
-    <mc-capabilities>
-      <mc-node-name>SRG1-PP</mc-node-name>
-      <slot-width-granularity>50</slot-width-granularity>
-      <center-freq-granularity>50</center-freq-granularity>
-    </mc-capabilities>
-    <mc-capabilities>
-      <mc-node-name>DEG2-TTP</mc-node-name>
-      <slot-width-granularity>50</slot-width-granularity>
-      <center-freq-granularity>50</center-freq-granularity>
-    </mc-capabilities>
-    <mc-capabilities>
-      <mc-node-name>DEG1-TTP</mc-node-name>
-      <slot-width-granularity>50</slot-width-granularity>
-      <center-freq-granularity>50</center-freq-granularity>
-    </mc-capabilities>
   </nodes>
   <nodes>
     <node-id>ROADM-A1</node-id>
     <node-info>
-      <node-clli>NodeA</node-clli>
-      <node-vendor>vendorA</node-vendor>
+      <node-type>rdm</node-type>
       <node-model>model2</node-model>
       <node-ip-address>127.0.0.11</node-ip-address>
-      <node-type>rdm</node-type>
+      <node-clli>NodeA</node-clli>
       <openroadm-version>2.2.1</openroadm-version>
+      <node-vendor>vendorA</node-vendor>
     </node-info>
     <cp-to-degree>
       <circuit-pack-name>1/0/ETH-PLUG</circuit-pack-name>
@@ -713,86 +757,86 @@
       <interface-name>1GE-interface-1</interface-name>
     </cp-to-degree>
     <mapping>
-      <logical-connection-point>SRG3-PP3-TXRX</logical-connection-point>
-      <supporting-circuit-pack-name>5/0</supporting-circuit-pack-name>
-      <supporting-port>C3</supporting-port>
+      <logical-connection-point>SRG1-PP3-TXRX</logical-connection-point>
+      <supporting-circuit-pack-name>3/0</supporting-circuit-pack-name>
       <port-direction>bidirectional</port-direction>
+      <supporting-port>C3</supporting-port>
     </mapping>
     <mapping>
-      <logical-connection-point>DEG2-TTP-TXRX</logical-connection-point>
-      <supporting-ots>OTS-DEG2-TTP-TXRX</supporting-ots>
-      <supporting-oms>OMS-DEG2-TTP-TXRX</supporting-oms>
-      <supporting-circuit-pack-name>2/0</supporting-circuit-pack-name>
-      <supporting-port>L1</supporting-port>
+      <logical-connection-point>SRG3-PP2-TXRX</logical-connection-point>
+      <supporting-circuit-pack-name>5/0</supporting-circuit-pack-name>
       <port-direction>bidirectional</port-direction>
+      <supporting-port>C2</supporting-port>
     </mapping>
     <mapping>
-      <logical-connection-point>SRG1-PP3-TXRX</logical-connection-point>
+      <logical-connection-point>SRG1-PP1-TXRX</logical-connection-point>
       <supporting-circuit-pack-name>3/0</supporting-circuit-pack-name>
-      <supporting-port>C3</supporting-port>
       <port-direction>bidirectional</port-direction>
+      <supporting-port>C1</supporting-port>
     </mapping>
     <mapping>
       <logical-connection-point>DEG1-TTP-TXRX</logical-connection-point>
       <supporting-circuit-pack-name>1/0</supporting-circuit-pack-name>
-      <supporting-port>L1</supporting-port>
-      <port-direction>bidirectional</port-direction>
-    </mapping>
-    <mapping>
-      <logical-connection-point>SRG1-PP1-TXRX</logical-connection-point>
-      <supporting-circuit-pack-name>3/0</supporting-circuit-pack-name>
-      <supporting-port>C1</supporting-port>
       <port-direction>bidirectional</port-direction>
+      <supporting-port>L1</supporting-port>
     </mapping>
     <mapping>
-      <logical-connection-point>SRG3-PP2-TXRX</logical-connection-point>
+      <logical-connection-point>SRG3-PP1-TXRX</logical-connection-point>
       <supporting-circuit-pack-name>5/0</supporting-circuit-pack-name>
-      <supporting-port>C2</supporting-port>
       <port-direction>bidirectional</port-direction>
+      <supporting-port>C1</supporting-port>
     </mapping>
     <mapping>
       <logical-connection-point>SRG1-PP2-TXRX</logical-connection-point>
       <supporting-circuit-pack-name>3/0</supporting-circuit-pack-name>
-      <supporting-port>C2</supporting-port>
-      <port-direction>bidirectional</port-direction>
-    </mapping>
-    <mapping>
-      <logical-connection-point>SRG3-PP1-TXRX</logical-connection-point>
-      <supporting-circuit-pack-name>5/0</supporting-circuit-pack-name>
-      <supporting-port>C1</supporting-port>
       <port-direction>bidirectional</port-direction>
+      <supporting-port>C2</supporting-port>
     </mapping>
     <mapping>
       <logical-connection-point>SRG1-PP4-TXRX</logical-connection-point>
       <supporting-circuit-pack-name>3/0</supporting-circuit-pack-name>
-      <supporting-port>C4</supporting-port>
       <port-direction>bidirectional</port-direction>
+      <supporting-port>C4</supporting-port>
     </mapping>
     <mapping>
       <logical-connection-point>SRG3-PP4-TXRX</logical-connection-point>
       <supporting-circuit-pack-name>5/0</supporting-circuit-pack-name>
+      <port-direction>bidirectional</port-direction>
       <supporting-port>C4</supporting-port>
+    </mapping>
+    <mapping>
+      <logical-connection-point>SRG3-PP3-TXRX</logical-connection-point>
+      <supporting-circuit-pack-name>5/0</supporting-circuit-pack-name>
       <port-direction>bidirectional</port-direction>
+      <supporting-port>C3</supporting-port>
+    </mapping>
+    <mapping>
+      <logical-connection-point>DEG2-TTP-TXRX</logical-connection-point>
+      <supporting-oms>OMS-DEG2-TTP-TXRX</supporting-oms>
+      <supporting-circuit-pack-name>2/0</supporting-circuit-pack-name>
+      <supporting-ots>OTS-DEG2-TTP-TXRX</supporting-ots>
+      <port-direction>bidirectional</port-direction>
+      <supporting-port>L1</supporting-port>
     </mapping>
-    <mc-capabilities>
-      <mc-node-name>SRG1-PP</mc-node-name>
-      <slot-width-granularity>50</slot-width-granularity>
-      <center-freq-granularity>50</center-freq-granularity>
-    </mc-capabilities>
     <mc-capabilities>
       <mc-node-name>DEG2-TTP</mc-node-name>
-      <slot-width-granularity>50</slot-width-granularity>
       <center-freq-granularity>50</center-freq-granularity>
+      <slot-width-granularity>50</slot-width-granularity>
     </mc-capabilities>
     <mc-capabilities>
       <mc-node-name>DEG1-TTP</mc-node-name>
-      <slot-width-granularity>50</slot-width-granularity>
       <center-freq-granularity>50</center-freq-granularity>
+      <slot-width-granularity>50</slot-width-granularity>
     </mc-capabilities>
     <mc-capabilities>
       <mc-node-name>SRG3-PP</mc-node-name>
+      <center-freq-granularity>50</center-freq-granularity>
       <slot-width-granularity>50</slot-width-granularity>
+    </mc-capabilities>
+    <mc-capabilities>
+      <mc-node-name>SRG1-PP</mc-node-name>
       <center-freq-granularity>50</center-freq-granularity>
+      <slot-width-granularity>50</slot-width-granularity>
     </mc-capabilities>
   </nodes>
 </network>