Update topology input files for Tapi topology UT

- to take into acount Administrative and operational states present in
openroadm-topology and otn-topology, as well as flexgrid data
- fix issues in ConvertORTopoToTapiTopo.java when converting openroadm
supported interfaces to tapi supported layer protocoles (extend the
number of supported interfaces handled, use Set interface instead of
List to avoid possible duplication of entries)
- adapt UT consequently

JIRA: TRNSPRTPCE-393
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I4f69329734f9533eb8f1549ca08cd3dd631de597

diff --git a/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/ConvertORTopoToTapiTopo.java b/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/ConvertORTopoToTapiTopo.java
index a0d87ae122af50af2d3a05f123abf38d5a9b990e..2d999780ad98e685454e666993168a1ac5a2e2ea 100644 (file)
--- a/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/ConvertORTopoToTapiTopo.java
+++ b/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/ConvertORTopoToTapiTopo.java
@@ -12,10 +12,12 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Set;
 import java.util.UUID;
 import java.util.stream.Collectors;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.TerminationPoint1;
@@ -52,6 +54,7 @@ import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.glob
 import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.global._class.NameKey;
 import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.dsr.rev181210.DIGITALSIGNALTYPE100GigE;
 import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.dsr.rev181210.DIGITALSIGNALTYPE10GigELAN;
+import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.odu.rev181210.ODUTYPEODU2;
 import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.odu.rev181210.ODUTYPEODU2E;
 import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.odu.rev181210.ODUTYPEODU4;
 import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.photonic.media.rev181210.PHOTONICLAYERQUALIFIEROMS;
@@ -565,7 +568,7 @@ public class ConvertORTopoToTapiTopo {
 
     private List<Class<? extends LAYERPROTOCOLQUALIFIER>> createSupportedCepLayerProtocolQualifier(TerminationPoint tp,
         LayerProtocolName lpn) {
-        List<Class<? extends LAYERPROTOCOLQUALIFIER>> sclpqList = new ArrayList<>();
+        Set<Class<? extends LAYERPROTOCOLQUALIFIER>> sclpqSet = new HashSet<>();
         List<SupportedInterfaceCapability> sicList = new ArrayList<>(
             tp.augmentation(org.opendaylight.yang.gen.v1.http
                     .org.openroadm.otn.network.topology.rev200529.TerminationPoint1.class).getTpSupportedInterfaces()
@@ -573,22 +576,39 @@ public class ConvertORTopoToTapiTopo {
         for (SupportedInterfaceCapability sic : sicList) {
             switch (lpn.getName()) {
                 case "DSR":
-                    if (sic.getIfCapType().getSimpleName().equals("If10GEODU2e")) {
-                        sclpqList.add(DIGITALSIGNALTYPE10GigELAN.class);
-                        sclpqList.add(ODUTYPEODU2E.class);
-                    } else if (sic.getIfCapType().getSimpleName().equals("IfOCHOTU4ODU4")) {
-                        sclpqList.add(ODUTYPEODU4.class);
-                    } else if (sic.getIfCapType().getSimpleName().equals("If100GEODU4")) {
-                        sclpqList.add(DIGITALSIGNALTYPE100GigE.class);
-                        sclpqList.add(ODUTYPEODU4.class);
-                    } else if (sic.getIfCapType().getSimpleName().equals("If100GE")) {
-                        sclpqList.add(DIGITALSIGNALTYPE100GigE.class);
+                    switch (sic.getIfCapType().getSimpleName()) {
+                        case "If10GEODU2e":
+                            sclpqSet.add(ODUTYPEODU2E.class);
+                            sclpqSet.add(DIGITALSIGNALTYPE10GigELAN.class);
+                            break;
+                        case "If10GEODU2":
+                            sclpqSet.add(ODUTYPEODU2.class);
+                            sclpqSet.add(DIGITALSIGNALTYPE10GigELAN.class);
+                            break;
+                        case "If10GE":
+                            sclpqSet.add(DIGITALSIGNALTYPE10GigELAN.class);
+                            break;
+                        case "If100GEODU4":
+                            sclpqSet.add(DIGITALSIGNALTYPE100GigE.class);
+                            sclpqSet.add(ODUTYPEODU4.class);
+                            break;
+                        case "If100GE":
+                            sclpqSet.add(DIGITALSIGNALTYPE100GigE.class);
+                            break;
+                        case "IfOCHOTU4ODU4":
+                        case "IfOCH":
+                            sclpqSet.add(ODUTYPEODU4.class);
+                            break;
+                        default:
+                            LOG.error("IfCapability type not managed");
+                            break;
                     }
                     break;
                 case "PHOTONIC_MEDIA":
-                    if (sic.getIfCapType().getSimpleName().equals("IfOCHOTU4ODU4")) {
-                        sclpqList.add(PHOTONICLAYERQUALIFIEROTSi.class);
-                        sclpqList.add(PHOTONICLAYERQUALIFIEROMS.class);
+                    if (sic.getIfCapType().getSimpleName().equals("IfOCHOTU4ODU4")
+                        || sic.getIfCapType().getSimpleName().equals("IfOCH")) {
+                        sclpqSet.add(PHOTONICLAYERQUALIFIEROTSi.class);
+                        sclpqSet.add(PHOTONICLAYERQUALIFIEROMS.class);
                     }
                     break;
                 default:
@@ -596,7 +616,7 @@ public class ConvertORTopoToTapiTopo {
                     break;
             }
         }
-        return sclpqList;
+        return new ArrayList<>(sclpqSet);
     }
 
     private void createTapiTransitionalLinks() {

diff --git a/tapi/src/test/java/org/opendaylight/transportpce/tapi/topology/ConvertORTopoObjectToTapiTooObjectTest.java b/tapi/src/test/java/org/opendaylight/transportpce/tapi/topology/ConvertORTopoObjectToTapiTooObjectTest.java
index abe843129ed345df73aa7a7c9d36ed146f26fc7d..b1e072abb8e9bb933308ca13312500506cec4d5b 100644 (file)
--- a/tapi/src/test/java/org/opendaylight/transportpce/tapi/topology/ConvertORTopoObjectToTapiTooObjectTest.java
+++ b/tapi/src/test/java/org/opendaylight/transportpce/tapi/topology/ConvertORTopoObjectToTapiTooObjectTest.java
@@ -61,6 +61,7 @@ import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.glob
 import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.global._class.NameKey;
 import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.dsr.rev181210.DIGITALSIGNALTYPE100GigE;
 import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.dsr.rev181210.DIGITALSIGNALTYPE10GigELAN;
+import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.odu.rev181210.ODUTYPEODU2;
 import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.odu.rev181210.ODUTYPEODU2E;
 import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.odu.rev181210.ODUTYPEODU4;
 import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.photonic.media.rev181210.PHOTONICLAYERQUALIFIEROMS;
@@ -544,11 +545,11 @@ public class ConvertORTopoObjectToTapiTooObjectTest extends AbstractTest {
             portName, name.getValue());
         assertEquals("value-name of client nep for '" + portName + "' should be '" + nepName + "'",
             nepName, name.getValueName());
-        assertEquals("Client nep should support 2 kind of cep",
-            2, nep.getSupportedCepLayerProtocolQualifier().size());
-        assertThat("client nep should support 2 kind of cep",
+        assertEquals("Client nep should support 3 kind of cep",
+            3, nep.getSupportedCepLayerProtocolQualifier().size());
+        assertThat("client nep should support 3 kind of cep",
             nep.getSupportedCepLayerProtocolQualifier(),
-            hasItems(ODUTYPEODU2E.class, DIGITALSIGNALTYPE10GigELAN.class));
+            hasItems(ODUTYPEODU2.class, ODUTYPEODU2E.class, DIGITALSIGNALTYPE10GigELAN.class));
         assertEquals("client nep should be of ETH protocol type", LayerProtocolName.ETH, nep.getLayerProtocolName());
         checkCommonPartOfNep(nep, false);
     }
@@ -559,7 +560,7 @@ public class ConvertORTopoObjectToTapiTooObjectTest extends AbstractTest {
         Name name = nameList.get(0);
         assertEquals("value of network nep should be '" + portName + "'",
             portName, name.getValue());
-        assertEquals("value-name of client nep for '" + portName + "' should be '" + nepName + "'",
+        assertEquals("value-name of network nep for '" + portName + "' should be '" + nepName + "'",
             nepName, name.getValueName());
         assertEquals("Network nep should support 1 kind of cep",
             1, nep.getSupportedCepLayerProtocolQualifier().size());

diff --git a/tapi/src/test/resources/openroadm-topology.xml b/tapi/src/test/resources/openroadm-topology.xml
index a7d2a5cf4e01a383bd3b2d5dc5b06e9f86e7d1a9..54068af2237707aac4b5473baa929ccc3be29cc7 100644 (file)
--- a/tapi/src/test/resources/openroadm-topology.xml
+++ b/tapi/src/test/resources/openroadm-topology.xml
@@ -3,46 +3,51 @@
 <network>
   <network-id>openroadm-topology</network-id>
   <network-types>
-    <openroadm-common-network
-      xmlns="http://org/openroadm/common/network" />
+    <openroadm-common-network xmlns="http://org/openroadm/common/network"/>
   </network-types>
   <node>
     <node-id>ROADM-A1-SRG3</node-id>
-    <termination-point
-      xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>SRG3-PP3-TXRX</tp-id>
+      <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
       <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
     </termination-point>
-    <termination-point
-      xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>SRG3-PP2-TXRX</tp-id>
+      <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
       <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
     </termination-point>
-    <termination-point
-      xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>SRG3-CP-TXRX</tp-id>
+      <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
       <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-CP</tp-type>
     </termination-point>
-    <termination-point
-      xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>SRG3-PP1-TXRX</tp-id>
+      <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
       <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
     </termination-point>
-    <termination-point
-      xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>SRG3-PP4-TXRX</tp-id>
+      <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
       <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
     </termination-point>
-    <srg-attributes
-      xmlns="http://org/openroadm/network/topology">
-    <avail-freq-maps>
+    <srg-attributes xmlns="http://org/openroadm/network/topology">
+      <avail-freq-maps>
         <map-name>cband</map-name>
-        <start-edge-freq> 191.325</start-edge-freq>
-        <freq-map-granularity> 6.25</freq-map-granularity>
-        <effective-bits>8</effective-bits>
-        <freq-map>////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-        </freq-map>
-    </avail-freq-maps>
+        <freq-map-granularity>6.25</freq-map-granularity>
+        <start-edge-freq>191.325</start-edge-freq>
+        <effective-bits>768</effective-bits>
+        <freq-map>////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////</freq-map>
+      </avail-freq-maps>
     </srg-attributes>
     <supporting-node>
       <network-ref>clli-network</network-ref>
@@ -52,41 +57,41 @@
       <network-ref>openroadm-network</network-ref>
       <node-ref>ROADM-A1</node-ref>
     </supporting-node>
-    <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
   </node>
   <node>
     <node-id>XPDR-C1-XPDR1</node-id>
-    <termination-point
-      xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <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>
+      <associated-connection-map-port xmlns="http://transportpce/topology">XPDR1-NETWORK1</associated-connection-map-port>
+      <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
       <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>
-      <associated-connection-map-port
-        xmlns="http://transportpce/topology">XPDR1-NETWORK2</associated-connection-map-port>
+      <associated-connection-map-port xmlns="http://transportpce/topology">XPDR1-NETWORK2</associated-connection-map-port>
+      <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
       <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-NETWORK2</tp-id>
-      <associated-connection-map-port
-        xmlns="http://transportpce/topology">XPDR1-CLIENT2</associated-connection-map-port>
+      <associated-connection-map-port xmlns="http://transportpce/topology">XPDR1-CLIENT2</associated-connection-map-port>
+      <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
       <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-NETWORK1</tp-id>
-      <associated-connection-map-port
-        xmlns="http://transportpce/topology">XPDR1-CLIENT1</associated-connection-map-port>
-      <xpdr-network-attributes
-        xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>ROADM-C1-SRG1--SRG1-PP1-TXRX
-        </tail-equipment-id>
+      <associated-connection-map-port xmlns="http://transportpce/topology">XPDR1-CLIENT1</associated-connection-map-port>
+      <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+        <tail-equipment-id>ROADM-C1-SRG1--SRG1-PP1-TXRX</tail-equipment-id>
       </xpdr-network-attributes>
+      <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
       <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
     </termination-point>
     <supporting-node>
@@ -97,45 +102,50 @@
       <network-ref>openroadm-network</network-ref>
       <node-ref>XPDR-C1</node-ref>
     </supporting-node>
-    <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
   </node>
   <node>
     <node-id>ROADM-A1-SRG1</node-id>
-    <termination-point
-      xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>SRG1-PP4-TXRX</tp-id>
+      <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
       <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
     </termination-point>
-    <termination-point
-      xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>SRG1-PP1-TXRX</tp-id>
+      <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
       <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
     </termination-point>
-    <termination-point
-      xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>SRG1-PP2-TXRX</tp-id>
+      <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
       <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
     </termination-point>
-    <termination-point
-      xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>SRG1-PP3-TXRX</tp-id>
+      <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
       <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
     </termination-point>
-    <termination-point
-      xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>SRG1-CP-TXRX</tp-id>
+      <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
       <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-CP</tp-type>
     </termination-point>
-    <srg-attributes
-      xmlns="http://org/openroadm/network/topology">
-    <avail-freq-maps>
+    <srg-attributes xmlns="http://org/openroadm/network/topology">
+      <avail-freq-maps>
         <map-name>cband</map-name>
-        <start-edge-freq> 191.325</start-edge-freq>
-        <freq-map-granularity> 6.25</freq-map-granularity>
-        <effective-bits>8</effective-bits>
-        <freq-map>////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-        </freq-map>
-    </avail-freq-maps> 
+        <freq-map-granularity>6.25</freq-map-granularity>
+        <start-edge-freq>191.325</start-edge-freq>
+        <effective-bits>768</effective-bits>
+        <freq-map>////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////</freq-map>
+      </avail-freq-maps>
     </srg-attributes>
     <supporting-node>
       <network-ref>clli-network</network-ref>
@@ -145,31 +155,34 @@
       <network-ref>openroadm-network</network-ref>
       <node-ref>ROADM-A1</node-ref>
     </supporting-node>
-    <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
   </node>
   <node>
     <node-id>ROADM-A1-DEG1</node-id>
-    <termination-point
-      xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>DEG1-CTP-TXRX</tp-id>
+      <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
       <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TXRX-CTP</tp-type>
     </termination-point>
-    <termination-point
-      xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>DEG1-TTP-TXRX</tp-id>
+      <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
       <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TXRX-TTP</tp-type>
     </termination-point>
-    <degree-attributes
-      xmlns="http://org/openroadm/network/topology">
+    <degree-attributes xmlns="http://org/openroadm/network/topology">
       <degree-number>1</degree-number>
-    <avail-freq-maps>
+      <avail-freq-maps>
         <map-name>cband</map-name>
-        <start-edge-freq> 191.325</start-edge-freq>
-        <freq-map-granularity> 6.25</freq-map-granularity>
-        <effective-bits>8</effective-bits>
-        <freq-map>////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-        </freq-map>
-    </avail-freq-maps>     </degree-attributes>
+        <freq-map-granularity>6.25</freq-map-granularity>
+        <start-edge-freq>191.325</start-edge-freq>
+        <effective-bits>768</effective-bits>
+        <freq-map>////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////</freq-map>
+      </avail-freq-maps>
+    </degree-attributes>
     <supporting-node>
       <network-ref>clli-network</network-ref>
       <node-ref>NodeA</node-ref>
@@ -178,41 +191,74 @@
       <network-ref>openroadm-network</network-ref>
       <node-ref>ROADM-A1</node-ref>
     </supporting-node>
+  </node>
+  <node>
+    <node-id>ROADM-A1-DEG2</node-id>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+      <tp-id>DEG2-TTP-TXRX</tp-id>
+      <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+      <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TXRX-TTP</tp-type>
+    </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+      <tp-id>DEG2-CTP-TXRX</tp-id>
+      <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+      <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TXRX-CTP</tp-type>
+    </termination-point>
+    <degree-attributes xmlns="http://org/openroadm/network/topology">
+      <degree-number>2</degree-number>
+      <avail-freq-maps>
+        <map-name>cband</map-name>
+        <freq-map-granularity>6.25</freq-map-granularity>
+        <start-edge-freq>191.325</start-edge-freq>
+        <effective-bits>768</effective-bits>
+        <freq-map>////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////</freq-map>
+      </avail-freq-maps>
+    </degree-attributes>
+    <supporting-node>
+      <network-ref>clli-network</network-ref>
+      <node-ref>NodeA</node-ref>
+    </supporting-node>
+    <supporting-node>
+      <network-ref>openroadm-network</network-ref>
+      <node-ref>ROADM-A1</node-ref>
+    </supporting-node>
   </node>
   <node>
     <node-id>XPDR-A1-XPDR1</node-id>
-    <termination-point
-      xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <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>
+      <associated-connection-map-port xmlns="http://transportpce/topology">XPDR1-NETWORK1</associated-connection-map-port>
+      <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
       <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>
-      <associated-connection-map-port
-        xmlns="http://transportpce/topology">XPDR1-NETWORK2</associated-connection-map-port>
+      <associated-connection-map-port xmlns="http://transportpce/topology">XPDR1-NETWORK2</associated-connection-map-port>
+      <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
       <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-NETWORK2</tp-id>
-      <associated-connection-map-port
-        xmlns="http://transportpce/topology">XPDR1-CLIENT2</associated-connection-map-port>
+      <associated-connection-map-port xmlns="http://transportpce/topology">XPDR1-CLIENT2</associated-connection-map-port>
+      <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
       <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-NETWORK1</tp-id>
-      <associated-connection-map-port
-        xmlns="http://transportpce/topology">XPDR1-CLIENT1</associated-connection-map-port>
-      <xpdr-network-attributes
-        xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>ROADM-A1-SRG1--SRG1-PP1-TXRX
-        </tail-equipment-id>
-      </xpdr-network-attributes>
+      <associated-connection-map-port xmlns="http://transportpce/topology">XPDR1-CLIENT1</associated-connection-map-port>
+      <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
       <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
     </termination-point>
     <supporting-node>
@@ -223,78 +269,51 @@
       <network-ref>clli-network</network-ref>
       <node-ref>NodeA</node-ref>
     </supporting-node>
-    <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
-  </node>
-  <node>
-    <node-id>ROADM-A1-DEG2</node-id>
-    <termination-point
-      xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-      <tp-id>DEG2-TTP-TXRX</tp-id>
-      <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TXRX-TTP</tp-type>
-    </termination-point>
-    <termination-point
-      xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-      <tp-id>DEG2-CTP-TXRX</tp-id>
-      <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TXRX-CTP</tp-type>
-    </termination-point>
-    <degree-attributes
-      xmlns="http://org/openroadm/network/topology">
-      <degree-number>2</degree-number>
-    <avail-freq-maps>
-        <map-name>cband</map-name>
-        <start-edge-freq> 191.325</start-edge-freq>
-        <freq-map-granularity> 6.25</freq-map-granularity>
-        <effective-bits>8</effective-bits>
-        <freq-map>////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-        </freq-map>
-    </avail-freq-maps>     </degree-attributes>
-    <supporting-node>
-      <network-ref>clli-network</network-ref>
-      <node-ref>NodeA</node-ref>
-    </supporting-node>
-    <supporting-node>
-      <network-ref>openroadm-network</network-ref>
-      <node-ref>ROADM-A1</node-ref>
-    </supporting-node>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
   </node>
   <node>
     <node-id>ROADM-C1-SRG1</node-id>
-    <termination-point
-      xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>SRG1-PP4-TXRX</tp-id>
+      <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
       <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
     </termination-point>
-    <termination-point
-      xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>SRG1-PP1-TXRX</tp-id>
+      <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
       <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
     </termination-point>
-    <termination-point
-      xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>SRG1-PP2-TXRX</tp-id>
+      <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
       <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
     </termination-point>
-    <termination-point
-      xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>SRG1-PP3-TXRX</tp-id>
+      <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
       <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
     </termination-point>
-    <termination-point
-      xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>SRG1-CP-TXRX</tp-id>
+      <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
       <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-CP</tp-type>
     </termination-point>
-    <srg-attributes
-      xmlns="http://org/openroadm/network/topology">
-    <avail-freq-maps>
+    <srg-attributes xmlns="http://org/openroadm/network/topology">
+      <avail-freq-maps>
         <map-name>cband</map-name>
-        <start-edge-freq> 191.325</start-edge-freq>
-        <freq-map-granularity> 6.25</freq-map-granularity>
-        <effective-bits>8</effective-bits>
-        <freq-map>////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-        </freq-map>
-    </avail-freq-maps>     </srg-attributes>
+        <freq-map-granularity>6.25</freq-map-granularity>
+        <start-edge-freq>191.325</start-edge-freq>
+        <effective-bits>768</effective-bits>
+        <freq-map>////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////</freq-map>
+      </avail-freq-maps>
+    </srg-attributes>
     <supporting-node>
       <network-ref>clli-network</network-ref>
       <node-ref>NodeC</node-ref>
@@ -303,19 +322,20 @@
       <network-ref>openroadm-network</network-ref>
       <node-ref>ROADM-C1</node-ref>
     </supporting-node>
-    <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
   </node>
   <node>
     <node-id>SPDR-SA1-XPDR1</node-id>
-    <termination-point
-      xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>XPDR1-NETWORK1</tp-id>
-      <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-      <xpdr-network-attributes
-        xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>ROADM-A1-SRG1--SRG1-PP2-TXRX
-        </tail-equipment-id>
+      <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+        <tail-equipment-id>ROADM-A1-SRG1--SRG1-PP2-TXRX</tail-equipment-id>
       </xpdr-network-attributes>
+      <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+      <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
     </termination-point>
     <supporting-node>
       <network-ref>openroadm-network</network-ref>
@@ -325,31 +345,34 @@
       <network-ref>clli-network</network-ref>
       <node-ref>NodeSA</node-ref>
     </supporting-node>
-    <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
   </node>
   <node>
     <node-id>ROADM-C1-DEG1</node-id>
-    <termination-point
-      xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>DEG1-CTP-TXRX</tp-id>
+      <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
       <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TXRX-CTP</tp-type>
     </termination-point>
-    <termination-point
-      xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>DEG1-TTP-TXRX</tp-id>
+      <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
       <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TXRX-TTP</tp-type>
     </termination-point>
-    <degree-attributes
-      xmlns="http://org/openroadm/network/topology">
+    <degree-attributes xmlns="http://org/openroadm/network/topology">
       <degree-number>1</degree-number>
-    <avail-freq-maps>
+      <avail-freq-maps>
         <map-name>cband</map-name>
-        <start-edge-freq> 191.325</start-edge-freq>
-        <freq-map-granularity> 6.25</freq-map-granularity>
-        <effective-bits>8</effective-bits>
-        <freq-map>////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-        </freq-map>
-    </avail-freq-maps>     </degree-attributes>
+        <freq-map-granularity>6.25</freq-map-granularity>
+        <start-edge-freq>191.325</start-edge-freq>
+        <effective-bits>768</effective-bits>
+        <freq-map>////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////</freq-map>
+      </avail-freq-maps>
+    </degree-attributes>
     <supporting-node>
       <network-ref>clli-network</network-ref>
       <node-ref>NodeC</node-ref>
@@ -358,19 +381,20 @@
       <network-ref>openroadm-network</network-ref>
       <node-ref>ROADM-C1</node-ref>
     </supporting-node>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
   </node>
   <node>
     <node-id>SPDR-SC1-XPDR1</node-id>
-    <termination-point
-      xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>XPDR1-NETWORK1</tp-id>
-      <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-      <xpdr-network-attributes
-        xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>ROADM-C1-SRG1--SRG1-PP2-TXRX
-        </tail-equipment-id>
+      <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+        <tail-equipment-id>ROADM-C1-SRG1--SRG1-PP2-TXRX</tail-equipment-id>
       </xpdr-network-attributes>
+      <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+      <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
     </termination-point>
     <supporting-node>
       <network-ref>openroadm-network</network-ref>
@@ -380,31 +404,33 @@
       <network-ref>clli-network</network-ref>
       <node-ref>NodeSC</node-ref>
     </supporting-node>
-    <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
   </node>
   <node>
     <node-id>ROADM-C1-DEG2</node-id>
-    <termination-point
-      xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>DEG2-TTP-TXRX</tp-id>
+      <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
       <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TXRX-TTP</tp-type>
     </termination-point>
-    <termination-point
-      xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>DEG2-CTP-TXRX</tp-id>
+      <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
       <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TXRX-CTP</tp-type>
     </termination-point>
-    <degree-attributes
-      xmlns="http://org/openroadm/network/topology">
+    <degree-attributes xmlns="http://org/openroadm/network/topology">
       <degree-number>2</degree-number>
-    <avail-freq-maps>
+      <avail-freq-maps>
         <map-name>cband</map-name>
-        <start-edge-freq> 191.325</start-edge-freq>
-        <freq-map-granularity> 6.25</freq-map-granularity>
-        <effective-bits>8</effective-bits>
-        <freq-map>////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-        </freq-map>
-    </avail-freq-maps>
+        <freq-map-granularity>6.25</freq-map-granularity>
+        <start-edge-freq>191.325</start-edge-freq>
+        <effective-bits>768</effective-bits>
+        <freq-map>////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////</freq-map>
+      </avail-freq-maps>
     </degree-attributes>
     <supporting-node>
       <network-ref>clli-network</network-ref>
@@ -414,38 +440,80 @@
       <network-ref>openroadm-network</network-ref>
       <node-ref>ROADM-C1</node-ref>
     </supporting-node>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+  </node>
+  <node>
+    <node-id>SPDR-SA1-XPDR3</node-id>
+    <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+      <tp-id>XPDR3-NETWORK1</tp-id>
+      <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+      <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
+    </termination-point>
+    <supporting-node>
+      <network-ref>openroadm-network</network-ref>
+      <node-ref>SPDR-SA1</node-ref>
+    </supporting-node>
+    <supporting-node>
+      <network-ref>clli-network</network-ref>
+      <node-ref>NodeSA</node-ref>
+    </supporting-node>
+  </node>
+  <node>
+    <node-id>SPDR-SC1-XPDR3</node-id>
+    <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+      <tp-id>XPDR3-NETWORK1</tp-id>
+      <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+      <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
+    </termination-point>
+    <supporting-node>
+      <network-ref>openroadm-network</network-ref>
+      <node-ref>SPDR-SC1</node-ref>
+    </supporting-node>
+    <supporting-node>
+      <network-ref>clli-network</network-ref>
+      <node-ref>NodeSC</node-ref>
+    </supporting-node>
   </node>
   <node>
     <node-id>SPDR-SA1-XPDR2</node-id>
-    <termination-point
-      xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>XPDR2-NETWORK1</tp-id>
+      <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
       <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
     </termination-point>
-    <termination-point
-      xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>XPDR2-NETWORK3</tp-id>
-      <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-      <xpdr-network-attributes
-        xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>ROADM-A1-SRG1--SRG1-PP4-TXRX
-        </tail-equipment-id>
+      <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+        <tail-equipment-id>ROADM-A1-SRG1--SRG1-PP4-TXRX</tail-equipment-id>
       </xpdr-network-attributes>
+      <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+      <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>
-      <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-      <xpdr-network-attributes
-        xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>ROADM-A1-SRG1--SRG1-PP3-TXRX
-        </tail-equipment-id>
+      <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+        <tail-equipment-id>ROADM-A1-SRG1--SRG1-PP3-TXRX</tail-equipment-id>
       </xpdr-network-attributes>
+      <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+      <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>
+      <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
       <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
     </termination-point>
     <supporting-node>
@@ -456,38 +524,40 @@
       <network-ref>clli-network</network-ref>
       <node-ref>NodeSA</node-ref>
     </supporting-node>
-    <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
   </node>
   <node>
     <node-id>SPDR-SC1-XPDR2</node-id>
-    <termination-point
-      xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>XPDR2-NETWORK1</tp-id>
+      <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
       <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
     </termination-point>
-    <termination-point
-      xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>XPDR2-NETWORK3</tp-id>
-      <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-      <xpdr-network-attributes
-        xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>ROADM-C1-SRG1--SRG1-PP4-TXRX
-        </tail-equipment-id>
+      <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+        <tail-equipment-id>ROADM-C1-SRG1--SRG1-PP4-TXRX</tail-equipment-id>
       </xpdr-network-attributes>
+      <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+      <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>
-      <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-      <xpdr-network-attributes
-        xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>ROADM-C1-SRG1--SRG1-PP3-TXRX
-        </tail-equipment-id>
+      <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+        <tail-equipment-id>ROADM-C1-SRG1--SRG1-PP3-TXRX</tail-equipment-id>
       </xpdr-network-attributes>
+      <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+      <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>
+      <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
       <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
     </termination-point>
     <supporting-node>
@@ -498,558 +568,517 @@
       <network-ref>clli-network</network-ref>
       <node-ref>NodeSC</node-ref>
     </supporting-node>
-    <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
   </node>
   <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>ROADM-C1-SRG1-SRG1-PP2-TXRXtoSPDR-SC1-XPDR1-XPDR1-NETWORK1
-    </link-id>
+    <link-id>ROADM-C1-SRG1-SRG1-PP2-TXRXtoSPDR-SC1-XPDR1-XPDR1-NETWORK1</link-id>
     <source>
       <source-node>ROADM-C1-SRG1</source-node>
       <source-tp>SRG1-PP2-TXRX</source-tp>
     </source>
+    <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    <opposite-link xmlns="http://org/openroadm/common/network">SPDR-SC1-XPDR1-XPDR1-NETWORK1toROADM-C1-SRG1-SRG1-PP2-TXRX</opposite-link>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
     <destination>
       <dest-tp>XPDR1-NETWORK1</dest-tp>
       <dest-node>SPDR-SC1-XPDR1</dest-node>
     </destination>
-    <opposite-link
-      xmlns="http://org/openroadm/common/network">SPDR-SC1-XPDR1-XPDR1-NETWORK1toROADM-C1-SRG1-SRG1-PP2-TXRX
-    </opposite-link>
-    <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
   </link>
   <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>ROADM-A1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG1-DEG1-TTP-TXRX
-    </link-id>
+    <link-id>ROADM-A1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG1-DEG1-TTP-TXRX</link-id>
     <source>
       <source-node>ROADM-A1-DEG2</source-node>
       <source-tp>DEG2-TTP-TXRX</source-tp>
     </source>
-    <OMS-attributes
-      xmlns="http://org/openroadm/network/topology">
-    </OMS-attributes>
+    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    <opposite-link xmlns="http://org/openroadm/common/network">ROADM-C1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG2-DEG2-TTP-TXRX</opposite-link>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
     <destination>
       <dest-tp>DEG1-TTP-TXRX</dest-tp>
       <dest-node>ROADM-C1-DEG1</dest-node>
     </destination>
-    <opposite-link
-      xmlns="http://org/openroadm/common/network">ROADM-C1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG2-DEG2-TTP-TXRX
-    </opposite-link>
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
   </link>
   <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>XPDR-C1-XPDR1-XPDR1-NETWORK1toROADM-C1-SRG1-SRG1-PP1-TXRX
-    </link-id>
+    <link-id>XPDR-C1-XPDR1-XPDR1-NETWORK1toROADM-C1-SRG1-SRG1-PP1-TXRX</link-id>
     <source>
       <source-node>XPDR-C1-XPDR1</source-node>
       <source-tp>XPDR1-NETWORK1</source-tp>
     </source>
+    <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    <opposite-link xmlns="http://org/openroadm/common/network">ROADM-C1-SRG1-SRG1-PP1-TXRXtoXPDR-C1-XPDR1-XPDR1-NETWORK1</opposite-link>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
     <destination>
       <dest-tp>SRG1-PP1-TXRX</dest-tp>
       <dest-node>ROADM-C1-SRG1</dest-node>
     </destination>
-    <opposite-link
-      xmlns="http://org/openroadm/common/network">ROADM-C1-SRG1-SRG1-PP1-TXRXtoXPDR-C1-XPDR1-XPDR1-NETWORK1
-    </opposite-link>
-    <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
   </link>
   <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>ROADM-C1-SRG1-SRG1-PP3-TXRXtoSPDR-SC1-XPDR2-XPDR2-NETWORK2
-    </link-id>
+    <link-id>ROADM-C1-SRG1-SRG1-PP3-TXRXtoSPDR-SC1-XPDR2-XPDR2-NETWORK2</link-id>
     <source>
       <source-node>ROADM-C1-SRG1</source-node>
       <source-tp>SRG1-PP3-TXRX</source-tp>
     </source>
+    <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    <opposite-link xmlns="http://org/openroadm/common/network">SPDR-SC1-XPDR2-XPDR2-NETWORK2toROADM-C1-SRG1-SRG1-PP3-TXRX</opposite-link>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
     <destination>
       <dest-tp>XPDR2-NETWORK2</dest-tp>
       <dest-node>SPDR-SC1-XPDR2</dest-node>
     </destination>
-    <opposite-link
-      xmlns="http://org/openroadm/common/network">SPDR-SC1-XPDR2-XPDR2-NETWORK2toROADM-C1-SRG1-SRG1-PP3-TXRX
-    </opposite-link>
-    <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
   </link>
   <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>ROADM-A1-SRG1-SRG1-PP4-TXRXtoSPDR-SA1-XPDR2-XPDR2-NETWORK3
-    </link-id>
+    <link-id>ROADM-A1-SRG1-SRG1-PP4-TXRXtoSPDR-SA1-XPDR2-XPDR2-NETWORK3</link-id>
     <source>
       <source-node>ROADM-A1-SRG1</source-node>
       <source-tp>SRG1-PP4-TXRX</source-tp>
     </source>
+    <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    <opposite-link xmlns="http://org/openroadm/common/network">SPDR-SA1-XPDR2-XPDR2-NETWORK3toROADM-A1-SRG1-SRG1-PP4-TXRX</opposite-link>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
     <destination>
       <dest-tp>XPDR2-NETWORK3</dest-tp>
       <dest-node>SPDR-SA1-XPDR2</dest-node>
     </destination>
-    <opposite-link
-      xmlns="http://org/openroadm/common/network">SPDR-SA1-XPDR2-XPDR2-NETWORK3toROADM-A1-SRG1-SRG1-PP4-TXRX
-    </opposite-link>
-    <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
   </link>
   <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>ROADM-C1-DEG1-DEG1-CTP-TXRXtoROADM-C1-SRG1-SRG1-CP-TXRX
-    </link-id>
+    <link-id>ROADM-C1-DEG1-DEG1-CTP-TXRXtoROADM-C1-SRG1-SRG1-CP-TXRX</link-id>
     <source>
       <source-node>ROADM-C1-DEG1</source-node>
       <source-tp>DEG1-CTP-TXRX</source-tp>
     </source>
+    <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    <opposite-link xmlns="http://org/openroadm/common/network">ROADM-C1-SRG1-SRG1-CP-TXRXtoROADM-C1-DEG1-DEG1-CTP-TXRX</opposite-link>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
     <destination>
       <dest-tp>SRG1-CP-TXRX</dest-tp>
       <dest-node>ROADM-C1-SRG1</dest-node>
     </destination>
-    <opposite-link
-      xmlns="http://org/openroadm/common/network">ROADM-C1-SRG1-SRG1-CP-TXRXtoROADM-C1-DEG1-DEG1-CTP-TXRX
-    </opposite-link>
-    <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
   </link>
   <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>SPDR-SA1-XPDR2-XPDR2-NETWORK3toROADM-A1-SRG1-SRG1-PP4-TXRX
-    </link-id>
+    <link-id>SPDR-SA1-XPDR2-XPDR2-NETWORK3toROADM-A1-SRG1-SRG1-PP4-TXRX</link-id>
     <source>
       <source-node>SPDR-SA1-XPDR2</source-node>
       <source-tp>XPDR2-NETWORK3</source-tp>
     </source>
+    <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    <opposite-link xmlns="http://org/openroadm/common/network">ROADM-A1-SRG1-SRG1-PP4-TXRXtoSPDR-SA1-XPDR2-XPDR2-NETWORK3</opposite-link>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
     <destination>
       <dest-tp>SRG1-PP4-TXRX</dest-tp>
       <dest-node>ROADM-A1-SRG1</dest-node>
     </destination>
-    <opposite-link
-      xmlns="http://org/openroadm/common/network">ROADM-A1-SRG1-SRG1-PP4-TXRXtoSPDR-SA1-XPDR2-XPDR2-NETWORK3
-    </opposite-link>
-    <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
   </link>
   <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>SPDR-SC1-XPDR1-XPDR1-NETWORK1toROADM-C1-SRG1-SRG1-PP2-TXRX
-    </link-id>
+    <link-id>SPDR-SC1-XPDR1-XPDR1-NETWORK1toROADM-C1-SRG1-SRG1-PP2-TXRX</link-id>
     <source>
       <source-node>SPDR-SC1-XPDR1</source-node>
       <source-tp>XPDR1-NETWORK1</source-tp>
     </source>
+    <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    <opposite-link xmlns="http://org/openroadm/common/network">ROADM-C1-SRG1-SRG1-PP2-TXRXtoSPDR-SC1-XPDR1-XPDR1-NETWORK1</opposite-link>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
     <destination>
       <dest-tp>SRG1-PP2-TXRX</dest-tp>
       <dest-node>ROADM-C1-SRG1</dest-node>
     </destination>
-    <opposite-link
-      xmlns="http://org/openroadm/common/network">ROADM-C1-SRG1-SRG1-PP2-TXRXtoSPDR-SC1-XPDR1-XPDR1-NETWORK1
-    </opposite-link>
-    <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
   </link>
   <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>ROADM-A1-SRG3-SRG3-CP-TXRXtoROADM-A1-DEG1-DEG1-CTP-TXRX
-    </link-id>
+    <link-id>ROADM-A1-SRG3-SRG3-CP-TXRXtoROADM-A1-DEG1-DEG1-CTP-TXRX</link-id>
     <source>
       <source-node>ROADM-A1-SRG3</source-node>
       <source-tp>SRG3-CP-TXRX</source-tp>
     </source>
+    <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    <opposite-link xmlns="http://org/openroadm/common/network">ROADM-A1-DEG1-DEG1-CTP-TXRXtoROADM-A1-SRG3-SRG3-CP-TXRX</opposite-link>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
     <destination>
       <dest-tp>DEG1-CTP-TXRX</dest-tp>
       <dest-node>ROADM-A1-DEG1</dest-node>
     </destination>
-    <opposite-link
-      xmlns="http://org/openroadm/common/network">ROADM-A1-DEG1-DEG1-CTP-TXRXtoROADM-A1-SRG3-SRG3-CP-TXRX
-    </opposite-link>
-    <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
   </link>
   <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>SPDR-SC1-XPDR2-XPDR2-NETWORK2toROADM-C1-SRG1-SRG1-PP3-TXRX
-    </link-id>
+    <link-id>SPDR-SC1-XPDR2-XPDR2-NETWORK2toROADM-C1-SRG1-SRG1-PP3-TXRX</link-id>
     <source>
       <source-node>SPDR-SC1-XPDR2</source-node>
       <source-tp>XPDR2-NETWORK2</source-tp>
     </source>
+    <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    <opposite-link xmlns="http://org/openroadm/common/network">ROADM-C1-SRG1-SRG1-PP3-TXRXtoSPDR-SC1-XPDR2-XPDR2-NETWORK2</opposite-link>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
     <destination>
       <dest-tp>SRG1-PP3-TXRX</dest-tp>
       <dest-node>ROADM-C1-SRG1</dest-node>
     </destination>
-    <opposite-link
-      xmlns="http://org/openroadm/common/network">ROADM-C1-SRG1-SRG1-PP3-TXRXtoSPDR-SC1-XPDR2-XPDR2-NETWORK2
-    </opposite-link>
-    <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
   </link>
   <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>ROADM-A1-SRG3-SRG3-CP-TXRXtoROADM-A1-DEG2-DEG2-CTP-TXRX
-    </link-id>
+    <link-id>ROADM-A1-SRG3-SRG3-CP-TXRXtoROADM-A1-DEG2-DEG2-CTP-TXRX</link-id>
     <source>
       <source-node>ROADM-A1-SRG3</source-node>
       <source-tp>SRG3-CP-TXRX</source-tp>
     </source>
+    <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    <opposite-link xmlns="http://org/openroadm/common/network">ROADM-A1-DEG2-DEG2-CTP-TXRXtoROADM-A1-SRG3-SRG3-CP-TXRX</opposite-link>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
     <destination>
       <dest-tp>DEG2-CTP-TXRX</dest-tp>
       <dest-node>ROADM-A1-DEG2</dest-node>
     </destination>
-    <opposite-link
-      xmlns="http://org/openroadm/common/network">ROADM-A1-DEG2-DEG2-CTP-TXRXtoROADM-A1-SRG3-SRG3-CP-TXRX
-    </opposite-link>
-    <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
   </link>
   <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>ROADM-C1-SRG1-SRG1-PP4-TXRXtoSPDR-SC1-XPDR2-XPDR2-NETWORK3
-    </link-id>
+    <link-id>ROADM-C1-SRG1-SRG1-PP4-TXRXtoSPDR-SC1-XPDR2-XPDR2-NETWORK3</link-id>
     <source>
       <source-node>ROADM-C1-SRG1</source-node>
       <source-tp>SRG1-PP4-TXRX</source-tp>
     </source>
+    <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    <opposite-link xmlns="http://org/openroadm/common/network">SPDR-SC1-XPDR2-XPDR2-NETWORK3toROADM-C1-SRG1-SRG1-PP4-TXRX</opposite-link>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
     <destination>
       <dest-tp>XPDR2-NETWORK3</dest-tp>
       <dest-node>SPDR-SC1-XPDR2</dest-node>
     </destination>
-    <opposite-link
-      xmlns="http://org/openroadm/common/network">SPDR-SC1-XPDR2-XPDR2-NETWORK3toROADM-C1-SRG1-SRG1-PP4-TXRX
-    </opposite-link>
-    <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
   </link>
   <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>ROADM-A1-DEG1-DEG1-CTP-TXRXtoROADM-A1-SRG3-SRG3-CP-TXRX
-    </link-id>
+    <link-id>ROADM-A1-DEG1-DEG1-CTP-TXRXtoROADM-A1-SRG3-SRG3-CP-TXRX</link-id>
     <source>
       <source-node>ROADM-A1-DEG1</source-node>
       <source-tp>DEG1-CTP-TXRX</source-tp>
     </source>
+    <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    <opposite-link xmlns="http://org/openroadm/common/network">ROADM-A1-SRG3-SRG3-CP-TXRXtoROADM-A1-DEG1-DEG1-CTP-TXRX</opposite-link>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
     <destination>
       <dest-tp>SRG3-CP-TXRX</dest-tp>
       <dest-node>ROADM-A1-SRG3</dest-node>
     </destination>
-    <opposite-link
-      xmlns="http://org/openroadm/common/network">ROADM-A1-SRG3-SRG3-CP-TXRXtoROADM-A1-DEG1-DEG1-CTP-TXRX
-    </opposite-link>
-    <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
   </link>
   <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>ROADM-A1-SRG1-SRG1-PP1-TXRXtoXPDR-A1-XPDR1-XPDR1-NETWORK1
-    </link-id>
+    <link-id>ROADM-A1-SRG1-SRG1-PP1-TXRXtoXPDR-A1-XPDR1-XPDR1-NETWORK1</link-id>
     <source>
       <source-node>ROADM-A1-SRG1</source-node>
       <source-tp>SRG1-PP1-TXRX</source-tp>
     </source>
+    <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    <opposite-link xmlns="http://org/openroadm/common/network">XPDR-A1-XPDR1-XPDR1-NETWORK1toROADM-A1-SRG1-SRG1-PP1-TXRX</opposite-link>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
     <destination>
       <dest-tp>XPDR1-NETWORK1</dest-tp>
       <dest-node>XPDR-A1-XPDR1</dest-node>
     </destination>
-    <opposite-link
-      xmlns="http://org/openroadm/common/network">XPDR-A1-XPDR1-XPDR1-NETWORK1toROADM-A1-SRG1-SRG1-PP1-TXRX
-    </opposite-link>
-    <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
   </link>
   <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>SPDR-SA1-XPDR1-XPDR1-NETWORK1toROADM-A1-SRG1-SRG1-PP2-TXRX
-    </link-id>
+    <link-id>SPDR-SA1-XPDR1-XPDR1-NETWORK1toROADM-A1-SRG1-SRG1-PP2-TXRX</link-id>
     <source>
       <source-node>SPDR-SA1-XPDR1</source-node>
       <source-tp>XPDR1-NETWORK1</source-tp>
     </source>
+    <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    <opposite-link xmlns="http://org/openroadm/common/network">ROADM-A1-SRG1-SRG1-PP2-TXRXtoSPDR-SA1-XPDR1-XPDR1-NETWORK1</opposite-link>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
     <destination>
       <dest-tp>SRG1-PP2-TXRX</dest-tp>
       <dest-node>ROADM-A1-SRG1</dest-node>
     </destination>
-    <opposite-link
-      xmlns="http://org/openroadm/common/network">ROADM-A1-SRG1-SRG1-PP2-TXRXtoSPDR-SA1-XPDR1-XPDR1-NETWORK1
-    </opposite-link>
-    <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
   </link>
   <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>ROADM-C1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG2-DEG2-TTP-TXRX
-    </link-id>
+    <link-id>ROADM-C1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG2-DEG2-TTP-TXRX</link-id>
     <source>
       <source-node>ROADM-C1-DEG1</source-node>
       <source-tp>DEG1-TTP-TXRX</source-tp>
     </source>
-    <OMS-attributes
-      xmlns="http://org/openroadm/network/topology">
-    </OMS-attributes>
+    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    <opposite-link xmlns="http://org/openroadm/common/network">ROADM-A1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG1-DEG1-TTP-TXRX</opposite-link>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
     <destination>
       <dest-tp>DEG2-TTP-TXRX</dest-tp>
       <dest-node>ROADM-A1-DEG2</dest-node>
     </destination>
-    <opposite-link
-      xmlns="http://org/openroadm/common/network">ROADM-A1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG1-DEG1-TTP-TXRX
-    </opposite-link>
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
   </link>
   <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>ROADM-A1-SRG1-SRG1-PP2-TXRXtoSPDR-SA1-XPDR1-XPDR1-NETWORK1
-    </link-id>
+    <link-id>ROADM-A1-SRG1-SRG1-PP2-TXRXtoSPDR-SA1-XPDR1-XPDR1-NETWORK1</link-id>
     <source>
       <source-node>ROADM-A1-SRG1</source-node>
       <source-tp>SRG1-PP2-TXRX</source-tp>
     </source>
+    <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    <opposite-link xmlns="http://org/openroadm/common/network">SPDR-SA1-XPDR1-XPDR1-NETWORK1toROADM-A1-SRG1-SRG1-PP2-TXRX</opposite-link>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
     <destination>
       <dest-tp>XPDR1-NETWORK1</dest-tp>
       <dest-node>SPDR-SA1-XPDR1</dest-node>
     </destination>
-    <opposite-link
-      xmlns="http://org/openroadm/common/network">SPDR-SA1-XPDR1-XPDR1-NETWORK1toROADM-A1-SRG1-SRG1-PP2-TXRX
-    </opposite-link>
-    <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
   </link>
   <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>ROADM-C1-DEG2-DEG2-CTP-TXRXtoROADM-C1-DEG1-DEG1-CTP-TXRX
-    </link-id>
+    <link-id>ROADM-C1-DEG2-DEG2-CTP-TXRXtoROADM-C1-DEG1-DEG1-CTP-TXRX</link-id>
     <source>
       <source-node>ROADM-C1-DEG2</source-node>
       <source-tp>DEG2-CTP-TXRX</source-tp>
     </source>
+    <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    <opposite-link xmlns="http://org/openroadm/common/network">ROADM-C1-DEG1-DEG1-CTP-TXRXtoROADM-C1-DEG2-DEG2-CTP-TXRX</opposite-link>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
     <destination>
       <dest-tp>DEG1-CTP-TXRX</dest-tp>
       <dest-node>ROADM-C1-DEG1</dest-node>
     </destination>
-    <opposite-link
-      xmlns="http://org/openroadm/common/network">ROADM-C1-DEG1-DEG1-CTP-TXRXtoROADM-C1-DEG2-DEG2-CTP-TXRX
-    </opposite-link>
-    <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
   </link>
   <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>ROADM-C1-DEG2-DEG2-CTP-TXRXtoROADM-C1-SRG1-SRG1-CP-TXRX
-    </link-id>
+    <link-id>ROADM-C1-DEG2-DEG2-CTP-TXRXtoROADM-C1-SRG1-SRG1-CP-TXRX</link-id>
     <source>
       <source-node>ROADM-C1-DEG2</source-node>
       <source-tp>DEG2-CTP-TXRX</source-tp>
     </source>
+    <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    <opposite-link xmlns="http://org/openroadm/common/network">ROADM-C1-SRG1-SRG1-CP-TXRXtoROADM-C1-DEG2-DEG2-CTP-TXRX</opposite-link>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
     <destination>
       <dest-tp>SRG1-CP-TXRX</dest-tp>
       <dest-node>ROADM-C1-SRG1</dest-node>
     </destination>
-    <opposite-link
-      xmlns="http://org/openroadm/common/network">ROADM-C1-SRG1-SRG1-CP-TXRXtoROADM-C1-DEG2-DEG2-CTP-TXRX
-    </opposite-link>
-    <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
   </link>
   <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>ROADM-A1-DEG2-DEG2-CTP-TXRXtoROADM-A1-SRG1-SRG1-CP-TXRX
-    </link-id>
+    <link-id>ROADM-A1-DEG2-DEG2-CTP-TXRXtoROADM-A1-SRG1-SRG1-CP-TXRX</link-id>
     <source>
       <source-node>ROADM-A1-DEG2</source-node>
       <source-tp>DEG2-CTP-TXRX</source-tp>
     </source>
+    <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    <opposite-link xmlns="http://org/openroadm/common/network">ROADM-A1-SRG1-SRG1-CP-TXRXtoROADM-A1-DEG2-DEG2-CTP-TXRX</opposite-link>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
     <destination>
       <dest-tp>SRG1-CP-TXRX</dest-tp>
       <dest-node>ROADM-A1-SRG1</dest-node>
     </destination>
-    <opposite-link
-      xmlns="http://org/openroadm/common/network">ROADM-A1-SRG1-SRG1-CP-TXRXtoROADM-A1-DEG2-DEG2-CTP-TXRX
-    </opposite-link>
-    <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
   </link>
   <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>ROADM-C1-DEG1-DEG1-CTP-TXRXtoROADM-C1-DEG2-DEG2-CTP-TXRX
-    </link-id>
+    <link-id>ROADM-C1-DEG1-DEG1-CTP-TXRXtoROADM-C1-DEG2-DEG2-CTP-TXRX</link-id>
     <source>
       <source-node>ROADM-C1-DEG1</source-node>
       <source-tp>DEG1-CTP-TXRX</source-tp>
     </source>
+    <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    <opposite-link xmlns="http://org/openroadm/common/network">ROADM-C1-DEG2-DEG2-CTP-TXRXtoROADM-C1-DEG1-DEG1-CTP-TXRX</opposite-link>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
     <destination>
       <dest-tp>DEG2-CTP-TXRX</dest-tp>
       <dest-node>ROADM-C1-DEG2</dest-node>
     </destination>
-    <opposite-link
-      xmlns="http://org/openroadm/common/network">ROADM-C1-DEG2-DEG2-CTP-TXRXtoROADM-C1-DEG1-DEG1-CTP-TXRX
-    </opposite-link>
-    <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
   </link>
   <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>SPDR-SC1-XPDR2-XPDR2-NETWORK3toROADM-C1-SRG1-SRG1-PP4-TXRX
-    </link-id>
+    <link-id>SPDR-SC1-XPDR2-XPDR2-NETWORK3toROADM-C1-SRG1-SRG1-PP4-TXRX</link-id>
     <source>
       <source-node>SPDR-SC1-XPDR2</source-node>
       <source-tp>XPDR2-NETWORK3</source-tp>
     </source>
+    <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    <opposite-link xmlns="http://org/openroadm/common/network">ROADM-C1-SRG1-SRG1-PP4-TXRXtoSPDR-SC1-XPDR2-XPDR2-NETWORK3</opposite-link>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
     <destination>
       <dest-tp>SRG1-PP4-TXRX</dest-tp>
       <dest-node>ROADM-C1-SRG1</dest-node>
     </destination>
-    <opposite-link
-      xmlns="http://org/openroadm/common/network">ROADM-C1-SRG1-SRG1-PP4-TXRXtoSPDR-SC1-XPDR2-XPDR2-NETWORK3
-    </opposite-link>
-    <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
   </link>
   <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>XPDR-A1-XPDR1-XPDR1-NETWORK1toROADM-A1-SRG1-SRG1-PP1-TXRX
-    </link-id>
+    <link-id>XPDR-A1-XPDR1-XPDR1-NETWORK1toROADM-A1-SRG1-SRG1-PP1-TXRX</link-id>
     <source>
       <source-node>XPDR-A1-XPDR1</source-node>
       <source-tp>XPDR1-NETWORK1</source-tp>
     </source>
+    <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    <opposite-link xmlns="http://org/openroadm/common/network">ROADM-A1-SRG1-SRG1-PP1-TXRXtoXPDR-A1-XPDR1-XPDR1-NETWORK1</opposite-link>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
     <destination>
       <dest-tp>SRG1-PP1-TXRX</dest-tp>
       <dest-node>ROADM-A1-SRG1</dest-node>
     </destination>
-    <opposite-link
-      xmlns="http://org/openroadm/common/network">ROADM-A1-SRG1-SRG1-PP1-TXRXtoXPDR-A1-XPDR1-XPDR1-NETWORK1
-    </opposite-link>
-    <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
   </link>
   <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>ROADM-A1-DEG2-DEG2-CTP-TXRXtoROADM-A1-DEG1-DEG1-CTP-TXRX
-    </link-id>
+    <link-id>ROADM-A1-DEG2-DEG2-CTP-TXRXtoROADM-A1-DEG1-DEG1-CTP-TXRX</link-id>
     <source>
       <source-node>ROADM-A1-DEG2</source-node>
       <source-tp>DEG2-CTP-TXRX</source-tp>
     </source>
+    <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    <opposite-link xmlns="http://org/openroadm/common/network">ROADM-A1-DEG1-DEG1-CTP-TXRXtoROADM-A1-DEG2-DEG2-CTP-TXRX</opposite-link>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
     <destination>
       <dest-tp>DEG1-CTP-TXRX</dest-tp>
       <dest-node>ROADM-A1-DEG1</dest-node>
     </destination>
-    <opposite-link
-      xmlns="http://org/openroadm/common/network">ROADM-A1-DEG1-DEG1-CTP-TXRXtoROADM-A1-DEG2-DEG2-CTP-TXRX
-    </opposite-link>
-    <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
   </link>
   <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>ROADM-A1-SRG1-SRG1-CP-TXRXtoROADM-A1-DEG1-DEG1-CTP-TXRX
-    </link-id>
+    <link-id>ROADM-A1-SRG1-SRG1-CP-TXRXtoROADM-A1-DEG1-DEG1-CTP-TXRX</link-id>
     <source>
       <source-node>ROADM-A1-SRG1</source-node>
       <source-tp>SRG1-CP-TXRX</source-tp>
     </source>
+    <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    <opposite-link xmlns="http://org/openroadm/common/network">ROADM-A1-DEG1-DEG1-CTP-TXRXtoROADM-A1-SRG1-SRG1-CP-TXRX</opposite-link>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
     <destination>
       <dest-tp>DEG1-CTP-TXRX</dest-tp>
       <dest-node>ROADM-A1-DEG1</dest-node>
     </destination>
-    <opposite-link
-      xmlns="http://org/openroadm/common/network">ROADM-A1-DEG1-DEG1-CTP-TXRXtoROADM-A1-SRG1-SRG1-CP-TXRX
-    </opposite-link>
-    <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
   </link>
   <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>ROADM-C1-SRG1-SRG1-PP1-TXRXtoXPDR-C1-XPDR1-XPDR1-NETWORK1
-    </link-id>
+    <link-id>ROADM-C1-SRG1-SRG1-PP1-TXRXtoXPDR-C1-XPDR1-XPDR1-NETWORK1</link-id>
     <source>
       <source-node>ROADM-C1-SRG1</source-node>
       <source-tp>SRG1-PP1-TXRX</source-tp>
     </source>
+    <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    <opposite-link xmlns="http://org/openroadm/common/network">XPDR-C1-XPDR1-XPDR1-NETWORK1toROADM-C1-SRG1-SRG1-PP1-TXRX</opposite-link>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
     <destination>
       <dest-tp>XPDR1-NETWORK1</dest-tp>
       <dest-node>XPDR-C1-XPDR1</dest-node>
     </destination>
-    <opposite-link
-      xmlns="http://org/openroadm/common/network">XPDR-C1-XPDR1-XPDR1-NETWORK1toROADM-C1-SRG1-SRG1-PP1-TXRX
-    </opposite-link>
-    <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
   </link>
   <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>ROADM-A1-DEG2-DEG2-CTP-TXRXtoROADM-A1-SRG3-SRG3-CP-TXRX
-    </link-id>
+    <link-id>ROADM-A1-DEG2-DEG2-CTP-TXRXtoROADM-A1-SRG3-SRG3-CP-TXRX</link-id>
     <source>
       <source-node>ROADM-A1-DEG2</source-node>
       <source-tp>DEG2-CTP-TXRX</source-tp>
     </source>
+    <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    <opposite-link xmlns="http://org/openroadm/common/network">ROADM-A1-SRG3-SRG3-CP-TXRXtoROADM-A1-DEG2-DEG2-CTP-TXRX</opposite-link>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
     <destination>
       <dest-tp>SRG3-CP-TXRX</dest-tp>
       <dest-node>ROADM-A1-SRG3</dest-node>
     </destination>
-    <opposite-link
-      xmlns="http://org/openroadm/common/network">ROADM-A1-SRG3-SRG3-CP-TXRXtoROADM-A1-DEG2-DEG2-CTP-TXRX
-    </opposite-link>
-    <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
   </link>
   <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>ROADM-A1-SRG1-SRG1-CP-TXRXtoROADM-A1-DEG2-DEG2-CTP-TXRX
-    </link-id>
+    <link-id>ROADM-A1-SRG1-SRG1-CP-TXRXtoROADM-A1-DEG2-DEG2-CTP-TXRX</link-id>
     <source>
       <source-node>ROADM-A1-SRG1</source-node>
       <source-tp>SRG1-CP-TXRX</source-tp>
     </source>
+    <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    <opposite-link xmlns="http://org/openroadm/common/network">ROADM-A1-DEG2-DEG2-CTP-TXRXtoROADM-A1-SRG1-SRG1-CP-TXRX</opposite-link>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
     <destination>
       <dest-tp>DEG2-CTP-TXRX</dest-tp>
       <dest-node>ROADM-A1-DEG2</dest-node>
     </destination>
-    <opposite-link
-      xmlns="http://org/openroadm/common/network">ROADM-A1-DEG2-DEG2-CTP-TXRXtoROADM-A1-SRG1-SRG1-CP-TXRX
-    </opposite-link>
-    <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
   </link>
   <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>SPDR-SA1-XPDR2-XPDR2-NETWORK2toROADM-A1-SRG1-SRG1-PP3-TXRX
-    </link-id>
+    <link-id>SPDR-SA1-XPDR2-XPDR2-NETWORK2toROADM-A1-SRG1-SRG1-PP3-TXRX</link-id>
     <source>
       <source-node>SPDR-SA1-XPDR2</source-node>
       <source-tp>XPDR2-NETWORK2</source-tp>
     </source>
+    <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    <opposite-link xmlns="http://org/openroadm/common/network">ROADM-A1-SRG1-SRG1-PP3-TXRXtoSPDR-SA1-XPDR2-XPDR2-NETWORK2</opposite-link>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
     <destination>
       <dest-tp>SRG1-PP3-TXRX</dest-tp>
       <dest-node>ROADM-A1-SRG1</dest-node>
     </destination>
-    <opposite-link
-      xmlns="http://org/openroadm/common/network">ROADM-A1-SRG1-SRG1-PP3-TXRXtoSPDR-SA1-XPDR2-XPDR2-NETWORK2
-    </opposite-link>
-    <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
   </link>
   <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>ROADM-A1-SRG1-SRG1-PP3-TXRXtoSPDR-SA1-XPDR2-XPDR2-NETWORK2
-    </link-id>
+    <link-id>ROADM-A1-SRG1-SRG1-PP3-TXRXtoSPDR-SA1-XPDR2-XPDR2-NETWORK2</link-id>
     <source>
       <source-node>ROADM-A1-SRG1</source-node>
       <source-tp>SRG1-PP3-TXRX</source-tp>
     </source>
+    <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    <opposite-link xmlns="http://org/openroadm/common/network">SPDR-SA1-XPDR2-XPDR2-NETWORK2toROADM-A1-SRG1-SRG1-PP3-TXRX</opposite-link>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
     <destination>
       <dest-tp>XPDR2-NETWORK2</dest-tp>
       <dest-node>SPDR-SA1-XPDR2</dest-node>
     </destination>
-    <opposite-link
-      xmlns="http://org/openroadm/common/network">SPDR-SA1-XPDR2-XPDR2-NETWORK2toROADM-A1-SRG1-SRG1-PP3-TXRX
-    </opposite-link>
-    <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
   </link>
   <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>ROADM-C1-SRG1-SRG1-CP-TXRXtoROADM-C1-DEG2-DEG2-CTP-TXRX
-    </link-id>
+    <link-id>ROADM-C1-SRG1-SRG1-CP-TXRXtoROADM-C1-DEG2-DEG2-CTP-TXRX</link-id>
     <source>
       <source-node>ROADM-C1-SRG1</source-node>
       <source-tp>SRG1-CP-TXRX</source-tp>
     </source>
+    <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    <opposite-link xmlns="http://org/openroadm/common/network">ROADM-C1-DEG2-DEG2-CTP-TXRXtoROADM-C1-SRG1-SRG1-CP-TXRX</opposite-link>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
     <destination>
       <dest-tp>DEG2-CTP-TXRX</dest-tp>
       <dest-node>ROADM-C1-DEG2</dest-node>
     </destination>
-    <opposite-link
-      xmlns="http://org/openroadm/common/network">ROADM-C1-DEG2-DEG2-CTP-TXRXtoROADM-C1-SRG1-SRG1-CP-TXRX
-    </opposite-link>
-    <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
   </link>
   <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>ROADM-A1-DEG1-DEG1-CTP-TXRXtoROADM-A1-SRG1-SRG1-CP-TXRX
-    </link-id>
+    <link-id>ROADM-A1-DEG1-DEG1-CTP-TXRXtoROADM-A1-SRG1-SRG1-CP-TXRX</link-id>
     <source>
       <source-node>ROADM-A1-DEG1</source-node>
       <source-tp>DEG1-CTP-TXRX</source-tp>
     </source>
+    <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    <opposite-link xmlns="http://org/openroadm/common/network">ROADM-A1-SRG1-SRG1-CP-TXRXtoROADM-A1-DEG1-DEG1-CTP-TXRX</opposite-link>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
     <destination>
       <dest-tp>SRG1-CP-TXRX</dest-tp>
       <dest-node>ROADM-A1-SRG1</dest-node>
     </destination>
-    <opposite-link
-      xmlns="http://org/openroadm/common/network">ROADM-A1-SRG1-SRG1-CP-TXRXtoROADM-A1-DEG1-DEG1-CTP-TXRX
-    </opposite-link>
-    <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
   </link>
   <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>ROADM-C1-SRG1-SRG1-CP-TXRXtoROADM-C1-DEG1-DEG1-CTP-TXRX
-    </link-id>
+    <link-id>ROADM-C1-SRG1-SRG1-CP-TXRXtoROADM-C1-DEG1-DEG1-CTP-TXRX</link-id>
     <source>
       <source-node>ROADM-C1-SRG1</source-node>
       <source-tp>SRG1-CP-TXRX</source-tp>
     </source>
+    <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    <opposite-link xmlns="http://org/openroadm/common/network">ROADM-C1-DEG1-DEG1-CTP-TXRXtoROADM-C1-SRG1-SRG1-CP-TXRX</opposite-link>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
     <destination>
       <dest-tp>DEG1-CTP-TXRX</dest-tp>
       <dest-node>ROADM-C1-DEG1</dest-node>
     </destination>
-    <opposite-link
-      xmlns="http://org/openroadm/common/network">ROADM-C1-DEG1-DEG1-CTP-TXRXtoROADM-C1-SRG1-SRG1-CP-TXRX
-    </opposite-link>
-    <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
   </link>
   <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>ROADM-A1-DEG1-DEG1-CTP-TXRXtoROADM-A1-DEG2-DEG2-CTP-TXRX
-    </link-id>
+    <link-id>ROADM-A1-DEG1-DEG1-CTP-TXRXtoROADM-A1-DEG2-DEG2-CTP-TXRX</link-id>
     <source>
       <source-node>ROADM-A1-DEG1</source-node>
       <source-tp>DEG1-CTP-TXRX</source-tp>
     </source>
+    <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    <opposite-link xmlns="http://org/openroadm/common/network">ROADM-A1-DEG2-DEG2-CTP-TXRXtoROADM-A1-DEG1-DEG1-CTP-TXRX</opposite-link>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
     <destination>
       <dest-tp>DEG2-CTP-TXRX</dest-tp>
       <dest-node>ROADM-A1-DEG2</dest-node>
     </destination>
-    <opposite-link
-      xmlns="http://org/openroadm/common/network">ROADM-A1-DEG2-DEG2-CTP-TXRXtoROADM-A1-DEG1-DEG1-CTP-TXRX
-    </opposite-link>
-    <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
   </link>
 </network>
 </networks>
-</data>
+</data>
\ No newline at end of file

diff --git a/tapi/src/test/resources/otn-topology.xml b/tapi/src/test/resources/otn-topology.xml
index bf7e734ce5a80fe915af5549a9c52e11d890ef3e..0134fca526fcf4d3880e67ddbe7ac4a3f8df27bb 100644 (file)
--- a/tapi/src/test/resources/otn-topology.xml
+++ b/tapi/src/test/resources/otn-topology.xml
@@ -3,89 +3,78 @@
 <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">
+    <node-type xmlns="http://org/openroadm/common/network">TPDR</node-type>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <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">
+      <associated-connection-map-port xmlns="http://transportpce/topology">XPDR1-NETWORK1</associated-connection-map-port>
+      <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>
+          <if-cap-type xmlns:x="http://org/openroadm/port/types">x:if-100GE</if-cap-type>
         </supported-interface-capability>
       </tp-supported-interfaces>
+      <xpdr-tp-port-connection-attributes xmlns="http://org/openroadm/otn/network/topology"/>
+      <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
       <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>
-      <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">
+      <associated-connection-map-port xmlns="http://transportpce/topology">XPDR1-NETWORK2</associated-connection-map-port>
+      <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>
+          <if-cap-type xmlns:x="http://org/openroadm/port/types">x:if-100GE</if-cap-type>
         </supported-interface-capability>
       </tp-supported-interfaces>
+      <xpdr-tp-port-connection-attributes xmlns="http://org/openroadm/otn/network/topology"/>
+      <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
       <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-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">
+      <associated-connection-map-port xmlns="http://transportpce/topology">XPDR1-CLIENT2</associated-connection-map-port>
+      <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</if-cap-type>
         </supported-interface-capability>
       </tp-supported-interfaces>
+      <xpdr-tp-port-connection-attributes xmlns="http://org/openroadm/otn/network/topology"/>
+      <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
       <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-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">
+      <associated-connection-map-port xmlns="http://transportpce/topology">XPDR1-CLIENT1</associated-connection-map-port>
+      <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</if-cap-type>
         </supported-interface-capability>
       </tp-supported-interfaces>
+      <xpdr-tp-port-connection-attributes xmlns="http://org/openroadm/otn/network/topology"/>
+      <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
       <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
     </termination-point>
+    <xpdr-attributes xmlns="http://org/openroadm/otn/network/topology">
+      <xpdr-number>1</xpdr-number>
+    </xpdr-attributes>
     <supporting-node>
       <network-ref>clli-network</network-ref>
       <node-ref>NodeC</node-ref>
@@ -98,406 +87,385 @@
       <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">
+    <node-type xmlns="http://org/openroadm/common/network">MUXPDR</node-type>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <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">
-        <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-ODU2</if-cap-type>
+        </supported-interface-capability>
         <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>
+      <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>
+      <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
       <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">
-        <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</if-cap-type>
+        </supported-interface-capability>
+        <supported-interface-capability>
+          <if-cap-type xmlns:x="http://org/openroadm/port/types">x:if-10GE-ODU2</if-cap-type>
+        </supported-interface-capability>
         <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>
+      <xpdr-tp-port-connection-attributes xmlns="http://org/openroadm/otn/network/topology"/>
+      <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
       <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">
-        <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-ODU2</if-cap-type>
+        </supported-interface-capability>
         <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>
+      <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>
+      <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
       <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">
+      <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>
+      <xpdr-tp-port-connection-attributes xmlns="http://org/openroadm/otn/network/topology">
+        <ts-pool>7</ts-pool>
+        <ts-pool>6</ts-pool>
+        <ts-pool>9</ts-pool>
+        <ts-pool>8</ts-pool>
+        <ts-pool>3</ts-pool>
+        <ts-pool>2</ts-pool>
+        <ts-pool>5</ts-pool>
+        <ts-pool>4</ts-pool>
+        <ts-pool>1</ts-pool>
+        <ts-pool>39</ts-pool>
+        <ts-pool>38</ts-pool>
+        <ts-pool>41</ts-pool>
+        <ts-pool>40</ts-pool>
+        <ts-pool>35</ts-pool>
+        <ts-pool>34</ts-pool>
+        <ts-pool>37</ts-pool>
+        <ts-pool>36</ts-pool>
+        <ts-pool>31</ts-pool>
+        <ts-pool>30</ts-pool>
+        <ts-pool>33</ts-pool>
+        <ts-pool>32</ts-pool>
+        <ts-pool>27</ts-pool>
+        <ts-pool>26</ts-pool>
+        <ts-pool>29</ts-pool>
+        <ts-pool>28</ts-pool>
+        <ts-pool>23</ts-pool>
+        <ts-pool>22</ts-pool>
+        <ts-pool>25</ts-pool>
+        <ts-pool>24</ts-pool>
+        <ts-pool>19</ts-pool>
+        <ts-pool>18</ts-pool>
+        <ts-pool>21</ts-pool>
+        <ts-pool>20</ts-pool>
+        <ts-pool>15</ts-pool>
+        <ts-pool>14</ts-pool>
+        <ts-pool>17</ts-pool>
+        <ts-pool>16</ts-pool>
+        <ts-pool>11</ts-pool>
+        <ts-pool>10</ts-pool>
+        <ts-pool>13</ts-pool>
+        <ts-pool>12</ts-pool>
+        <ts-pool>71</ts-pool>
+        <ts-pool>70</ts-pool>
+        <ts-pool>73</ts-pool>
+        <ts-pool>72</ts-pool>
+        <ts-pool>67</ts-pool>
+        <ts-pool>66</ts-pool>
+        <ts-pool>69</ts-pool>
+        <ts-pool>68</ts-pool>
+        <ts-pool>63</ts-pool>
+        <ts-pool>62</ts-pool>
+        <ts-pool>65</ts-pool>
+        <ts-pool>64</ts-pool>
+        <ts-pool>59</ts-pool>
+        <ts-pool>58</ts-pool>
+        <ts-pool>61</ts-pool>
+        <ts-pool>60</ts-pool>
+        <ts-pool>55</ts-pool>
+        <ts-pool>54</ts-pool>
+        <ts-pool>57</ts-pool>
+        <ts-pool>56</ts-pool>
+        <ts-pool>51</ts-pool>
+        <ts-pool>50</ts-pool>
+        <ts-pool>53</ts-pool>
+        <ts-pool>52</ts-pool>
+        <ts-pool>47</ts-pool>
+        <ts-pool>46</ts-pool>
+        <ts-pool>49</ts-pool>
+        <ts-pool>48</ts-pool>
+        <ts-pool>43</ts-pool>
+        <ts-pool>42</ts-pool>
+        <ts-pool>45</ts-pool>
+        <ts-pool>44</ts-pool>
+        <ts-pool>79</ts-pool>
+        <ts-pool>78</ts-pool>
+        <ts-pool>80</ts-pool>
+        <ts-pool>75</ts-pool>
+        <ts-pool>74</ts-pool>
+        <ts-pool>77</ts-pool>
+        <ts-pool>76</ts-pool>
+        <rate xmlns:x="http://org/openroadm/otn-common-types">x:ODU4</rate>
         <odtu-tpn-pool>
-          <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>
-          <tpn-pool>11</tpn-pool>
-          <tpn-pool>14</tpn-pool>
-          <tpn-pool>13</tpn-pool>
-          <tpn-pool>16</tpn-pool>
-          <tpn-pool>15</tpn-pool>
+          <odtu-type xmlns:x="http://org/openroadm/otn-common-types">x:ODTU4.ts-Allocated</odtu-type>
+          <tpn-pool>80</tpn-pool>
+          <tpn-pool>79</tpn-pool>
+          <tpn-pool>74</tpn-pool>
+          <tpn-pool>73</tpn-pool>
+          <tpn-pool>72</tpn-pool>
+          <tpn-pool>71</tpn-pool>
+          <tpn-pool>78</tpn-pool>
+          <tpn-pool>77</tpn-pool>
+          <tpn-pool>76</tpn-pool>
+          <tpn-pool>75</tpn-pool>
+          <tpn-pool>66</tpn-pool>
+          <tpn-pool>65</tpn-pool>
+          <tpn-pool>64</tpn-pool>
+          <tpn-pool>63</tpn-pool>
+          <tpn-pool>70</tpn-pool>
+          <tpn-pool>69</tpn-pool>
+          <tpn-pool>68</tpn-pool>
+          <tpn-pool>67</tpn-pool>
+          <tpn-pool>58</tpn-pool>
+          <tpn-pool>57</tpn-pool>
+          <tpn-pool>56</tpn-pool>
+          <tpn-pool>55</tpn-pool>
+          <tpn-pool>62</tpn-pool>
+          <tpn-pool>61</tpn-pool>
+          <tpn-pool>60</tpn-pool>
+          <tpn-pool>59</tpn-pool>
           <tpn-pool>18</tpn-pool>
           <tpn-pool>17</tpn-pool>
-          <tpn-pool>4</tpn-pool>
-          <tpn-pool>3</tpn-pool>
-          <tpn-pool>6</tpn-pool>
-          <tpn-pool>5</tpn-pool>
-          <tpn-pool>8</tpn-pool>
-          <tpn-pool>7</tpn-pool>
-          <tpn-pool>10</tpn-pool>
-          <tpn-pool>9</tpn-pool>
-          <tpn-pool>28</tpn-pool>
-          <tpn-pool>27</tpn-pool>
-          <tpn-pool>30</tpn-pool>
-          <tpn-pool>29</tpn-pool>
-          <tpn-pool>32</tpn-pool>
-          <tpn-pool>31</tpn-pool>
-          <tpn-pool>34</tpn-pool>
-          <tpn-pool>33</tpn-pool>
-          <tpn-pool>20</tpn-pool>
-          <tpn-pool>19</tpn-pool>
+          <tpn-pool>16</tpn-pool>
+          <tpn-pool>15</tpn-pool>
           <tpn-pool>22</tpn-pool>
           <tpn-pool>21</tpn-pool>
-          <tpn-pool>24</tpn-pool>
-          <tpn-pool>23</tpn-pool>
-          <tpn-pool>26</tpn-pool>
-          <tpn-pool>25</tpn-pool>
-          <tpn-pool>44</tpn-pool>
-          <tpn-pool>43</tpn-pool>
-          <tpn-pool>46</tpn-pool>
-          <tpn-pool>45</tpn-pool>
-          <tpn-pool>48</tpn-pool>
-          <tpn-pool>47</tpn-pool>
+          <tpn-pool>20</tpn-pool>
+          <tpn-pool>19</tpn-pool>
+          <tpn-pool>10</tpn-pool>
+          <tpn-pool>9</tpn-pool>
+          <tpn-pool>8</tpn-pool>
+          <tpn-pool>7</tpn-pool>
+          <tpn-pool>14</tpn-pool>
+          <tpn-pool>13</tpn-pool>
+          <tpn-pool>12</tpn-pool>
+          <tpn-pool>11</tpn-pool>
+          <tpn-pool>2</tpn-pool>
+          <tpn-pool>1</tpn-pool>
+          <tpn-pool>6</tpn-pool>
+          <tpn-pool>5</tpn-pool>
+          <tpn-pool>4</tpn-pool>
+          <tpn-pool>3</tpn-pool>
           <tpn-pool>50</tpn-pool>
           <tpn-pool>49</tpn-pool>
-          <tpn-pool>36</tpn-pool>
-          <tpn-pool>35</tpn-pool>
-          <tpn-pool>38</tpn-pool>
-          <tpn-pool>37</tpn-pool>
-          <tpn-pool>40</tpn-pool>
-          <tpn-pool>39</tpn-pool>
-          <tpn-pool>42</tpn-pool>
-          <tpn-pool>41</tpn-pool>
-          <tpn-pool>60</tpn-pool>
-          <tpn-pool>59</tpn-pool>
-          <tpn-pool>62</tpn-pool>
-          <tpn-pool>61</tpn-pool>
-          <tpn-pool>64</tpn-pool>
-          <tpn-pool>63</tpn-pool>
-          <tpn-pool>66</tpn-pool>
-          <tpn-pool>65</tpn-pool>
-          <tpn-pool>52</tpn-pool>
-          <tpn-pool>51</tpn-pool>
+          <tpn-pool>48</tpn-pool>
+          <tpn-pool>47</tpn-pool>
           <tpn-pool>54</tpn-pool>
           <tpn-pool>53</tpn-pool>
-          <tpn-pool>56</tpn-pool>
-          <tpn-pool>55</tpn-pool>
-          <tpn-pool>58</tpn-pool>
-          <tpn-pool>57</tpn-pool>
-          <tpn-pool>76</tpn-pool>
-          <tpn-pool>75</tpn-pool>
-          <tpn-pool>78</tpn-pool>
-          <tpn-pool>77</tpn-pool>
-          <tpn-pool>80</tpn-pool>
-          <tpn-pool>79</tpn-pool>
-          <tpn-pool>68</tpn-pool>
-          <tpn-pool>67</tpn-pool>
-          <tpn-pool>70</tpn-pool>
-          <tpn-pool>69</tpn-pool>
-          <tpn-pool>72</tpn-pool>
-          <tpn-pool>71</tpn-pool>
-          <tpn-pool>74</tpn-pool>
-          <tpn-pool>73</tpn-pool>
-        </odtu-tpn-pool>
-        <rate xmlns:x="http://org/openroadm/otn-common-types">x:ODU4</rate>
-        <ts-pool>48</ts-pool>
-        <ts-pool>49</ts-pool>
-        <ts-pool>46</ts-pool>
-        <ts-pool>47</ts-pool>
-        <ts-pool>52</ts-pool>
-        <ts-pool>53</ts-pool>
-        <ts-pool>50</ts-pool>
-        <ts-pool>51</ts-pool>
-        <ts-pool>40</ts-pool>
-        <ts-pool>41</ts-pool>
-        <ts-pool>38</ts-pool>
-        <ts-pool>39</ts-pool>
-        <ts-pool>44</ts-pool>
-        <ts-pool>45</ts-pool>
-        <ts-pool>42</ts-pool>
-        <ts-pool>43</ts-pool>
-        <ts-pool>64</ts-pool>
-        <ts-pool>65</ts-pool>
-        <ts-pool>62</ts-pool>
-        <ts-pool>63</ts-pool>
-        <ts-pool>68</ts-pool>
-        <ts-pool>69</ts-pool>
-        <ts-pool>66</ts-pool>
-        <ts-pool>67</ts-pool>
-        <ts-pool>56</ts-pool>
-        <ts-pool>57</ts-pool>
-        <ts-pool>54</ts-pool>
-        <ts-pool>55</ts-pool>
-        <ts-pool>60</ts-pool>
-        <ts-pool>61</ts-pool>
-        <ts-pool>58</ts-pool>
-        <ts-pool>59</ts-pool>
-        <ts-pool>80</ts-pool>
-        <ts-pool>78</ts-pool>
-        <ts-pool>79</ts-pool>
-        <ts-pool>72</ts-pool>
-        <ts-pool>73</ts-pool>
-        <ts-pool>70</ts-pool>
-        <ts-pool>71</ts-pool>
-        <ts-pool>76</ts-pool>
-        <ts-pool>77</ts-pool>
-        <ts-pool>74</ts-pool>
-        <ts-pool>75</ts-pool>
-        <ts-pool>1</ts-pool>
-        <ts-pool>4</ts-pool>
-        <ts-pool>5</ts-pool>
-        <ts-pool>2</ts-pool>
-        <ts-pool>3</ts-pool>
-        <ts-pool>16</ts-pool>
-        <ts-pool>17</ts-pool>
-        <ts-pool>14</ts-pool>
-        <ts-pool>15</ts-pool>
-        <ts-pool>20</ts-pool>
-        <ts-pool>21</ts-pool>
-        <ts-pool>18</ts-pool>
-        <ts-pool>19</ts-pool>
-        <ts-pool>8</ts-pool>
-        <ts-pool>9</ts-pool>
-        <ts-pool>6</ts-pool>
-        <ts-pool>7</ts-pool>
-        <ts-pool>12</ts-pool>
-        <ts-pool>13</ts-pool>
-        <ts-pool>10</ts-pool>
-        <ts-pool>11</ts-pool>
-        <ts-pool>32</ts-pool>
-        <ts-pool>33</ts-pool>
-        <ts-pool>30</ts-pool>
-        <ts-pool>31</ts-pool>
-        <ts-pool>36</ts-pool>
-        <ts-pool>37</ts-pool>
-        <ts-pool>34</ts-pool>
-        <ts-pool>35</ts-pool>
-        <ts-pool>24</ts-pool>
-        <ts-pool>25</ts-pool>
-        <ts-pool>22</ts-pool>
-        <ts-pool>23</ts-pool>
-        <ts-pool>28</ts-pool>
-        <ts-pool>29</ts-pool>
-        <ts-pool>26</ts-pool>
-        <ts-pool>27</ts-pool>
+          <tpn-pool>52</tpn-pool>
+          <tpn-pool>51</tpn-pool>
+          <tpn-pool>42</tpn-pool>
+          <tpn-pool>41</tpn-pool>
+          <tpn-pool>40</tpn-pool>
+          <tpn-pool>39</tpn-pool>
+          <tpn-pool>46</tpn-pool>
+          <tpn-pool>45</tpn-pool>
+          <tpn-pool>44</tpn-pool>
+          <tpn-pool>43</tpn-pool>
+          <tpn-pool>34</tpn-pool>
+          <tpn-pool>33</tpn-pool>
+          <tpn-pool>32</tpn-pool>
+          <tpn-pool>31</tpn-pool>
+          <tpn-pool>38</tpn-pool>
+          <tpn-pool>37</tpn-pool>
+          <tpn-pool>36</tpn-pool>
+          <tpn-pool>35</tpn-pool>
+          <tpn-pool>26</tpn-pool>
+          <tpn-pool>25</tpn-pool>
+          <tpn-pool>24</tpn-pool>
+          <tpn-pool>23</tpn-pool>
+          <tpn-pool>30</tpn-pool>
+          <tpn-pool>29</tpn-pool>
+          <tpn-pool>28</tpn-pool>
+          <tpn-pool>27</tpn-pool>
+        </odtu-tpn-pool>
       </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>
+      <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
       <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">
-        <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</if-cap-type>
+        </supported-interface-capability>
+        <supported-interface-capability>
+          <if-cap-type xmlns:x="http://org/openroadm/port/types">x:if-10GE-ODU2</if-cap-type>
+        </supported-interface-capability>
         <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>
+      <xpdr-tp-port-connection-attributes xmlns="http://org/openroadm/otn/network/topology"/>
+      <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
       <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
     </termination-point>
-    <supporting-node>
-      <network-ref>openroadm-network</network-ref>
-      <node-ref>SPDR-SA1</node-ref>
-    </supporting-node>
-    <supporting-node>
-      <network-ref>clli-network</network-ref>
-      <node-ref>NodeSA</node-ref>
-    </supporting-node>
-    <supporting-node>
-      <network-ref>openroadm-topology</network-ref>
-      <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">
+    <xpdr-attributes xmlns="http://org/openroadm/otn/network/topology">
+      <xpdr-number>1</xpdr-number>
+    </xpdr-attributes>
+    <tp-bandwidth-sharing 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>
+        <switching-pool-type>non-blocking</switching-pool-type>
         <non-blocking-list>
           <nbl-number>4</nbl-number>
-          <available-interconnect-bandwidth>10
-          </available-interconnect-bandwidth>
-          <interconnect-bandwidth-unit>1000000000
-          </interconnect-bandwidth-unit>
+          <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
           <tp-list>XPDR1-CLIENT4</tp-list>
           <tp-list>XPDR1-NETWORK1</tp-list>
+          <available-interconnect-bandwidth>10</available-interconnect-bandwidth>
         </non-blocking-list>
         <non-blocking-list>
           <nbl-number>1</nbl-number>
-          <available-interconnect-bandwidth>10
-          </available-interconnect-bandwidth>
-          <interconnect-bandwidth-unit>1000000000
-          </interconnect-bandwidth-unit>
-          <tp-list>XPDR1-CLIENT1</tp-list>
+          <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
           <tp-list>XPDR1-NETWORK1</tp-list>
+          <tp-list>XPDR1-CLIENT1</tp-list>
+          <available-interconnect-bandwidth>10</available-interconnect-bandwidth>
         </non-blocking-list>
         <non-blocking-list>
-          <nbl-number>2</nbl-number>
-          <available-interconnect-bandwidth>10
-          </available-interconnect-bandwidth>
-          <interconnect-bandwidth-unit>1000000000
-          </interconnect-bandwidth-unit>
+          <nbl-number>3</nbl-number>
+          <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
           <tp-list>XPDR1-NETWORK1</tp-list>
-          <tp-list>XPDR1-CLIENT2</tp-list>
+          <tp-list>XPDR1-CLIENT3</tp-list>
+          <available-interconnect-bandwidth>10</available-interconnect-bandwidth>
         </non-blocking-list>
         <non-blocking-list>
-          <nbl-number>3</nbl-number>
-          <available-interconnect-bandwidth>10
-          </available-interconnect-bandwidth>
-          <interconnect-bandwidth-unit>1000000000
-          </interconnect-bandwidth-unit>
+          <nbl-number>2</nbl-number>
+          <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
           <tp-list>XPDR1-NETWORK1</tp-list>
-          <tp-list>XPDR1-CLIENT3</tp-list>
+          <tp-list>XPDR1-CLIENT2</tp-list>
+          <available-interconnect-bandwidth>10</available-interconnect-bandwidth>
         </non-blocking-list>
-        <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">
-      <xpdr-number>1</xpdr-number>
-    </xpdr-attributes>
+    <supporting-node>
+      <network-ref>openroadm-network</network-ref>
+      <node-ref>SPDR-SA1</node-ref>
+    </supporting-node>
+    <supporting-node>
+      <network-ref>clli-network</network-ref>
+      <node-ref>NodeSA</node-ref>
+    </supporting-node>
+    <supporting-node>
+      <network-ref>openroadm-topology</network-ref>
+      <node-ref>SPDR-SA1-XPDR1</node-ref>
+    </supporting-node>
   </node>
   <node>
     <node-id>XPDR-A1-XPDR1</node-id>
-    <termination-point
-      xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <node-type xmlns="http://org/openroadm/common/network">TPDR</node-type>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <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">
+      <associated-connection-map-port xmlns="http://transportpce/topology">XPDR1-NETWORK1</associated-connection-map-port>
+      <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>
+          <if-cap-type xmlns:x="http://org/openroadm/port/types">x:if-100GE</if-cap-type>
         </supported-interface-capability>
       </tp-supported-interfaces>
+      <xpdr-tp-port-connection-attributes xmlns="http://org/openroadm/otn/network/topology"/>
+      <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
       <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>
-      <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">
+      <associated-connection-map-port xmlns="http://transportpce/topology">XPDR1-NETWORK2</associated-connection-map-port>
+      <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>
+          <if-cap-type xmlns:x="http://org/openroadm/port/types">x:if-100GE</if-cap-type>
         </supported-interface-capability>
       </tp-supported-interfaces>
+      <xpdr-tp-port-connection-attributes xmlns="http://org/openroadm/otn/network/topology"/>
+      <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
       <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-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">
+      <associated-connection-map-port xmlns="http://transportpce/topology">XPDR1-CLIENT2</associated-connection-map-port>
+      <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</if-cap-type>
         </supported-interface-capability>
       </tp-supported-interfaces>
+      <xpdr-tp-port-connection-attributes xmlns="http://org/openroadm/otn/network/topology"/>
+      <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
       <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-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">
+      <associated-connection-map-port xmlns="http://transportpce/topology">XPDR1-CLIENT1</associated-connection-map-port>
+      <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</if-cap-type>
         </supported-interface-capability>
       </tp-supported-interfaces>
+      <xpdr-tp-port-connection-attributes xmlns="http://org/openroadm/otn/network/topology"/>
+      <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
       <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
     </termination-point>
+    <xpdr-attributes xmlns="http://org/openroadm/otn/network/topology">
+      <xpdr-number>1</xpdr-number>
+    </xpdr-attributes>
     <supporting-node>
       <network-ref>openroadm-network</network-ref>
       <node-ref>XPDR-A1</node-ref>
@@ -510,476 +478,747 @@
       <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">
+    <node-type xmlns="http://org/openroadm/common/network">MUXPDR</node-type>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <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">
-        <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-ODU2</if-cap-type>
+        </supported-interface-capability>
         <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>
+      <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>
+      <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
       <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">
-        <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</if-cap-type>
+        </supported-interface-capability>
+        <supported-interface-capability>
+          <if-cap-type xmlns:x="http://org/openroadm/port/types">x:if-10GE-ODU2</if-cap-type>
+        </supported-interface-capability>
         <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>
+      <xpdr-tp-port-connection-attributes xmlns="http://org/openroadm/otn/network/topology"/>
+      <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
       <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">
-        <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-ODU2</if-cap-type>
+        </supported-interface-capability>
         <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>
+      <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>
+      <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
       <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">
+      <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>
+      <xpdr-tp-port-connection-attributes xmlns="http://org/openroadm/otn/network/topology">
+        <ts-pool>7</ts-pool>
+        <ts-pool>6</ts-pool>
+        <ts-pool>9</ts-pool>
+        <ts-pool>8</ts-pool>
+        <ts-pool>3</ts-pool>
+        <ts-pool>2</ts-pool>
+        <ts-pool>5</ts-pool>
+        <ts-pool>4</ts-pool>
+        <ts-pool>1</ts-pool>
+        <ts-pool>39</ts-pool>
+        <ts-pool>38</ts-pool>
+        <ts-pool>41</ts-pool>
+        <ts-pool>40</ts-pool>
+        <ts-pool>35</ts-pool>
+        <ts-pool>34</ts-pool>
+        <ts-pool>37</ts-pool>
+        <ts-pool>36</ts-pool>
+        <ts-pool>31</ts-pool>
+        <ts-pool>30</ts-pool>
+        <ts-pool>33</ts-pool>
+        <ts-pool>32</ts-pool>
+        <ts-pool>27</ts-pool>
+        <ts-pool>26</ts-pool>
+        <ts-pool>29</ts-pool>
+        <ts-pool>28</ts-pool>
+        <ts-pool>23</ts-pool>
+        <ts-pool>22</ts-pool>
+        <ts-pool>25</ts-pool>
+        <ts-pool>24</ts-pool>
+        <ts-pool>19</ts-pool>
+        <ts-pool>18</ts-pool>
+        <ts-pool>21</ts-pool>
+        <ts-pool>20</ts-pool>
+        <ts-pool>15</ts-pool>
+        <ts-pool>14</ts-pool>
+        <ts-pool>17</ts-pool>
+        <ts-pool>16</ts-pool>
+        <ts-pool>11</ts-pool>
+        <ts-pool>10</ts-pool>
+        <ts-pool>13</ts-pool>
+        <ts-pool>12</ts-pool>
+        <ts-pool>71</ts-pool>
+        <ts-pool>70</ts-pool>
+        <ts-pool>73</ts-pool>
+        <ts-pool>72</ts-pool>
+        <ts-pool>67</ts-pool>
+        <ts-pool>66</ts-pool>
+        <ts-pool>69</ts-pool>
+        <ts-pool>68</ts-pool>
+        <ts-pool>63</ts-pool>
+        <ts-pool>62</ts-pool>
+        <ts-pool>65</ts-pool>
+        <ts-pool>64</ts-pool>
+        <ts-pool>59</ts-pool>
+        <ts-pool>58</ts-pool>
+        <ts-pool>61</ts-pool>
+        <ts-pool>60</ts-pool>
+        <ts-pool>55</ts-pool>
+        <ts-pool>54</ts-pool>
+        <ts-pool>57</ts-pool>
+        <ts-pool>56</ts-pool>
+        <ts-pool>51</ts-pool>
+        <ts-pool>50</ts-pool>
+        <ts-pool>53</ts-pool>
+        <ts-pool>52</ts-pool>
+        <ts-pool>47</ts-pool>
+        <ts-pool>46</ts-pool>
+        <ts-pool>49</ts-pool>
+        <ts-pool>48</ts-pool>
+        <ts-pool>43</ts-pool>
+        <ts-pool>42</ts-pool>
+        <ts-pool>45</ts-pool>
+        <ts-pool>44</ts-pool>
+        <ts-pool>79</ts-pool>
+        <ts-pool>78</ts-pool>
+        <ts-pool>80</ts-pool>
+        <ts-pool>75</ts-pool>
+        <ts-pool>74</ts-pool>
+        <ts-pool>77</ts-pool>
+        <ts-pool>76</ts-pool>
+        <rate xmlns:x="http://org/openroadm/otn-common-types">x:ODU4</rate>
         <odtu-tpn-pool>
-          <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>
-          <tpn-pool>11</tpn-pool>
-          <tpn-pool>14</tpn-pool>
-          <tpn-pool>13</tpn-pool>
-          <tpn-pool>16</tpn-pool>
-          <tpn-pool>15</tpn-pool>
-          <tpn-pool>18</tpn-pool>
+          <odtu-type xmlns:x="http://org/openroadm/otn-common-types">x:ODTU4.ts-Allocated</odtu-type>
+          <tpn-pool>80</tpn-pool>
+          <tpn-pool>79</tpn-pool>
+          <tpn-pool>74</tpn-pool>
+          <tpn-pool>73</tpn-pool>
+          <tpn-pool>72</tpn-pool>
+          <tpn-pool>71</tpn-pool>
+          <tpn-pool>78</tpn-pool>
+          <tpn-pool>77</tpn-pool>
+          <tpn-pool>76</tpn-pool>
+          <tpn-pool>75</tpn-pool>
+          <tpn-pool>66</tpn-pool>
+          <tpn-pool>65</tpn-pool>
+          <tpn-pool>64</tpn-pool>
+          <tpn-pool>63</tpn-pool>
+          <tpn-pool>70</tpn-pool>
+          <tpn-pool>69</tpn-pool>
+          <tpn-pool>68</tpn-pool>
+          <tpn-pool>67</tpn-pool>
+          <tpn-pool>58</tpn-pool>
+          <tpn-pool>57</tpn-pool>
+          <tpn-pool>56</tpn-pool>
+          <tpn-pool>55</tpn-pool>
+          <tpn-pool>62</tpn-pool>
+          <tpn-pool>61</tpn-pool>
+          <tpn-pool>60</tpn-pool>
+          <tpn-pool>59</tpn-pool>
+          <tpn-pool>18</tpn-pool>
           <tpn-pool>17</tpn-pool>
-          <tpn-pool>4</tpn-pool>
-          <tpn-pool>3</tpn-pool>
-          <tpn-pool>6</tpn-pool>
-          <tpn-pool>5</tpn-pool>
-          <tpn-pool>8</tpn-pool>
-          <tpn-pool>7</tpn-pool>
-          <tpn-pool>10</tpn-pool>
-          <tpn-pool>9</tpn-pool>
-          <tpn-pool>28</tpn-pool>
-          <tpn-pool>27</tpn-pool>
-          <tpn-pool>30</tpn-pool>
-          <tpn-pool>29</tpn-pool>
-          <tpn-pool>32</tpn-pool>
-          <tpn-pool>31</tpn-pool>
-          <tpn-pool>34</tpn-pool>
-          <tpn-pool>33</tpn-pool>
-          <tpn-pool>20</tpn-pool>
-          <tpn-pool>19</tpn-pool>
+          <tpn-pool>16</tpn-pool>
+          <tpn-pool>15</tpn-pool>
           <tpn-pool>22</tpn-pool>
           <tpn-pool>21</tpn-pool>
-          <tpn-pool>24</tpn-pool>
-          <tpn-pool>23</tpn-pool>
-          <tpn-pool>26</tpn-pool>
-          <tpn-pool>25</tpn-pool>
-          <tpn-pool>44</tpn-pool>
-          <tpn-pool>43</tpn-pool>
-          <tpn-pool>46</tpn-pool>
-          <tpn-pool>45</tpn-pool>
-          <tpn-pool>48</tpn-pool>
-          <tpn-pool>47</tpn-pool>
+          <tpn-pool>20</tpn-pool>
+          <tpn-pool>19</tpn-pool>
+          <tpn-pool>10</tpn-pool>
+          <tpn-pool>9</tpn-pool>
+          <tpn-pool>8</tpn-pool>
+          <tpn-pool>7</tpn-pool>
+          <tpn-pool>14</tpn-pool>
+          <tpn-pool>13</tpn-pool>
+          <tpn-pool>12</tpn-pool>
+          <tpn-pool>11</tpn-pool>
+          <tpn-pool>2</tpn-pool>
+          <tpn-pool>1</tpn-pool>
+          <tpn-pool>6</tpn-pool>
+          <tpn-pool>5</tpn-pool>
+          <tpn-pool>4</tpn-pool>
+          <tpn-pool>3</tpn-pool>
           <tpn-pool>50</tpn-pool>
           <tpn-pool>49</tpn-pool>
-          <tpn-pool>36</tpn-pool>
-          <tpn-pool>35</tpn-pool>
-          <tpn-pool>38</tpn-pool>
-          <tpn-pool>37</tpn-pool>
-          <tpn-pool>40</tpn-pool>
-          <tpn-pool>39</tpn-pool>
-          <tpn-pool>42</tpn-pool>
-          <tpn-pool>41</tpn-pool>
-          <tpn-pool>60</tpn-pool>
-          <tpn-pool>59</tpn-pool>
-          <tpn-pool>62</tpn-pool>
-          <tpn-pool>61</tpn-pool>
-          <tpn-pool>64</tpn-pool>
-          <tpn-pool>63</tpn-pool>
-          <tpn-pool>66</tpn-pool>
-          <tpn-pool>65</tpn-pool>
-          <tpn-pool>52</tpn-pool>
-          <tpn-pool>51</tpn-pool>
+          <tpn-pool>48</tpn-pool>
+          <tpn-pool>47</tpn-pool>
           <tpn-pool>54</tpn-pool>
           <tpn-pool>53</tpn-pool>
-          <tpn-pool>56</tpn-pool>
-          <tpn-pool>55</tpn-pool>
-          <tpn-pool>58</tpn-pool>
-          <tpn-pool>57</tpn-pool>
-          <tpn-pool>76</tpn-pool>
-          <tpn-pool>75</tpn-pool>
-          <tpn-pool>78</tpn-pool>
-          <tpn-pool>77</tpn-pool>
-          <tpn-pool>80</tpn-pool>
-          <tpn-pool>79</tpn-pool>
-          <tpn-pool>68</tpn-pool>
-          <tpn-pool>67</tpn-pool>
-          <tpn-pool>70</tpn-pool>
-          <tpn-pool>69</tpn-pool>
-          <tpn-pool>72</tpn-pool>
-          <tpn-pool>71</tpn-pool>
-          <tpn-pool>74</tpn-pool>
-          <tpn-pool>73</tpn-pool>
+          <tpn-pool>52</tpn-pool>
+          <tpn-pool>51</tpn-pool>
+          <tpn-pool>42</tpn-pool>
+          <tpn-pool>41</tpn-pool>
+          <tpn-pool>40</tpn-pool>
+          <tpn-pool>39</tpn-pool>
+          <tpn-pool>46</tpn-pool>
+          <tpn-pool>45</tpn-pool>
+          <tpn-pool>44</tpn-pool>
+          <tpn-pool>43</tpn-pool>
+          <tpn-pool>34</tpn-pool>
+          <tpn-pool>33</tpn-pool>
+          <tpn-pool>32</tpn-pool>
+          <tpn-pool>31</tpn-pool>
+          <tpn-pool>38</tpn-pool>
+          <tpn-pool>37</tpn-pool>
+          <tpn-pool>36</tpn-pool>
+          <tpn-pool>35</tpn-pool>
+          <tpn-pool>26</tpn-pool>
+          <tpn-pool>25</tpn-pool>
+          <tpn-pool>24</tpn-pool>
+          <tpn-pool>23</tpn-pool>
+          <tpn-pool>30</tpn-pool>
+          <tpn-pool>29</tpn-pool>
+          <tpn-pool>28</tpn-pool>
+          <tpn-pool>27</tpn-pool>
         </odtu-tpn-pool>
+      </xpdr-tp-port-connection-attributes>
+      <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+      <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-CLIENT4</tp-id>
+      <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</if-cap-type>
+        </supported-interface-capability>
+        <supported-interface-capability>
+          <if-cap-type xmlns:x="http://org/openroadm/port/types">x:if-10GE-ODU2</if-cap-type>
+        </supported-interface-capability>
+        <supported-interface-capability>
+          <if-cap-type xmlns:x="http://org/openroadm/port/types">x:if-10GE-ODU2e</if-cap-type>
+        </supported-interface-capability>
+      </tp-supported-interfaces>
+      <xpdr-tp-port-connection-attributes xmlns="http://org/openroadm/otn/network/topology"/>
+      <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+      <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
+    </termination-point>
+    <xpdr-attributes xmlns="http://org/openroadm/otn/network/topology">
+      <xpdr-number>1</xpdr-number>
+    </xpdr-attributes>
+    <tp-bandwidth-sharing 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>
+        <switching-pool-type>non-blocking</switching-pool-type>
+        <non-blocking-list>
+          <nbl-number>4</nbl-number>
+          <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+          <tp-list>XPDR1-CLIENT4</tp-list>
+          <tp-list>XPDR1-NETWORK1</tp-list>
+          <available-interconnect-bandwidth>10</available-interconnect-bandwidth>
+        </non-blocking-list>
+        <non-blocking-list>
+          <nbl-number>1</nbl-number>
+          <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+          <tp-list>XPDR1-NETWORK1</tp-list>
+          <tp-list>XPDR1-CLIENT1</tp-list>
+          <available-interconnect-bandwidth>10</available-interconnect-bandwidth>
+        </non-blocking-list>
+        <non-blocking-list>
+          <nbl-number>3</nbl-number>
+          <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+          <tp-list>XPDR1-NETWORK1</tp-list>
+          <tp-list>XPDR1-CLIENT3</tp-list>
+          <available-interconnect-bandwidth>10</available-interconnect-bandwidth>
+        </non-blocking-list>
+        <non-blocking-list>
+          <nbl-number>2</nbl-number>
+          <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+          <tp-list>XPDR1-NETWORK1</tp-list>
+          <tp-list>XPDR1-CLIENT2</tp-list>
+          <available-interconnect-bandwidth>10</available-interconnect-bandwidth>
+        </non-blocking-list>
+      </odu-switching-pools>
+    </switching-pools>
+    <supporting-node>
+      <network-ref>openroadm-network</network-ref>
+      <node-ref>SPDR-SC1</node-ref>
+    </supporting-node>
+    <supporting-node>
+      <network-ref>clli-network</network-ref>
+      <node-ref>NodeSC</node-ref>
+    </supporting-node>
+    <supporting-node>
+      <network-ref>openroadm-topology</network-ref>
+      <node-ref>SPDR-SC1-XPDR1</node-ref>
+    </supporting-node>
+  </node>
+  <node>
+    <node-id>SPDR-SA1-XPDR3</node-id>
+    <node-type xmlns="http://org/openroadm/common/network">MUXPDR</node-type>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+      <tp-id>XPDR3-CLIENT1</tp-id>
+      <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-1GE-ODU0</if-cap-type>
+        </supported-interface-capability>
+      </tp-supported-interfaces>
+      <xpdr-tp-port-connection-attributes xmlns="http://org/openroadm/otn/network/topology">
+        <rate xmlns:x="http://org/openroadm/otn-common-types">x:ODU0</rate>
+      </xpdr-tp-port-connection-attributes>
+      <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+      <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>XPDR3-NETWORK1</tp-id>
+      <supporting-termination-point>
+        <network-ref>openroadm-topology</network-ref>
+        <node-ref>SPDR-SA1-XPDR3</node-ref>
+        <tp-ref>XPDR3-NETWORK1</tp-ref>
+      </supporting-termination-point>
+      <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>
+      <xpdr-tp-port-connection-attributes xmlns="http://org/openroadm/otn/network/topology">
         <rate xmlns:x="http://org/openroadm/otn-common-types">x:ODU4</rate>
-        <ts-pool>48</ts-pool>
-        <ts-pool>49</ts-pool>
-        <ts-pool>46</ts-pool>
-        <ts-pool>47</ts-pool>
-        <ts-pool>52</ts-pool>
-        <ts-pool>53</ts-pool>
-        <ts-pool>50</ts-pool>
-        <ts-pool>51</ts-pool>
-        <ts-pool>40</ts-pool>
-        <ts-pool>41</ts-pool>
-        <ts-pool>38</ts-pool>
-        <ts-pool>39</ts-pool>
-        <ts-pool>44</ts-pool>
-        <ts-pool>45</ts-pool>
-        <ts-pool>42</ts-pool>
-        <ts-pool>43</ts-pool>
-        <ts-pool>64</ts-pool>
-        <ts-pool>65</ts-pool>
-        <ts-pool>62</ts-pool>
-        <ts-pool>63</ts-pool>
-        <ts-pool>68</ts-pool>
-        <ts-pool>69</ts-pool>
-        <ts-pool>66</ts-pool>
-        <ts-pool>67</ts-pool>
-        <ts-pool>56</ts-pool>
-        <ts-pool>57</ts-pool>
-        <ts-pool>54</ts-pool>
-        <ts-pool>55</ts-pool>
-        <ts-pool>60</ts-pool>
-        <ts-pool>61</ts-pool>
-        <ts-pool>58</ts-pool>
-        <ts-pool>59</ts-pool>
-        <ts-pool>80</ts-pool>
-        <ts-pool>78</ts-pool>
-        <ts-pool>79</ts-pool>
-        <ts-pool>72</ts-pool>
-        <ts-pool>73</ts-pool>
-        <ts-pool>70</ts-pool>
-        <ts-pool>71</ts-pool>
-        <ts-pool>76</ts-pool>
-        <ts-pool>77</ts-pool>
-        <ts-pool>74</ts-pool>
-        <ts-pool>75</ts-pool>
-        <ts-pool>1</ts-pool>
-        <ts-pool>4</ts-pool>
-        <ts-pool>5</ts-pool>
-        <ts-pool>2</ts-pool>
-        <ts-pool>3</ts-pool>
-        <ts-pool>16</ts-pool>
-        <ts-pool>17</ts-pool>
-        <ts-pool>14</ts-pool>
-        <ts-pool>15</ts-pool>
-        <ts-pool>20</ts-pool>
-        <ts-pool>21</ts-pool>
-        <ts-pool>18</ts-pool>
-        <ts-pool>19</ts-pool>
-        <ts-pool>8</ts-pool>
-        <ts-pool>9</ts-pool>
-        <ts-pool>6</ts-pool>
-        <ts-pool>7</ts-pool>
-        <ts-pool>12</ts-pool>
-        <ts-pool>13</ts-pool>
-        <ts-pool>10</ts-pool>
-        <ts-pool>11</ts-pool>
-        <ts-pool>32</ts-pool>
-        <ts-pool>33</ts-pool>
-        <ts-pool>30</ts-pool>
-        <ts-pool>31</ts-pool>
-        <ts-pool>36</ts-pool>
-        <ts-pool>37</ts-pool>
-        <ts-pool>34</ts-pool>
-        <ts-pool>35</ts-pool>
-        <ts-pool>24</ts-pool>
-        <ts-pool>25</ts-pool>
-        <ts-pool>22</ts-pool>
-        <ts-pool>23</ts-pool>
-        <ts-pool>28</ts-pool>
-        <ts-pool>29</ts-pool>
-        <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">
+      <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+      <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>XPDR3-CLIENT4</tp-id>
+      <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-1GE-ODU0</if-cap-type>
+        </supported-interface-capability>
+      </tp-supported-interfaces>
+      <xpdr-tp-port-connection-attributes xmlns="http://org/openroadm/otn/network/topology">
+        <rate xmlns:x="http://org/openroadm/otn-common-types">x:ODU0</rate>
+      </xpdr-tp-port-connection-attributes>
+      <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+      <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>XPDR3-CLIENT2</tp-id>
+      <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-1GE-ODU0</if-cap-type>
+        </supported-interface-capability>
+      </tp-supported-interfaces>
+      <xpdr-tp-port-connection-attributes xmlns="http://org/openroadm/otn/network/topology">
+        <rate xmlns:x="http://org/openroadm/otn-common-types">x:ODU0</rate>
+      </xpdr-tp-port-connection-attributes>
+      <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+      <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>XPDR3-CLIENT3</tp-id>
+      <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-1GE-ODU0</if-cap-type>
+        </supported-interface-capability>
+      </tp-supported-interfaces>
+      <xpdr-tp-port-connection-attributes xmlns="http://org/openroadm/otn/network/topology">
+        <rate xmlns:x="http://org/openroadm/otn-common-types">x:ODU0</rate>
+      </xpdr-tp-port-connection-attributes>
+      <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+      <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
+    </termination-point>
+    <xpdr-attributes xmlns="http://org/openroadm/otn/network/topology">
+      <xpdr-number>3</xpdr-number>
+    </xpdr-attributes>
+    <tp-bandwidth-sharing 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>
+        <switching-pool-type>non-blocking</switching-pool-type>
+        <non-blocking-list>
+          <nbl-number>4</nbl-number>
+          <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+          <tp-list>XPDR3-NETWORK1</tp-list>
+          <tp-list>XPDR3-CLIENT4</tp-list>
+          <available-interconnect-bandwidth>10</available-interconnect-bandwidth>
+        </non-blocking-list>
+        <non-blocking-list>
+          <nbl-number>1</nbl-number>
+          <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+          <tp-list>XPDR3-NETWORK1</tp-list>
+          <tp-list>XPDR3-CLIENT1</tp-list>
+          <available-interconnect-bandwidth>10</available-interconnect-bandwidth>
+        </non-blocking-list>
+        <non-blocking-list>
+          <nbl-number>3</nbl-number>
+          <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+          <tp-list>XPDR3-CLIENT3</tp-list>
+          <tp-list>XPDR3-NETWORK1</tp-list>
+          <available-interconnect-bandwidth>10</available-interconnect-bandwidth>
+        </non-blocking-list>
+        <non-blocking-list>
+          <nbl-number>2</nbl-number>
+          <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+          <tp-list>XPDR3-CLIENT2</tp-list>
+          <tp-list>XPDR3-NETWORK1</tp-list>
+          <available-interconnect-bandwidth>10</available-interconnect-bandwidth>
+        </non-blocking-list>
+      </odu-switching-pools>
+    </switching-pools>
+    <supporting-node>
+      <network-ref>openroadm-network</network-ref>
+      <node-ref>SPDR-SA1</node-ref>
+    </supporting-node>
+    <supporting-node>
+      <network-ref>clli-network</network-ref>
+      <node-ref>NodeSA</node-ref>
+    </supporting-node>
+    <supporting-node>
+      <network-ref>openroadm-topology</network-ref>
+      <node-ref>SPDR-SA1-XPDR3</node-ref>
+    </supporting-node>
+  </node>
+  <node>
+    <node-id>SPDR-SC1-XPDR3</node-id>
+    <node-type xmlns="http://org/openroadm/common/network">MUXPDR</node-type>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+      <tp-id>XPDR3-CLIENT1</tp-id>
+      <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-1GE-ODU0</if-cap-type>
+        </supported-interface-capability>
+      </tp-supported-interfaces>
+      <xpdr-tp-port-connection-attributes xmlns="http://org/openroadm/otn/network/topology">
+        <rate xmlns:x="http://org/openroadm/otn-common-types">x:ODU0</rate>
+      </xpdr-tp-port-connection-attributes>
+      <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+      <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>XPDR3-NETWORK1</tp-id>
+      <supporting-termination-point>
+        <network-ref>openroadm-topology</network-ref>
+        <node-ref>SPDR-SC1-XPDR3</node-ref>
+        <tp-ref>XPDR3-NETWORK1</tp-ref>
+      </supporting-termination-point>
+      <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>
+      <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>
+      <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
       <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-CLIENT4</tp-id>
-      <xpdr-tp-port-connection-attributes
-        xmlns="http://org/openroadm/otn/network/topology">
-        <rate xmlns:x="http://org/openroadm/otn-common-types">x:ODU2e</rate>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+      <tp-id>XPDR3-CLIENT4</tp-id>
+      <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-1GE-ODU0</if-cap-type>
+        </supported-interface-capability>
+      </tp-supported-interfaces>
+      <xpdr-tp-port-connection-attributes xmlns="http://org/openroadm/otn/network/topology">
+        <rate xmlns:x="http://org/openroadm/otn-common-types">x:ODU0</rate>
       </xpdr-tp-port-connection-attributes>
-      <tp-supported-interfaces
-        xmlns="http://org/openroadm/otn/network/topology">
+      <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+      <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>XPDR3-CLIENT2</tp-id>
+      <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-1GE-ODU0</if-cap-type>
         </supported-interface-capability>
       </tp-supported-interfaces>
+      <xpdr-tp-port-connection-attributes xmlns="http://org/openroadm/otn/network/topology">
+        <rate xmlns:x="http://org/openroadm/otn-common-types">x:ODU0</rate>
+      </xpdr-tp-port-connection-attributes>
+      <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
       <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
     </termination-point>
-    <supporting-node>
-      <network-ref>openroadm-network</network-ref>
-      <node-ref>SPDR-SC1</node-ref>
-    </supporting-node>
-    <supporting-node>
-      <network-ref>clli-network</network-ref>
-      <node-ref>NodeSC</node-ref>
-    </supporting-node>
-    <supporting-node>
-      <network-ref>openroadm-topology</network-ref>
-      <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">
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+      <tp-id>XPDR3-CLIENT3</tp-id>
+      <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-1GE-ODU0</if-cap-type>
+        </supported-interface-capability>
+      </tp-supported-interfaces>
+      <xpdr-tp-port-connection-attributes xmlns="http://org/openroadm/otn/network/topology">
+        <rate xmlns:x="http://org/openroadm/otn-common-types">x:ODU0</rate>
+      </xpdr-tp-port-connection-attributes>
+      <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+      <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
+    </termination-point>
+    <xpdr-attributes xmlns="http://org/openroadm/otn/network/topology">
+      <xpdr-number>3</xpdr-number>
+    </xpdr-attributes>
+    <tp-bandwidth-sharing 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>
+        <switching-pool-type>non-blocking</switching-pool-type>
         <non-blocking-list>
           <nbl-number>4</nbl-number>
-          <available-interconnect-bandwidth>10
-          </available-interconnect-bandwidth>
-          <interconnect-bandwidth-unit>1000000000
-          </interconnect-bandwidth-unit>
-          <tp-list>XPDR1-CLIENT4</tp-list>
-          <tp-list>XPDR1-NETWORK1</tp-list>
+          <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+          <tp-list>XPDR3-NETWORK1</tp-list>
+          <tp-list>XPDR3-CLIENT4</tp-list>
+          <available-interconnect-bandwidth>10</available-interconnect-bandwidth>
         </non-blocking-list>
         <non-blocking-list>
           <nbl-number>1</nbl-number>
-          <available-interconnect-bandwidth>10
-          </available-interconnect-bandwidth>
-          <interconnect-bandwidth-unit>1000000000
-          </interconnect-bandwidth-unit>
-          <tp-list>XPDR1-CLIENT1</tp-list>
-          <tp-list>XPDR1-NETWORK1</tp-list>
+          <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+          <tp-list>XPDR3-NETWORK1</tp-list>
+          <tp-list>XPDR3-CLIENT1</tp-list>
+          <available-interconnect-bandwidth>10</available-interconnect-bandwidth>
         </non-blocking-list>
         <non-blocking-list>
-          <nbl-number>2</nbl-number>
-          <available-interconnect-bandwidth>10
-          </available-interconnect-bandwidth>
-          <interconnect-bandwidth-unit>1000000000
-          </interconnect-bandwidth-unit>
-          <tp-list>XPDR1-NETWORK1</tp-list>
-          <tp-list>XPDR1-CLIENT2</tp-list>
+          <nbl-number>3</nbl-number>
+          <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+          <tp-list>XPDR3-CLIENT3</tp-list>
+          <tp-list>XPDR3-NETWORK1</tp-list>
+          <available-interconnect-bandwidth>10</available-interconnect-bandwidth>
         </non-blocking-list>
         <non-blocking-list>
-          <nbl-number>3</nbl-number>
-          <available-interconnect-bandwidth>10
-          </available-interconnect-bandwidth>
-          <interconnect-bandwidth-unit>1000000000
-          </interconnect-bandwidth-unit>
-          <tp-list>XPDR1-NETWORK1</tp-list>
-          <tp-list>XPDR1-CLIENT3</tp-list>
+          <nbl-number>2</nbl-number>
+          <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
+          <tp-list>XPDR3-CLIENT2</tp-list>
+          <tp-list>XPDR3-NETWORK1</tp-list>
+          <available-interconnect-bandwidth>10</available-interconnect-bandwidth>
         </non-blocking-list>
-        <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">
-      <xpdr-number>1</xpdr-number>
-    </xpdr-attributes>
+    <supporting-node>
+      <network-ref>openroadm-topology</network-ref>
+      <node-ref>SPDR-SC1-XPDR3</node-ref>
+    </supporting-node>
+    <supporting-node>
+      <network-ref>openroadm-network</network-ref>
+      <node-ref>SPDR-SC1</node-ref>
+    </supporting-node>
+    <supporting-node>
+      <network-ref>clli-network</network-ref>
+      <node-ref>NodeSC</node-ref>
+    </supporting-node>
   </node>
   <node>
     <node-id>SPDR-SA1-XPDR2</node-id>
-    <termination-point
-      xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <node-type xmlns="http://org/openroadm/common/network">SWITCH</node-type>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <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">
-        <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>
+      <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>
+      <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
       <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">
-        <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>
+      <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>
+      <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
       <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">
-        <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>
+      <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>
+      <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
       <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">
-        <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>
+      <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>
+      <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
       <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">
-        <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</if-cap-type>
+        </supported-interface-capability>
         <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>
+      <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>
+      <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
       <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">
-        <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</if-cap-type>
+        </supported-interface-capability>
         <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>
+      <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>
+      <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
       <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">
-        <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</if-cap-type>
+        </supported-interface-capability>
         <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>
+      <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>
+      <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
       <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">
-        <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</if-cap-type>
+        </supported-interface-capability>
         <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>
+      <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>
+      <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
       <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
     </termination-point>
+    <xpdr-attributes xmlns="http://org/openroadm/otn/network/topology">
+      <xpdr-number>2</xpdr-number>
+    </xpdr-attributes>
+    <tp-bandwidth-sharing 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>
+        <switching-pool-type>non-blocking</switching-pool-type>
+        <non-blocking-list>
+          <nbl-number>1</nbl-number>
+          <tp-list>XPDR2-CLIENT4</tp-list>
+          <tp-list>XPDR2-CLIENT3</tp-list>
+          <tp-list>XPDR2-NETWORK4</tp-list>
+          <tp-list>XPDR2-NETWORK3</tp-list>
+          <tp-list>XPDR2-NETWORK2</tp-list>
+          <tp-list>XPDR2-CLIENT2</tp-list>
+          <tp-list>XPDR2-NETWORK1</tp-list>
+          <tp-list>XPDR2-CLIENT1</tp-list>
+        </non-blocking-list>
+      </odu-switching-pools>
+    </switching-pools>
     <supporting-node>
       <network-ref>openroadm-network</network-ref>
       <node-ref>SPDR-SA1</node-ref>
@@ -992,182 +1231,177 @@
       <network-ref>openroadm-topology</network-ref>
       <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">
-      <odu-switching-pools>
-        <switching-pool-number>1</switching-pool-number>
-        <non-blocking-list>
-          <nbl-number>1</nbl-number>
-          <tp-list>XPDR2-CLIENT1</tp-list>
-          <tp-list>XPDR2-NETWORK4</tp-list>
-          <tp-list>XPDR2-CLIENT2</tp-list>
-          <tp-list>XPDR2-NETWORK1</tp-list>
-          <tp-list>XPDR2-CLIENT3</tp-list>
-          <tp-list>XPDR2-NETWORK2</tp-list>
-          <tp-list>XPDR2-CLIENT4</tp-list>
-          <tp-list>XPDR2-NETWORK3</tp-list>
-        </non-blocking-list>
-        <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">
-      <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">
+    <node-type xmlns="http://org/openroadm/common/network">SWITCH</node-type>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <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">
-        <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>
+      <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>
+      <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
       <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">
-        <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>
+      <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>
+      <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
       <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">
-        <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>
+      <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>
+      <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
       <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">
-        <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>
+      <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>
+      <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
       <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">
-        <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</if-cap-type>
+        </supported-interface-capability>
         <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>
+      <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>
+      <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
       <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">
-        <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</if-cap-type>
+        </supported-interface-capability>
         <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>
+      <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>
+      <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
       <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">
-        <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</if-cap-type>
+        </supported-interface-capability>
         <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>
+      <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>
+      <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
       <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">
-        <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</if-cap-type>
+        </supported-interface-capability>
         <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>
+      <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>
+      <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
       <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
     </termination-point>
+    <xpdr-attributes xmlns="http://org/openroadm/otn/network/topology">
+      <xpdr-number>2</xpdr-number>
+    </xpdr-attributes>
+    <tp-bandwidth-sharing 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>
+        <switching-pool-type>non-blocking</switching-pool-type>
+        <non-blocking-list>
+          <nbl-number>1</nbl-number>
+          <tp-list>XPDR2-CLIENT4</tp-list>
+          <tp-list>XPDR2-CLIENT3</tp-list>
+          <tp-list>XPDR2-NETWORK4</tp-list>
+          <tp-list>XPDR2-NETWORK3</tp-list>
+          <tp-list>XPDR2-NETWORK2</tp-list>
+          <tp-list>XPDR2-CLIENT2</tp-list>
+          <tp-list>XPDR2-NETWORK1</tp-list>
+          <tp-list>XPDR2-CLIENT1</tp-list>
+        </non-blocking-list>
+      </odu-switching-pools>
+    </switching-pools>
     <supporting-node>
       <network-ref>openroadm-topology</network-ref>
       <node-ref>SPDR-SC1-XPDR2</node-ref>
@@ -1180,115 +1414,78 @@
       <network-ref>clli-network</network-ref>
       <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">
-      <odu-switching-pools>
-        <switching-pool-number>1</switching-pool-number>
-        <non-blocking-list>
-          <nbl-number>1</nbl-number>
-          <tp-list>XPDR2-CLIENT1</tp-list>
-          <tp-list>XPDR2-NETWORK4</tp-list>
-          <tp-list>XPDR2-CLIENT2</tp-list>
-          <tp-list>XPDR2-NETWORK1</tp-list>
-          <tp-list>XPDR2-CLIENT3</tp-list>
-          <tp-list>XPDR2-NETWORK2</tp-list>
-          <tp-list>XPDR2-CLIENT4</tp-list>
-          <tp-list>XPDR2-NETWORK3</tp-list>
-        </non-blocking-list>
-        <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">
-      <xpdr-number>2</xpdr-number>
-    </xpdr-attributes>
   </node>
   <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>
+    <link-id>OTU4-SPDR-SC1-XPDR1-XPDR1-NETWORK1toSPDR-SA1-XPDR1-XPDR1-NETWORK1</link-id>
     <source>
       <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>
+    <available-bandwidth xmlns="http://org/openroadm/otn/network/topology">0</available-bandwidth>
+    <used-bandwidth xmlns="http://org/openroadm/otn/network/topology">100000</used-bandwidth>
+    <link-type xmlns="http://org/openroadm/common/network">OTN-LINK</link-type>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    <opposite-link xmlns="http://org/openroadm/common/network">OTU4-SPDR-SA1-XPDR1-XPDR1-NETWORK1toSPDR-SC1-XPDR1-XPDR1-NETWORK1</opposite-link>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
     <destination>
       <dest-tp>XPDR1-NETWORK1</dest-tp>
       <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-SA1-XPDR1-XPDR1-NETWORK1toSPDR-SC1-XPDR1-XPDR1-NETWORK1
-    </opposite-link>
-    <link-type xmlns="http://org/openroadm/common/network">OTN-LINK</link-type>
+    <otn-link-type xmlns="http://transportpce/topology">OTU4</otn-link-type>
   </link>
   <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>
+    <link-id>OTU4-SPDR-SA1-XPDR1-XPDR1-NETWORK1toSPDR-SC1-XPDR1-XPDR1-NETWORK1</link-id>
     <source>
       <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>
+    <available-bandwidth xmlns="http://org/openroadm/otn/network/topology">0</available-bandwidth>
+    <used-bandwidth xmlns="http://org/openroadm/otn/network/topology">100000</used-bandwidth>
+    <link-type xmlns="http://org/openroadm/common/network">OTN-LINK</link-type>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    <opposite-link xmlns="http://org/openroadm/common/network">OTU4-SPDR-SC1-XPDR1-XPDR1-NETWORK1toSPDR-SA1-XPDR1-XPDR1-NETWORK1</opposite-link>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
     <destination>
       <dest-tp>XPDR1-NETWORK1</dest-tp>
       <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-SC1-XPDR1-XPDR1-NETWORK1toSPDR-SA1-XPDR1-XPDR1-NETWORK1
-    </opposite-link>
-    <link-type xmlns="http://org/openroadm/common/network">OTN-LINK</link-type>
+    <otn-link-type xmlns="http://transportpce/topology">OTU4</otn-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>
+    <link-id>ODU4-SPDR-SC1-XPDR1-XPDR1-NETWORK1toSPDR-SA1-XPDR1-XPDR1-NETWORK1</link-id>
     <source>
       <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>
+    <available-bandwidth xmlns="http://org/openroadm/otn/network/topology">100000</available-bandwidth>
+    <used-bandwidth xmlns="http://org/openroadm/otn/network/topology">0</used-bandwidth>
+    <link-type xmlns="http://org/openroadm/common/network">OTN-LINK</link-type>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    <opposite-link xmlns="http://org/openroadm/common/network">ODU4-SPDR-SA1-XPDR1-XPDR1-NETWORK1toSPDR-SC1-XPDR1-XPDR1-NETWORK1</opposite-link>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
     <destination>
       <dest-tp>XPDR1-NETWORK1</dest-tp>
       <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-SA1-XPDR1-XPDR1-NETWORK1toSPDR-SC1-XPDR1-XPDR1-NETWORK1
-    </opposite-link>
-    <link-type xmlns="http://org/openroadm/common/network">OTN-LINK</link-type>
+    <otn-link-type xmlns="http://transportpce/topology">ODTU4</otn-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>
+    <link-id>ODU4-SPDR-SA1-XPDR1-XPDR1-NETWORK1toSPDR-SC1-XPDR1-XPDR1-NETWORK1</link-id>
     <source>
       <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>
+    <available-bandwidth xmlns="http://org/openroadm/otn/network/topology">100000</available-bandwidth>
+    <used-bandwidth xmlns="http://org/openroadm/otn/network/topology">0</used-bandwidth>
+    <link-type xmlns="http://org/openroadm/common/network">OTN-LINK</link-type>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    <opposite-link xmlns="http://org/openroadm/common/network">ODU4-SPDR-SC1-XPDR1-XPDR1-NETWORK1toSPDR-SA1-XPDR1-XPDR1-NETWORK1</opposite-link>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
     <destination>
       <dest-tp>XPDR1-NETWORK1</dest-tp>
       <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-SC1-XPDR1-XPDR1-NETWORK1toSPDR-SA1-XPDR1-XPDR1-NETWORK1
-    </opposite-link>
-    <link-type xmlns="http://org/openroadm/common/network">OTN-LINK</link-type>
+    <otn-link-type xmlns="http://transportpce/topology">ODTU4</otn-link-type>
   </link>
 </network>
 </networks>

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>