added OSNR calculation logic into PCE

JIRA: TRNSPRTPCE-51
Change-Id: I12c490d246c943dc5158c17e37911720d415c304
Signed-off-by: shweta <sv111y@att.com>

diff --git a/pce/pom.xml b/pce/pom.xml
index e2a0578fceeeceadffcb8e786e8f99c7760d87d1..5bb34e77d16374b600457413a51dbc7cf120e276 100755 (executable)
--- a/pce/pom.xml
+++ b/pce/pom.xml
@@ -44,6 +44,7 @@ Author: Martial Coulibaly <martial.coulibaly@gfi.com> on behalf of Orange
   </build>
 
   <dependencies>
+
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>transportpce-api</artifactId>
@@ -85,4 +86,5 @@ Author: Martial Coulibaly <martial.coulibaly@gfi.com> on behalf of Orange
     </dependency>
 
   </dependencies>
+
 </project>

diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/MapUtils.java b/pce/src/main/java/org/opendaylight/transportpce/pce/MapUtils.java
new file mode 100644 (file)
index 0000000..db2ebb2
--- /dev/null
+++ b/pce/src/main/java/org/opendaylight/transportpce/pce/MapUtils.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright © 2017 AT&T, Inc. and others.  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+package org.opendaylight.transportpce.pce;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.opendaylight.yang.gen.v1.http.org.openroadm.link.rev170929.span.attributes.LinkConcatenation;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev170929.Link1;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev170929.network.link.oms.attributes.Span;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev170929.OpenroadmLinkType;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev150608.network.Node;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev150608.network.Link;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public final class MapUtils {
+    /* Logging. */
+    private static final Logger LOG = LoggerFactory.getLogger(MapUtils.class);
+
+    private MapUtils() {
+    }
+
+    public static String getCLLI(Node node) {
+        // TODO STUB retrieve CLLI from node. for now it is supporting node ID of the first supp node
+        return node.getSupportingNode().get(0).getNodeRef().getValue();
+    }
+
+    public static List<Long> getSRLG(Link link) {
+        List<Long> srlgList = new ArrayList<Long>();
+        Span span = getOmsAttributesSpan(link);
+        if (span != null) {
+            List<LinkConcatenation> linkList = span.getLinkConcatenation();
+            for (LinkConcatenation lc : linkList) {
+                srlgList.add(lc.getSRLGId());
+            }
+        } else {
+            LOG.error("MapUtils: No LinkConcatenation for link : {}", link);
+        }
+        return srlgList;
+    }
+
+    public static String getSupNode(Node node) {
+        // TODO: supporting IDs exist as a List. this code takes just the first element
+        return node.getSupportingNode().get(0).getNodeRef().getValue();
+    }
+
+    public static OpenroadmLinkType calcType(Link link) {
+        Link1 link1 = null;
+        OpenroadmLinkType tmplType = null;
+
+        link1 = link.augmentation(Link1.class);
+        if (link1 == null) {
+            LOG.error("MapUtils: No Link augmentation available. {}", link.getLinkId().getValue());
+            return null;
+        }
+
+        tmplType = link1.getLinkType();
+        if (tmplType == null) {
+            LOG.error("MapUtils: No Link type available. {}", link.getLinkId().getValue());
+            return null;
+        }
+        return tmplType;
+    }
+
+    public static Span getOmsAttributesSpan(Link link) {
+        Link1 link1 = null;
+        Span tempSpan = null;
+        link1 = link.augmentation(Link1.class);
+        if (link1 == null) {
+            LOG.error("MapUtils: No Link augmentation available. {}", link.getLinkId().getValue());
+            return null;
+        }
+        try {
+            tempSpan = link1.getOMSAttributes().getSpan();
+            if (tempSpan == null) {
+                LOG.error("MapUtils: No Link getOMSAttributes available. {}", link.getLinkId().getValue());
+                return null;
+            }
+        } catch (NullPointerException e) {
+            LOG.error("MapUtils: No Link getOMSAttributes available. {}", link.getLinkId().getValue());
+            return null;
+        }
+        return tempSpan;
+    }
+
+}

diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/PceComplianceCheck.java b/pce/src/main/java/org/opendaylight/transportpce/pce/PceComplianceCheck.java
index 65d6e0e5ea00f8cb5bc9daf5c931fb78c18b9c60..67fdcac7e6d3e3cc30481e01b20ad28736355b4d 100755 (executable)
--- a/pce/src/main/java/org/opendaylight/transportpce/pce/PceComplianceCheck.java
+++ b/pce/src/main/java/org/opendaylight/transportpce/pce/PceComplianceCheck.java
@@ -18,6 +18,9 @@ public final class PceComplianceCheck {
 
     private static final Logger LOG = LoggerFactory.getLogger(PceComplianceCheck.class);
 
+    private PceComplianceCheck() {
+    }
+
     /*
      * Check if a String is not
      * null and not equal to ''.
@@ -27,7 +30,7 @@ public final class PceComplianceCheck {
      *          false if not
      */
     public static boolean checkString(String value) {
-        return (value != null) && (value.compareTo("") != 0);
+        return ((value != null) && (value.compareTo("") != 0));
     }
 
     public static PceComplianceCheckResult check(PathComputationRequestInput input) {
@@ -51,8 +54,5 @@ public final class PceComplianceCheck {
         return new PceComplianceCheckResult(result, message);
     }
 
-    private PceComplianceCheck() {
-    }
-
 }
 

diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/PceConstraints.java b/pce/src/main/java/org/opendaylight/transportpce/pce/PceConstraints.java
index d64674809993d50b48c4b061f08417404212bb56..242737c4187a44f6d551a4eae443a0f0e69c883d 100644 (file)
--- a/pce/src/main/java/org/opendaylight/transportpce/pce/PceConstraints.java
+++ b/pce/src/main/java/org/opendaylight/transportpce/pce/PceConstraints.java
@@ -26,6 +26,8 @@ public class PceConstraints {
     private List<String> srlgToExclude = new ArrayList<String>();
     private List<String> nodesToInclude = new ArrayList<String>();
     private List<PceNode> pceNodesToInclude = new ArrayList<PceNode>();
+    public static Long constOSNR = 1L;
+    private double maxOSNR = (constOSNR / (Math.pow(10, (24 / 10.0))));
 //  List<String> srlgToInclude = new ArrayList<String>();
 
 
@@ -92,4 +94,10 @@ public class PceConstraints {
         this.pceNodesToInclude.add(node);
     }
 
+    public Double getMaxOSNR() {
+        LOG.debug("in Pceconstraints getMaxOSNR = {}", maxOSNR);
+        return maxOSNR;
+    }
+
+
 }

diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/PceGraph.java b/pce/src/main/java/org/opendaylight/transportpce/pce/PceGraph.java
index 3deec9d7afc993cfebd967afbf8860df0129f3cf..6007dee626a1c3110592a5e8244fdc6fc90146d6 100644 (file)
--- a/pce/src/main/java/org/opendaylight/transportpce/pce/PceGraph.java
+++ b/pce/src/main/java/org/opendaylight/transportpce/pce/PceGraph.java
@@ -446,9 +446,9 @@ public class PceGraph {
 
     }
 
-    public void setConstrains(PceConstraints pceHardCons, PceConstraints pceSoftCons) {
-        this.pceHardConstraints = pceHardCons;
-        this.pceSoftConstraints = pceSoftCons;
+    public void setConstrains(PceConstraints pceHardConstraintsIn, PceConstraints pceSoftConstraintsIn) {
+        this.pceHardConstraints = pceHardConstraintsIn;
+        this.pceSoftConstraints = pceSoftConstraintsIn;
     }
 
 }

diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/PceLink.java b/pce/src/main/java/org/opendaylight/transportpce/pce/PceLink.java
index 4411cc4f488de848c9b351460bf804fba6bc764a..1108780f0fa2448219c8f0276614ba7e5f55b14d 100644 (file)
--- a/pce/src/main/java/org/opendaylight/transportpce/pce/PceLink.java
+++ b/pce/src/main/java/org/opendaylight/transportpce/pce/PceLink.java
@@ -8,7 +8,9 @@
 
 package org.opendaylight.transportpce.pce;
 
+import java.util.List;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev170929.Link1;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev170929.network.link.oms.attributes.Span;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev170929.OpenroadmLinkType;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev150608.NodeId;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev150608.LinkId;
@@ -43,6 +45,9 @@ public class PceLink {
     private final Object destTP;
     private final LinkId oppositeLink;
     private final Long latency;
+    private final List<Long> srlg;
+    private final double osnr;
+    private final Span omsAttributesSpan;
 
     public PceLink(Link link) {
         LOG.debug("PceLink: : PceLink start ");
@@ -60,6 +65,16 @@ public class PceLink {
         this.oppositeLink = calcOpposite(link);
         this.latency = calcLatency(link);
 
+        if (this.linkType == OpenroadmLinkType.ROADMTOROADM) {
+            this.omsAttributesSpan = MapUtils.getOmsAttributesSpan(link);
+            this.srlg = MapUtils.getSRLG(link);
+            this.osnr = retrieveOSNR();
+        } else {
+            this.omsAttributesSpan = null;
+            this.srlg = null;
+            this.osnr = 0L;
+        }
+
         LOG.debug("PceLink: created PceLink  {}", toString());
     }
 
@@ -112,6 +127,78 @@ public class PceLink {
 
     }
 
+    @SuppressWarnings("checkstyle:VariableDeclarationUsageDistance")
+    public double retrieveOSNR() {
+        double sum = 0;        // sum of 1 over the span OSNRs (linear units)
+        double linkOsnrDb;     // link OSNR, in dB
+        double linkOsnrLu;     // link OSNR, in dB
+        double spanOsnrDb;     // span OSNR, in dB
+        double spanOsnrLu;     // span OSNR, in linear units
+        double ampNoise = 5.5; // default amplifier noise value, in dB
+        double loss;           // fiber span measured loss, in dB
+        double power;          // launch power, in dB
+        double constantA = 38.97293;
+        double constantB = 0.72782;
+        double constantC = -0.532331;
+        double constactD = -0.019549;
+        double upperBoundOSNR = 33;
+        double lowerBoundOSNR = 0.1;
+
+        if (omsAttributesSpan ==  null) {
+            return 0L; // indicates no data or N/A
+        }
+        loss = omsAttributesSpan.getSpanlossCurrent().getValue().doubleValue();
+        switch (omsAttributesSpan.getLinkConcatenation().get(0).getFiberType()) {
+            case Smf:
+                power = 2;
+                break;
+
+            case Eleaf:
+                power = 1;
+                break;
+
+            case Oleaf:
+                power = 0;
+                break;
+
+            case Dsf:
+                power = 0;
+                break;
+
+            case Truewave:
+                power = 0;
+                break;
+
+            case Truewavec:
+                power = -1;
+                break;
+
+            case NzDsf:
+                power = 0;
+                break;
+
+            case Ull:
+                power = 0;
+                break;
+
+            default:
+                power = 0;
+                break;
+        }
+        spanOsnrDb = constantA + constantB * power + constantC * loss + constactD * power * loss;
+        if (spanOsnrDb > upperBoundOSNR) {
+            spanOsnrDb =  upperBoundOSNR;
+        } else if (spanOsnrDb < lowerBoundOSNR) {
+            spanOsnrDb = lowerBoundOSNR;
+        }
+        spanOsnrLu = Math.pow(10, (spanOsnrDb / 10.0));
+        sum = PceConstraints.constOSNR / spanOsnrLu;
+        linkOsnrLu = sum;
+        //link_OSNR_dB = 10 * Math.log10(1 / sum);
+        LOG.debug("In retrieveOSNR: link OSNR is {} dB", linkOsnrLu);
+        return linkOsnrLu;
+    }
+
 
     public LinkId getOppositeLink() {
         return this.oppositeLink;

diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/PceResult.java b/pce/src/main/java/org/opendaylight/transportpce/pce/PceResult.java
index c5563e5385e6a160f3a0389c065fdc399850a0d2..3a340616b895beece0a848fe32998f91dd44f9a5 100644 (file)
--- a/pce/src/main/java/org/opendaylight/transportpce/pce/PceResult.java
+++ b/pce/src/main/java/org/opendaylight/transportpce/pce/PceResult.java
@@ -86,12 +86,12 @@ public class PceResult {
         return this.ztoadirection;
     }
 
-    public void setAtoZDirection(AToZDirection atozdir) {
-        this.atozdirection = atozdir;
+    public void setAtoZDirection(AToZDirection atozdirectionIn) {
+        this.atozdirection = atozdirectionIn;
     }
 
-    public void setZtoADirection(ZToADirection ztoadir) {
-        this.ztoadirection = ztoadir;
+    public void setZtoADirection(ZToADirection ztoadirectionIn) {
+        this.ztoadirection = ztoadirectionIn;
     }
 
     public long getRate() {

diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/PceSendingPceRPCs.java b/pce/src/main/java/org/opendaylight/transportpce/pce/PceSendingPceRPCs.java
index af8a7f5803efa1f811b01b68d9307d563c784ad3..324b022608b51b717c0d5a5c9f6abccabf4bed87 100644 (file)
--- a/pce/src/main/java/org/opendaylight/transportpce/pce/PceSendingPceRPCs.java
+++ b/pce/src/main/java/org/opendaylight/transportpce/pce/PceSendingPceRPCs.java
@@ -107,7 +107,7 @@ public class PceSendingPceRPCs {
                 && (pceHardConstraints.getMaxLatency() != -1)) {
 
                 pceHardConstraints.setPceMetrics(PceMetric.PropagationDelay);
-                graph = patchRerunGraph(graph, pceHardConstraints, pceSoftConstraints);
+                graph = patchRerunGraph(graph);
             }
 
             if (!rc.getStatus()) {
@@ -146,10 +146,9 @@ public class PceSendingPceRPCs {
         LOG.info("In pathComputation Graph is Found");
     }
 
-    private PceGraph patchRerunGraph(PceGraph graph, PceConstraints pceHardCons, PceConstraints pceSoftCons) {
-
+    private PceGraph patchRerunGraph(PceGraph graph) {
         LOG.info("In pathComputation patchRerunGraph : rerun Graph with metric = PROPAGATION-DELAY ");
-        graph.setConstrains(pceHardCons, pceSoftCons);
+        graph.setConstrains(pceHardConstraints, pceSoftConstraints);
         graph.calcPath();
         return graph;
 

diff --git a/pce/src/test/resources/topologyData/NW-for-test-5-4.xml b/pce/src/test/resources/topologyData/NW-for-test-5-4.xml
index 35ec4b2f42ac3dc90aacc98021194217a891f2cb..599b82dbcb12e742e73e92a017b882327f549763 100644 (file)
--- a/pce/src/test/resources/topologyData/NW-for-test-5-4.xml
+++ b/pce/src/test/resources/topologyData/NW-for-test-5-4.xml
@@ -1,1974 +1,2654 @@
 <data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
-<network xmlns="urn:ietf:params:xml:ns:yang:ietf-network">
- <network-id>openroadm-topology</network-id>
-<node>    <node-id>OpenROADM-1-1-DEG1</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>1</index> </available-wavelengths>
-        <available-wavelengths> <index>2</index> </available-wavelengths>
-        <available-wavelengths> <index>3</index> </available-wavelengths>
-        <available-wavelengths> <index>4</index> </available-wavelengths>
-        <available-wavelengths> <index>5</index> </available-wavelengths>
-        <available-wavelengths> <index>6</index> </available-wavelengths>
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-1</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-1-1-DEG2</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>1</index> </available-wavelengths>
-        <available-wavelengths> <index>2</index> </available-wavelengths>
-        <available-wavelengths> <index>3</index> </available-wavelengths>
-        <available-wavelengths> <index>4</index> </available-wavelengths>
-        <available-wavelengths> <index>5</index> </available-wavelengths>
-        <available-wavelengths> <index>6</index> </available-wavelengths>
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-1</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-1-1-DEG3</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>1</index> </available-wavelengths>
-        <available-wavelengths> <index>2</index> </available-wavelengths>
-        <available-wavelengths> <index>3</index> </available-wavelengths>
-        <available-wavelengths> <index>4</index> </available-wavelengths>
-        <available-wavelengths> <index>5</index> </available-wavelengths>
-        <available-wavelengths> <index>6</index> </available-wavelengths>
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-1</node-ref>    </supporting-node></node>
-<node>   <node-id>OpenROADM-1-1-SRG1</node-id>     <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
-        <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-1</node-ref>    </supporting-node>
-        <srg-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>1</index> </available-wavelengths>
-        <available-wavelengths> <index>2</index> </available-wavelengths>
-        <available-wavelengths> <index>3</index> </available-wavelengths>
-        <available-wavelengths> <index>4</index> </available-wavelengths>
-        <available-wavelengths> <index>5</index> </available-wavelengths>
-        <available-wavelengths> <index>6</index> </available-wavelengths>
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>               </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>               </termination-point>
-</node>
-<node>        <node-id>XPONDER-1-1</node-id>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-1-1</node-ref>    </supporting-node>
-    <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
-</node>
-<node>    <node-id>OpenROADM-1-2-DEG1</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>1</index> </available-wavelengths>
-        <available-wavelengths> <index>2</index> </available-wavelengths>
-        <available-wavelengths> <index>3</index> </available-wavelengths>
-        <available-wavelengths> <index>4</index> </available-wavelengths>
-        <available-wavelengths> <index>5</index> </available-wavelengths>
-        <available-wavelengths> <index>6</index> </available-wavelengths>
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-2</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-1-2-DEG2</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>1</index> </available-wavelengths>
-        <available-wavelengths> <index>2</index> </available-wavelengths>
-        <available-wavelengths> <index>3</index> </available-wavelengths>
-        <available-wavelengths> <index>4</index> </available-wavelengths>
-        <available-wavelengths> <index>5</index> </available-wavelengths>
-        <available-wavelengths> <index>6</index> </available-wavelengths>
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-2</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-1-2-DEG3</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>1</index> </available-wavelengths>
-        <available-wavelengths> <index>2</index> </available-wavelengths>
-        <available-wavelengths> <index>3</index> </available-wavelengths>
-        <available-wavelengths> <index>4</index> </available-wavelengths>
-        <available-wavelengths> <index>5</index> </available-wavelengths>
-        <available-wavelengths> <index>6</index> </available-wavelengths>
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-2</node-ref>    </supporting-node></node>
-<node>   <node-id>OpenROADM-1-2-SRG1</node-id>     <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
-        <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-2</node-ref>    </supporting-node>
-        <srg-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>1</index> </available-wavelengths>
-        <available-wavelengths> <index>2</index> </available-wavelengths>
-        <available-wavelengths> <index>3</index> </available-wavelengths>
-        <available-wavelengths> <index>4</index> </available-wavelengths>
-        <available-wavelengths> <index>5</index> </available-wavelengths>
-        <available-wavelengths> <index>6</index> </available-wavelengths>
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>               </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>               </termination-point>
-</node>
-<node>        <node-id>XPONDER-1-2</node-id>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-1-2</node-ref>    </supporting-node>
-    <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
-</node>
-<node>    <node-id>OpenROADM-1-3-DEG1</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>1</index> </available-wavelengths>
-        <available-wavelengths> <index>2</index> </available-wavelengths>
-        <available-wavelengths> <index>3</index> </available-wavelengths>
-        <available-wavelengths> <index>4</index> </available-wavelengths>
-        <available-wavelengths> <index>5</index> </available-wavelengths>
-        <available-wavelengths> <index>6</index> </available-wavelengths>
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-3</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-1-3-DEG2</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>1</index> </available-wavelengths>
-        <available-wavelengths> <index>2</index> </available-wavelengths>
-        <available-wavelengths> <index>3</index> </available-wavelengths>
-        <available-wavelengths> <index>4</index> </available-wavelengths>
-        <available-wavelengths> <index>5</index> </available-wavelengths>
-        <available-wavelengths> <index>6</index> </available-wavelengths>
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-3</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-1-3-DEG3</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>1</index> </available-wavelengths>
-        <available-wavelengths> <index>2</index> </available-wavelengths>
-        <available-wavelengths> <index>3</index> </available-wavelengths>
-        <available-wavelengths> <index>4</index> </available-wavelengths>
-        <available-wavelengths> <index>5</index> </available-wavelengths>
-        <available-wavelengths> <index>6</index> </available-wavelengths>
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-3</node-ref>    </supporting-node></node>
-<node>   <node-id>OpenROADM-1-3-SRG1</node-id>     <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
-        <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-3</node-ref>    </supporting-node>
-        <srg-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>1</index> </available-wavelengths>
-        <available-wavelengths> <index>2</index> </available-wavelengths>
-        <available-wavelengths> <index>3</index> </available-wavelengths>
-        <available-wavelengths> <index>4</index> </available-wavelengths>
-        <available-wavelengths> <index>5</index> </available-wavelengths>
-        <available-wavelengths> <index>6</index> </available-wavelengths>
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>               </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>               </termination-point>
-</node>
-<node>        <node-id>XPONDER-1-3</node-id>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-1-3</node-ref>    </supporting-node>
-    <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
-</node>
-<node>    <node-id>OpenROADM-1-4-DEG1</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>1</index> </available-wavelengths>
-        <available-wavelengths> <index>2</index> </available-wavelengths>
-        <available-wavelengths> <index>3</index> </available-wavelengths>
-        <available-wavelengths> <index>4</index> </available-wavelengths>
-        <available-wavelengths> <index>5</index> </available-wavelengths>
-        <available-wavelengths> <index>6</index> </available-wavelengths>
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-4</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-1-4-DEG2</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>1</index> </available-wavelengths>
-        <available-wavelengths> <index>2</index> </available-wavelengths>
-        <available-wavelengths> <index>3</index> </available-wavelengths>
-        <available-wavelengths> <index>4</index> </available-wavelengths>
-        <available-wavelengths> <index>5</index> </available-wavelengths>
-        <available-wavelengths> <index>6</index> </available-wavelengths>
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-4</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-1-4-DEG3</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>1</index> </available-wavelengths>
-        <available-wavelengths> <index>2</index> </available-wavelengths>
-        <available-wavelengths> <index>3</index> </available-wavelengths>
-        <available-wavelengths> <index>4</index> </available-wavelengths>
-        <available-wavelengths> <index>5</index> </available-wavelengths>
-        <available-wavelengths> <index>6</index> </available-wavelengths>
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-4</node-ref>    </supporting-node></node>
-<node>   <node-id>OpenROADM-1-4-SRG1</node-id>     <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
-        <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-4</node-ref>    </supporting-node>
-        <srg-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>1</index> </available-wavelengths>
-        <available-wavelengths> <index>2</index> </available-wavelengths>
-        <available-wavelengths> <index>3</index> </available-wavelengths>
-        <available-wavelengths> <index>4</index> </available-wavelengths>
-        <available-wavelengths> <index>5</index> </available-wavelengths>
-        <available-wavelengths> <index>6</index> </available-wavelengths>
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>               </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>               </termination-point>
-</node>
-<node>        <node-id>XPONDER-1-4</node-id>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-1-4</node-ref>    </supporting-node>
-    <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
-</node>
-<node>    <node-id>OpenROADM-2-1-DEG1</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>2</index> </available-wavelengths>
-        <available-wavelengths> <index>3</index> </available-wavelengths>
-        <available-wavelengths> <index>4</index> </available-wavelengths>
-        <available-wavelengths> <index>5</index> </available-wavelengths>
-         </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-1</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-2-1-DEG2</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>2</index> </available-wavelengths>
-        <available-wavelengths> <index>3</index> </available-wavelengths>
-        <available-wavelengths> <index>4</index> </available-wavelengths>
-        <available-wavelengths> <index>5</index> </available-wavelengths>
-        </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-1</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-2-1-DEG3</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>2</index> </available-wavelengths>
-        <available-wavelengths> <index>3</index> </available-wavelengths>
-        <available-wavelengths> <index>4</index> </available-wavelengths>
-        <available-wavelengths> <index>5</index> </available-wavelengths>
-        </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-1</node-ref>    </supporting-node></node>
-<node>   <node-id>OpenROADM-2-1-SRG1</node-id>     <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
-        <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-1</node-ref>    </supporting-node>
-        <srg-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>2</index> </available-wavelengths>
-        <available-wavelengths> <index>3</index> </available-wavelengths>
-        <available-wavelengths> <index>4</index> </available-wavelengths>
-        <available-wavelengths> <index>5</index> </available-wavelengths>
-        </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>               </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>               </termination-point>
-</node>
-<node>        <node-id>XPONDER-2-1</node-id>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-2-1</node-ref>    </supporting-node>
-    <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
-</node>
-<node>    <node-id>OpenROADM-2-2-DEG1</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>2</index> </available-wavelengths>
-        <available-wavelengths> <index>3</index> </available-wavelengths>
-        <available-wavelengths> <index>4</index> </available-wavelengths>
-        <available-wavelengths> <index>5</index> </available-wavelengths>
-        </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-2</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-2-2-DEG2</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>2</index> </available-wavelengths>
-        <available-wavelengths> <index>3</index> </available-wavelengths>
-        <available-wavelengths> <index>4</index> </available-wavelengths>
-        <available-wavelengths> <index>5</index> </available-wavelengths>
-        </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-2</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-2-2-DEG3</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>2</index> </available-wavelengths>
-        <available-wavelengths> <index>3</index> </available-wavelengths>
-        <available-wavelengths> <index>4</index> </available-wavelengths>
-        <available-wavelengths> <index>5</index> </available-wavelengths>
-        </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-2</node-ref>    </supporting-node></node>
-<node>   <node-id>OpenROADM-2-2-SRG1</node-id>     <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
-        <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-2</node-ref>    </supporting-node>
-        <srg-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>2</index> </available-wavelengths>
-        <available-wavelengths> <index>3</index> </available-wavelengths>
-        <available-wavelengths> <index>4</index> </available-wavelengths>
-        <available-wavelengths> <index>5</index> </available-wavelengths>
-        </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>               </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>               </termination-point>
-</node>
-<node>        <node-id>XPONDER-2-2</node-id>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-2-2</node-ref>    </supporting-node>
-    <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
-</node>
-<node>    <node-id>OpenROADM-2-3-DEG1</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>2</index> </available-wavelengths>
-        <available-wavelengths> <index>3</index> </available-wavelengths>
-        <available-wavelengths> <index>4</index> </available-wavelengths>
-        <available-wavelengths> <index>5</index> </available-wavelengths>
-        </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-3</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-2-3-DEG2</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>2</index> </available-wavelengths>
-        <available-wavelengths> <index>3</index> </available-wavelengths>
-        <available-wavelengths> <index>4</index> </available-wavelengths>
-        <available-wavelengths> <index>5</index> </available-wavelengths>
-        </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-3</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-2-3-DEG3</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>2</index> </available-wavelengths>
-        <available-wavelengths> <index>3</index> </available-wavelengths>
-        <available-wavelengths> <index>4</index> </available-wavelengths>
-        <available-wavelengths> <index>5</index> </available-wavelengths>
-        </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-3</node-ref>    </supporting-node></node>
-<node>   <node-id>OpenROADM-2-3-SRG1</node-id>     <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
-        <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-3</node-ref>    </supporting-node>
-        <srg-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>2</index> </available-wavelengths>
-        <available-wavelengths> <index>3</index> </available-wavelengths>
-        <available-wavelengths> <index>4</index> </available-wavelengths>
-        <available-wavelengths> <index>5</index> </available-wavelengths>
-        </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>               </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>               </termination-point>
-</node>
-<node>        <node-id>XPONDER-2-3</node-id>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-2-3</node-ref>    </supporting-node>
-    <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
-</node>
-<node>    <node-id>OpenROADM-2-4-DEG1</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>2</index> </available-wavelengths>
-        <available-wavelengths> <index>3</index> </available-wavelengths>
-        <available-wavelengths> <index>4</index> </available-wavelengths>
-        <available-wavelengths> <index>5</index> </available-wavelengths>
-        </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-4</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-2-4-DEG2</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>2</index> </available-wavelengths>
-        <available-wavelengths> <index>3</index> </available-wavelengths>
-        <available-wavelengths> <index>4</index> </available-wavelengths>
-        <available-wavelengths> <index>5</index> </available-wavelengths>
-        </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-4</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-2-4-DEG3</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>2</index> </available-wavelengths>
-        <available-wavelengths> <index>3</index> </available-wavelengths>
-        <available-wavelengths> <index>4</index> </available-wavelengths>
-        <available-wavelengths> <index>5</index> </available-wavelengths>
-        </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-4</node-ref>    </supporting-node></node>
-<node>   <node-id>OpenROADM-2-4-SRG1</node-id>     <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
-        <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-4</node-ref>    </supporting-node>
-        <srg-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>2</index> </available-wavelengths>
-        <available-wavelengths> <index>3</index> </available-wavelengths>
-        <available-wavelengths> <index>4</index> </available-wavelengths>
-        <available-wavelengths> <index>5</index> </available-wavelengths>
-        </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>               </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>               </termination-point>
-</node>
-<node>        <node-id>XPONDER-2-4</node-id>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-2-4</node-ref>    </supporting-node>
-    <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
-</node>
-<node>    <node-id>OpenROADM-3-1-DEG1</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>5</index> </available-wavelengths>
-        <available-wavelengths> <index>6</index> </available-wavelengths>
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <available-wavelengths> <index>11</index> </available-wavelengths>
-        <available-wavelengths> <index>12</index> </available-wavelengths>
-        </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-1</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-3-1-DEG2</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-         <available-wavelengths> <index>5</index> </available-wavelengths>
-        <available-wavelengths> <index>6</index> </available-wavelengths>
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <available-wavelengths> <index>11</index> </available-wavelengths>
-        <available-wavelengths> <index>12</index> </available-wavelengths>
-        </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-1</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-3-1-DEG3</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>5</index> </available-wavelengths>
-        <available-wavelengths> <index>6</index> </available-wavelengths>
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <available-wavelengths> <index>11</index> </available-wavelengths>
-        <available-wavelengths> <index>12</index> </available-wavelengths>
-        </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-1</node-ref>    </supporting-node></node>
-<node>   <node-id>OpenROADM-3-1-SRG1</node-id>     <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
-        <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-1</node-ref>    </supporting-node>
-        <srg-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>5</index> </available-wavelengths>
-        <available-wavelengths> <index>6</index> </available-wavelengths>
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <available-wavelengths> <index>11</index> </available-wavelengths>
-        <available-wavelengths> <index>12</index> </available-wavelengths>
-        </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>               </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>               </termination-point>
-</node>
-<node>        <node-id>XPONDER-3-1</node-id>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-3-1</node-ref>    </supporting-node>
-    <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
-</node>
-<node>    <node-id>OpenROADM-3-2-DEG1</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>5</index> </available-wavelengths>
-        <available-wavelengths> <index>6</index> </available-wavelengths>
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <available-wavelengths> <index>11</index> </available-wavelengths>
-        <available-wavelengths> <index>12</index> </available-wavelengths>
-        </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-2</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-3-2-DEG2</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>5</index> </available-wavelengths>
-        <available-wavelengths> <index>6</index> </available-wavelengths>
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <available-wavelengths> <index>11</index> </available-wavelengths>
-        <available-wavelengths> <index>12</index> </available-wavelengths>
-        </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-2</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-3-2-DEG3</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>5</index> </available-wavelengths>
-        <available-wavelengths> <index>6</index> </available-wavelengths>
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <available-wavelengths> <index>11</index> </available-wavelengths>
-        <available-wavelengths> <index>12</index> </available-wavelengths>
-        </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-2</node-ref>    </supporting-node></node>
-<node>   <node-id>OpenROADM-3-2-SRG1</node-id>     <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
-        <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-2</node-ref>    </supporting-node>
-        <srg-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>5</index> </available-wavelengths>
-        <available-wavelengths> <index>6</index> </available-wavelengths>
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <available-wavelengths> <index>11</index> </available-wavelengths>
-        <available-wavelengths> <index>12</index> </available-wavelengths>
-        </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>               </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>               </termination-point>
-</node>
-<node>        <node-id>XPONDER-3-2</node-id>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-3-2</node-ref>    </supporting-node>
-    <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
-</node>
-<node>    <node-id>OpenROADM-3-3-DEG1</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>5</index> </available-wavelengths>
-        <available-wavelengths> <index>6</index> </available-wavelengths>
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <available-wavelengths> <index>11</index> </available-wavelengths>
-        <available-wavelengths> <index>12</index> </available-wavelengths>
-        </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-3</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-3-3-DEG2</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>5</index> </available-wavelengths>
-        <available-wavelengths> <index>6</index> </available-wavelengths>
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <available-wavelengths> <index>11</index> </available-wavelengths>
-        <available-wavelengths> <index>12</index> </available-wavelengths>
-        </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-3</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-3-3-DEG3</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>5</index> </available-wavelengths>
-        <available-wavelengths> <index>6</index> </available-wavelengths>
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <available-wavelengths> <index>11</index> </available-wavelengths>
-        <available-wavelengths> <index>12</index> </available-wavelengths>
-        </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-3</node-ref>    </supporting-node></node>
-<node>   <node-id>OpenROADM-3-3-SRG1</node-id>     <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
-        <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-3</node-ref>    </supporting-node>
-        <srg-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>5</index> </available-wavelengths>
-        <available-wavelengths> <index>6</index> </available-wavelengths>
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <available-wavelengths> <index>11</index> </available-wavelengths>
-        <available-wavelengths> <index>12</index> </available-wavelengths>
-        </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>               </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>               </termination-point>
-</node>
-<node>        <node-id>XPONDER-3-3</node-id>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-3-3</node-ref>    </supporting-node>
-    <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
-</node>
-<node>    <node-id>OpenROADM-3-4-DEG1</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>5</index> </available-wavelengths>
-        <available-wavelengths> <index>6</index> </available-wavelengths>
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <available-wavelengths> <index>11</index> </available-wavelengths>
-        <available-wavelengths> <index>12</index> </available-wavelengths>
-        </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-4</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-3-4-DEG2</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>5</index> </available-wavelengths>
-        <available-wavelengths> <index>6</index> </available-wavelengths>
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <available-wavelengths> <index>11</index> </available-wavelengths>
-        <available-wavelengths> <index>12</index> </available-wavelengths>
-        </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-4</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-3-4-DEG3</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>5</index> </available-wavelengths>
-        <available-wavelengths> <index>6</index> </available-wavelengths>
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <available-wavelengths> <index>11</index> </available-wavelengths>
-        <available-wavelengths> <index>12</index> </available-wavelengths>
-        </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-4</node-ref>    </supporting-node></node>
-<node>   <node-id>OpenROADM-3-4-SRG1</node-id>     <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
-        <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-4</node-ref>    </supporting-node>
-        <srg-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>5</index> </available-wavelengths>
-        <available-wavelengths> <index>6</index> </available-wavelengths>
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <available-wavelengths> <index>11</index> </available-wavelengths>
-        <available-wavelengths> <index>12</index> </available-wavelengths>
-        </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>               </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>               </termination-point>
-</node>
-<node>        <node-id>XPONDER-3-4</node-id>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-3-4</node-ref>    </supporting-node>
-    <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
-</node>
-<node>    <node-id>OpenROADM-4-1-DEG1</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <available-wavelengths> <index>11</index> </available-wavelengths>
-        <available-wavelengths> <index>12</index> </available-wavelengths>
-        <available-wavelengths> <index>13</index> </available-wavelengths>
-        </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-1</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-4-1-DEG2</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <available-wavelengths> <index>11</index> </available-wavelengths>
-        <available-wavelengths> <index>12</index> </available-wavelengths>
-        <available-wavelengths> <index>13</index> </available-wavelengths>
-        </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-1</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-4-1-DEG3</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <available-wavelengths> <index>11</index> </available-wavelengths>
-        <available-wavelengths> <index>12</index> </available-wavelengths>
-        <available-wavelengths> <index>13</index> </available-wavelengths>
-        </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-1</node-ref>    </supporting-node></node>
-<node>   <node-id>OpenROADM-4-1-SRG1</node-id>     <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
-        <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-1</node-ref>    </supporting-node>
-        <srg-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <available-wavelengths> <index>11</index> </available-wavelengths>
-        <available-wavelengths> <index>12</index> </available-wavelengths>
-        <available-wavelengths> <index>13</index> </available-wavelengths>
-        </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>               </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>               </termination-point>
-</node>
-<node>        <node-id>XPONDER-4-1</node-id>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-4-1</node-ref>    </supporting-node>
-    <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
-</node>
-<node>    <node-id>OpenROADM-4-2-DEG1</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <available-wavelengths> <index>11</index> </available-wavelengths>
-        <available-wavelengths> <index>12</index> </available-wavelengths>
-        <available-wavelengths> <index>13</index> </available-wavelengths>
-        </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-2</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-4-2-DEG2</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <available-wavelengths> <index>11</index> </available-wavelengths>
-        <available-wavelengths> <index>12</index> </available-wavelengths>
-        <available-wavelengths> <index>13</index> </available-wavelengths>
-        </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-2</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-4-2-DEG3</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <available-wavelengths> <index>11</index> </available-wavelengths>
-        <available-wavelengths> <index>12</index> </available-wavelengths>
-        <available-wavelengths> <index>13</index> </available-wavelengths>
-        </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-2</node-ref>    </supporting-node></node>
-<node>   <node-id>OpenROADM-4-2-SRG1</node-id>     <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
-        <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-2</node-ref>    </supporting-node>
-        <srg-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <available-wavelengths> <index>11</index> </available-wavelengths>
-        <available-wavelengths> <index>12</index> </available-wavelengths>
-        <available-wavelengths> <index>13</index> </available-wavelengths>
-        </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>               </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>               </termination-point>
-</node>
-<node>        <node-id>XPONDER-4-2</node-id>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-4-2</node-ref>    </supporting-node>
-    <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
-</node>
-<node>    <node-id>OpenROADM-4-3-DEG1</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <available-wavelengths> <index>11</index> </available-wavelengths>
-        <available-wavelengths> <index>12</index> </available-wavelengths>
-        <available-wavelengths> <index>13</index> </available-wavelengths>
-        </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-3</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-4-3-DEG2</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <available-wavelengths> <index>11</index> </available-wavelengths>
-        <available-wavelengths> <index>12</index> </available-wavelengths>
-        <available-wavelengths> <index>13</index> </available-wavelengths>
-        </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-3</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-4-3-DEG3</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <available-wavelengths> <index>11</index> </available-wavelengths>
-        <available-wavelengths> <index>12</index> </available-wavelengths>
-        <available-wavelengths> <index>13</index> </available-wavelengths>
-        </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-3</node-ref>    </supporting-node></node>
-<node>   <node-id>OpenROADM-4-3-SRG1</node-id>     <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
-        <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-3</node-ref>    </supporting-node>
-        <srg-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <available-wavelengths> <index>11</index> </available-wavelengths>
-        <available-wavelengths> <index>12</index> </available-wavelengths>
-        <available-wavelengths> <index>13</index> </available-wavelengths>
-        </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>               </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>               </termination-point>
-</node>
-<node>        <node-id>XPONDER-4-3</node-id>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-4-3</node-ref>    </supporting-node>
-    <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
-</node>
-<node>    <node-id>OpenROADM-4-4-DEG1</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <available-wavelengths> <index>11</index> </available-wavelengths>
-        <available-wavelengths> <index>12</index> </available-wavelengths>
-        <available-wavelengths> <index>13</index> </available-wavelengths>
-        </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-4</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-4-4-DEG2</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <available-wavelengths> <index>11</index> </available-wavelengths>
-        <available-wavelengths> <index>12</index> </available-wavelengths>
-        <available-wavelengths> <index>13</index> </available-wavelengths>
-        </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-4</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-4-4-DEG3</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <available-wavelengths> <index>11</index> </available-wavelengths>
-        <available-wavelengths> <index>12</index> </available-wavelengths>
-        <available-wavelengths> <index>13</index> </available-wavelengths>
-        </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-4</node-ref>    </supporting-node></node>
-<node>   <node-id>OpenROADM-4-4-SRG1</node-id>     <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
-        <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-4</node-ref>    </supporting-node>
-        <srg-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <available-wavelengths> <index>11</index> </available-wavelengths>
-        <available-wavelengths> <index>12</index> </available-wavelengths>
-        <available-wavelengths> <index>13</index> </available-wavelengths>
-        </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>               </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>               </termination-point>
-</node>
-<node>        <node-id>XPONDER-4-4</node-id>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-4-4</node-ref>    </supporting-node>
-    <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
-</node>
-<node>    <node-id>OpenROADM-5-1-DEG1</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <available-wavelengths> <index>11</index> </available-wavelengths>
-        <available-wavelengths> <index>12</index> </available-wavelengths>
-        <available-wavelengths> <index>13</index> </available-wavelengths>
-        <available-wavelengths> <index>14</index> </available-wavelengths>
-        </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-1</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-5-1-DEG2</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <available-wavelengths> <index>11</index> </available-wavelengths>
-        <available-wavelengths> <index>12</index> </available-wavelengths>
-        <available-wavelengths> <index>13</index> </available-wavelengths>
-        <available-wavelengths> <index>14</index> </available-wavelengths>
-        </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-1</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-5-1-DEG3</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <available-wavelengths> <index>11</index> </available-wavelengths>
-        <available-wavelengths> <index>12</index> </available-wavelengths>
-        <available-wavelengths> <index>13</index> </available-wavelengths>
-        <available-wavelengths> <index>14</index> </available-wavelengths>
-        </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-1</node-ref>    </supporting-node></node>
-<node>   <node-id>OpenROADM-5-1-SRG1</node-id>     <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
-        <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-1</node-ref>    </supporting-node>
-        <srg-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <available-wavelengths> <index>11</index> </available-wavelengths>
-        <available-wavelengths> <index>12</index> </available-wavelengths>
-        <available-wavelengths> <index>13</index> </available-wavelengths>
-        <available-wavelengths> <index>14</index> </available-wavelengths>
-        </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>               </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>               </termination-point>
-</node>
-<node>        <node-id>XPONDER-5-1</node-id>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-5-1</node-ref>    </supporting-node>
-    <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
-</node>
-<node>    <node-id>OpenROADM-5-2-DEG1</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <available-wavelengths> <index>11</index> </available-wavelengths>
-        <available-wavelengths> <index>12</index> </available-wavelengths>
-        <available-wavelengths> <index>13</index> </available-wavelengths>
-        <available-wavelengths> <index>14</index> </available-wavelengths>
-        </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-2</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-5-2-DEG2</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <available-wavelengths> <index>11</index> </available-wavelengths>
-        <available-wavelengths> <index>12</index> </available-wavelengths>
-        <available-wavelengths> <index>13</index> </available-wavelengths>
-        <available-wavelengths> <index>14</index> </available-wavelengths>
-        </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-2</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-5-2-DEG3</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <available-wavelengths> <index>11</index> </available-wavelengths>
-        <available-wavelengths> <index>12</index> </available-wavelengths>
-        <available-wavelengths> <index>13</index> </available-wavelengths>
-        <available-wavelengths> <index>14</index> </available-wavelengths>
-        </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-2</node-ref>    </supporting-node></node>
-<node>   <node-id>OpenROADM-5-2-SRG1</node-id>     <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
-        <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-2</node-ref>    </supporting-node>
-        <srg-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <available-wavelengths> <index>11</index> </available-wavelengths>
-        <available-wavelengths> <index>12</index> </available-wavelengths>
-        <available-wavelengths> <index>13</index> </available-wavelengths>
-        <available-wavelengths> <index>14</index> </available-wavelengths>
-        </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>               </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>               </termination-point>
-</node>
-<node>        <node-id>XPONDER-5-2</node-id>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-5-2</node-ref>    </supporting-node>
-    <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
-</node>
-<node>    <node-id>OpenROADM-5-3-DEG1</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <available-wavelengths> <index>11</index> </available-wavelengths>
-        <available-wavelengths> <index>12</index> </available-wavelengths>
-        <available-wavelengths> <index>13</index> </available-wavelengths>
-        <available-wavelengths> <index>14</index> </available-wavelengths>
-        </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-3</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-5-3-DEG2</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <available-wavelengths> <index>11</index> </available-wavelengths>
-        <available-wavelengths> <index>12</index> </available-wavelengths>
-        <available-wavelengths> <index>13</index> </available-wavelengths>
-        <available-wavelengths> <index>14</index> </available-wavelengths>
-        </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-3</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-5-3-DEG3</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <available-wavelengths> <index>11</index> </available-wavelengths>
-        <available-wavelengths> <index>12</index> </available-wavelengths>
-        <available-wavelengths> <index>13</index> </available-wavelengths>
-        <available-wavelengths> <index>14</index> </available-wavelengths>
-        </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-3</node-ref>    </supporting-node></node>
-<node>   <node-id>OpenROADM-5-3-SRG1</node-id>     <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
-        <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-3</node-ref>    </supporting-node>
-        <srg-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <available-wavelengths> <index>11</index> </available-wavelengths>
-        <available-wavelengths> <index>12</index> </available-wavelengths>
-        <available-wavelengths> <index>13</index> </available-wavelengths>
-        <available-wavelengths> <index>14</index> </available-wavelengths>
-        </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>               </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>               </termination-point>
-</node>
-<node>        <node-id>XPONDER-5-3</node-id>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-5-3</node-ref>    </supporting-node>
-    <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
-</node>
-<node>    <node-id>OpenROADM-5-4-DEG1</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <available-wavelengths> <index>11</index> </available-wavelengths>
-        <available-wavelengths> <index>12</index> </available-wavelengths>
-        <available-wavelengths> <index>13</index> </available-wavelengths>
-        <available-wavelengths> <index>14</index> </available-wavelengths>
-        </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-4</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-5-4-DEG2</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <available-wavelengths> <index>11</index> </available-wavelengths>
-        <available-wavelengths> <index>12</index> </available-wavelengths>
-        <available-wavelengths> <index>13</index> </available-wavelengths>
-        <available-wavelengths> <index>14</index> </available-wavelengths>
-        </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-4</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-5-4-DEG3</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <available-wavelengths> <index>11</index> </available-wavelengths>
-        <available-wavelengths> <index>12</index> </available-wavelengths>
-        <available-wavelengths> <index>13</index> </available-wavelengths>
-        <available-wavelengths> <index>14</index> </available-wavelengths>
-        </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-4</node-ref>    </supporting-node></node>
-<node>   <node-id>OpenROADM-5-4-SRG1</node-id>     <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
-        <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-4</node-ref>    </supporting-node>
-        <srg-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <available-wavelengths> <index>11</index> </available-wavelengths>
-        <available-wavelengths> <index>12</index> </available-wavelengths>
-        <available-wavelengths> <index>13</index> </available-wavelengths>
-        <available-wavelengths> <index>14</index> </available-wavelengths>
-        </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>               </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>               </termination-point>
-</node>
-<node>        <node-id>XPONDER-5-4</node-id>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-5-4</node-ref>    </supporting-node>
-    <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
-</node>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-1-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-1-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-1-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-1-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-1-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-1-DEG3-DEG3-CTP-TXtoOpenROADM-1-1-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+    <network xmlns="urn:ietf:params:xml:ns:yang:ietf-network">
+        <network-id>openroadm-topology</network-id>
+        <node>    <node-id>OpenROADM-1-1-DEG1</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>1</index> </available-wavelengths>
+                <available-wavelengths> <index>2</index> </available-wavelengths>
+                <available-wavelengths> <index>3</index> </available-wavelengths>
+                <available-wavelengths> <index>4</index> </available-wavelengths>
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-1</node-ref>    </supporting-node></node>
+        <node>    <node-id>OpenROADM-1-1-DEG2</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>1</index> </available-wavelengths>
+                <available-wavelengths> <index>2</index> </available-wavelengths>
+                <available-wavelengths> <index>3</index> </available-wavelengths>
+                <available-wavelengths> <index>4</index> </available-wavelengths>
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-1</node-ref>    </supporting-node></node>
+        <node>    <node-id>OpenROADM-1-1-DEG3</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>1</index> </available-wavelengths>
+                <available-wavelengths> <index>2</index> </available-wavelengths>
+                <available-wavelengths> <index>3</index> </available-wavelengths>
+                <available-wavelengths> <index>4</index> </available-wavelengths>
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-1</node-ref>    </supporting-node></node>
+        <node>   <node-id>OpenROADM-1-1-SRG1</node-id>     <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-1</node-ref>    </supporting-node>
+            <srg-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>1</index> </available-wavelengths>
+                <available-wavelengths> <index>2</index> </available-wavelengths>
+                <available-wavelengths> <index>3</index> </available-wavelengths>
+                <available-wavelengths> <index>4</index> </available-wavelengths>
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+            </srg-attributes>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>       <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-CP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>       <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-CP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+        </node>
+        <node>        <node-id>XPONDER-1-1</node-id>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-1-1</node-ref>    </supporting-node>
+            <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-1</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-2</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-3</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-4</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+        </node>
+        <node>    <node-id>OpenROADM-1-2-DEG1</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>1</index> </available-wavelengths>
+                <available-wavelengths> <index>2</index> </available-wavelengths>
+                <available-wavelengths> <index>3</index> </available-wavelengths>
+                <available-wavelengths> <index>4</index> </available-wavelengths>
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-2</node-ref>    </supporting-node></node>
+        <node>    <node-id>OpenROADM-1-2-DEG2</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>1</index> </available-wavelengths>
+                <available-wavelengths> <index>2</index> </available-wavelengths>
+                <available-wavelengths> <index>3</index> </available-wavelengths>
+                <available-wavelengths> <index>4</index> </available-wavelengths>
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-2</node-ref>    </supporting-node></node>
+        <node>    <node-id>OpenROADM-1-2-DEG3</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>1</index> </available-wavelengths>
+                <available-wavelengths> <index>2</index> </available-wavelengths>
+                <available-wavelengths> <index>3</index> </available-wavelengths>
+                <available-wavelengths> <index>4</index> </available-wavelengths>
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-2</node-ref>    </supporting-node></node>
+        <node>   <node-id>OpenROADM-1-2-SRG1</node-id>     <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-2</node-ref>    </supporting-node>
+            <srg-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>1</index> </available-wavelengths>
+                <available-wavelengths> <index>2</index> </available-wavelengths>
+                <available-wavelengths> <index>3</index> </available-wavelengths>
+                <available-wavelengths> <index>4</index> </available-wavelengths>
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+            </srg-attributes>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>       <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-CP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>       <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-CP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+        </node>
+        <node>        <node-id>XPONDER-1-2</node-id>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-1-2</node-ref>    </supporting-node>
+            <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-1</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-2</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-3</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-4</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+        </node>
+        <node>    <node-id>OpenROADM-1-3-DEG1</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>1</index> </available-wavelengths>
+                <available-wavelengths> <index>2</index> </available-wavelengths>
+                <available-wavelengths> <index>3</index> </available-wavelengths>
+                <available-wavelengths> <index>4</index> </available-wavelengths>
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-3</node-ref>    </supporting-node></node>
+        <node>    <node-id>OpenROADM-1-3-DEG2</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>1</index> </available-wavelengths>
+                <available-wavelengths> <index>2</index> </available-wavelengths>
+                <available-wavelengths> <index>3</index> </available-wavelengths>
+                <available-wavelengths> <index>4</index> </available-wavelengths>
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-3</node-ref>    </supporting-node></node>
+        <node>    <node-id>OpenROADM-1-3-DEG3</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>1</index> </available-wavelengths>
+                <available-wavelengths> <index>2</index> </available-wavelengths>
+                <available-wavelengths> <index>3</index> </available-wavelengths>
+                <available-wavelengths> <index>4</index> </available-wavelengths>
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-3</node-ref>    </supporting-node></node>
+        <node>   <node-id>OpenROADM-1-3-SRG1</node-id>     <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-3</node-ref>    </supporting-node>
+            <srg-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>1</index> </available-wavelengths>
+                <available-wavelengths> <index>2</index> </available-wavelengths>
+                <available-wavelengths> <index>3</index> </available-wavelengths>
+                <available-wavelengths> <index>4</index> </available-wavelengths>
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+            </srg-attributes>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>       <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-CP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>       <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-CP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+        </node>
+        <node>        <node-id>XPONDER-1-3</node-id>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-1-3</node-ref>    </supporting-node>
+            <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-1</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-2</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-3</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-4</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+        </node>
+        <node>    <node-id>OpenROADM-1-4-DEG1</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>1</index> </available-wavelengths>
+                <available-wavelengths> <index>2</index> </available-wavelengths>
+                <available-wavelengths> <index>3</index> </available-wavelengths>
+                <available-wavelengths> <index>4</index> </available-wavelengths>
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-4</node-ref>    </supporting-node></node>
+        <node>    <node-id>OpenROADM-1-4-DEG2</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>1</index> </available-wavelengths>
+                <available-wavelengths> <index>2</index> </available-wavelengths>
+                <available-wavelengths> <index>3</index> </available-wavelengths>
+                <available-wavelengths> <index>4</index> </available-wavelengths>
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-4</node-ref>    </supporting-node></node>
+        <node>    <node-id>OpenROADM-1-4-DEG3</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>1</index> </available-wavelengths>
+                <available-wavelengths> <index>2</index> </available-wavelengths>
+                <available-wavelengths> <index>3</index> </available-wavelengths>
+                <available-wavelengths> <index>4</index> </available-wavelengths>
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-4</node-ref>    </supporting-node></node>
+        <node>   <node-id>OpenROADM-1-4-SRG1</node-id>     <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-4</node-ref>    </supporting-node>
+            <srg-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>1</index> </available-wavelengths>
+                <available-wavelengths> <index>2</index> </available-wavelengths>
+                <available-wavelengths> <index>3</index> </available-wavelengths>
+                <available-wavelengths> <index>4</index> </available-wavelengths>
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+            </srg-attributes>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>       <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-CP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>       <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-CP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+        </node>
+        <node>        <node-id>XPONDER-1-4</node-id>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-1-4</node-ref>    </supporting-node>
+            <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-1</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-2</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-3</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-4</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+        </node>
+        <node>    <node-id>OpenROADM-2-1-DEG1</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>3</index> </available-wavelengths>
+                <available-wavelengths> <index>4</index> </available-wavelengths>
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-1</node-ref>    </supporting-node></node>
+        <node>    <node-id>OpenROADM-2-1-DEG2</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>3</index> </available-wavelengths>
+                <available-wavelengths> <index>4</index> </available-wavelengths>
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-1</node-ref>    </supporting-node></node>
+        <node>    <node-id>OpenROADM-2-1-DEG3</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>3</index> </available-wavelengths>
+                <available-wavelengths> <index>4</index> </available-wavelengths>
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-1</node-ref>    </supporting-node></node>
+        <node>   <node-id>OpenROADM-2-1-SRG1</node-id>     <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-1</node-ref>    </supporting-node>
+            <srg-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>3</index> </available-wavelengths>
+                <available-wavelengths> <index>4</index> </available-wavelengths>
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+            </srg-attributes>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>       <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-CP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>       <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-CP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+        </node>
+        <node>        <node-id>XPONDER-2-1</node-id>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-2-1</node-ref>    </supporting-node>
+            <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-1</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-2</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-3</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-4</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+        </node>
+        <node>    <node-id>OpenROADM-2-2-DEG1</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>3</index> </available-wavelengths>
+                <available-wavelengths> <index>4</index> </available-wavelengths>
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-2</node-ref>    </supporting-node></node>
+        <node>    <node-id>OpenROADM-2-2-DEG2</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>3</index> </available-wavelengths>
+                <available-wavelengths> <index>4</index> </available-wavelengths>
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-2</node-ref>    </supporting-node></node>
+        <node>    <node-id>OpenROADM-2-2-DEG3</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>3</index> </available-wavelengths>
+                <available-wavelengths> <index>4</index> </available-wavelengths>
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-2</node-ref>    </supporting-node></node>
+        <node>   <node-id>OpenROADM-2-2-SRG1</node-id>     <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-2</node-ref>    </supporting-node>
+            <srg-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>3</index> </available-wavelengths>
+                <available-wavelengths> <index>4</index> </available-wavelengths>
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+            </srg-attributes>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>       <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-CP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>       <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-CP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+        </node>
+        <node>        <node-id>XPONDER-2-2</node-id>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-2-2</node-ref>    </supporting-node>
+            <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-1</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-2</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-3</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-4</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+        </node>
+        <node>    <node-id>OpenROADM-2-3-DEG1</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>3</index> </available-wavelengths>
+                <available-wavelengths> <index>4</index> </available-wavelengths>
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-3</node-ref>    </supporting-node></node>
+        <node>    <node-id>OpenROADM-2-3-DEG2</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>3</index> </available-wavelengths>
+                <available-wavelengths> <index>4</index> </available-wavelengths>
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-3</node-ref>    </supporting-node></node>
+        <node>    <node-id>OpenROADM-2-3-DEG3</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>3</index> </available-wavelengths>
+                <available-wavelengths> <index>4</index> </available-wavelengths>
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-3</node-ref>    </supporting-node></node>
+        <node>   <node-id>OpenROADM-2-3-SRG1</node-id>     <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-3</node-ref>    </supporting-node>
+            <srg-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>3</index> </available-wavelengths>
+                <available-wavelengths> <index>4</index> </available-wavelengths>
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+            </srg-attributes>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>       <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-CP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>       <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-CP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+        </node>
+        <node>        <node-id>XPONDER-2-3</node-id>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-2-3</node-ref>    </supporting-node>
+            <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-1</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-2</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-3</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-4</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+        </node>
+        <node>    <node-id>OpenROADM-2-4-DEG1</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>3</index> </available-wavelengths>
+                <available-wavelengths> <index>4</index> </available-wavelengths>
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-4</node-ref>    </supporting-node></node>
+        <node>    <node-id>OpenROADM-2-4-DEG2</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>3</index> </available-wavelengths>
+                <available-wavelengths> <index>4</index> </available-wavelengths>
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-4</node-ref>    </supporting-node></node>
+        <node>    <node-id>OpenROADM-2-4-DEG3</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>3</index> </available-wavelengths>
+                <available-wavelengths> <index>4</index> </available-wavelengths>
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-4</node-ref>    </supporting-node></node>
+        <node>   <node-id>OpenROADM-2-4-SRG1</node-id>     <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-4</node-ref>    </supporting-node>
+            <srg-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>3</index> </available-wavelengths>
+                <available-wavelengths> <index>4</index> </available-wavelengths>
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+            </srg-attributes>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>       <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-CP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>       <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-CP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+        </node>
+        <node>        <node-id>XPONDER-2-4</node-id>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-2-4</node-ref>    </supporting-node>
+            <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-1</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-2</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-3</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-4</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+        </node>
+        <node>    <node-id>OpenROADM-3-1-DEG1</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-1</node-ref>    </supporting-node></node>
+        <node>    <node-id>OpenROADM-3-1-DEG2</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-1</node-ref>    </supporting-node></node>
+        <node>    <node-id>OpenROADM-3-1-DEG3</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-1</node-ref>    </supporting-node></node>
+        <node>   <node-id>OpenROADM-3-1-SRG1</node-id>     <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-1</node-ref>    </supporting-node>
+            <srg-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+            </srg-attributes>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>       <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-CP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>       <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-CP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+        </node>
+        <node>        <node-id>XPONDER-3-1</node-id>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-3-1</node-ref>    </supporting-node>
+            <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-1</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-2</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-3</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-4</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+        </node>
+        <node>    <node-id>OpenROADM-3-2-DEG1</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-2</node-ref>    </supporting-node></node>
+        <node>    <node-id>OpenROADM-3-2-DEG2</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-2</node-ref>    </supporting-node></node>
+        <node>    <node-id>OpenROADM-3-2-DEG3</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-2</node-ref>    </supporting-node></node>
+        <node>   <node-id>OpenROADM-3-2-SRG1</node-id>     <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-2</node-ref>    </supporting-node>
+            <srg-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+            </srg-attributes>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>       <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-CP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>       <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-CP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+        </node>
+        <node>        <node-id>XPONDER-3-2</node-id>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-3-2</node-ref>    </supporting-node>
+            <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-1</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-2</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-3</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-4</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+        </node>
+        <node>    <node-id>OpenROADM-3-3-DEG1</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-3</node-ref>    </supporting-node></node>
+        <node>    <node-id>OpenROADM-3-3-DEG2</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-3</node-ref>    </supporting-node></node>
+        <node>    <node-id>OpenROADM-3-3-DEG3</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-3</node-ref>    </supporting-node></node>
+        <node>   <node-id>OpenROADM-3-3-SRG1</node-id>     <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-3</node-ref>    </supporting-node>
+            <srg-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+            </srg-attributes>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>       <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-CP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>       <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-CP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+        </node>
+        <node>        <node-id>XPONDER-3-3</node-id>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-3-3</node-ref>    </supporting-node>
+            <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-1</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-2</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-3</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-4</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+        </node>
+        <node>    <node-id>OpenROADM-3-4-DEG1</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-4</node-ref>    </supporting-node></node>
+        <node>    <node-id>OpenROADM-3-4-DEG2</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-4</node-ref>    </supporting-node></node>
+        <node>    <node-id>OpenROADM-3-4-DEG3</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-4</node-ref>    </supporting-node></node>
+        <node>   <node-id>OpenROADM-3-4-SRG1</node-id>     <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-4</node-ref>    </supporting-node>
+            <srg-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+            </srg-attributes>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>       <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-CP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>       <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-CP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+        </node>
+        <node>        <node-id>XPONDER-3-4</node-id>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-3-4</node-ref>    </supporting-node>
+            <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-1</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-2</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-3</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-4</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+        </node>
+        <node>    <node-id>OpenROADM-4-1-DEG1</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+                <available-wavelengths> <index>11</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-1</node-ref>    </supporting-node></node>
+        <node>    <node-id>OpenROADM-4-1-DEG2</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+                <available-wavelengths> <index>11</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-1</node-ref>    </supporting-node></node>
+        <node>    <node-id>OpenROADM-4-1-DEG3</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+                <available-wavelengths> <index>11</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-1</node-ref>    </supporting-node></node>
+        <node>   <node-id>OpenROADM-4-1-SRG1</node-id>     <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-1</node-ref>    </supporting-node>
+            <srg-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+                <available-wavelengths> <index>11</index> </available-wavelengths>
+            </srg-attributes>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>       <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-CP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>       <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-CP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+        </node>
+        <node>        <node-id>XPONDER-4-1</node-id>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-4-1</node-ref>    </supporting-node>
+            <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-1</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-2</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-3</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-4</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+        </node>
+        <node>    <node-id>OpenROADM-4-2-DEG1</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+                <available-wavelengths> <index>11</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-2</node-ref>    </supporting-node></node>
+        <node>    <node-id>OpenROADM-4-2-DEG2</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+                <available-wavelengths> <index>11</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-2</node-ref>    </supporting-node></node>
+        <node>    <node-id>OpenROADM-4-2-DEG3</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+                <available-wavelengths> <index>11</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-2</node-ref>    </supporting-node></node>
+        <node>   <node-id>OpenROADM-4-2-SRG1</node-id>     <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-2</node-ref>    </supporting-node>
+            <srg-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+                <available-wavelengths> <index>11</index> </available-wavelengths>
+            </srg-attributes>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>       <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-CP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>       <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-CP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+        </node>
+        <node>        <node-id>XPONDER-4-2</node-id>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-4-2</node-ref>    </supporting-node>
+            <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-1</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-2</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-3</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-4</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+        </node>
+        <node>    <node-id>OpenROADM-4-3-DEG1</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+                <available-wavelengths> <index>11</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-3</node-ref>    </supporting-node></node>
+        <node>    <node-id>OpenROADM-4-3-DEG2</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+                <available-wavelengths> <index>11</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-3</node-ref>    </supporting-node></node>
+        <node>    <node-id>OpenROADM-4-3-DEG3</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+                <available-wavelengths> <index>11</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-3</node-ref>    </supporting-node></node>
+        <node>   <node-id>OpenROADM-4-3-SRG1</node-id>     <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-3</node-ref>    </supporting-node>
+            <srg-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+                <available-wavelengths> <index>11</index> </available-wavelengths>
+            </srg-attributes>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>       <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-CP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>       <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-CP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+        </node>
+        <node>        <node-id>XPONDER-4-3</node-id>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-4-3</node-ref>    </supporting-node>
+            <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-1</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-2</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-3</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-4</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+        </node>
+        <node>    <node-id>OpenROADM-4-4-DEG1</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+                <available-wavelengths> <index>11</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-4</node-ref>    </supporting-node></node>
+        <node>    <node-id>OpenROADM-4-4-DEG2</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+                <available-wavelengths> <index>11</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-4</node-ref>    </supporting-node></node>
+        <node>    <node-id>OpenROADM-4-4-DEG3</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+                <available-wavelengths> <index>11</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-4</node-ref>    </supporting-node></node>
+        <node>   <node-id>OpenROADM-4-4-SRG1</node-id>     <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-4</node-ref>    </supporting-node>
+            <srg-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+                <available-wavelengths> <index>11</index> </available-wavelengths>
+            </srg-attributes>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>       <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-CP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>       <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-CP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+        </node>
+        <node>        <node-id>XPONDER-4-4</node-id>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-4-4</node-ref>    </supporting-node>
+            <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-1</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-2</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-3</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-4</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+        </node>
+        <node>    <node-id>OpenROADM-5-1-DEG1</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+                <available-wavelengths> <index>11</index> </available-wavelengths>
+                <available-wavelengths> <index>12</index> </available-wavelengths>
+                <available-wavelengths> <index>13</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-1</node-ref>    </supporting-node></node>
+        <node>    <node-id>OpenROADM-5-1-DEG2</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+                <available-wavelengths> <index>11</index> </available-wavelengths>
+                <available-wavelengths> <index>12</index> </available-wavelengths>
+                <available-wavelengths> <index>13</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-1</node-ref>    </supporting-node></node>
+        <node>    <node-id>OpenROADM-5-1-DEG3</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+                <available-wavelengths> <index>11</index> </available-wavelengths>
+                <available-wavelengths> <index>12</index> </available-wavelengths>
+                <available-wavelengths> <index>13</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-1</node-ref>    </supporting-node></node>
+        <node>   <node-id>OpenROADM-5-1-SRG1</node-id>     <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-1</node-ref>    </supporting-node>
+            <srg-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+                <available-wavelengths> <index>11</index> </available-wavelengths>
+                <available-wavelengths> <index>12</index> </available-wavelengths>
+                <available-wavelengths> <index>13</index> </available-wavelengths>
+            </srg-attributes>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>       <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-CP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>       <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-CP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+        </node>
+        <node>        <node-id>XPONDER-5-1</node-id>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-5-1</node-ref>    </supporting-node>
+            <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-1</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-2</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-3</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-4</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+        </node>
+        <node>    <node-id>OpenROADM-5-2-DEG1</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+                <available-wavelengths> <index>11</index> </available-wavelengths>
+                <available-wavelengths> <index>12</index> </available-wavelengths>
+                <available-wavelengths> <index>13</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-2</node-ref>    </supporting-node></node>
+        <node>    <node-id>OpenROADM-5-2-DEG2</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+                <available-wavelengths> <index>11</index> </available-wavelengths>
+                <available-wavelengths> <index>12</index> </available-wavelengths>
+                <available-wavelengths> <index>13</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-2</node-ref>    </supporting-node></node>
+        <node>    <node-id>OpenROADM-5-2-DEG3</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+                <available-wavelengths> <index>11</index> </available-wavelengths>
+                <available-wavelengths> <index>12</index> </available-wavelengths>
+                <available-wavelengths> <index>13</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-2</node-ref>    </supporting-node></node>
+        <node>   <node-id>OpenROADM-5-2-SRG1</node-id>     <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-2</node-ref>    </supporting-node>
+            <srg-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+                <available-wavelengths> <index>11</index> </available-wavelengths>
+                <available-wavelengths> <index>12</index> </available-wavelengths>
+                <available-wavelengths> <index>13</index> </available-wavelengths>
+            </srg-attributes>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>       <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-CP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>       <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-CP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+        </node>
+        <node>        <node-id>XPONDER-5-2</node-id>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-5-2</node-ref>    </supporting-node>
+            <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-1</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-2</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-3</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-4</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+        </node>
+        <node>    <node-id>OpenROADM-5-3-DEG1</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+                <available-wavelengths> <index>11</index> </available-wavelengths>
+                <available-wavelengths> <index>12</index> </available-wavelengths>
+                <available-wavelengths> <index>13</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-3</node-ref>    </supporting-node></node>
+        <node>    <node-id>OpenROADM-5-3-DEG2</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+                <available-wavelengths> <index>11</index> </available-wavelengths>
+                <available-wavelengths> <index>12</index> </available-wavelengths>
+                <available-wavelengths> <index>13</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-3</node-ref>    </supporting-node></node>
+        <node>    <node-id>OpenROADM-5-3-DEG3</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+                <available-wavelengths> <index>11</index> </available-wavelengths>
+                <available-wavelengths> <index>12</index> </available-wavelengths>
+                <available-wavelengths> <index>13</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-3</node-ref>    </supporting-node></node>
+        <node>   <node-id>OpenROADM-5-3-SRG1</node-id>     <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-3</node-ref>    </supporting-node>
+            <srg-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+                <available-wavelengths> <index>11</index> </available-wavelengths>
+                <available-wavelengths> <index>12</index> </available-wavelengths>
+                <available-wavelengths> <index>13</index> </available-wavelengths>
+            </srg-attributes>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>       <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-CP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>       <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-CP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+        </node>
+        <node>        <node-id>XPONDER-5-3</node-id>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-5-3</node-ref>    </supporting-node>
+            <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-1</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-2</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-3</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-4</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+        </node>
+        <node>    <node-id>OpenROADM-5-4-DEG1</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+                <available-wavelengths> <index>11</index> </available-wavelengths>
+                <available-wavelengths> <index>12</index> </available-wavelengths>
+                <available-wavelengths> <index>13</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-4</node-ref>    </supporting-node></node>
+        <node>    <node-id>OpenROADM-5-4-DEG2</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+                <available-wavelengths> <index>11</index> </available-wavelengths>
+                <available-wavelengths> <index>12</index> </available-wavelengths>
+                <available-wavelengths> <index>13</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-4</node-ref>    </supporting-node></node>
+        <node>    <node-id>OpenROADM-5-4-DEG3</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+                <available-wavelengths> <index>11</index> </available-wavelengths>
+                <available-wavelengths> <index>12</index> </available-wavelengths>
+                <available-wavelengths> <index>13</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-4</node-ref>    </supporting-node></node>
+        <node>   <node-id>OpenROADM-5-4-SRG1</node-id>     <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-4</node-ref>    </supporting-node>
+            <srg-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+                <available-wavelengths> <index>11</index> </available-wavelengths>
+                <available-wavelengths> <index>12</index> </available-wavelengths>
+                <available-wavelengths> <index>13</index> </available-wavelengths>
+            </srg-attributes>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>       <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-CP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>       <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-CP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+        </node>
+        <node>        <node-id>XPONDER-5-4</node-id>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-5-4</node-ref>    </supporting-node>
+            <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-1</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-2</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-3</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-4</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+        </node>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-1-DEG2-DEG2-CTP-RX</link-id>
+            <source><source-node>OpenROADM-1-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-1-DEG1-DEG1-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-1-DEG3-DEG3-CTP-RX</link-id>
+            <source><source-node>OpenROADM-1-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-1-DEG3-DEG3-CTP-TXtoOpenROADM-1-1-DEG1-DEG1-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-1-SRG1-SRG1-CP-TXtoOpenROADM-1-1-DEG1-DEG1-CTP-RX</link-id>
             <source><source-node>OpenROADM-1-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-1-SRG1-SRG1-CP-RX</opposite-link>
@@ -1977,14 +2657,14 @@
             <source><source-node>OpenROADM-1-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-1-SRG1-SRG1-CP-TXtoOpenROADM-1-1-DEG1-DEG1-CTP-RX</opposite-link>
             <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-1-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-1-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-1-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-1-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-1-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-1-DEG3-DEG3-CTP-TXtoOpenROADM-1-1-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-1-DEG1-DEG1-CTP-RX</link-id>
+            <source><source-node>OpenROADM-1-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-1-DEG2-DEG2-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-1-DEG3-DEG3-CTP-RX</link-id>
+            <source><source-node>OpenROADM-1-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-1-DEG3-DEG3-CTP-TXtoOpenROADM-1-1-DEG2-DEG2-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-1-SRG1-SRG1-CP-TXtoOpenROADM-1-1-DEG2-DEG2-CTP-RX</link-id>
             <source><source-node>OpenROADM-1-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-1-SRG1-SRG1-CP-RX</opposite-link>
@@ -1993,14 +2673,14 @@
             <source><source-node>OpenROADM-1-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-1-SRG1-SRG1-CP-TXtoOpenROADM-1-1-DEG2-DEG2-CTP-RX</opposite-link>
             <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-DEG3-DEG3-CTP-TXtoOpenROADM-1-1-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-1-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-1-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-DEG3-DEG3-CTP-TXtoOpenROADM-1-1-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-1-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-1-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-DEG3-DEG3-CTP-TXtoOpenROADM-1-1-DEG1-DEG1-CTP-RX</link-id>
+            <source><source-node>OpenROADM-1-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-1-DEG3-DEG3-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-DEG3-DEG3-CTP-TXtoOpenROADM-1-1-DEG2-DEG2-CTP-RX</link-id>
+            <source><source-node>OpenROADM-1-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-1-DEG3-DEG3-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-1-SRG1-SRG1-CP-TXtoOpenROADM-1-1-DEG3-DEG3-CTP-RX</link-id>
             <source><source-node>OpenROADM-1-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-1-DEG3-DEG3-CTP-TXtoOpenROADM-1-1-SRG1-SRG1-CP-RX</opposite-link>
@@ -2009,46 +2689,46 @@
             <source><source-node>OpenROADM-1-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-1-SRG1-SRG1-CP-TXtoOpenROADM-1-1-DEG3-DEG3-CTP-RX</opposite-link>
             <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-1XPDR-NW1-TX-toOpenROADM-1-1-SRG1-SRG1-PP1-RX</link-id>
-        <source><source-node>XPONDER-1-1</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-1-SRG1-SRG1-PP1-TX-to-XPONDER-1-1XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-SRG1-SRG1-PP1-TX-to-XPONDER-1-1XPDR-NW1-RX</link-id>
-        <source><source-node>OpenROADM-1-1-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-1-1</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-1-1XPDR-NW1-TX-toOpenROADM-1-1-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-1XPDR-NW2-TX-toOpenROADM-1-1-SRG1-SRG1-PP2-RX</link-id>
-        <source><source-node>XPONDER-1-1</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-1-SRG1-SRG1-PP2-TX-to-XPONDER-1-1XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-SRG1-SRG1-PP2-TX-to-XPONDER-1-1XPDR-NW2-RX</link-id>
-        <source><source-node>OpenROADM-1-1-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-1-1</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-1-1XPDR-NW2-TX-toOpenROADM-1-1-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-1XPDR-NW3-TX-toOpenROADM-1-1-SRG1-SRG1-PP3-RX</link-id>
-        <source><source-node>XPONDER-1-1</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-1-SRG1-SRG1-PP3-TX-to-XPONDER-1-1XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-SRG1-SRG1-PP3-TX-to-XPONDER-1-1XPDR-NW3-RX</link-id>
-        <source><source-node>OpenROADM-1-1-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-1-1</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-1-1XPDR-NW3-TX-toOpenROADM-1-1-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-1XPDR-NW4-TX-toOpenROADM-1-1-SRG1-SRG1-PP4-RX</link-id>
-        <source><source-node>XPONDER-1-1</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-1-SRG1-SRG1-PP4-TX-to-XPONDER-1-1XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-SRG1-SRG1-PP4-TX-to-XPONDER-1-1XPDR-NW4-RX</link-id>
-        <source><source-node>OpenROADM-1-1-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-1-1</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-1-1XPDR-NW4-TX-toOpenROADM-1-1-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-DEG1-DEG1-CTP-TXtoOpenROADM-1-2-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-1-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-2-DEG2-DEG2-CTP-TXtoOpenROADM-1-2-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-DEG1-DEG1-CTP-TXtoOpenROADM-1-2-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-1-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-2-DEG3-DEG3-CTP-TXtoOpenROADM-1-2-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-1XPDR-NW1-TX-toOpenROADM-1-1-SRG1-SRG1-PP1-RX</link-id>
+            <source><source-node>XPONDER-1-1</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-1-SRG1-SRG1-PP1-TX-to-XPONDER-1-1XPDR-NW1-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-SRG1-SRG1-PP1-TX-to-XPONDER-1-1XPDR-NW1-RX</link-id>
+            <source><source-node>OpenROADM-1-1-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-1-1</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-1-1XPDR-NW1-TX-toOpenROADM-1-1-SRG1-SRG1-PP1-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-1XPDR-NW2-TX-toOpenROADM-1-1-SRG1-SRG1-PP2-RX</link-id>
+            <source><source-node>XPONDER-1-1</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-1-SRG1-SRG1-PP2-TX-to-XPONDER-1-1XPDR-NW2-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-SRG1-SRG1-PP2-TX-to-XPONDER-1-1XPDR-NW2-RX</link-id>
+            <source><source-node>OpenROADM-1-1-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-1-1</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-1-1XPDR-NW2-TX-toOpenROADM-1-1-SRG1-SRG1-PP2-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-1XPDR-NW3-TX-toOpenROADM-1-1-SRG1-SRG1-PP3-RX</link-id>
+            <source><source-node>XPONDER-1-1</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-1-SRG1-SRG1-PP3-TX-to-XPONDER-1-1XPDR-NW3-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-SRG1-SRG1-PP3-TX-to-XPONDER-1-1XPDR-NW3-RX</link-id>
+            <source><source-node>OpenROADM-1-1-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-1-1</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-1-1XPDR-NW3-TX-toOpenROADM-1-1-SRG1-SRG1-PP3-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-1XPDR-NW4-TX-toOpenROADM-1-1-SRG1-SRG1-PP4-RX</link-id>
+            <source><source-node>XPONDER-1-1</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-1-SRG1-SRG1-PP4-TX-to-XPONDER-1-1XPDR-NW4-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-SRG1-SRG1-PP4-TX-to-XPONDER-1-1XPDR-NW4-RX</link-id>
+            <source><source-node>OpenROADM-1-1-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-1-1</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-1-1XPDR-NW4-TX-toOpenROADM-1-1-SRG1-SRG1-PP4-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-DEG1-DEG1-CTP-TXtoOpenROADM-1-2-DEG2-DEG2-CTP-RX</link-id>
+            <source><source-node>OpenROADM-1-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-2-DEG2-DEG2-CTP-TXtoOpenROADM-1-2-DEG1-DEG1-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-DEG1-DEG1-CTP-TXtoOpenROADM-1-2-DEG3-DEG3-CTP-RX</link-id>
+            <source><source-node>OpenROADM-1-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-2-DEG3-DEG3-CTP-TXtoOpenROADM-1-2-DEG1-DEG1-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-2-SRG1-SRG1-CP-TXtoOpenROADM-1-2-DEG1-DEG1-CTP-RX</link-id>
             <source><source-node>OpenROADM-1-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-2-DEG1-DEG1-CTP-TXtoOpenROADM-1-2-SRG1-SRG1-CP-RX</opposite-link>
@@ -2057,14 +2737,14 @@
             <source><source-node>OpenROADM-1-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-2-SRG1-SRG1-CP-TXtoOpenROADM-1-2-DEG1-DEG1-CTP-RX</opposite-link>
             <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-DEG2-DEG2-CTP-TXtoOpenROADM-1-2-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-1-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-2-DEG1-DEG1-CTP-TXtoOpenROADM-1-2-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-DEG2-DEG2-CTP-TXtoOpenROADM-1-2-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-1-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-2-DEG3-DEG3-CTP-TXtoOpenROADM-1-2-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-DEG2-DEG2-CTP-TXtoOpenROADM-1-2-DEG1-DEG1-CTP-RX</link-id>
+            <source><source-node>OpenROADM-1-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-2-DEG1-DEG1-CTP-TXtoOpenROADM-1-2-DEG2-DEG2-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-DEG2-DEG2-CTP-TXtoOpenROADM-1-2-DEG3-DEG3-CTP-RX</link-id>
+            <source><source-node>OpenROADM-1-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-2-DEG3-DEG3-CTP-TXtoOpenROADM-1-2-DEG2-DEG2-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-2-SRG1-SRG1-CP-TXtoOpenROADM-1-2-DEG2-DEG2-CTP-RX</link-id>
             <source><source-node>OpenROADM-1-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-2-DEG2-DEG2-CTP-TXtoOpenROADM-1-2-SRG1-SRG1-CP-RX</opposite-link>
@@ -2073,14 +2753,14 @@
             <source><source-node>OpenROADM-1-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-2-SRG1-SRG1-CP-TXtoOpenROADM-1-2-DEG2-DEG2-CTP-RX</opposite-link>
             <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-DEG3-DEG3-CTP-TXtoOpenROADM-1-2-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-1-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-2-DEG1-DEG1-CTP-TXtoOpenROADM-1-2-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-DEG3-DEG3-CTP-TXtoOpenROADM-1-2-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-1-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-2-DEG2-DEG2-CTP-TXtoOpenROADM-1-2-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-DEG3-DEG3-CTP-TXtoOpenROADM-1-2-DEG1-DEG1-CTP-RX</link-id>
+            <source><source-node>OpenROADM-1-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-2-DEG1-DEG1-CTP-TXtoOpenROADM-1-2-DEG3-DEG3-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-DEG3-DEG3-CTP-TXtoOpenROADM-1-2-DEG2-DEG2-CTP-RX</link-id>
+            <source><source-node>OpenROADM-1-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-2-DEG2-DEG2-CTP-TXtoOpenROADM-1-2-DEG3-DEG3-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-2-SRG1-SRG1-CP-TXtoOpenROADM-1-2-DEG3-DEG3-CTP-RX</link-id>
             <source><source-node>OpenROADM-1-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-2-DEG3-DEG3-CTP-TXtoOpenROADM-1-2-SRG1-SRG1-CP-RX</opposite-link>
@@ -2089,46 +2769,46 @@
             <source><source-node>OpenROADM-1-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-2-SRG1-SRG1-CP-TXtoOpenROADM-1-2-DEG3-DEG3-CTP-RX</opposite-link>
             <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-2XPDR-NW1-TX-toOpenROADM-1-2-SRG1-SRG1-PP1-RX</link-id>
-        <source><source-node>XPONDER-1-2</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-2-SRG1-SRG1-PP1-TX-to-XPONDER-1-2XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-SRG1-SRG1-PP1-TX-to-XPONDER-1-2XPDR-NW1-RX</link-id>
-        <source><source-node>OpenROADM-1-2-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-1-2</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-1-2XPDR-NW1-TX-toOpenROADM-1-2-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-2XPDR-NW2-TX-toOpenROADM-1-2-SRG1-SRG1-PP2-RX</link-id>
-        <source><source-node>XPONDER-1-2</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-2-SRG1-SRG1-PP2-TX-to-XPONDER-1-2XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-SRG1-SRG1-PP2-TX-to-XPONDER-1-2XPDR-NW2-RX</link-id>
-        <source><source-node>OpenROADM-1-2-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-1-2</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-1-2XPDR-NW2-TX-toOpenROADM-1-2-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-2XPDR-NW3-TX-toOpenROADM-1-2-SRG1-SRG1-PP3-RX</link-id>
-        <source><source-node>XPONDER-1-2</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-2-SRG1-SRG1-PP3-TX-to-XPONDER-1-2XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-SRG1-SRG1-PP3-TX-to-XPONDER-1-2XPDR-NW3-RX</link-id>
-        <source><source-node>OpenROADM-1-2-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-1-2</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-1-2XPDR-NW3-TX-toOpenROADM-1-2-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-2XPDR-NW4-TX-toOpenROADM-1-2-SRG1-SRG1-PP4-RX</link-id>
-        <source><source-node>XPONDER-1-2</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-2-SRG1-SRG1-PP4-TX-to-XPONDER-1-2XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-SRG1-SRG1-PP4-TX-to-XPONDER-1-2XPDR-NW4-RX</link-id>
-        <source><source-node>OpenROADM-1-2-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-1-2</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-1-2XPDR-NW4-TX-toOpenROADM-1-2-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-3-DEG1-DEG1-CTP-TXtoOpenROADM-1-3-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-1-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-3-DEG2-DEG2-CTP-TXtoOpenROADM-1-3-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-3-DEG1-DEG1-CTP-TXtoOpenROADM-1-3-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-1-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-3-DEG3-DEG3-CTP-TXtoOpenROADM-1-3-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-2XPDR-NW1-TX-toOpenROADM-1-2-SRG1-SRG1-PP1-RX</link-id>
+            <source><source-node>XPONDER-1-2</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-2-SRG1-SRG1-PP1-TX-to-XPONDER-1-2XPDR-NW1-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-SRG1-SRG1-PP1-TX-to-XPONDER-1-2XPDR-NW1-RX</link-id>
+            <source><source-node>OpenROADM-1-2-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-1-2</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-1-2XPDR-NW1-TX-toOpenROADM-1-2-SRG1-SRG1-PP1-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-2XPDR-NW2-TX-toOpenROADM-1-2-SRG1-SRG1-PP2-RX</link-id>
+            <source><source-node>XPONDER-1-2</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-2-SRG1-SRG1-PP2-TX-to-XPONDER-1-2XPDR-NW2-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-SRG1-SRG1-PP2-TX-to-XPONDER-1-2XPDR-NW2-RX</link-id>
+            <source><source-node>OpenROADM-1-2-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-1-2</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-1-2XPDR-NW2-TX-toOpenROADM-1-2-SRG1-SRG1-PP2-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-2XPDR-NW3-TX-toOpenROADM-1-2-SRG1-SRG1-PP3-RX</link-id>
+            <source><source-node>XPONDER-1-2</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-2-SRG1-SRG1-PP3-TX-to-XPONDER-1-2XPDR-NW3-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-SRG1-SRG1-PP3-TX-to-XPONDER-1-2XPDR-NW3-RX</link-id>
+            <source><source-node>OpenROADM-1-2-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-1-2</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-1-2XPDR-NW3-TX-toOpenROADM-1-2-SRG1-SRG1-PP3-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-2XPDR-NW4-TX-toOpenROADM-1-2-SRG1-SRG1-PP4-RX</link-id>
+            <source><source-node>XPONDER-1-2</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-2-SRG1-SRG1-PP4-TX-to-XPONDER-1-2XPDR-NW4-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-SRG1-SRG1-PP4-TX-to-XPONDER-1-2XPDR-NW4-RX</link-id>
+            <source><source-node>OpenROADM-1-2-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-1-2</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-1-2XPDR-NW4-TX-toOpenROADM-1-2-SRG1-SRG1-PP4-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-3-DEG1-DEG1-CTP-TXtoOpenROADM-1-3-DEG2-DEG2-CTP-RX</link-id>
+            <source><source-node>OpenROADM-1-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-3-DEG2-DEG2-CTP-TXtoOpenROADM-1-3-DEG1-DEG1-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-3-DEG1-DEG1-CTP-TXtoOpenROADM-1-3-DEG3-DEG3-CTP-RX</link-id>
+            <source><source-node>OpenROADM-1-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-3-DEG3-DEG3-CTP-TXtoOpenROADM-1-3-DEG1-DEG1-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-3-SRG1-SRG1-CP-TXtoOpenROADM-1-3-DEG1-DEG1-CTP-RX</link-id>
             <source><source-node>OpenROADM-1-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-3-DEG1-DEG1-CTP-TXtoOpenROADM-1-3-SRG1-SRG1-CP-RX</opposite-link>
@@ -2137,14 +2817,14 @@
             <source><source-node>OpenROADM-1-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-3-SRG1-SRG1-CP-TXtoOpenROADM-1-3-DEG1-DEG1-CTP-RX</opposite-link>
             <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-3-DEG2-DEG2-CTP-TXtoOpenROADM-1-3-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-1-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-3-DEG1-DEG1-CTP-TXtoOpenROADM-1-3-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-3-DEG2-DEG2-CTP-TXtoOpenROADM-1-3-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-1-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-3-DEG3-DEG3-CTP-TXtoOpenROADM-1-3-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-3-DEG2-DEG2-CTP-TXtoOpenROADM-1-3-DEG1-DEG1-CTP-RX</link-id>
+            <source><source-node>OpenROADM-1-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-3-DEG1-DEG1-CTP-TXtoOpenROADM-1-3-DEG2-DEG2-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-3-DEG2-DEG2-CTP-TXtoOpenROADM-1-3-DEG3-DEG3-CTP-RX</link-id>
+            <source><source-node>OpenROADM-1-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-3-DEG3-DEG3-CTP-TXtoOpenROADM-1-3-DEG2-DEG2-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-3-SRG1-SRG1-CP-TXtoOpenROADM-1-3-DEG2-DEG2-CTP-RX</link-id>
             <source><source-node>OpenROADM-1-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-3-DEG2-DEG2-CTP-TXtoOpenROADM-1-3-SRG1-SRG1-CP-RX</opposite-link>
@@ -2153,14 +2833,14 @@
             <source><source-node>OpenROADM-1-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-3-SRG1-SRG1-CP-TXtoOpenROADM-1-3-DEG2-DEG2-CTP-RX</opposite-link>
             <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-3-DEG3-DEG3-CTP-TXtoOpenROADM-1-3-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-1-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-3-DEG1-DEG1-CTP-TXtoOpenROADM-1-3-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-3-DEG3-DEG3-CTP-TXtoOpenROADM-1-3-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-1-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-3-DEG2-DEG2-CTP-TXtoOpenROADM-1-3-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-3-DEG3-DEG3-CTP-TXtoOpenROADM-1-3-DEG1-DEG1-CTP-RX</link-id>
+            <source><source-node>OpenROADM-1-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-3-DEG1-DEG1-CTP-TXtoOpenROADM-1-3-DEG3-DEG3-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-3-DEG3-DEG3-CTP-TXtoOpenROADM-1-3-DEG2-DEG2-CTP-RX</link-id>
+            <source><source-node>OpenROADM-1-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-3-DEG2-DEG2-CTP-TXtoOpenROADM-1-3-DEG3-DEG3-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-3-SRG1-SRG1-CP-TXtoOpenROADM-1-3-DEG3-DEG3-CTP-RX</link-id>
             <source><source-node>OpenROADM-1-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-3-DEG3-DEG3-CTP-TXtoOpenROADM-1-3-SRG1-SRG1-CP-RX</opposite-link>
@@ -2169,46 +2849,46 @@
             <source><source-node>OpenROADM-1-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-3-SRG1-SRG1-CP-TXtoOpenROADM-1-3-DEG3-DEG3-CTP-RX</opposite-link>
             <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-3XPDR-NW1-TX-toOpenROADM-1-3-SRG1-SRG1-PP1-RX</link-id>
-        <source><source-node>XPONDER-1-3</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-3-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-3-SRG1-SRG1-PP1-TX-to-XPONDER-1-3XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-3-SRG1-SRG1-PP1-TX-to-XPONDER-1-3XPDR-NW1-RX</link-id>
-        <source><source-node>OpenROADM-1-3-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-1-3</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-1-3XPDR-NW1-TX-toOpenROADM-1-3-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-3XPDR-NW2-TX-toOpenROADM-1-3-SRG1-SRG1-PP2-RX</link-id>
-        <source><source-node>XPONDER-1-3</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-3-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-3-SRG1-SRG1-PP2-TX-to-XPONDER-1-3XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-3-SRG1-SRG1-PP2-TX-to-XPONDER-1-3XPDR-NW2-RX</link-id>
-        <source><source-node>OpenROADM-1-3-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-1-3</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-1-3XPDR-NW2-TX-toOpenROADM-1-3-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-3XPDR-NW3-TX-toOpenROADM-1-3-SRG1-SRG1-PP3-RX</link-id>
-        <source><source-node>XPONDER-1-3</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-3-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-3-SRG1-SRG1-PP3-TX-to-XPONDER-1-3XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-3-SRG1-SRG1-PP3-TX-to-XPONDER-1-3XPDR-NW3-RX</link-id>
-        <source><source-node>OpenROADM-1-3-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-1-3</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-1-3XPDR-NW3-TX-toOpenROADM-1-3-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-3XPDR-NW4-TX-toOpenROADM-1-3-SRG1-SRG1-PP4-RX</link-id>
-        <source><source-node>XPONDER-1-3</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-3-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-3-SRG1-SRG1-PP4-TX-to-XPONDER-1-3XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-3-SRG1-SRG1-PP4-TX-to-XPONDER-1-3XPDR-NW4-RX</link-id>
-        <source><source-node>OpenROADM-1-3-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-1-3</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-1-3XPDR-NW4-TX-toOpenROADM-1-3-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-4-DEG1-DEG1-CTP-TXtoOpenROADM-1-4-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-1-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-4-DEG2-DEG2-CTP-TXtoOpenROADM-1-4-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-4-DEG1-DEG1-CTP-TXtoOpenROADM-1-4-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-1-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-4-DEG3-DEG3-CTP-TXtoOpenROADM-1-4-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-3XPDR-NW1-TX-toOpenROADM-1-3-SRG1-SRG1-PP1-RX</link-id>
+            <source><source-node>XPONDER-1-3</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-3-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-3-SRG1-SRG1-PP1-TX-to-XPONDER-1-3XPDR-NW1-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-3-SRG1-SRG1-PP1-TX-to-XPONDER-1-3XPDR-NW1-RX</link-id>
+            <source><source-node>OpenROADM-1-3-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-1-3</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-1-3XPDR-NW1-TX-toOpenROADM-1-3-SRG1-SRG1-PP1-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-3XPDR-NW2-TX-toOpenROADM-1-3-SRG1-SRG1-PP2-RX</link-id>
+            <source><source-node>XPONDER-1-3</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-3-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-3-SRG1-SRG1-PP2-TX-to-XPONDER-1-3XPDR-NW2-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-3-SRG1-SRG1-PP2-TX-to-XPONDER-1-3XPDR-NW2-RX</link-id>
+            <source><source-node>OpenROADM-1-3-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-1-3</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-1-3XPDR-NW2-TX-toOpenROADM-1-3-SRG1-SRG1-PP2-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-3XPDR-NW3-TX-toOpenROADM-1-3-SRG1-SRG1-PP3-RX</link-id>
+            <source><source-node>XPONDER-1-3</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-3-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-3-SRG1-SRG1-PP3-TX-to-XPONDER-1-3XPDR-NW3-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-3-SRG1-SRG1-PP3-TX-to-XPONDER-1-3XPDR-NW3-RX</link-id>
+            <source><source-node>OpenROADM-1-3-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-1-3</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-1-3XPDR-NW3-TX-toOpenROADM-1-3-SRG1-SRG1-PP3-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-3XPDR-NW4-TX-toOpenROADM-1-3-SRG1-SRG1-PP4-RX</link-id>
+            <source><source-node>XPONDER-1-3</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-3-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-3-SRG1-SRG1-PP4-TX-to-XPONDER-1-3XPDR-NW4-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-3-SRG1-SRG1-PP4-TX-to-XPONDER-1-3XPDR-NW4-RX</link-id>
+            <source><source-node>OpenROADM-1-3-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-1-3</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-1-3XPDR-NW4-TX-toOpenROADM-1-3-SRG1-SRG1-PP4-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-4-DEG1-DEG1-CTP-TXtoOpenROADM-1-4-DEG2-DEG2-CTP-RX</link-id>
+            <source><source-node>OpenROADM-1-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-4-DEG2-DEG2-CTP-TXtoOpenROADM-1-4-DEG1-DEG1-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-4-DEG1-DEG1-CTP-TXtoOpenROADM-1-4-DEG3-DEG3-CTP-RX</link-id>
+            <source><source-node>OpenROADM-1-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-4-DEG3-DEG3-CTP-TXtoOpenROADM-1-4-DEG1-DEG1-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-4-SRG1-SRG1-CP-TXtoOpenROADM-1-4-DEG1-DEG1-CTP-RX</link-id>
             <source><source-node>OpenROADM-1-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-4-DEG1-DEG1-CTP-TXtoOpenROADM-1-4-SRG1-SRG1-CP-RX</opposite-link>
@@ -2217,14 +2897,14 @@
             <source><source-node>OpenROADM-1-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-4-SRG1-SRG1-CP-TXtoOpenROADM-1-4-DEG1-DEG1-CTP-RX</opposite-link>
             <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-4-DEG2-DEG2-CTP-TXtoOpenROADM-1-4-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-1-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-4-DEG1-DEG1-CTP-TXtoOpenROADM-1-4-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-4-DEG2-DEG2-CTP-TXtoOpenROADM-1-4-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-1-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-4-DEG3-DEG3-CTP-TXtoOpenROADM-1-4-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-4-DEG2-DEG2-CTP-TXtoOpenROADM-1-4-DEG1-DEG1-CTP-RX</link-id>
+            <source><source-node>OpenROADM-1-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-4-DEG1-DEG1-CTP-TXtoOpenROADM-1-4-DEG2-DEG2-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-4-DEG2-DEG2-CTP-TXtoOpenROADM-1-4-DEG3-DEG3-CTP-RX</link-id>
+            <source><source-node>OpenROADM-1-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-4-DEG3-DEG3-CTP-TXtoOpenROADM-1-4-DEG2-DEG2-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-4-SRG1-SRG1-CP-TXtoOpenROADM-1-4-DEG2-DEG2-CTP-RX</link-id>
             <source><source-node>OpenROADM-1-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-4-DEG2-DEG2-CTP-TXtoOpenROADM-1-4-SRG1-SRG1-CP-RX</opposite-link>
@@ -2233,14 +2913,14 @@
             <source><source-node>OpenROADM-1-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-4-SRG1-SRG1-CP-TXtoOpenROADM-1-4-DEG2-DEG2-CTP-RX</opposite-link>
             <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-4-DEG3-DEG3-CTP-TXtoOpenROADM-1-4-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-1-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-4-DEG1-DEG1-CTP-TXtoOpenROADM-1-4-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-4-DEG3-DEG3-CTP-TXtoOpenROADM-1-4-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-1-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-4-DEG2-DEG2-CTP-TXtoOpenROADM-1-4-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-4-DEG3-DEG3-CTP-TXtoOpenROADM-1-4-DEG1-DEG1-CTP-RX</link-id>
+            <source><source-node>OpenROADM-1-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-4-DEG1-DEG1-CTP-TXtoOpenROADM-1-4-DEG3-DEG3-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-4-DEG3-DEG3-CTP-TXtoOpenROADM-1-4-DEG2-DEG2-CTP-RX</link-id>
+            <source><source-node>OpenROADM-1-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-4-DEG2-DEG2-CTP-TXtoOpenROADM-1-4-DEG3-DEG3-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-4-SRG1-SRG1-CP-TXtoOpenROADM-1-4-DEG3-DEG3-CTP-RX</link-id>
             <source><source-node>OpenROADM-1-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-4-DEG3-DEG3-CTP-TXtoOpenROADM-1-4-SRG1-SRG1-CP-RX</opposite-link>
@@ -2249,78 +2929,150 @@
             <source><source-node>OpenROADM-1-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-4-SRG1-SRG1-CP-TXtoOpenROADM-1-4-DEG3-DEG3-CTP-RX</opposite-link>
             <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-4XPDR-NW1-TX-toOpenROADM-1-4-SRG1-SRG1-PP1-RX</link-id>
-        <source><source-node>XPONDER-1-4</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-4-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-4-SRG1-SRG1-PP1-TX-to-XPONDER-1-4XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-4-SRG1-SRG1-PP1-TX-to-XPONDER-1-4XPDR-NW1-RX</link-id>
-        <source><source-node>OpenROADM-1-4-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-1-4</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-1-4XPDR-NW1-TX-toOpenROADM-1-4-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-4XPDR-NW2-TX-toOpenROADM-1-4-SRG1-SRG1-PP2-RX</link-id>
-        <source><source-node>XPONDER-1-4</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-4-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-4-SRG1-SRG1-PP2-TX-to-XPONDER-1-4XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-4-SRG1-SRG1-PP2-TX-to-XPONDER-1-4XPDR-NW2-RX</link-id>
-        <source><source-node>OpenROADM-1-4-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-1-4</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-1-4XPDR-NW2-TX-toOpenROADM-1-4-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-4XPDR-NW3-TX-toOpenROADM-1-4-SRG1-SRG1-PP3-RX</link-id>
-        <source><source-node>XPONDER-1-4</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-4-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-4-SRG1-SRG1-PP3-TX-to-XPONDER-1-4XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-4-SRG1-SRG1-PP3-TX-to-XPONDER-1-4XPDR-NW3-RX</link-id>
-        <source><source-node>OpenROADM-1-4-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-1-4</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-1-4XPDR-NW3-TX-toOpenROADM-1-4-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-4XPDR-NW4-TX-toOpenROADM-1-4-SRG1-SRG1-PP4-RX</link-id>
-        <source><source-node>XPONDER-1-4</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-4-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-4-SRG1-SRG1-PP4-TX-to-XPONDER-1-4XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-4-SRG1-SRG1-PP4-TX-to-XPONDER-1-4XPDR-NW4-RX</link-id>
-        <source><source-node>OpenROADM-1-4-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-1-4</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-1-4XPDR-NW4-TX-toOpenROADM-1-4-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-1-1-DEG1-to-OpenROADM-1-2-DEG1</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-2-DEG1-to-OpenROADM-1-1-DEG1</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-1-1-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-1-2-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-1-2-DEG1-to-OpenROADM-1-1-DEG1</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-1-DEG1-to-OpenROADM-1-2-DEG1</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-1-2-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-1-1-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-1-2-DEG2-to-OpenROADM-1-3-DEG2</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-3-DEG2-to-OpenROADM-1-2-DEG2</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-1-2-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-1-3-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-1-3-DEG2-to-OpenROADM-1-2-DEG2</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-2-DEG2-to-OpenROADM-1-3-DEG2</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-1-3-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-1-2-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-1-3-DEG1-to-OpenROADM-1-4-DEG1</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-4-DEG1-to-OpenROADM-1-3-DEG1</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-1-3-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-1-4-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-1-4-DEG1-to-OpenROADM-1-3-DEG1</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-3-DEG1-to-OpenROADM-1-4-DEG1</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-1-4-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-1-3-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-1-4-DEG2-to-OpenROADM-1-1-DEG2</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-1-DEG2-to-OpenROADM-1-4-DEG2</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-1-4-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-1-1-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-1-1-DEG2-to-OpenROADM-1-4-DEG2</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-4-DEG2-to-OpenROADM-1-1-DEG2</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-1-1-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-1-4-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-DEG1-DEG1-CTP-TXtoOpenROADM-2-1-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-2-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-1-DEG2-DEG2-CTP-TXtoOpenROADM-2-1-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-DEG1-DEG1-CTP-TXtoOpenROADM-2-1-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-2-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-1-DEG3-DEG3-CTP-TXtoOpenROADM-2-1-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-4XPDR-NW1-TX-toOpenROADM-1-4-SRG1-SRG1-PP1-RX</link-id>
+            <source><source-node>XPONDER-1-4</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-4-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-4-SRG1-SRG1-PP1-TX-to-XPONDER-1-4XPDR-NW1-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-4-SRG1-SRG1-PP1-TX-to-XPONDER-1-4XPDR-NW1-RX</link-id>
+            <source><source-node>OpenROADM-1-4-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-1-4</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-1-4XPDR-NW1-TX-toOpenROADM-1-4-SRG1-SRG1-PP1-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-4XPDR-NW2-TX-toOpenROADM-1-4-SRG1-SRG1-PP2-RX</link-id>
+            <source><source-node>XPONDER-1-4</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-4-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-4-SRG1-SRG1-PP2-TX-to-XPONDER-1-4XPDR-NW2-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-4-SRG1-SRG1-PP2-TX-to-XPONDER-1-4XPDR-NW2-RX</link-id>
+            <source><source-node>OpenROADM-1-4-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-1-4</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-1-4XPDR-NW2-TX-toOpenROADM-1-4-SRG1-SRG1-PP2-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-4XPDR-NW3-TX-toOpenROADM-1-4-SRG1-SRG1-PP3-RX</link-id>
+            <source><source-node>XPONDER-1-4</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-4-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-4-SRG1-SRG1-PP3-TX-to-XPONDER-1-4XPDR-NW3-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-4-SRG1-SRG1-PP3-TX-to-XPONDER-1-4XPDR-NW3-RX</link-id>
+            <source><source-node>OpenROADM-1-4-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-1-4</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-1-4XPDR-NW3-TX-toOpenROADM-1-4-SRG1-SRG1-PP3-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-4XPDR-NW4-TX-toOpenROADM-1-4-SRG1-SRG1-PP4-RX</link-id>
+            <source><source-node>XPONDER-1-4</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-4-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-4-SRG1-SRG1-PP4-TX-to-XPONDER-1-4XPDR-NW4-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-4-SRG1-SRG1-PP4-TX-to-XPONDER-1-4XPDR-NW4-RX</link-id>
+            <source><source-node>OpenROADM-1-4-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-1-4</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-1-4XPDR-NW4-TX-toOpenROADM-1-4-SRG1-SRG1-PP4-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-1-1-DEG1-to-OpenROADM-1-2-DEG1</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-2-DEG1-to-OpenROADM-1-1-DEG1</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">10</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-1-1-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-1-2-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>11121</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>11122</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>11123</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>11124</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-1-2-DEG1-to-OpenROADM-1-1-DEG1</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-1-DEG1-to-OpenROADM-1-2-DEG1</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">10</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-1-2-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-1-1-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>12111</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>12112</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>12113</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>12114</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-1-2-DEG2-to-OpenROADM-1-3-DEG2</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-3-DEG2-to-OpenROADM-1-2-DEG2</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">10</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-1-2-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-1-3-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>12131</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>12132</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>12133</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>12134</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-1-3-DEG2-to-OpenROADM-1-2-DEG2</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-2-DEG2-to-OpenROADM-1-3-DEG2</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">10</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-1-3-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-1-2-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>13121</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>13122</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>13123</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>13124</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-1-3-DEG1-to-OpenROADM-1-4-DEG1</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-4-DEG1-to-OpenROADM-1-3-DEG1</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">10</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-1-3-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-1-4-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>13141</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>13142</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>13143</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>13144</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-1-4-DEG1-to-OpenROADM-1-3-DEG1</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-3-DEG1-to-OpenROADM-1-4-DEG1</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">10</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-1-4-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-1-3-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>14131</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>14132</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>14133</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>14134</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-1-4-DEG2-to-OpenROADM-1-1-DEG2</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-1-DEG2-to-OpenROADM-1-4-DEG2</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">10</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-1-4-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-1-1-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>14111</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>14112</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>14113</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>14114</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-1-1-DEG2-to-OpenROADM-1-4-DEG2</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-4-DEG2-to-OpenROADM-1-1-DEG2</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">10</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-1-1-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-1-4-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>11141</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>11142</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>11143</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>11144</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-DEG1-DEG1-CTP-TXtoOpenROADM-2-1-DEG2-DEG2-CTP-RX</link-id>
+            <source><source-node>OpenROADM-2-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-1-DEG2-DEG2-CTP-TXtoOpenROADM-2-1-DEG1-DEG1-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-DEG1-DEG1-CTP-TXtoOpenROADM-2-1-DEG3-DEG3-CTP-RX</link-id>
+            <source><source-node>OpenROADM-2-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-1-DEG3-DEG3-CTP-TXtoOpenROADM-2-1-DEG1-DEG1-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-1-SRG1-SRG1-CP-TXtoOpenROADM-2-1-DEG1-DEG1-CTP-RX</link-id>
             <source><source-node>OpenROADM-2-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-1-DEG1-DEG1-CTP-TXtoOpenROADM-2-1-SRG1-SRG1-CP-RX</opposite-link>
@@ -2329,14 +3081,14 @@
             <source><source-node>OpenROADM-2-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-1-SRG1-SRG1-CP-TXtoOpenROADM-2-1-DEG1-DEG1-CTP-RX</opposite-link>
             <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-DEG2-DEG2-CTP-TXtoOpenROADM-2-1-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-2-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-1-DEG1-DEG1-CTP-TXtoOpenROADM-2-1-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-DEG2-DEG2-CTP-TXtoOpenROADM-2-1-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-2-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-1-DEG3-DEG3-CTP-TXtoOpenROADM-2-1-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-DEG2-DEG2-CTP-TXtoOpenROADM-2-1-DEG1-DEG1-CTP-RX</link-id>
+            <source><source-node>OpenROADM-2-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-1-DEG1-DEG1-CTP-TXtoOpenROADM-2-1-DEG2-DEG2-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-DEG2-DEG2-CTP-TXtoOpenROADM-2-1-DEG3-DEG3-CTP-RX</link-id>
+            <source><source-node>OpenROADM-2-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-1-DEG3-DEG3-CTP-TXtoOpenROADM-2-1-DEG2-DEG2-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-1-SRG1-SRG1-CP-TXtoOpenROADM-2-1-DEG2-DEG2-CTP-RX</link-id>
             <source><source-node>OpenROADM-2-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-1-DEG2-DEG2-CTP-TXtoOpenROADM-2-1-SRG1-SRG1-CP-RX</opposite-link>
@@ -2345,14 +3097,14 @@
             <source><source-node>OpenROADM-2-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-1-SRG1-SRG1-CP-TXtoOpenROADM-2-1-DEG2-DEG2-CTP-RX</opposite-link>
             <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-DEG3-DEG3-CTP-TXtoOpenROADM-2-1-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-2-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-1-DEG1-DEG1-CTP-TXtoOpenROADM-2-1-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-DEG3-DEG3-CTP-TXtoOpenROADM-2-1-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-2-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-1-DEG2-DEG2-CTP-TXtoOpenROADM-2-1-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-DEG3-DEG3-CTP-TXtoOpenROADM-2-1-DEG1-DEG1-CTP-RX</link-id>
+            <source><source-node>OpenROADM-2-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-1-DEG1-DEG1-CTP-TXtoOpenROADM-2-1-DEG3-DEG3-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-DEG3-DEG3-CTP-TXtoOpenROADM-2-1-DEG2-DEG2-CTP-RX</link-id>
+            <source><source-node>OpenROADM-2-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-1-DEG2-DEG2-CTP-TXtoOpenROADM-2-1-DEG3-DEG3-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-1-SRG1-SRG1-CP-TXtoOpenROADM-2-1-DEG3-DEG3-CTP-RX</link-id>
             <source><source-node>OpenROADM-2-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-1-DEG3-DEG3-CTP-TXtoOpenROADM-2-1-SRG1-SRG1-CP-RX</opposite-link>
@@ -2361,46 +3113,46 @@
             <source><source-node>OpenROADM-2-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-1-SRG1-SRG1-CP-TXtoOpenROADM-2-1-DEG3-DEG3-CTP-RX</opposite-link>
             <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-1XPDR-NW1-TX-toOpenROADM-2-1-SRG1-SRG1-PP1-RX</link-id>
-        <source><source-node>XPONDER-2-1</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-1-SRG1-SRG1-PP1-TX-to-XPONDER-2-1XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-SRG1-SRG1-PP1-TX-to-XPONDER-2-1XPDR-NW1-RX</link-id>
-        <source><source-node>OpenROADM-2-1-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-2-1</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-2-1XPDR-NW1-TX-toOpenROADM-2-1-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-1XPDR-NW2-TX-toOpenROADM-2-1-SRG1-SRG1-PP2-RX</link-id>
-        <source><source-node>XPONDER-2-1</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-1-SRG1-SRG1-PP2-TX-to-XPONDER-2-1XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-SRG1-SRG1-PP2-TX-to-XPONDER-2-1XPDR-NW2-RX</link-id>
-        <source><source-node>OpenROADM-2-1-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-2-1</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-2-1XPDR-NW2-TX-toOpenROADM-2-1-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-1XPDR-NW3-TX-toOpenROADM-2-1-SRG1-SRG1-PP3-RX</link-id>
-        <source><source-node>XPONDER-2-1</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-1-SRG1-SRG1-PP3-TX-to-XPONDER-2-1XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-SRG1-SRG1-PP3-TX-to-XPONDER-2-1XPDR-NW3-RX</link-id>
-        <source><source-node>OpenROADM-2-1-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-2-1</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-2-1XPDR-NW3-TX-toOpenROADM-2-1-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-1XPDR-NW4-TX-toOpenROADM-2-1-SRG1-SRG1-PP4-RX</link-id>
-        <source><source-node>XPONDER-2-1</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-1-SRG1-SRG1-PP4-TX-to-XPONDER-2-1XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-SRG1-SRG1-PP4-TX-to-XPONDER-2-1XPDR-NW4-RX</link-id>
-        <source><source-node>OpenROADM-2-1-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-2-1</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-2-1XPDR-NW4-TX-toOpenROADM-2-1-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-2-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-2-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-2-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-2-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-2-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-2-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-1XPDR-NW1-TX-toOpenROADM-2-1-SRG1-SRG1-PP1-RX</link-id>
+            <source><source-node>XPONDER-2-1</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-1-SRG1-SRG1-PP1-TX-to-XPONDER-2-1XPDR-NW1-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-SRG1-SRG1-PP1-TX-to-XPONDER-2-1XPDR-NW1-RX</link-id>
+            <source><source-node>OpenROADM-2-1-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-2-1</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-2-1XPDR-NW1-TX-toOpenROADM-2-1-SRG1-SRG1-PP1-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-1XPDR-NW2-TX-toOpenROADM-2-1-SRG1-SRG1-PP2-RX</link-id>
+            <source><source-node>XPONDER-2-1</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-1-SRG1-SRG1-PP2-TX-to-XPONDER-2-1XPDR-NW2-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-SRG1-SRG1-PP2-TX-to-XPONDER-2-1XPDR-NW2-RX</link-id>
+            <source><source-node>OpenROADM-2-1-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-2-1</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-2-1XPDR-NW2-TX-toOpenROADM-2-1-SRG1-SRG1-PP2-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-1XPDR-NW3-TX-toOpenROADM-2-1-SRG1-SRG1-PP3-RX</link-id>
+            <source><source-node>XPONDER-2-1</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-1-SRG1-SRG1-PP3-TX-to-XPONDER-2-1XPDR-NW3-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-SRG1-SRG1-PP3-TX-to-XPONDER-2-1XPDR-NW3-RX</link-id>
+            <source><source-node>OpenROADM-2-1-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-2-1</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-2-1XPDR-NW3-TX-toOpenROADM-2-1-SRG1-SRG1-PP3-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-1XPDR-NW4-TX-toOpenROADM-2-1-SRG1-SRG1-PP4-RX</link-id>
+            <source><source-node>XPONDER-2-1</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-1-SRG1-SRG1-PP4-TX-to-XPONDER-2-1XPDR-NW4-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-SRG1-SRG1-PP4-TX-to-XPONDER-2-1XPDR-NW4-RX</link-id>
+            <source><source-node>OpenROADM-2-1-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-2-1</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-2-1XPDR-NW4-TX-toOpenROADM-2-1-SRG1-SRG1-PP4-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-2-DEG2-DEG2-CTP-RX</link-id>
+            <source><source-node>OpenROADM-2-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-2-DEG1-DEG1-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-2-DEG3-DEG3-CTP-RX</link-id>
+            <source><source-node>OpenROADM-2-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-2-DEG1-DEG1-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-2-SRG1-SRG1-CP-TXtoOpenROADM-2-2-DEG1-DEG1-CTP-RX</link-id>
             <source><source-node>OpenROADM-2-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-2-SRG1-SRG1-CP-RX</opposite-link>
@@ -2409,14 +3161,14 @@
             <source><source-node>OpenROADM-2-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-2-SRG1-SRG1-CP-TXtoOpenROADM-2-2-DEG1-DEG1-CTP-RX</opposite-link>
             <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-2-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-2-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-2-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-2-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-2-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-2-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-2-DEG1-DEG1-CTP-RX</link-id>
+            <source><source-node>OpenROADM-2-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-2-DEG2-DEG2-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-2-DEG3-DEG3-CTP-RX</link-id>
+            <source><source-node>OpenROADM-2-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-2-DEG2-DEG2-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-2-SRG1-SRG1-CP-TXtoOpenROADM-2-2-DEG2-DEG2-CTP-RX</link-id>
             <source><source-node>OpenROADM-2-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-2-SRG1-SRG1-CP-RX</opposite-link>
@@ -2425,14 +3177,14 @@
             <source><source-node>OpenROADM-2-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-2-SRG1-SRG1-CP-TXtoOpenROADM-2-2-DEG2-DEG2-CTP-RX</opposite-link>
             <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-2-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-2-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-2-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-2-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-2-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-2-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-2-DEG1-DEG1-CTP-RX</link-id>
+            <source><source-node>OpenROADM-2-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-2-DEG3-DEG3-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-2-DEG2-DEG2-CTP-RX</link-id>
+            <source><source-node>OpenROADM-2-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-2-DEG3-DEG3-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-2-SRG1-SRG1-CP-TXtoOpenROADM-2-2-DEG3-DEG3-CTP-RX</link-id>
             <source><source-node>OpenROADM-2-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-2-SRG1-SRG1-CP-RX</opposite-link>
@@ -2441,46 +3193,46 @@
             <source><source-node>OpenROADM-2-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-2-SRG1-SRG1-CP-TXtoOpenROADM-2-2-DEG3-DEG3-CTP-RX</opposite-link>
             <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-2XPDR-NW1-TX-toOpenROADM-2-2-SRG1-SRG1-PP1-RX</link-id>
-        <source><source-node>XPONDER-2-2</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-2-SRG1-SRG1-PP1-TX-to-XPONDER-2-2XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-SRG1-SRG1-PP1-TX-to-XPONDER-2-2XPDR-NW1-RX</link-id>
-        <source><source-node>OpenROADM-2-2-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-2-2</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-2-2XPDR-NW1-TX-toOpenROADM-2-2-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-2XPDR-NW2-TX-toOpenROADM-2-2-SRG1-SRG1-PP2-RX</link-id>
-        <source><source-node>XPONDER-2-2</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-2-SRG1-SRG1-PP2-TX-to-XPONDER-2-2XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-SRG1-SRG1-PP2-TX-to-XPONDER-2-2XPDR-NW2-RX</link-id>
-        <source><source-node>OpenROADM-2-2-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-2-2</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-2-2XPDR-NW2-TX-toOpenROADM-2-2-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-2XPDR-NW3-TX-toOpenROADM-2-2-SRG1-SRG1-PP3-RX</link-id>
-        <source><source-node>XPONDER-2-2</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-2-SRG1-SRG1-PP3-TX-to-XPONDER-2-2XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-SRG1-SRG1-PP3-TX-to-XPONDER-2-2XPDR-NW3-RX</link-id>
-        <source><source-node>OpenROADM-2-2-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-2-2</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-2-2XPDR-NW3-TX-toOpenROADM-2-2-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-2XPDR-NW4-TX-toOpenROADM-2-2-SRG1-SRG1-PP4-RX</link-id>
-        <source><source-node>XPONDER-2-2</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-2-SRG1-SRG1-PP4-TX-to-XPONDER-2-2XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-SRG1-SRG1-PP4-TX-to-XPONDER-2-2XPDR-NW4-RX</link-id>
-        <source><source-node>OpenROADM-2-2-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-2-2</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-2-2XPDR-NW4-TX-toOpenROADM-2-2-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-3-DEG1-DEG1-CTP-TXtoOpenROADM-2-3-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-2-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-3-DEG2-DEG2-CTP-TXtoOpenROADM-2-3-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-3-DEG1-DEG1-CTP-TXtoOpenROADM-2-3-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-2-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-3-DEG3-DEG3-CTP-TXtoOpenROADM-2-3-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-2XPDR-NW1-TX-toOpenROADM-2-2-SRG1-SRG1-PP1-RX</link-id>
+            <source><source-node>XPONDER-2-2</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-2-SRG1-SRG1-PP1-TX-to-XPONDER-2-2XPDR-NW1-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-SRG1-SRG1-PP1-TX-to-XPONDER-2-2XPDR-NW1-RX</link-id>
+            <source><source-node>OpenROADM-2-2-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-2-2</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-2-2XPDR-NW1-TX-toOpenROADM-2-2-SRG1-SRG1-PP1-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-2XPDR-NW2-TX-toOpenROADM-2-2-SRG1-SRG1-PP2-RX</link-id>
+            <source><source-node>XPONDER-2-2</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-2-SRG1-SRG1-PP2-TX-to-XPONDER-2-2XPDR-NW2-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-SRG1-SRG1-PP2-TX-to-XPONDER-2-2XPDR-NW2-RX</link-id>
+            <source><source-node>OpenROADM-2-2-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-2-2</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-2-2XPDR-NW2-TX-toOpenROADM-2-2-SRG1-SRG1-PP2-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-2XPDR-NW3-TX-toOpenROADM-2-2-SRG1-SRG1-PP3-RX</link-id>
+            <source><source-node>XPONDER-2-2</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-2-SRG1-SRG1-PP3-TX-to-XPONDER-2-2XPDR-NW3-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-SRG1-SRG1-PP3-TX-to-XPONDER-2-2XPDR-NW3-RX</link-id>
+            <source><source-node>OpenROADM-2-2-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-2-2</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-2-2XPDR-NW3-TX-toOpenROADM-2-2-SRG1-SRG1-PP3-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-2XPDR-NW4-TX-toOpenROADM-2-2-SRG1-SRG1-PP4-RX</link-id>
+            <source><source-node>XPONDER-2-2</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-2-SRG1-SRG1-PP4-TX-to-XPONDER-2-2XPDR-NW4-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-SRG1-SRG1-PP4-TX-to-XPONDER-2-2XPDR-NW4-RX</link-id>
+            <source><source-node>OpenROADM-2-2-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-2-2</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-2-2XPDR-NW4-TX-toOpenROADM-2-2-SRG1-SRG1-PP4-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-3-DEG1-DEG1-CTP-TXtoOpenROADM-2-3-DEG2-DEG2-CTP-RX</link-id>
+            <source><source-node>OpenROADM-2-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-3-DEG2-DEG2-CTP-TXtoOpenROADM-2-3-DEG1-DEG1-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-3-DEG1-DEG1-CTP-TXtoOpenROADM-2-3-DEG3-DEG3-CTP-RX</link-id>
+            <source><source-node>OpenROADM-2-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-3-DEG3-DEG3-CTP-TXtoOpenROADM-2-3-DEG1-DEG1-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-3-SRG1-SRG1-CP-TXtoOpenROADM-2-3-DEG1-DEG1-CTP-RX</link-id>
             <source><source-node>OpenROADM-2-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-3-DEG1-DEG1-CTP-TXtoOpenROADM-2-3-SRG1-SRG1-CP-RX</opposite-link>
@@ -2489,14 +3241,14 @@
             <source><source-node>OpenROADM-2-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-3-SRG1-SRG1-CP-TXtoOpenROADM-2-3-DEG1-DEG1-CTP-RX</opposite-link>
             <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-3-DEG2-DEG2-CTP-TXtoOpenROADM-2-3-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-2-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-3-DEG1-DEG1-CTP-TXtoOpenROADM-2-3-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-3-DEG2-DEG2-CTP-TXtoOpenROADM-2-3-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-2-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-3-DEG3-DEG3-CTP-TXtoOpenROADM-2-3-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-3-DEG2-DEG2-CTP-TXtoOpenROADM-2-3-DEG1-DEG1-CTP-RX</link-id>
+            <source><source-node>OpenROADM-2-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-3-DEG1-DEG1-CTP-TXtoOpenROADM-2-3-DEG2-DEG2-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-3-DEG2-DEG2-CTP-TXtoOpenROADM-2-3-DEG3-DEG3-CTP-RX</link-id>
+            <source><source-node>OpenROADM-2-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-3-DEG3-DEG3-CTP-TXtoOpenROADM-2-3-DEG2-DEG2-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-3-SRG1-SRG1-CP-TXtoOpenROADM-2-3-DEG2-DEG2-CTP-RX</link-id>
             <source><source-node>OpenROADM-2-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-3-DEG2-DEG2-CTP-TXtoOpenROADM-2-3-SRG1-SRG1-CP-RX</opposite-link>
@@ -2505,14 +3257,14 @@
             <source><source-node>OpenROADM-2-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-3-SRG1-SRG1-CP-TXtoOpenROADM-2-3-DEG2-DEG2-CTP-RX</opposite-link>
             <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-3-DEG3-DEG3-CTP-TXtoOpenROADM-2-3-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-2-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-3-DEG1-DEG1-CTP-TXtoOpenROADM-2-3-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-3-DEG3-DEG3-CTP-TXtoOpenROADM-2-3-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-2-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-3-DEG2-DEG2-CTP-TXtoOpenROADM-2-3-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-3-DEG3-DEG3-CTP-TXtoOpenROADM-2-3-DEG1-DEG1-CTP-RX</link-id>
+            <source><source-node>OpenROADM-2-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-3-DEG1-DEG1-CTP-TXtoOpenROADM-2-3-DEG3-DEG3-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-3-DEG3-DEG3-CTP-TXtoOpenROADM-2-3-DEG2-DEG2-CTP-RX</link-id>
+            <source><source-node>OpenROADM-2-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-3-DEG2-DEG2-CTP-TXtoOpenROADM-2-3-DEG3-DEG3-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-3-SRG1-SRG1-CP-TXtoOpenROADM-2-3-DEG3-DEG3-CTP-RX</link-id>
             <source><source-node>OpenROADM-2-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-3-DEG3-DEG3-CTP-TXtoOpenROADM-2-3-SRG1-SRG1-CP-RX</opposite-link>
@@ -2521,46 +3273,46 @@
             <source><source-node>OpenROADM-2-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-3-SRG1-SRG1-CP-TXtoOpenROADM-2-3-DEG3-DEG3-CTP-RX</opposite-link>
             <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-3XPDR-NW1-TX-toOpenROADM-2-3-SRG1-SRG1-PP1-RX</link-id>
-        <source><source-node>XPONDER-2-3</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-3-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-3-SRG1-SRG1-PP1-TX-to-XPONDER-2-3XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-3-SRG1-SRG1-PP1-TX-to-XPONDER-2-3XPDR-NW1-RX</link-id>
-        <source><source-node>OpenROADM-2-3-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-2-3</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-2-3XPDR-NW1-TX-toOpenROADM-2-3-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-3XPDR-NW2-TX-toOpenROADM-2-3-SRG1-SRG1-PP2-RX</link-id>
-        <source><source-node>XPONDER-2-3</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-3-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-3-SRG1-SRG1-PP2-TX-to-XPONDER-2-3XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-3-SRG1-SRG1-PP2-TX-to-XPONDER-2-3XPDR-NW2-RX</link-id>
-        <source><source-node>OpenROADM-2-3-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-2-3</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-2-3XPDR-NW2-TX-toOpenROADM-2-3-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-3XPDR-NW3-TX-toOpenROADM-2-3-SRG1-SRG1-PP3-RX</link-id>
-        <source><source-node>XPONDER-2-3</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-3-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-3-SRG1-SRG1-PP3-TX-to-XPONDER-2-3XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-3-SRG1-SRG1-PP3-TX-to-XPONDER-2-3XPDR-NW3-RX</link-id>
-        <source><source-node>OpenROADM-2-3-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-2-3</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-2-3XPDR-NW3-TX-toOpenROADM-2-3-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-3XPDR-NW4-TX-toOpenROADM-2-3-SRG1-SRG1-PP4-RX</link-id>
-        <source><source-node>XPONDER-2-3</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-3-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-3-SRG1-SRG1-PP4-TX-to-XPONDER-2-3XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-3-SRG1-SRG1-PP4-TX-to-XPONDER-2-3XPDR-NW4-RX</link-id>
-        <source><source-node>OpenROADM-2-3-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-2-3</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-2-3XPDR-NW4-TX-toOpenROADM-2-3-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-4-DEG1-DEG1-CTP-TXtoOpenROADM-2-4-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-2-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-4-DEG2-DEG2-CTP-TXtoOpenROADM-2-4-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-4-DEG1-DEG1-CTP-TXtoOpenROADM-2-4-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-2-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-4-DEG3-DEG3-CTP-TXtoOpenROADM-2-4-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-3XPDR-NW1-TX-toOpenROADM-2-3-SRG1-SRG1-PP1-RX</link-id>
+            <source><source-node>XPONDER-2-3</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-3-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-3-SRG1-SRG1-PP1-TX-to-XPONDER-2-3XPDR-NW1-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-3-SRG1-SRG1-PP1-TX-to-XPONDER-2-3XPDR-NW1-RX</link-id>
+            <source><source-node>OpenROADM-2-3-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-2-3</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-2-3XPDR-NW1-TX-toOpenROADM-2-3-SRG1-SRG1-PP1-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-3XPDR-NW2-TX-toOpenROADM-2-3-SRG1-SRG1-PP2-RX</link-id>
+            <source><source-node>XPONDER-2-3</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-3-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-3-SRG1-SRG1-PP2-TX-to-XPONDER-2-3XPDR-NW2-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-3-SRG1-SRG1-PP2-TX-to-XPONDER-2-3XPDR-NW2-RX</link-id>
+            <source><source-node>OpenROADM-2-3-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-2-3</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-2-3XPDR-NW2-TX-toOpenROADM-2-3-SRG1-SRG1-PP2-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-3XPDR-NW3-TX-toOpenROADM-2-3-SRG1-SRG1-PP3-RX</link-id>
+            <source><source-node>XPONDER-2-3</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-3-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-3-SRG1-SRG1-PP3-TX-to-XPONDER-2-3XPDR-NW3-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-3-SRG1-SRG1-PP3-TX-to-XPONDER-2-3XPDR-NW3-RX</link-id>
+            <source><source-node>OpenROADM-2-3-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-2-3</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-2-3XPDR-NW3-TX-toOpenROADM-2-3-SRG1-SRG1-PP3-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-3XPDR-NW4-TX-toOpenROADM-2-3-SRG1-SRG1-PP4-RX</link-id>
+            <source><source-node>XPONDER-2-3</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-3-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-3-SRG1-SRG1-PP4-TX-to-XPONDER-2-3XPDR-NW4-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-3-SRG1-SRG1-PP4-TX-to-XPONDER-2-3XPDR-NW4-RX</link-id>
+            <source><source-node>OpenROADM-2-3-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-2-3</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-2-3XPDR-NW4-TX-toOpenROADM-2-3-SRG1-SRG1-PP4-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-4-DEG1-DEG1-CTP-TXtoOpenROADM-2-4-DEG2-DEG2-CTP-RX</link-id>
+            <source><source-node>OpenROADM-2-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-4-DEG2-DEG2-CTP-TXtoOpenROADM-2-4-DEG1-DEG1-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-4-DEG1-DEG1-CTP-TXtoOpenROADM-2-4-DEG3-DEG3-CTP-RX</link-id>
+            <source><source-node>OpenROADM-2-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-4-DEG3-DEG3-CTP-TXtoOpenROADM-2-4-DEG1-DEG1-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-4-SRG1-SRG1-CP-TXtoOpenROADM-2-4-DEG1-DEG1-CTP-RX</link-id>
             <source><source-node>OpenROADM-2-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-4-DEG1-DEG1-CTP-TXtoOpenROADM-2-4-SRG1-SRG1-CP-RX</opposite-link>
@@ -2569,14 +3321,14 @@
             <source><source-node>OpenROADM-2-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-4-SRG1-SRG1-CP-TXtoOpenROADM-2-4-DEG1-DEG1-CTP-RX</opposite-link>
             <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-4-DEG2-DEG2-CTP-TXtoOpenROADM-2-4-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-2-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-4-DEG1-DEG1-CTP-TXtoOpenROADM-2-4-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-4-DEG2-DEG2-CTP-TXtoOpenROADM-2-4-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-2-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-4-DEG3-DEG3-CTP-TXtoOpenROADM-2-4-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-4-DEG2-DEG2-CTP-TXtoOpenROADM-2-4-DEG1-DEG1-CTP-RX</link-id>
+            <source><source-node>OpenROADM-2-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-4-DEG1-DEG1-CTP-TXtoOpenROADM-2-4-DEG2-DEG2-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-4-DEG2-DEG2-CTP-TXtoOpenROADM-2-4-DEG3-DEG3-CTP-RX</link-id>
+            <source><source-node>OpenROADM-2-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-4-DEG3-DEG3-CTP-TXtoOpenROADM-2-4-DEG2-DEG2-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-4-SRG1-SRG1-CP-TXtoOpenROADM-2-4-DEG2-DEG2-CTP-RX</link-id>
             <source><source-node>OpenROADM-2-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-4-DEG2-DEG2-CTP-TXtoOpenROADM-2-4-SRG1-SRG1-CP-RX</opposite-link>
@@ -2585,14 +3337,14 @@
             <source><source-node>OpenROADM-2-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-4-SRG1-SRG1-CP-TXtoOpenROADM-2-4-DEG2-DEG2-CTP-RX</opposite-link>
             <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-4-DEG3-DEG3-CTP-TXtoOpenROADM-2-4-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-2-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-4-DEG1-DEG1-CTP-TXtoOpenROADM-2-4-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-4-DEG3-DEG3-CTP-TXtoOpenROADM-2-4-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-2-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-4-DEG2-DEG2-CTP-TXtoOpenROADM-2-4-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-4-DEG3-DEG3-CTP-TXtoOpenROADM-2-4-DEG1-DEG1-CTP-RX</link-id>
+            <source><source-node>OpenROADM-2-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-4-DEG1-DEG1-CTP-TXtoOpenROADM-2-4-DEG3-DEG3-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-4-DEG3-DEG3-CTP-TXtoOpenROADM-2-4-DEG2-DEG2-CTP-RX</link-id>
+            <source><source-node>OpenROADM-2-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-4-DEG2-DEG2-CTP-TXtoOpenROADM-2-4-DEG3-DEG3-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-4-SRG1-SRG1-CP-TXtoOpenROADM-2-4-DEG3-DEG3-CTP-RX</link-id>
             <source><source-node>OpenROADM-2-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-4-DEG3-DEG3-CTP-TXtoOpenROADM-2-4-SRG1-SRG1-CP-RX</opposite-link>
@@ -2601,78 +3353,150 @@
             <source><source-node>OpenROADM-2-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-4-SRG1-SRG1-CP-TXtoOpenROADM-2-4-DEG3-DEG3-CTP-RX</opposite-link>
             <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-4XPDR-NW1-TX-toOpenROADM-2-4-SRG1-SRG1-PP1-RX</link-id>
-        <source><source-node>XPONDER-2-4</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-4-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-4-SRG1-SRG1-PP1-TX-to-XPONDER-2-4XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-4-SRG1-SRG1-PP1-TX-to-XPONDER-2-4XPDR-NW1-RX</link-id>
-        <source><source-node>OpenROADM-2-4-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-2-4</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-2-4XPDR-NW1-TX-toOpenROADM-2-4-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-4XPDR-NW2-TX-toOpenROADM-2-4-SRG1-SRG1-PP2-RX</link-id>
-        <source><source-node>XPONDER-2-4</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-4-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-4-SRG1-SRG1-PP2-TX-to-XPONDER-2-4XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-4-SRG1-SRG1-PP2-TX-to-XPONDER-2-4XPDR-NW2-RX</link-id>
-        <source><source-node>OpenROADM-2-4-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-2-4</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-2-4XPDR-NW2-TX-toOpenROADM-2-4-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-4XPDR-NW3-TX-toOpenROADM-2-4-SRG1-SRG1-PP3-RX</link-id>
-        <source><source-node>XPONDER-2-4</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-4-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-4-SRG1-SRG1-PP3-TX-to-XPONDER-2-4XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-4-SRG1-SRG1-PP3-TX-to-XPONDER-2-4XPDR-NW3-RX</link-id>
-        <source><source-node>OpenROADM-2-4-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-2-4</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-2-4XPDR-NW3-TX-toOpenROADM-2-4-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-4XPDR-NW4-TX-toOpenROADM-2-4-SRG1-SRG1-PP4-RX</link-id>
-        <source><source-node>XPONDER-2-4</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-4-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-4-SRG1-SRG1-PP4-TX-to-XPONDER-2-4XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-4-SRG1-SRG1-PP4-TX-to-XPONDER-2-4XPDR-NW4-RX</link-id>
-        <source><source-node>OpenROADM-2-4-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-2-4</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-2-4XPDR-NW4-TX-toOpenROADM-2-4-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-2-1-DEG1-to-OpenROADM-2-2-DEG1</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-2-DEG1-to-OpenROADM-2-1-DEG1</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-2-1-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-2-2-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-2-2-DEG1-to-OpenROADM-2-1-DEG1</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-1-DEG1-to-OpenROADM-2-2-DEG1</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-2-2-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-2-1-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-2-2-DEG2-to-OpenROADM-2-3-DEG2</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-3-DEG2-to-OpenROADM-2-2-DEG2</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-2-2-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-2-3-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-2-3-DEG2-to-OpenROADM-2-2-DEG2</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-2-DEG2-to-OpenROADM-2-3-DEG2</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-2-3-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-2-2-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-2-3-DEG1-to-OpenROADM-2-4-DEG1</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-4-DEG1-to-OpenROADM-2-3-DEG1</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-2-3-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-2-4-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-2-4-DEG1-to-OpenROADM-2-3-DEG1</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-3-DEG1-to-OpenROADM-2-4-DEG1</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-2-4-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-2-3-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-2-4-DEG2-to-OpenROADM-2-1-DEG2</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-1-DEG2-to-OpenROADM-2-4-DEG2</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-2-4-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-2-1-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-2-1-DEG2-to-OpenROADM-2-4-DEG2</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-4-DEG2-to-OpenROADM-2-1-DEG2</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-2-1-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-2-4-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-1-DEG1-DEG1-CTP-TXtoOpenROADM-3-1-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-3-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-1-DEG2-DEG2-CTP-TXtoOpenROADM-3-1-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-1-DEG1-DEG1-CTP-TXtoOpenROADM-3-1-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-3-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-1-DEG3-DEG3-CTP-TXtoOpenROADM-3-1-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-4XPDR-NW1-TX-toOpenROADM-2-4-SRG1-SRG1-PP1-RX</link-id>
+            <source><source-node>XPONDER-2-4</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-4-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-4-SRG1-SRG1-PP1-TX-to-XPONDER-2-4XPDR-NW1-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-4-SRG1-SRG1-PP1-TX-to-XPONDER-2-4XPDR-NW1-RX</link-id>
+            <source><source-node>OpenROADM-2-4-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-2-4</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-2-4XPDR-NW1-TX-toOpenROADM-2-4-SRG1-SRG1-PP1-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-4XPDR-NW2-TX-toOpenROADM-2-4-SRG1-SRG1-PP2-RX</link-id>
+            <source><source-node>XPONDER-2-4</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-4-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-4-SRG1-SRG1-PP2-TX-to-XPONDER-2-4XPDR-NW2-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-4-SRG1-SRG1-PP2-TX-to-XPONDER-2-4XPDR-NW2-RX</link-id>
+            <source><source-node>OpenROADM-2-4-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-2-4</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-2-4XPDR-NW2-TX-toOpenROADM-2-4-SRG1-SRG1-PP2-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-4XPDR-NW3-TX-toOpenROADM-2-4-SRG1-SRG1-PP3-RX</link-id>
+            <source><source-node>XPONDER-2-4</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-4-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-4-SRG1-SRG1-PP3-TX-to-XPONDER-2-4XPDR-NW3-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-4-SRG1-SRG1-PP3-TX-to-XPONDER-2-4XPDR-NW3-RX</link-id>
+            <source><source-node>OpenROADM-2-4-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-2-4</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-2-4XPDR-NW3-TX-toOpenROADM-2-4-SRG1-SRG1-PP3-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-4XPDR-NW4-TX-toOpenROADM-2-4-SRG1-SRG1-PP4-RX</link-id>
+            <source><source-node>XPONDER-2-4</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-4-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-4-SRG1-SRG1-PP4-TX-to-XPONDER-2-4XPDR-NW4-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-4-SRG1-SRG1-PP4-TX-to-XPONDER-2-4XPDR-NW4-RX</link-id>
+            <source><source-node>OpenROADM-2-4-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-2-4</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-2-4XPDR-NW4-TX-toOpenROADM-2-4-SRG1-SRG1-PP4-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-2-1-DEG1-to-OpenROADM-2-2-DEG1</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-2-DEG1-to-OpenROADM-2-1-DEG1</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">20</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-2-1-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-2-2-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>21221</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>21222</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>21223</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>21224</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-2-2-DEG1-to-OpenROADM-2-1-DEG1</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-1-DEG1-to-OpenROADM-2-2-DEG1</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">20</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-2-2-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-2-1-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>22211</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>22212</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>22213</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>22214</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-2-2-DEG2-to-OpenROADM-2-3-DEG2</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-3-DEG2-to-OpenROADM-2-2-DEG2</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">20</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-2-2-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-2-3-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>22231</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>22232</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>22233</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>22234</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-2-3-DEG2-to-OpenROADM-2-2-DEG2</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-2-DEG2-to-OpenROADM-2-3-DEG2</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">20</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-2-3-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-2-2-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>23221</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>23222</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>23223</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>23224</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-2-3-DEG1-to-OpenROADM-2-4-DEG1</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-4-DEG1-to-OpenROADM-2-3-DEG1</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">20</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-2-3-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-2-4-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>23241</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>23242</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>23243</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>23244</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-2-4-DEG1-to-OpenROADM-2-3-DEG1</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-3-DEG1-to-OpenROADM-2-4-DEG1</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">20</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-2-4-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-2-3-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>24231</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>24232</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>24233</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>24234</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-2-4-DEG2-to-OpenROADM-2-1-DEG2</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-1-DEG2-to-OpenROADM-2-4-DEG2</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">20</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-2-4-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-2-1-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>24211</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>24212</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>24213</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>24214</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-2-1-DEG2-to-OpenROADM-2-4-DEG2</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-4-DEG2-to-OpenROADM-2-1-DEG2</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">20</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-2-1-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-2-4-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>21241</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>21242</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>21243</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>21244</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-1-DEG1-DEG1-CTP-TXtoOpenROADM-3-1-DEG2-DEG2-CTP-RX</link-id>
+            <source><source-node>OpenROADM-3-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-1-DEG2-DEG2-CTP-TXtoOpenROADM-3-1-DEG1-DEG1-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-1-DEG1-DEG1-CTP-TXtoOpenROADM-3-1-DEG3-DEG3-CTP-RX</link-id>
+            <source><source-node>OpenROADM-3-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-1-DEG3-DEG3-CTP-TXtoOpenROADM-3-1-DEG1-DEG1-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-1-SRG1-SRG1-CP-TXtoOpenROADM-3-1-DEG1-DEG1-CTP-RX</link-id>
             <source><source-node>OpenROADM-3-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-1-DEG1-DEG1-CTP-TXtoOpenROADM-3-1-SRG1-SRG1-CP-RX</opposite-link>
@@ -2681,14 +3505,14 @@
             <source><source-node>OpenROADM-3-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-1-SRG1-SRG1-CP-TXtoOpenROADM-3-1-DEG1-DEG1-CTP-RX</opposite-link>
             <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-1-DEG2-DEG2-CTP-TXtoOpenROADM-3-1-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-3-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-1-DEG1-DEG1-CTP-TXtoOpenROADM-3-1-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-1-DEG2-DEG2-CTP-TXtoOpenROADM-3-1-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-3-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-1-DEG3-DEG3-CTP-TXtoOpenROADM-3-1-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-1-DEG2-DEG2-CTP-TXtoOpenROADM-3-1-DEG1-DEG1-CTP-RX</link-id>
+            <source><source-node>OpenROADM-3-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-1-DEG1-DEG1-CTP-TXtoOpenROADM-3-1-DEG2-DEG2-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-1-DEG2-DEG2-CTP-TXtoOpenROADM-3-1-DEG3-DEG3-CTP-RX</link-id>
+            <source><source-node>OpenROADM-3-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-1-DEG3-DEG3-CTP-TXtoOpenROADM-3-1-DEG2-DEG2-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-1-SRG1-SRG1-CP-TXtoOpenROADM-3-1-DEG2-DEG2-CTP-RX</link-id>
             <source><source-node>OpenROADM-3-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-1-DEG2-DEG2-CTP-TXtoOpenROADM-3-1-SRG1-SRG1-CP-RX</opposite-link>
@@ -2697,14 +3521,14 @@
             <source><source-node>OpenROADM-3-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-1-SRG1-SRG1-CP-TXtoOpenROADM-3-1-DEG2-DEG2-CTP-RX</opposite-link>
             <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-1-DEG3-DEG3-CTP-TXtoOpenROADM-3-1-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-3-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-1-DEG1-DEG1-CTP-TXtoOpenROADM-3-1-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-1-DEG3-DEG3-CTP-TXtoOpenROADM-3-1-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-3-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-1-DEG2-DEG2-CTP-TXtoOpenROADM-3-1-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-1-DEG3-DEG3-CTP-TXtoOpenROADM-3-1-DEG1-DEG1-CTP-RX</link-id>
+            <source><source-node>OpenROADM-3-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-1-DEG1-DEG1-CTP-TXtoOpenROADM-3-1-DEG3-DEG3-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-1-DEG3-DEG3-CTP-TXtoOpenROADM-3-1-DEG2-DEG2-CTP-RX</link-id>
+            <source><source-node>OpenROADM-3-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-1-DEG2-DEG2-CTP-TXtoOpenROADM-3-1-DEG3-DEG3-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-1-SRG1-SRG1-CP-TXtoOpenROADM-3-1-DEG3-DEG3-CTP-RX</link-id>
             <source><source-node>OpenROADM-3-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-1-DEG3-DEG3-CTP-TXtoOpenROADM-3-1-SRG1-SRG1-CP-RX</opposite-link>
@@ -2713,46 +3537,46 @@
             <source><source-node>OpenROADM-3-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-1-SRG1-SRG1-CP-TXtoOpenROADM-3-1-DEG3-DEG3-CTP-RX</opposite-link>
             <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-1XPDR-NW1-TX-toOpenROADM-3-1-SRG1-SRG1-PP1-RX</link-id>
-        <source><source-node>XPONDER-3-1</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-1-SRG1-SRG1-PP1-TX-to-XPONDER-3-1XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-1-SRG1-SRG1-PP1-TX-to-XPONDER-3-1XPDR-NW1-RX</link-id>
-        <source><source-node>OpenROADM-3-1-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-3-1</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-3-1XPDR-NW1-TX-toOpenROADM-3-1-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-1XPDR-NW2-TX-toOpenROADM-3-1-SRG1-SRG1-PP2-RX</link-id>
-        <source><source-node>XPONDER-3-1</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-1-SRG1-SRG1-PP2-TX-to-XPONDER-3-1XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-1-SRG1-SRG1-PP2-TX-to-XPONDER-3-1XPDR-NW2-RX</link-id>
-        <source><source-node>OpenROADM-3-1-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-3-1</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-3-1XPDR-NW2-TX-toOpenROADM-3-1-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-1XPDR-NW3-TX-toOpenROADM-3-1-SRG1-SRG1-PP3-RX</link-id>
-        <source><source-node>XPONDER-3-1</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-1-SRG1-SRG1-PP3-TX-to-XPONDER-3-1XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-1-SRG1-SRG1-PP3-TX-to-XPONDER-3-1XPDR-NW3-RX</link-id>
-        <source><source-node>OpenROADM-3-1-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-3-1</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-3-1XPDR-NW3-TX-toOpenROADM-3-1-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-1XPDR-NW4-TX-toOpenROADM-3-1-SRG1-SRG1-PP4-RX</link-id>
-        <source><source-node>XPONDER-3-1</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-1-SRG1-SRG1-PP4-TX-to-XPONDER-3-1XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-1-SRG1-SRG1-PP4-TX-to-XPONDER-3-1XPDR-NW4-RX</link-id>
-        <source><source-node>OpenROADM-3-1-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-3-1</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-3-1XPDR-NW4-TX-toOpenROADM-3-1-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-DEG1-DEG1-CTP-TXtoOpenROADM-3-2-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-3-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-2-DEG2-DEG2-CTP-TXtoOpenROADM-3-2-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-DEG1-DEG1-CTP-TXtoOpenROADM-3-2-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-3-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-2-DEG3-DEG3-CTP-TXtoOpenROADM-3-2-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-1XPDR-NW1-TX-toOpenROADM-3-1-SRG1-SRG1-PP1-RX</link-id>
+            <source><source-node>XPONDER-3-1</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-1-SRG1-SRG1-PP1-TX-to-XPONDER-3-1XPDR-NW1-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-1-SRG1-SRG1-PP1-TX-to-XPONDER-3-1XPDR-NW1-RX</link-id>
+            <source><source-node>OpenROADM-3-1-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-3-1</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-3-1XPDR-NW1-TX-toOpenROADM-3-1-SRG1-SRG1-PP1-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-1XPDR-NW2-TX-toOpenROADM-3-1-SRG1-SRG1-PP2-RX</link-id>
+            <source><source-node>XPONDER-3-1</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-1-SRG1-SRG1-PP2-TX-to-XPONDER-3-1XPDR-NW2-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-1-SRG1-SRG1-PP2-TX-to-XPONDER-3-1XPDR-NW2-RX</link-id>
+            <source><source-node>OpenROADM-3-1-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-3-1</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-3-1XPDR-NW2-TX-toOpenROADM-3-1-SRG1-SRG1-PP2-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-1XPDR-NW3-TX-toOpenROADM-3-1-SRG1-SRG1-PP3-RX</link-id>
+            <source><source-node>XPONDER-3-1</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-1-SRG1-SRG1-PP3-TX-to-XPONDER-3-1XPDR-NW3-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-1-SRG1-SRG1-PP3-TX-to-XPONDER-3-1XPDR-NW3-RX</link-id>
+            <source><source-node>OpenROADM-3-1-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-3-1</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-3-1XPDR-NW3-TX-toOpenROADM-3-1-SRG1-SRG1-PP3-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-1XPDR-NW4-TX-toOpenROADM-3-1-SRG1-SRG1-PP4-RX</link-id>
+            <source><source-node>XPONDER-3-1</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-1-SRG1-SRG1-PP4-TX-to-XPONDER-3-1XPDR-NW4-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-1-SRG1-SRG1-PP4-TX-to-XPONDER-3-1XPDR-NW4-RX</link-id>
+            <source><source-node>OpenROADM-3-1-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-3-1</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-3-1XPDR-NW4-TX-toOpenROADM-3-1-SRG1-SRG1-PP4-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-DEG1-DEG1-CTP-TXtoOpenROADM-3-2-DEG2-DEG2-CTP-RX</link-id>
+            <source><source-node>OpenROADM-3-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-2-DEG2-DEG2-CTP-TXtoOpenROADM-3-2-DEG1-DEG1-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-DEG1-DEG1-CTP-TXtoOpenROADM-3-2-DEG3-DEG3-CTP-RX</link-id>
+            <source><source-node>OpenROADM-3-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-2-DEG3-DEG3-CTP-TXtoOpenROADM-3-2-DEG1-DEG1-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-2-SRG1-SRG1-CP-TXtoOpenROADM-3-2-DEG1-DEG1-CTP-RX</link-id>
             <source><source-node>OpenROADM-3-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-2-DEG1-DEG1-CTP-TXtoOpenROADM-3-2-SRG1-SRG1-CP-RX</opposite-link>
@@ -2761,14 +3585,14 @@
             <source><source-node>OpenROADM-3-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-2-SRG1-SRG1-CP-TXtoOpenROADM-3-2-DEG1-DEG1-CTP-RX</opposite-link>
             <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-DEG2-DEG2-CTP-TXtoOpenROADM-3-2-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-3-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-2-DEG1-DEG1-CTP-TXtoOpenROADM-3-2-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-DEG2-DEG2-CTP-TXtoOpenROADM-3-2-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-3-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-2-DEG3-DEG3-CTP-TXtoOpenROADM-3-2-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-DEG2-DEG2-CTP-TXtoOpenROADM-3-2-DEG1-DEG1-CTP-RX</link-id>
+            <source><source-node>OpenROADM-3-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-2-DEG1-DEG1-CTP-TXtoOpenROADM-3-2-DEG2-DEG2-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-DEG2-DEG2-CTP-TXtoOpenROADM-3-2-DEG3-DEG3-CTP-RX</link-id>
+            <source><source-node>OpenROADM-3-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-2-DEG3-DEG3-CTP-TXtoOpenROADM-3-2-DEG2-DEG2-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-2-SRG1-SRG1-CP-TXtoOpenROADM-3-2-DEG2-DEG2-CTP-RX</link-id>
             <source><source-node>OpenROADM-3-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-2-DEG2-DEG2-CTP-TXtoOpenROADM-3-2-SRG1-SRG1-CP-RX</opposite-link>
@@ -2777,14 +3601,14 @@
             <source><source-node>OpenROADM-3-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-2-SRG1-SRG1-CP-TXtoOpenROADM-3-2-DEG2-DEG2-CTP-RX</opposite-link>
             <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-DEG3-DEG3-CTP-TXtoOpenROADM-3-2-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-3-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-2-DEG1-DEG1-CTP-TXtoOpenROADM-3-2-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-DEG3-DEG3-CTP-TXtoOpenROADM-3-2-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-3-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-2-DEG2-DEG2-CTP-TXtoOpenROADM-3-2-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-DEG3-DEG3-CTP-TXtoOpenROADM-3-2-DEG1-DEG1-CTP-RX</link-id>
+            <source><source-node>OpenROADM-3-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-2-DEG1-DEG1-CTP-TXtoOpenROADM-3-2-DEG3-DEG3-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-DEG3-DEG3-CTP-TXtoOpenROADM-3-2-DEG2-DEG2-CTP-RX</link-id>
+            <source><source-node>OpenROADM-3-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-2-DEG2-DEG2-CTP-TXtoOpenROADM-3-2-DEG3-DEG3-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-2-SRG1-SRG1-CP-TXtoOpenROADM-3-2-DEG3-DEG3-CTP-RX</link-id>
             <source><source-node>OpenROADM-3-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-2-DEG3-DEG3-CTP-TXtoOpenROADM-3-2-SRG1-SRG1-CP-RX</opposite-link>
@@ -2793,46 +3617,46 @@
             <source><source-node>OpenROADM-3-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-2-SRG1-SRG1-CP-TXtoOpenROADM-3-2-DEG3-DEG3-CTP-RX</opposite-link>
             <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-2XPDR-NW1-TX-toOpenROADM-3-2-SRG1-SRG1-PP1-RX</link-id>
-        <source><source-node>XPONDER-3-2</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-2-SRG1-SRG1-PP1-TX-to-XPONDER-3-2XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-SRG1-SRG1-PP1-TX-to-XPONDER-3-2XPDR-NW1-RX</link-id>
-        <source><source-node>OpenROADM-3-2-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-3-2</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-3-2XPDR-NW1-TX-toOpenROADM-3-2-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-2XPDR-NW2-TX-toOpenROADM-3-2-SRG1-SRG1-PP2-RX</link-id>
-        <source><source-node>XPONDER-3-2</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-2-SRG1-SRG1-PP2-TX-to-XPONDER-3-2XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-SRG1-SRG1-PP2-TX-to-XPONDER-3-2XPDR-NW2-RX</link-id>
-        <source><source-node>OpenROADM-3-2-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-3-2</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-3-2XPDR-NW2-TX-toOpenROADM-3-2-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-2XPDR-NW3-TX-toOpenROADM-3-2-SRG1-SRG1-PP3-RX</link-id>
-        <source><source-node>XPONDER-3-2</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-2-SRG1-SRG1-PP3-TX-to-XPONDER-3-2XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-SRG1-SRG1-PP3-TX-to-XPONDER-3-2XPDR-NW3-RX</link-id>
-        <source><source-node>OpenROADM-3-2-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-3-2</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-3-2XPDR-NW3-TX-toOpenROADM-3-2-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-2XPDR-NW4-TX-toOpenROADM-3-2-SRG1-SRG1-PP4-RX</link-id>
-        <source><source-node>XPONDER-3-2</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-2-SRG1-SRG1-PP4-TX-to-XPONDER-3-2XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-SRG1-SRG1-PP4-TX-to-XPONDER-3-2XPDR-NW4-RX</link-id>
-        <source><source-node>OpenROADM-3-2-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-3-2</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-3-2XPDR-NW4-TX-toOpenROADM-3-2-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-3-DEG1-DEG1-CTP-TXtoOpenROADM-3-3-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-3-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-3-DEG2-DEG2-CTP-TXtoOpenROADM-3-3-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-3-DEG1-DEG1-CTP-TXtoOpenROADM-3-3-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-3-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-3-DEG3-DEG3-CTP-TXtoOpenROADM-3-3-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-2XPDR-NW1-TX-toOpenROADM-3-2-SRG1-SRG1-PP1-RX</link-id>
+            <source><source-node>XPONDER-3-2</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-2-SRG1-SRG1-PP1-TX-to-XPONDER-3-2XPDR-NW1-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-SRG1-SRG1-PP1-TX-to-XPONDER-3-2XPDR-NW1-RX</link-id>
+            <source><source-node>OpenROADM-3-2-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-3-2</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-3-2XPDR-NW1-TX-toOpenROADM-3-2-SRG1-SRG1-PP1-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-2XPDR-NW2-TX-toOpenROADM-3-2-SRG1-SRG1-PP2-RX</link-id>
+            <source><source-node>XPONDER-3-2</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-2-SRG1-SRG1-PP2-TX-to-XPONDER-3-2XPDR-NW2-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-SRG1-SRG1-PP2-TX-to-XPONDER-3-2XPDR-NW2-RX</link-id>
+            <source><source-node>OpenROADM-3-2-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-3-2</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-3-2XPDR-NW2-TX-toOpenROADM-3-2-SRG1-SRG1-PP2-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-2XPDR-NW3-TX-toOpenROADM-3-2-SRG1-SRG1-PP3-RX</link-id>
+            <source><source-node>XPONDER-3-2</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-2-SRG1-SRG1-PP3-TX-to-XPONDER-3-2XPDR-NW3-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-SRG1-SRG1-PP3-TX-to-XPONDER-3-2XPDR-NW3-RX</link-id>
+            <source><source-node>OpenROADM-3-2-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-3-2</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-3-2XPDR-NW3-TX-toOpenROADM-3-2-SRG1-SRG1-PP3-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-2XPDR-NW4-TX-toOpenROADM-3-2-SRG1-SRG1-PP4-RX</link-id>
+            <source><source-node>XPONDER-3-2</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-2-SRG1-SRG1-PP4-TX-to-XPONDER-3-2XPDR-NW4-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-SRG1-SRG1-PP4-TX-to-XPONDER-3-2XPDR-NW4-RX</link-id>
+            <source><source-node>OpenROADM-3-2-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-3-2</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-3-2XPDR-NW4-TX-toOpenROADM-3-2-SRG1-SRG1-PP4-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-3-DEG1-DEG1-CTP-TXtoOpenROADM-3-3-DEG2-DEG2-CTP-RX</link-id>
+            <source><source-node>OpenROADM-3-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-3-DEG2-DEG2-CTP-TXtoOpenROADM-3-3-DEG1-DEG1-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-3-DEG1-DEG1-CTP-TXtoOpenROADM-3-3-DEG3-DEG3-CTP-RX</link-id>
+            <source><source-node>OpenROADM-3-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-3-DEG3-DEG3-CTP-TXtoOpenROADM-3-3-DEG1-DEG1-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-3-SRG1-SRG1-CP-TXtoOpenROADM-3-3-DEG1-DEG1-CTP-RX</link-id>
             <source><source-node>OpenROADM-3-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-3-DEG1-DEG1-CTP-TXtoOpenROADM-3-3-SRG1-SRG1-CP-RX</opposite-link>
@@ -2841,14 +3665,14 @@
             <source><source-node>OpenROADM-3-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-3-SRG1-SRG1-CP-TXtoOpenROADM-3-3-DEG1-DEG1-CTP-RX</opposite-link>
             <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-3-DEG2-DEG2-CTP-TXtoOpenROADM-3-3-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-3-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-3-DEG1-DEG1-CTP-TXtoOpenROADM-3-3-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-3-DEG2-DEG2-CTP-TXtoOpenROADM-3-3-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-3-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-3-DEG3-DEG3-CTP-TXtoOpenROADM-3-3-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-3-DEG2-DEG2-CTP-TXtoOpenROADM-3-3-DEG1-DEG1-CTP-RX</link-id>
+            <source><source-node>OpenROADM-3-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-3-DEG1-DEG1-CTP-TXtoOpenROADM-3-3-DEG2-DEG2-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-3-DEG2-DEG2-CTP-TXtoOpenROADM-3-3-DEG3-DEG3-CTP-RX</link-id>
+            <source><source-node>OpenROADM-3-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-3-DEG3-DEG3-CTP-TXtoOpenROADM-3-3-DEG2-DEG2-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-3-SRG1-SRG1-CP-TXtoOpenROADM-3-3-DEG2-DEG2-CTP-RX</link-id>
             <source><source-node>OpenROADM-3-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-3-DEG2-DEG2-CTP-TXtoOpenROADM-3-3-SRG1-SRG1-CP-RX</opposite-link>
@@ -2857,14 +3681,14 @@
             <source><source-node>OpenROADM-3-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-3-SRG1-SRG1-CP-TXtoOpenROADM-3-3-DEG2-DEG2-CTP-RX</opposite-link>
             <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-3-DEG3-DEG3-CTP-TXtoOpenROADM-3-3-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-3-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-3-DEG1-DEG1-CTP-TXtoOpenROADM-3-3-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-3-DEG3-DEG3-CTP-TXtoOpenROADM-3-3-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-3-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-3-DEG2-DEG2-CTP-TXtoOpenROADM-3-3-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-3-DEG3-DEG3-CTP-TXtoOpenROADM-3-3-DEG1-DEG1-CTP-RX</link-id>
+            <source><source-node>OpenROADM-3-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-3-DEG1-DEG1-CTP-TXtoOpenROADM-3-3-DEG3-DEG3-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-3-DEG3-DEG3-CTP-TXtoOpenROADM-3-3-DEG2-DEG2-CTP-RX</link-id>
+            <source><source-node>OpenROADM-3-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-3-DEG2-DEG2-CTP-TXtoOpenROADM-3-3-DEG3-DEG3-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-3-SRG1-SRG1-CP-TXtoOpenROADM-3-3-DEG3-DEG3-CTP-RX</link-id>
             <source><source-node>OpenROADM-3-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-3-DEG3-DEG3-CTP-TXtoOpenROADM-3-3-SRG1-SRG1-CP-RX</opposite-link>
@@ -2873,46 +3697,46 @@
             <source><source-node>OpenROADM-3-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-3-SRG1-SRG1-CP-TXtoOpenROADM-3-3-DEG3-DEG3-CTP-RX</opposite-link>
             <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-3XPDR-NW1-TX-toOpenROADM-3-3-SRG1-SRG1-PP1-RX</link-id>
-        <source><source-node>XPONDER-3-3</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-3-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-3-SRG1-SRG1-PP1-TX-to-XPONDER-3-3XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-3-SRG1-SRG1-PP1-TX-to-XPONDER-3-3XPDR-NW1-RX</link-id>
-        <source><source-node>OpenROADM-3-3-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-3-3</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-3-3XPDR-NW1-TX-toOpenROADM-3-3-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-3XPDR-NW2-TX-toOpenROADM-3-3-SRG1-SRG1-PP2-RX</link-id>
-        <source><source-node>XPONDER-3-3</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-3-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-3-SRG1-SRG1-PP2-TX-to-XPONDER-3-3XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-3-SRG1-SRG1-PP2-TX-to-XPONDER-3-3XPDR-NW2-RX</link-id>
-        <source><source-node>OpenROADM-3-3-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-3-3</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-3-3XPDR-NW2-TX-toOpenROADM-3-3-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-3XPDR-NW3-TX-toOpenROADM-3-3-SRG1-SRG1-PP3-RX</link-id>
-        <source><source-node>XPONDER-3-3</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-3-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-3-SRG1-SRG1-PP3-TX-to-XPONDER-3-3XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-3-SRG1-SRG1-PP3-TX-to-XPONDER-3-3XPDR-NW3-RX</link-id>
-        <source><source-node>OpenROADM-3-3-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-3-3</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-3-3XPDR-NW3-TX-toOpenROADM-3-3-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-3XPDR-NW4-TX-toOpenROADM-3-3-SRG1-SRG1-PP4-RX</link-id>
-        <source><source-node>XPONDER-3-3</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-3-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-3-SRG1-SRG1-PP4-TX-to-XPONDER-3-3XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-3-SRG1-SRG1-PP4-TX-to-XPONDER-3-3XPDR-NW4-RX</link-id>
-        <source><source-node>OpenROADM-3-3-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-3-3</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-3-3XPDR-NW4-TX-toOpenROADM-3-3-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-4-DEG1-DEG1-CTP-TXtoOpenROADM-3-4-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-3-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-4-DEG2-DEG2-CTP-TXtoOpenROADM-3-4-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-4-DEG1-DEG1-CTP-TXtoOpenROADM-3-4-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-3-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-4-DEG3-DEG3-CTP-TXtoOpenROADM-3-4-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-3XPDR-NW1-TX-toOpenROADM-3-3-SRG1-SRG1-PP1-RX</link-id>
+            <source><source-node>XPONDER-3-3</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-3-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-3-SRG1-SRG1-PP1-TX-to-XPONDER-3-3XPDR-NW1-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-3-SRG1-SRG1-PP1-TX-to-XPONDER-3-3XPDR-NW1-RX</link-id>
+            <source><source-node>OpenROADM-3-3-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-3-3</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-3-3XPDR-NW1-TX-toOpenROADM-3-3-SRG1-SRG1-PP1-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-3XPDR-NW2-TX-toOpenROADM-3-3-SRG1-SRG1-PP2-RX</link-id>
+            <source><source-node>XPONDER-3-3</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-3-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-3-SRG1-SRG1-PP2-TX-to-XPONDER-3-3XPDR-NW2-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-3-SRG1-SRG1-PP2-TX-to-XPONDER-3-3XPDR-NW2-RX</link-id>
+            <source><source-node>OpenROADM-3-3-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-3-3</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-3-3XPDR-NW2-TX-toOpenROADM-3-3-SRG1-SRG1-PP2-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-3XPDR-NW3-TX-toOpenROADM-3-3-SRG1-SRG1-PP3-RX</link-id>
+            <source><source-node>XPONDER-3-3</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-3-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-3-SRG1-SRG1-PP3-TX-to-XPONDER-3-3XPDR-NW3-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-3-SRG1-SRG1-PP3-TX-to-XPONDER-3-3XPDR-NW3-RX</link-id>
+            <source><source-node>OpenROADM-3-3-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-3-3</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-3-3XPDR-NW3-TX-toOpenROADM-3-3-SRG1-SRG1-PP3-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-3XPDR-NW4-TX-toOpenROADM-3-3-SRG1-SRG1-PP4-RX</link-id>
+            <source><source-node>XPONDER-3-3</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-3-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-3-SRG1-SRG1-PP4-TX-to-XPONDER-3-3XPDR-NW4-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-3-SRG1-SRG1-PP4-TX-to-XPONDER-3-3XPDR-NW4-RX</link-id>
+            <source><source-node>OpenROADM-3-3-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-3-3</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-3-3XPDR-NW4-TX-toOpenROADM-3-3-SRG1-SRG1-PP4-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-4-DEG1-DEG1-CTP-TXtoOpenROADM-3-4-DEG2-DEG2-CTP-RX</link-id>
+            <source><source-node>OpenROADM-3-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-4-DEG2-DEG2-CTP-TXtoOpenROADM-3-4-DEG1-DEG1-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-4-DEG1-DEG1-CTP-TXtoOpenROADM-3-4-DEG3-DEG3-CTP-RX</link-id>
+            <source><source-node>OpenROADM-3-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-4-DEG3-DEG3-CTP-TXtoOpenROADM-3-4-DEG1-DEG1-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-4-SRG1-SRG1-CP-TXtoOpenROADM-3-4-DEG1-DEG1-CTP-RX</link-id>
             <source><source-node>OpenROADM-3-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-4-DEG1-DEG1-CTP-TXtoOpenROADM-3-4-SRG1-SRG1-CP-RX</opposite-link>
@@ -2921,14 +3745,14 @@
             <source><source-node>OpenROADM-3-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-4-SRG1-SRG1-CP-TXtoOpenROADM-3-4-DEG1-DEG1-CTP-RX</opposite-link>
             <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-4-DEG2-DEG2-CTP-TXtoOpenROADM-3-4-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-3-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-4-DEG1-DEG1-CTP-TXtoOpenROADM-3-4-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-4-DEG2-DEG2-CTP-TXtoOpenROADM-3-4-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-3-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-4-DEG3-DEG3-CTP-TXtoOpenROADM-3-4-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-4-DEG2-DEG2-CTP-TXtoOpenROADM-3-4-DEG1-DEG1-CTP-RX</link-id>
+            <source><source-node>OpenROADM-3-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-4-DEG1-DEG1-CTP-TXtoOpenROADM-3-4-DEG2-DEG2-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-4-DEG2-DEG2-CTP-TXtoOpenROADM-3-4-DEG3-DEG3-CTP-RX</link-id>
+            <source><source-node>OpenROADM-3-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-4-DEG3-DEG3-CTP-TXtoOpenROADM-3-4-DEG2-DEG2-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-4-SRG1-SRG1-CP-TXtoOpenROADM-3-4-DEG2-DEG2-CTP-RX</link-id>
             <source><source-node>OpenROADM-3-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-4-DEG2-DEG2-CTP-TXtoOpenROADM-3-4-SRG1-SRG1-CP-RX</opposite-link>
@@ -2937,14 +3761,14 @@
             <source><source-node>OpenROADM-3-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-4-SRG1-SRG1-CP-TXtoOpenROADM-3-4-DEG2-DEG2-CTP-RX</opposite-link>
             <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-4-DEG3-DEG3-CTP-TXtoOpenROADM-3-4-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-3-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-4-DEG1-DEG1-CTP-TXtoOpenROADM-3-4-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-4-DEG3-DEG3-CTP-TXtoOpenROADM-3-4-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-3-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-4-DEG2-DEG2-CTP-TXtoOpenROADM-3-4-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-4-DEG3-DEG3-CTP-TXtoOpenROADM-3-4-DEG1-DEG1-CTP-RX</link-id>
+            <source><source-node>OpenROADM-3-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-4-DEG1-DEG1-CTP-TXtoOpenROADM-3-4-DEG3-DEG3-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-4-DEG3-DEG3-CTP-TXtoOpenROADM-3-4-DEG2-DEG2-CTP-RX</link-id>
+            <source><source-node>OpenROADM-3-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-4-DEG2-DEG2-CTP-TXtoOpenROADM-3-4-DEG3-DEG3-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-4-SRG1-SRG1-CP-TXtoOpenROADM-3-4-DEG3-DEG3-CTP-RX</link-id>
             <source><source-node>OpenROADM-3-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-4-DEG3-DEG3-CTP-TXtoOpenROADM-3-4-SRG1-SRG1-CP-RX</opposite-link>
@@ -2953,78 +3777,150 @@
             <source><source-node>OpenROADM-3-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-4-SRG1-SRG1-CP-TXtoOpenROADM-3-4-DEG3-DEG3-CTP-RX</opposite-link>
             <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-4XPDR-NW1-TX-toOpenROADM-3-4-SRG1-SRG1-PP1-RX</link-id>
-        <source><source-node>XPONDER-3-4</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-4-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-4-SRG1-SRG1-PP1-TX-to-XPONDER-3-4XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-4-SRG1-SRG1-PP1-TX-to-XPONDER-3-4XPDR-NW1-RX</link-id>
-        <source><source-node>OpenROADM-3-4-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-3-4</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-3-4XPDR-NW1-TX-toOpenROADM-3-4-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-4XPDR-NW2-TX-toOpenROADM-3-4-SRG1-SRG1-PP2-RX</link-id>
-        <source><source-node>XPONDER-3-4</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-4-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-4-SRG1-SRG1-PP2-TX-to-XPONDER-3-4XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-4-SRG1-SRG1-PP2-TX-to-XPONDER-3-4XPDR-NW2-RX</link-id>
-        <source><source-node>OpenROADM-3-4-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-3-4</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-3-4XPDR-NW2-TX-toOpenROADM-3-4-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-4XPDR-NW3-TX-toOpenROADM-3-4-SRG1-SRG1-PP3-RX</link-id>
-        <source><source-node>XPONDER-3-4</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-4-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-4-SRG1-SRG1-PP3-TX-to-XPONDER-3-4XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-4-SRG1-SRG1-PP3-TX-to-XPONDER-3-4XPDR-NW3-RX</link-id>
-        <source><source-node>OpenROADM-3-4-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-3-4</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-3-4XPDR-NW3-TX-toOpenROADM-3-4-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-4XPDR-NW4-TX-toOpenROADM-3-4-SRG1-SRG1-PP4-RX</link-id>
-        <source><source-node>XPONDER-3-4</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-4-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-4-SRG1-SRG1-PP4-TX-to-XPONDER-3-4XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-4-SRG1-SRG1-PP4-TX-to-XPONDER-3-4XPDR-NW4-RX</link-id>
-        <source><source-node>OpenROADM-3-4-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-3-4</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-3-4XPDR-NW4-TX-toOpenROADM-3-4-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-3-1-DEG1-to-OpenROADM-3-2-DEG1</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-2-DEG1-to-OpenROADM-3-1-DEG1</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-3-1-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-3-2-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-3-2-DEG1-to-OpenROADM-3-1-DEG1</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-1-DEG1-to-OpenROADM-3-2-DEG1</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-3-2-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-3-1-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-3-2-DEG2-to-OpenROADM-3-3-DEG2</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-3-DEG2-to-OpenROADM-3-2-DEG2</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-3-2-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-3-3-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-3-3-DEG2-to-OpenROADM-3-2-DEG2</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-2-DEG2-to-OpenROADM-3-3-DEG2</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-3-3-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-3-2-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-3-3-DEG1-to-OpenROADM-3-4-DEG1</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-4-DEG1-to-OpenROADM-3-3-DEG1</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-3-3-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-3-4-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-3-4-DEG1-to-OpenROADM-3-3-DEG1</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-3-DEG1-to-OpenROADM-3-4-DEG1</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-3-4-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-3-3-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-3-4-DEG2-to-OpenROADM-3-1-DEG2</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-1-DEG2-to-OpenROADM-3-4-DEG2</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-3-4-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-3-1-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-3-1-DEG2-to-OpenROADM-3-4-DEG2</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-4-DEG2-to-OpenROADM-3-1-DEG2</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-3-1-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-3-4-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-DEG1-DEG1-CTP-TXtoOpenROADM-4-1-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-4-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-1-DEG2-DEG2-CTP-TXtoOpenROADM-4-1-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-DEG1-DEG1-CTP-TXtoOpenROADM-4-1-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-4-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-1-DEG3-DEG3-CTP-TXtoOpenROADM-4-1-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-4XPDR-NW1-TX-toOpenROADM-3-4-SRG1-SRG1-PP1-RX</link-id>
+            <source><source-node>XPONDER-3-4</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-4-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-4-SRG1-SRG1-PP1-TX-to-XPONDER-3-4XPDR-NW1-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-4-SRG1-SRG1-PP1-TX-to-XPONDER-3-4XPDR-NW1-RX</link-id>
+            <source><source-node>OpenROADM-3-4-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-3-4</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-3-4XPDR-NW1-TX-toOpenROADM-3-4-SRG1-SRG1-PP1-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-4XPDR-NW2-TX-toOpenROADM-3-4-SRG1-SRG1-PP2-RX</link-id>
+            <source><source-node>XPONDER-3-4</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-4-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-4-SRG1-SRG1-PP2-TX-to-XPONDER-3-4XPDR-NW2-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-4-SRG1-SRG1-PP2-TX-to-XPONDER-3-4XPDR-NW2-RX</link-id>
+            <source><source-node>OpenROADM-3-4-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-3-4</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-3-4XPDR-NW2-TX-toOpenROADM-3-4-SRG1-SRG1-PP2-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-4XPDR-NW3-TX-toOpenROADM-3-4-SRG1-SRG1-PP3-RX</link-id>
+            <source><source-node>XPONDER-3-4</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-4-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-4-SRG1-SRG1-PP3-TX-to-XPONDER-3-4XPDR-NW3-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-4-SRG1-SRG1-PP3-TX-to-XPONDER-3-4XPDR-NW3-RX</link-id>
+            <source><source-node>OpenROADM-3-4-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-3-4</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-3-4XPDR-NW3-TX-toOpenROADM-3-4-SRG1-SRG1-PP3-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-4XPDR-NW4-TX-toOpenROADM-3-4-SRG1-SRG1-PP4-RX</link-id>
+            <source><source-node>XPONDER-3-4</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-4-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-4-SRG1-SRG1-PP4-TX-to-XPONDER-3-4XPDR-NW4-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-4-SRG1-SRG1-PP4-TX-to-XPONDER-3-4XPDR-NW4-RX</link-id>
+            <source><source-node>OpenROADM-3-4-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-3-4</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-3-4XPDR-NW4-TX-toOpenROADM-3-4-SRG1-SRG1-PP4-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-3-1-DEG1-to-OpenROADM-3-2-DEG1</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-2-DEG1-to-OpenROADM-3-1-DEG1</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">30</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-3-1-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-3-2-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>31321</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>31322</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>31323</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>31324</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-3-2-DEG1-to-OpenROADM-3-1-DEG1</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-1-DEG1-to-OpenROADM-3-2-DEG1</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">30</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-3-2-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-3-1-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>32311</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>32312</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>32313</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>32314</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-3-2-DEG2-to-OpenROADM-3-3-DEG2</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-3-DEG2-to-OpenROADM-3-2-DEG2</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">30</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-3-2-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-3-3-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>32331</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>32332</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>32333</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>32334</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-3-3-DEG2-to-OpenROADM-3-2-DEG2</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-2-DEG2-to-OpenROADM-3-3-DEG2</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">30</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-3-3-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-3-2-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>33321</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>33322</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>33323</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>33324</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-3-3-DEG1-to-OpenROADM-3-4-DEG1</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-4-DEG1-to-OpenROADM-3-3-DEG1</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">30</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-3-3-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-3-4-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>33341</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>33342</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>33343</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>33344</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-3-4-DEG1-to-OpenROADM-3-3-DEG1</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-3-DEG1-to-OpenROADM-3-4-DEG1</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">30</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-3-4-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-3-3-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>34331</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>34332</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>34333</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>34334</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-3-4-DEG2-to-OpenROADM-3-1-DEG2</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-1-DEG2-to-OpenROADM-3-4-DEG2</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">30</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-3-4-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-3-1-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>34311</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>34312</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>34313</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>34314</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-3-1-DEG2-to-OpenROADM-3-4-DEG2</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-4-DEG2-to-OpenROADM-3-1-DEG2</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">30</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-3-1-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-3-4-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>31341</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>31342</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>31343</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>31344</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-DEG1-DEG1-CTP-TXtoOpenROADM-4-1-DEG2-DEG2-CTP-RX</link-id>
+            <source><source-node>OpenROADM-4-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-1-DEG2-DEG2-CTP-TXtoOpenROADM-4-1-DEG1-DEG1-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-DEG1-DEG1-CTP-TXtoOpenROADM-4-1-DEG3-DEG3-CTP-RX</link-id>
+            <source><source-node>OpenROADM-4-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-1-DEG3-DEG3-CTP-TXtoOpenROADM-4-1-DEG1-DEG1-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-1-SRG1-SRG1-CP-TXtoOpenROADM-4-1-DEG1-DEG1-CTP-RX</link-id>
             <source><source-node>OpenROADM-4-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-1-DEG1-DEG1-CTP-TXtoOpenROADM-4-1-SRG1-SRG1-CP-RX</opposite-link>
@@ -3033,14 +3929,14 @@
             <source><source-node>OpenROADM-4-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-1-SRG1-SRG1-CP-TXtoOpenROADM-4-1-DEG1-DEG1-CTP-RX</opposite-link>
             <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-DEG2-DEG2-CTP-TXtoOpenROADM-4-1-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-4-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-1-DEG1-DEG1-CTP-TXtoOpenROADM-4-1-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-DEG2-DEG2-CTP-TXtoOpenROADM-4-1-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-4-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-1-DEG3-DEG3-CTP-TXtoOpenROADM-4-1-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-DEG2-DEG2-CTP-TXtoOpenROADM-4-1-DEG1-DEG1-CTP-RX</link-id>
+            <source><source-node>OpenROADM-4-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-1-DEG1-DEG1-CTP-TXtoOpenROADM-4-1-DEG2-DEG2-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-DEG2-DEG2-CTP-TXtoOpenROADM-4-1-DEG3-DEG3-CTP-RX</link-id>
+            <source><source-node>OpenROADM-4-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-1-DEG3-DEG3-CTP-TXtoOpenROADM-4-1-DEG2-DEG2-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-1-SRG1-SRG1-CP-TXtoOpenROADM-4-1-DEG2-DEG2-CTP-RX</link-id>
             <source><source-node>OpenROADM-4-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-1-DEG2-DEG2-CTP-TXtoOpenROADM-4-1-SRG1-SRG1-CP-RX</opposite-link>
@@ -3049,14 +3945,14 @@
             <source><source-node>OpenROADM-4-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-1-SRG1-SRG1-CP-TXtoOpenROADM-4-1-DEG2-DEG2-CTP-RX</opposite-link>
             <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-DEG3-DEG3-CTP-TXtoOpenROADM-4-1-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-4-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-1-DEG1-DEG1-CTP-TXtoOpenROADM-4-1-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-DEG3-DEG3-CTP-TXtoOpenROADM-4-1-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-4-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-1-DEG2-DEG2-CTP-TXtoOpenROADM-4-1-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-DEG3-DEG3-CTP-TXtoOpenROADM-4-1-DEG1-DEG1-CTP-RX</link-id>
+            <source><source-node>OpenROADM-4-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-1-DEG1-DEG1-CTP-TXtoOpenROADM-4-1-DEG3-DEG3-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-DEG3-DEG3-CTP-TXtoOpenROADM-4-1-DEG2-DEG2-CTP-RX</link-id>
+            <source><source-node>OpenROADM-4-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-1-DEG2-DEG2-CTP-TXtoOpenROADM-4-1-DEG3-DEG3-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-1-SRG1-SRG1-CP-TXtoOpenROADM-4-1-DEG3-DEG3-CTP-RX</link-id>
             <source><source-node>OpenROADM-4-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-1-DEG3-DEG3-CTP-TXtoOpenROADM-4-1-SRG1-SRG1-CP-RX</opposite-link>
@@ -3065,46 +3961,46 @@
             <source><source-node>OpenROADM-4-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-1-SRG1-SRG1-CP-TXtoOpenROADM-4-1-DEG3-DEG3-CTP-RX</opposite-link>
             <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-1XPDR-NW1-TX-toOpenROADM-4-1-SRG1-SRG1-PP1-RX</link-id>
-        <source><source-node>XPONDER-4-1</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-1-SRG1-SRG1-PP1-TX-to-XPONDER-4-1XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-SRG1-SRG1-PP1-TX-to-XPONDER-4-1XPDR-NW1-RX</link-id>
-        <source><source-node>OpenROADM-4-1-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-4-1</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-4-1XPDR-NW1-TX-toOpenROADM-4-1-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-1XPDR-NW2-TX-toOpenROADM-4-1-SRG1-SRG1-PP2-RX</link-id>
-        <source><source-node>XPONDER-4-1</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-1-SRG1-SRG1-PP2-TX-to-XPONDER-4-1XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-SRG1-SRG1-PP2-TX-to-XPONDER-4-1XPDR-NW2-RX</link-id>
-        <source><source-node>OpenROADM-4-1-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-4-1</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-4-1XPDR-NW2-TX-toOpenROADM-4-1-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-1XPDR-NW3-TX-toOpenROADM-4-1-SRG1-SRG1-PP3-RX</link-id>
-        <source><source-node>XPONDER-4-1</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-1-SRG1-SRG1-PP3-TX-to-XPONDER-4-1XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-SRG1-SRG1-PP3-TX-to-XPONDER-4-1XPDR-NW3-RX</link-id>
-        <source><source-node>OpenROADM-4-1-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-4-1</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-4-1XPDR-NW3-TX-toOpenROADM-4-1-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-1XPDR-NW4-TX-toOpenROADM-4-1-SRG1-SRG1-PP4-RX</link-id>
-        <source><source-node>XPONDER-4-1</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-1-SRG1-SRG1-PP4-TX-to-XPONDER-4-1XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-SRG1-SRG1-PP4-TX-to-XPONDER-4-1XPDR-NW4-RX</link-id>
-        <source><source-node>OpenROADM-4-1-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-4-1</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-4-1XPDR-NW4-TX-toOpenROADM-4-1-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-DEG1-DEG1-CTP-TXtoOpenROADM-4-2-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-4-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-2-DEG2-DEG2-CTP-TXtoOpenROADM-4-2-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-DEG1-DEG1-CTP-TXtoOpenROADM-4-2-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-4-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-2-DEG3-DEG3-CTP-TXtoOpenROADM-4-2-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-1XPDR-NW1-TX-toOpenROADM-4-1-SRG1-SRG1-PP1-RX</link-id>
+            <source><source-node>XPONDER-4-1</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-1-SRG1-SRG1-PP1-TX-to-XPONDER-4-1XPDR-NW1-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-SRG1-SRG1-PP1-TX-to-XPONDER-4-1XPDR-NW1-RX</link-id>
+            <source><source-node>OpenROADM-4-1-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-4-1</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-4-1XPDR-NW1-TX-toOpenROADM-4-1-SRG1-SRG1-PP1-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-1XPDR-NW2-TX-toOpenROADM-4-1-SRG1-SRG1-PP2-RX</link-id>
+            <source><source-node>XPONDER-4-1</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-1-SRG1-SRG1-PP2-TX-to-XPONDER-4-1XPDR-NW2-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-SRG1-SRG1-PP2-TX-to-XPONDER-4-1XPDR-NW2-RX</link-id>
+            <source><source-node>OpenROADM-4-1-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-4-1</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-4-1XPDR-NW2-TX-toOpenROADM-4-1-SRG1-SRG1-PP2-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-1XPDR-NW3-TX-toOpenROADM-4-1-SRG1-SRG1-PP3-RX</link-id>
+            <source><source-node>XPONDER-4-1</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-1-SRG1-SRG1-PP3-TX-to-XPONDER-4-1XPDR-NW3-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-SRG1-SRG1-PP3-TX-to-XPONDER-4-1XPDR-NW3-RX</link-id>
+            <source><source-node>OpenROADM-4-1-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-4-1</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-4-1XPDR-NW3-TX-toOpenROADM-4-1-SRG1-SRG1-PP3-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-1XPDR-NW4-TX-toOpenROADM-4-1-SRG1-SRG1-PP4-RX</link-id>
+            <source><source-node>XPONDER-4-1</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-1-SRG1-SRG1-PP4-TX-to-XPONDER-4-1XPDR-NW4-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-SRG1-SRG1-PP4-TX-to-XPONDER-4-1XPDR-NW4-RX</link-id>
+            <source><source-node>OpenROADM-4-1-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-4-1</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-4-1XPDR-NW4-TX-toOpenROADM-4-1-SRG1-SRG1-PP4-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-DEG1-DEG1-CTP-TXtoOpenROADM-4-2-DEG2-DEG2-CTP-RX</link-id>
+            <source><source-node>OpenROADM-4-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-2-DEG2-DEG2-CTP-TXtoOpenROADM-4-2-DEG1-DEG1-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-DEG1-DEG1-CTP-TXtoOpenROADM-4-2-DEG3-DEG3-CTP-RX</link-id>
+            <source><source-node>OpenROADM-4-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-2-DEG3-DEG3-CTP-TXtoOpenROADM-4-2-DEG1-DEG1-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-2-SRG1-SRG1-CP-TXtoOpenROADM-4-2-DEG1-DEG1-CTP-RX</link-id>
             <source><source-node>OpenROADM-4-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-2-DEG1-DEG1-CTP-TXtoOpenROADM-4-2-SRG1-SRG1-CP-RX</opposite-link>
@@ -3113,14 +4009,14 @@
             <source><source-node>OpenROADM-4-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-2-SRG1-SRG1-CP-TXtoOpenROADM-4-2-DEG1-DEG1-CTP-RX</opposite-link>
             <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-DEG2-DEG2-CTP-TXtoOpenROADM-4-2-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-4-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-2-DEG1-DEG1-CTP-TXtoOpenROADM-4-2-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-DEG2-DEG2-CTP-TXtoOpenROADM-4-2-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-4-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-2-DEG3-DEG3-CTP-TXtoOpenROADM-4-2-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-DEG2-DEG2-CTP-TXtoOpenROADM-4-2-DEG1-DEG1-CTP-RX</link-id>
+            <source><source-node>OpenROADM-4-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-2-DEG1-DEG1-CTP-TXtoOpenROADM-4-2-DEG2-DEG2-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-DEG2-DEG2-CTP-TXtoOpenROADM-4-2-DEG3-DEG3-CTP-RX</link-id>
+            <source><source-node>OpenROADM-4-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-2-DEG3-DEG3-CTP-TXtoOpenROADM-4-2-DEG2-DEG2-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-2-SRG1-SRG1-CP-TXtoOpenROADM-4-2-DEG2-DEG2-CTP-RX</link-id>
             <source><source-node>OpenROADM-4-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-2-DEG2-DEG2-CTP-TXtoOpenROADM-4-2-SRG1-SRG1-CP-RX</opposite-link>
@@ -3129,14 +4025,14 @@
             <source><source-node>OpenROADM-4-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-2-SRG1-SRG1-CP-TXtoOpenROADM-4-2-DEG2-DEG2-CTP-RX</opposite-link>
             <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-DEG3-DEG3-CTP-TXtoOpenROADM-4-2-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-4-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-2-DEG1-DEG1-CTP-TXtoOpenROADM-4-2-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-DEG3-DEG3-CTP-TXtoOpenROADM-4-2-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-4-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-2-DEG2-DEG2-CTP-TXtoOpenROADM-4-2-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-DEG3-DEG3-CTP-TXtoOpenROADM-4-2-DEG1-DEG1-CTP-RX</link-id>
+            <source><source-node>OpenROADM-4-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-2-DEG1-DEG1-CTP-TXtoOpenROADM-4-2-DEG3-DEG3-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-DEG3-DEG3-CTP-TXtoOpenROADM-4-2-DEG2-DEG2-CTP-RX</link-id>
+            <source><source-node>OpenROADM-4-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-2-DEG2-DEG2-CTP-TXtoOpenROADM-4-2-DEG3-DEG3-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-2-SRG1-SRG1-CP-TXtoOpenROADM-4-2-DEG3-DEG3-CTP-RX</link-id>
             <source><source-node>OpenROADM-4-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-2-DEG3-DEG3-CTP-TXtoOpenROADM-4-2-SRG1-SRG1-CP-RX</opposite-link>
@@ -3145,46 +4041,46 @@
             <source><source-node>OpenROADM-4-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-2-SRG1-SRG1-CP-TXtoOpenROADM-4-2-DEG3-DEG3-CTP-RX</opposite-link>
             <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-2XPDR-NW1-TX-toOpenROADM-4-2-SRG1-SRG1-PP1-RX</link-id>
-        <source><source-node>XPONDER-4-2</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-2-SRG1-SRG1-PP1-TX-to-XPONDER-4-2XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-SRG1-SRG1-PP1-TX-to-XPONDER-4-2XPDR-NW1-RX</link-id>
-        <source><source-node>OpenROADM-4-2-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-4-2</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-4-2XPDR-NW1-TX-toOpenROADM-4-2-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-2XPDR-NW2-TX-toOpenROADM-4-2-SRG1-SRG1-PP2-RX</link-id>
-        <source><source-node>XPONDER-4-2</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-2-SRG1-SRG1-PP2-TX-to-XPONDER-4-2XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-SRG1-SRG1-PP2-TX-to-XPONDER-4-2XPDR-NW2-RX</link-id>
-        <source><source-node>OpenROADM-4-2-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-4-2</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-4-2XPDR-NW2-TX-toOpenROADM-4-2-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-2XPDR-NW3-TX-toOpenROADM-4-2-SRG1-SRG1-PP3-RX</link-id>
-        <source><source-node>XPONDER-4-2</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-2-SRG1-SRG1-PP3-TX-to-XPONDER-4-2XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-SRG1-SRG1-PP3-TX-to-XPONDER-4-2XPDR-NW3-RX</link-id>
-        <source><source-node>OpenROADM-4-2-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-4-2</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-4-2XPDR-NW3-TX-toOpenROADM-4-2-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-2XPDR-NW4-TX-toOpenROADM-4-2-SRG1-SRG1-PP4-RX</link-id>
-        <source><source-node>XPONDER-4-2</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-2-SRG1-SRG1-PP4-TX-to-XPONDER-4-2XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-SRG1-SRG1-PP4-TX-to-XPONDER-4-2XPDR-NW4-RX</link-id>
-        <source><source-node>OpenROADM-4-2-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-4-2</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-4-2XPDR-NW4-TX-toOpenROADM-4-2-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-3-DEG1-DEG1-CTP-TXtoOpenROADM-4-3-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-4-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-3-DEG2-DEG2-CTP-TXtoOpenROADM-4-3-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-3-DEG1-DEG1-CTP-TXtoOpenROADM-4-3-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-4-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-3-DEG3-DEG3-CTP-TXtoOpenROADM-4-3-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-2XPDR-NW1-TX-toOpenROADM-4-2-SRG1-SRG1-PP1-RX</link-id>
+            <source><source-node>XPONDER-4-2</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-2-SRG1-SRG1-PP1-TX-to-XPONDER-4-2XPDR-NW1-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-SRG1-SRG1-PP1-TX-to-XPONDER-4-2XPDR-NW1-RX</link-id>
+            <source><source-node>OpenROADM-4-2-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-4-2</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-4-2XPDR-NW1-TX-toOpenROADM-4-2-SRG1-SRG1-PP1-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-2XPDR-NW2-TX-toOpenROADM-4-2-SRG1-SRG1-PP2-RX</link-id>
+            <source><source-node>XPONDER-4-2</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-2-SRG1-SRG1-PP2-TX-to-XPONDER-4-2XPDR-NW2-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-SRG1-SRG1-PP2-TX-to-XPONDER-4-2XPDR-NW2-RX</link-id>
+            <source><source-node>OpenROADM-4-2-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-4-2</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-4-2XPDR-NW2-TX-toOpenROADM-4-2-SRG1-SRG1-PP2-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-2XPDR-NW3-TX-toOpenROADM-4-2-SRG1-SRG1-PP3-RX</link-id>
+            <source><source-node>XPONDER-4-2</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-2-SRG1-SRG1-PP3-TX-to-XPONDER-4-2XPDR-NW3-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-SRG1-SRG1-PP3-TX-to-XPONDER-4-2XPDR-NW3-RX</link-id>
+            <source><source-node>OpenROADM-4-2-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-4-2</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-4-2XPDR-NW3-TX-toOpenROADM-4-2-SRG1-SRG1-PP3-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-2XPDR-NW4-TX-toOpenROADM-4-2-SRG1-SRG1-PP4-RX</link-id>
+            <source><source-node>XPONDER-4-2</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-2-SRG1-SRG1-PP4-TX-to-XPONDER-4-2XPDR-NW4-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-SRG1-SRG1-PP4-TX-to-XPONDER-4-2XPDR-NW4-RX</link-id>
+            <source><source-node>OpenROADM-4-2-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-4-2</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-4-2XPDR-NW4-TX-toOpenROADM-4-2-SRG1-SRG1-PP4-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-3-DEG1-DEG1-CTP-TXtoOpenROADM-4-3-DEG2-DEG2-CTP-RX</link-id>
+            <source><source-node>OpenROADM-4-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-3-DEG2-DEG2-CTP-TXtoOpenROADM-4-3-DEG1-DEG1-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-3-DEG1-DEG1-CTP-TXtoOpenROADM-4-3-DEG3-DEG3-CTP-RX</link-id>
+            <source><source-node>OpenROADM-4-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-3-DEG3-DEG3-CTP-TXtoOpenROADM-4-3-DEG1-DEG1-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-3-SRG1-SRG1-CP-TXtoOpenROADM-4-3-DEG1-DEG1-CTP-RX</link-id>
             <source><source-node>OpenROADM-4-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-3-DEG1-DEG1-CTP-TXtoOpenROADM-4-3-SRG1-SRG1-CP-RX</opposite-link>
@@ -3193,14 +4089,14 @@
             <source><source-node>OpenROADM-4-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-3-SRG1-SRG1-CP-TXtoOpenROADM-4-3-DEG1-DEG1-CTP-RX</opposite-link>
             <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-3-DEG2-DEG2-CTP-TXtoOpenROADM-4-3-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-4-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-3-DEG1-DEG1-CTP-TXtoOpenROADM-4-3-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-3-DEG2-DEG2-CTP-TXtoOpenROADM-4-3-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-4-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-3-DEG3-DEG3-CTP-TXtoOpenROADM-4-3-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-3-DEG2-DEG2-CTP-TXtoOpenROADM-4-3-DEG1-DEG1-CTP-RX</link-id>
+            <source><source-node>OpenROADM-4-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-3-DEG1-DEG1-CTP-TXtoOpenROADM-4-3-DEG2-DEG2-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-3-DEG2-DEG2-CTP-TXtoOpenROADM-4-3-DEG3-DEG3-CTP-RX</link-id>
+            <source><source-node>OpenROADM-4-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-3-DEG3-DEG3-CTP-TXtoOpenROADM-4-3-DEG2-DEG2-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-3-SRG1-SRG1-CP-TXtoOpenROADM-4-3-DEG2-DEG2-CTP-RX</link-id>
             <source><source-node>OpenROADM-4-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-3-DEG2-DEG2-CTP-TXtoOpenROADM-4-3-SRG1-SRG1-CP-RX</opposite-link>
@@ -3209,14 +4105,14 @@
             <source><source-node>OpenROADM-4-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-3-SRG1-SRG1-CP-TXtoOpenROADM-4-3-DEG2-DEG2-CTP-RX</opposite-link>
             <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-3-DEG3-DEG3-CTP-TXtoOpenROADM-4-3-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-4-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-3-DEG1-DEG1-CTP-TXtoOpenROADM-4-3-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-3-DEG3-DEG3-CTP-TXtoOpenROADM-4-3-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-4-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-3-DEG2-DEG2-CTP-TXtoOpenROADM-4-3-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-3-DEG3-DEG3-CTP-TXtoOpenROADM-4-3-DEG1-DEG1-CTP-RX</link-id>
+            <source><source-node>OpenROADM-4-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-3-DEG1-DEG1-CTP-TXtoOpenROADM-4-3-DEG3-DEG3-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-3-DEG3-DEG3-CTP-TXtoOpenROADM-4-3-DEG2-DEG2-CTP-RX</link-id>
+            <source><source-node>OpenROADM-4-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-3-DEG2-DEG2-CTP-TXtoOpenROADM-4-3-DEG3-DEG3-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-3-SRG1-SRG1-CP-TXtoOpenROADM-4-3-DEG3-DEG3-CTP-RX</link-id>
             <source><source-node>OpenROADM-4-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-3-DEG3-DEG3-CTP-TXtoOpenROADM-4-3-SRG1-SRG1-CP-RX</opposite-link>
@@ -3225,46 +4121,46 @@
             <source><source-node>OpenROADM-4-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-3-SRG1-SRG1-CP-TXtoOpenROADM-4-3-DEG3-DEG3-CTP-RX</opposite-link>
             <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-3XPDR-NW1-TX-toOpenROADM-4-3-SRG1-SRG1-PP1-RX</link-id>
-        <source><source-node>XPONDER-4-3</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-3-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-3-SRG1-SRG1-PP1-TX-to-XPONDER-4-3XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-3-SRG1-SRG1-PP1-TX-to-XPONDER-4-3XPDR-NW1-RX</link-id>
-        <source><source-node>OpenROADM-4-3-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-4-3</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-4-3XPDR-NW1-TX-toOpenROADM-4-3-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-3XPDR-NW2-TX-toOpenROADM-4-3-SRG1-SRG1-PP2-RX</link-id>
-        <source><source-node>XPONDER-4-3</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-3-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-3-SRG1-SRG1-PP2-TX-to-XPONDER-4-3XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-3-SRG1-SRG1-PP2-TX-to-XPONDER-4-3XPDR-NW2-RX</link-id>
-        <source><source-node>OpenROADM-4-3-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-4-3</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-4-3XPDR-NW2-TX-toOpenROADM-4-3-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-3XPDR-NW3-TX-toOpenROADM-4-3-SRG1-SRG1-PP3-RX</link-id>
-        <source><source-node>XPONDER-4-3</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-3-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-3-SRG1-SRG1-PP3-TX-to-XPONDER-4-3XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-3-SRG1-SRG1-PP3-TX-to-XPONDER-4-3XPDR-NW3-RX</link-id>
-        <source><source-node>OpenROADM-4-3-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-4-3</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-4-3XPDR-NW3-TX-toOpenROADM-4-3-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-3XPDR-NW4-TX-toOpenROADM-4-3-SRG1-SRG1-PP4-RX</link-id>
-        <source><source-node>XPONDER-4-3</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-3-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-3-SRG1-SRG1-PP4-TX-to-XPONDER-4-3XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-3-SRG1-SRG1-PP4-TX-to-XPONDER-4-3XPDR-NW4-RX</link-id>
-        <source><source-node>OpenROADM-4-3-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-4-3</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-4-3XPDR-NW4-TX-toOpenROADM-4-3-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-4-DEG1-DEG1-CTP-TXtoOpenROADM-4-4-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-4-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-4-DEG2-DEG2-CTP-TXtoOpenROADM-4-4-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-4-DEG1-DEG1-CTP-TXtoOpenROADM-4-4-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-4-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-4-DEG3-DEG3-CTP-TXtoOpenROADM-4-4-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-3XPDR-NW1-TX-toOpenROADM-4-3-SRG1-SRG1-PP1-RX</link-id>
+            <source><source-node>XPONDER-4-3</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-3-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-3-SRG1-SRG1-PP1-TX-to-XPONDER-4-3XPDR-NW1-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-3-SRG1-SRG1-PP1-TX-to-XPONDER-4-3XPDR-NW1-RX</link-id>
+            <source><source-node>OpenROADM-4-3-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-4-3</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-4-3XPDR-NW1-TX-toOpenROADM-4-3-SRG1-SRG1-PP1-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-3XPDR-NW2-TX-toOpenROADM-4-3-SRG1-SRG1-PP2-RX</link-id>
+            <source><source-node>XPONDER-4-3</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-3-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-3-SRG1-SRG1-PP2-TX-to-XPONDER-4-3XPDR-NW2-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-3-SRG1-SRG1-PP2-TX-to-XPONDER-4-3XPDR-NW2-RX</link-id>
+            <source><source-node>OpenROADM-4-3-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-4-3</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-4-3XPDR-NW2-TX-toOpenROADM-4-3-SRG1-SRG1-PP2-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-3XPDR-NW3-TX-toOpenROADM-4-3-SRG1-SRG1-PP3-RX</link-id>
+            <source><source-node>XPONDER-4-3</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-3-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-3-SRG1-SRG1-PP3-TX-to-XPONDER-4-3XPDR-NW3-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-3-SRG1-SRG1-PP3-TX-to-XPONDER-4-3XPDR-NW3-RX</link-id>
+            <source><source-node>OpenROADM-4-3-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-4-3</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-4-3XPDR-NW3-TX-toOpenROADM-4-3-SRG1-SRG1-PP3-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-3XPDR-NW4-TX-toOpenROADM-4-3-SRG1-SRG1-PP4-RX</link-id>
+            <source><source-node>XPONDER-4-3</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-3-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-3-SRG1-SRG1-PP4-TX-to-XPONDER-4-3XPDR-NW4-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-3-SRG1-SRG1-PP4-TX-to-XPONDER-4-3XPDR-NW4-RX</link-id>
+            <source><source-node>OpenROADM-4-3-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-4-3</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-4-3XPDR-NW4-TX-toOpenROADM-4-3-SRG1-SRG1-PP4-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-4-DEG1-DEG1-CTP-TXtoOpenROADM-4-4-DEG2-DEG2-CTP-RX</link-id>
+            <source><source-node>OpenROADM-4-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-4-DEG2-DEG2-CTP-TXtoOpenROADM-4-4-DEG1-DEG1-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-4-DEG1-DEG1-CTP-TXtoOpenROADM-4-4-DEG3-DEG3-CTP-RX</link-id>
+            <source><source-node>OpenROADM-4-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-4-DEG3-DEG3-CTP-TXtoOpenROADM-4-4-DEG1-DEG1-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-4-SRG1-SRG1-CP-TXtoOpenROADM-4-4-DEG1-DEG1-CTP-RX</link-id>
             <source><source-node>OpenROADM-4-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-4-DEG1-DEG1-CTP-TXtoOpenROADM-4-4-SRG1-SRG1-CP-RX</opposite-link>
@@ -3273,14 +4169,14 @@
             <source><source-node>OpenROADM-4-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-4-SRG1-SRG1-CP-TXtoOpenROADM-4-4-DEG1-DEG1-CTP-RX</opposite-link>
             <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-4-DEG2-DEG2-CTP-TXtoOpenROADM-4-4-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-4-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-4-DEG1-DEG1-CTP-TXtoOpenROADM-4-4-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-4-DEG2-DEG2-CTP-TXtoOpenROADM-4-4-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-4-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-4-DEG3-DEG3-CTP-TXtoOpenROADM-4-4-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-4-DEG2-DEG2-CTP-TXtoOpenROADM-4-4-DEG1-DEG1-CTP-RX</link-id>
+            <source><source-node>OpenROADM-4-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-4-DEG1-DEG1-CTP-TXtoOpenROADM-4-4-DEG2-DEG2-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-4-DEG2-DEG2-CTP-TXtoOpenROADM-4-4-DEG3-DEG3-CTP-RX</link-id>
+            <source><source-node>OpenROADM-4-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-4-DEG3-DEG3-CTP-TXtoOpenROADM-4-4-DEG2-DEG2-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-4-SRG1-SRG1-CP-TXtoOpenROADM-4-4-DEG2-DEG2-CTP-RX</link-id>
             <source><source-node>OpenROADM-4-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-4-DEG2-DEG2-CTP-TXtoOpenROADM-4-4-SRG1-SRG1-CP-RX</opposite-link>
@@ -3289,14 +4185,14 @@
             <source><source-node>OpenROADM-4-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-4-SRG1-SRG1-CP-TXtoOpenROADM-4-4-DEG2-DEG2-CTP-RX</opposite-link>
             <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-4-DEG3-DEG3-CTP-TXtoOpenROADM-4-4-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-4-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-4-DEG1-DEG1-CTP-TXtoOpenROADM-4-4-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-4-DEG3-DEG3-CTP-TXtoOpenROADM-4-4-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-4-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-4-DEG2-DEG2-CTP-TXtoOpenROADM-4-4-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-4-DEG3-DEG3-CTP-TXtoOpenROADM-4-4-DEG1-DEG1-CTP-RX</link-id>
+            <source><source-node>OpenROADM-4-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-4-DEG1-DEG1-CTP-TXtoOpenROADM-4-4-DEG3-DEG3-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-4-DEG3-DEG3-CTP-TXtoOpenROADM-4-4-DEG2-DEG2-CTP-RX</link-id>
+            <source><source-node>OpenROADM-4-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-4-DEG2-DEG2-CTP-TXtoOpenROADM-4-4-DEG3-DEG3-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-4-SRG1-SRG1-CP-TXtoOpenROADM-4-4-DEG3-DEG3-CTP-RX</link-id>
             <source><source-node>OpenROADM-4-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-4-DEG3-DEG3-CTP-TXtoOpenROADM-4-4-SRG1-SRG1-CP-RX</opposite-link>
@@ -3305,78 +4201,150 @@
             <source><source-node>OpenROADM-4-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-4-SRG1-SRG1-CP-TXtoOpenROADM-4-4-DEG3-DEG3-CTP-RX</opposite-link>
             <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-4XPDR-NW1-TX-toOpenROADM-4-4-SRG1-SRG1-PP1-RX</link-id>
-        <source><source-node>XPONDER-4-4</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-4-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-4-SRG1-SRG1-PP1-TX-to-XPONDER-4-4XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-4-SRG1-SRG1-PP1-TX-to-XPONDER-4-4XPDR-NW1-RX</link-id>
-        <source><source-node>OpenROADM-4-4-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-4-4</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-4-4XPDR-NW1-TX-toOpenROADM-4-4-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-4XPDR-NW2-TX-toOpenROADM-4-4-SRG1-SRG1-PP2-RX</link-id>
-        <source><source-node>XPONDER-4-4</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-4-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-4-SRG1-SRG1-PP2-TX-to-XPONDER-4-4XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-4-SRG1-SRG1-PP2-TX-to-XPONDER-4-4XPDR-NW2-RX</link-id>
-        <source><source-node>OpenROADM-4-4-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-4-4</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-4-4XPDR-NW2-TX-toOpenROADM-4-4-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-4XPDR-NW3-TX-toOpenROADM-4-4-SRG1-SRG1-PP3-RX</link-id>
-        <source><source-node>XPONDER-4-4</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-4-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-4-SRG1-SRG1-PP3-TX-to-XPONDER-4-4XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-4-SRG1-SRG1-PP3-TX-to-XPONDER-4-4XPDR-NW3-RX</link-id>
-        <source><source-node>OpenROADM-4-4-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-4-4</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-4-4XPDR-NW3-TX-toOpenROADM-4-4-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-4XPDR-NW4-TX-toOpenROADM-4-4-SRG1-SRG1-PP4-RX</link-id>
-        <source><source-node>XPONDER-4-4</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-4-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-4-SRG1-SRG1-PP4-TX-to-XPONDER-4-4XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-4-SRG1-SRG1-PP4-TX-to-XPONDER-4-4XPDR-NW4-RX</link-id>
-        <source><source-node>OpenROADM-4-4-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-4-4</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-4-4XPDR-NW4-TX-toOpenROADM-4-4-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-4-1-DEG1-to-OpenROADM-4-2-DEG1</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-2-DEG1-to-OpenROADM-4-1-DEG1</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-4-1-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-4-2-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-4-2-DEG1-to-OpenROADM-4-1-DEG1</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-1-DEG1-to-OpenROADM-4-2-DEG1</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-4-2-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-4-1-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-4-2-DEG2-to-OpenROADM-4-3-DEG2</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-3-DEG2-to-OpenROADM-4-2-DEG2</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-4-2-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-4-3-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-4-3-DEG2-to-OpenROADM-4-2-DEG2</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-2-DEG2-to-OpenROADM-4-3-DEG2</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-4-3-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-4-2-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-4-3-DEG1-to-OpenROADM-4-4-DEG1</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-4-DEG1-to-OpenROADM-4-3-DEG1</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-4-3-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-4-4-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-4-4-DEG1-to-OpenROADM-4-3-DEG1</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-3-DEG1-to-OpenROADM-4-4-DEG1</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-4-4-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-4-3-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-4-4-DEG2-to-OpenROADM-4-1-DEG2</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-1-DEG2-to-OpenROADM-4-4-DEG2</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-4-4-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-4-1-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-4-1-DEG2-to-OpenROADM-4-4-DEG2</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-4-DEG2-to-OpenROADM-4-1-DEG2</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-4-1-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-4-4-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-DEG1-DEG1-CTP-TXtoOpenROADM-5-1-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-5-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-1-DEG2-DEG2-CTP-TXtoOpenROADM-5-1-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-DEG1-DEG1-CTP-TXtoOpenROADM-5-1-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-5-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-1-DEG3-DEG3-CTP-TXtoOpenROADM-5-1-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-4XPDR-NW1-TX-toOpenROADM-4-4-SRG1-SRG1-PP1-RX</link-id>
+            <source><source-node>XPONDER-4-4</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-4-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-4-SRG1-SRG1-PP1-TX-to-XPONDER-4-4XPDR-NW1-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-4-SRG1-SRG1-PP1-TX-to-XPONDER-4-4XPDR-NW1-RX</link-id>
+            <source><source-node>OpenROADM-4-4-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-4-4</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-4-4XPDR-NW1-TX-toOpenROADM-4-4-SRG1-SRG1-PP1-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-4XPDR-NW2-TX-toOpenROADM-4-4-SRG1-SRG1-PP2-RX</link-id>
+            <source><source-node>XPONDER-4-4</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-4-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-4-SRG1-SRG1-PP2-TX-to-XPONDER-4-4XPDR-NW2-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-4-SRG1-SRG1-PP2-TX-to-XPONDER-4-4XPDR-NW2-RX</link-id>
+            <source><source-node>OpenROADM-4-4-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-4-4</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-4-4XPDR-NW2-TX-toOpenROADM-4-4-SRG1-SRG1-PP2-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-4XPDR-NW3-TX-toOpenROADM-4-4-SRG1-SRG1-PP3-RX</link-id>
+            <source><source-node>XPONDER-4-4</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-4-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-4-SRG1-SRG1-PP3-TX-to-XPONDER-4-4XPDR-NW3-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-4-SRG1-SRG1-PP3-TX-to-XPONDER-4-4XPDR-NW3-RX</link-id>
+            <source><source-node>OpenROADM-4-4-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-4-4</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-4-4XPDR-NW3-TX-toOpenROADM-4-4-SRG1-SRG1-PP3-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-4XPDR-NW4-TX-toOpenROADM-4-4-SRG1-SRG1-PP4-RX</link-id>
+            <source><source-node>XPONDER-4-4</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-4-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-4-SRG1-SRG1-PP4-TX-to-XPONDER-4-4XPDR-NW4-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-4-SRG1-SRG1-PP4-TX-to-XPONDER-4-4XPDR-NW4-RX</link-id>
+            <source><source-node>OpenROADM-4-4-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-4-4</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-4-4XPDR-NW4-TX-toOpenROADM-4-4-SRG1-SRG1-PP4-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-4-1-DEG1-to-OpenROADM-4-2-DEG1</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-2-DEG1-to-OpenROADM-4-1-DEG1</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">40</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-4-1-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-4-2-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>41421</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>41422</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>41423</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>41424</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-4-2-DEG1-to-OpenROADM-4-1-DEG1</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-1-DEG1-to-OpenROADM-4-2-DEG1</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">40</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-4-2-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-4-1-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>42411</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>42412</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>42413</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>42414</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-4-2-DEG2-to-OpenROADM-4-3-DEG2</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-3-DEG2-to-OpenROADM-4-2-DEG2</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">40</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-4-2-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-4-3-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>42431</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>42432</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>42433</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>42434</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-4-3-DEG2-to-OpenROADM-4-2-DEG2</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-2-DEG2-to-OpenROADM-4-3-DEG2</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">40</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-4-3-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-4-2-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>43421</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>43422</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>43423</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>43424</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-4-3-DEG1-to-OpenROADM-4-4-DEG1</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-4-DEG1-to-OpenROADM-4-3-DEG1</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">40</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-4-3-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-4-4-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>43441</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>43442</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>43443</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>43444</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-4-4-DEG1-to-OpenROADM-4-3-DEG1</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-3-DEG1-to-OpenROADM-4-4-DEG1</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">40</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-4-4-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-4-3-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>44431</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>44432</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>44433</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>44434</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-4-4-DEG2-to-OpenROADM-4-1-DEG2</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-1-DEG2-to-OpenROADM-4-4-DEG2</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">40</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-4-4-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-4-1-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>44411</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>44412</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>44413</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>44414</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-4-1-DEG2-to-OpenROADM-4-4-DEG2</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-4-DEG2-to-OpenROADM-4-1-DEG2</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">40</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-4-1-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-4-4-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>41441</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>41442</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>41443</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>41444</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-DEG1-DEG1-CTP-TXtoOpenROADM-5-1-DEG2-DEG2-CTP-RX</link-id>
+            <source><source-node>OpenROADM-5-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-1-DEG2-DEG2-CTP-TXtoOpenROADM-5-1-DEG1-DEG1-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-DEG1-DEG1-CTP-TXtoOpenROADM-5-1-DEG3-DEG3-CTP-RX</link-id>
+            <source><source-node>OpenROADM-5-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-1-DEG3-DEG3-CTP-TXtoOpenROADM-5-1-DEG1-DEG1-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-1-SRG1-SRG1-CP-TXtoOpenROADM-5-1-DEG1-DEG1-CTP-RX</link-id>
             <source><source-node>OpenROADM-5-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-1-DEG1-DEG1-CTP-TXtoOpenROADM-5-1-SRG1-SRG1-CP-RX</opposite-link>
@@ -3385,14 +4353,14 @@
             <source><source-node>OpenROADM-5-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-1-SRG1-SRG1-CP-TXtoOpenROADM-5-1-DEG1-DEG1-CTP-RX</opposite-link>
             <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-DEG2-DEG2-CTP-TXtoOpenROADM-5-1-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-5-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-1-DEG1-DEG1-CTP-TXtoOpenROADM-5-1-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-DEG2-DEG2-CTP-TXtoOpenROADM-5-1-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-5-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-1-DEG3-DEG3-CTP-TXtoOpenROADM-5-1-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-DEG2-DEG2-CTP-TXtoOpenROADM-5-1-DEG1-DEG1-CTP-RX</link-id>
+            <source><source-node>OpenROADM-5-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-1-DEG1-DEG1-CTP-TXtoOpenROADM-5-1-DEG2-DEG2-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-DEG2-DEG2-CTP-TXtoOpenROADM-5-1-DEG3-DEG3-CTP-RX</link-id>
+            <source><source-node>OpenROADM-5-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-1-DEG3-DEG3-CTP-TXtoOpenROADM-5-1-DEG2-DEG2-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-1-SRG1-SRG1-CP-TXtoOpenROADM-5-1-DEG2-DEG2-CTP-RX</link-id>
             <source><source-node>OpenROADM-5-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-1-DEG2-DEG2-CTP-TXtoOpenROADM-5-1-SRG1-SRG1-CP-RX</opposite-link>
@@ -3401,14 +4369,14 @@
             <source><source-node>OpenROADM-5-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-1-SRG1-SRG1-CP-TXtoOpenROADM-5-1-DEG2-DEG2-CTP-RX</opposite-link>
             <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-DEG3-DEG3-CTP-TXtoOpenROADM-5-1-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-5-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-1-DEG1-DEG1-CTP-TXtoOpenROADM-5-1-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-DEG3-DEG3-CTP-TXtoOpenROADM-5-1-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-5-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-1-DEG2-DEG2-CTP-TXtoOpenROADM-5-1-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-DEG3-DEG3-CTP-TXtoOpenROADM-5-1-DEG1-DEG1-CTP-RX</link-id>
+            <source><source-node>OpenROADM-5-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-1-DEG1-DEG1-CTP-TXtoOpenROADM-5-1-DEG3-DEG3-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-DEG3-DEG3-CTP-TXtoOpenROADM-5-1-DEG2-DEG2-CTP-RX</link-id>
+            <source><source-node>OpenROADM-5-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-1-DEG2-DEG2-CTP-TXtoOpenROADM-5-1-DEG3-DEG3-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-1-SRG1-SRG1-CP-TXtoOpenROADM-5-1-DEG3-DEG3-CTP-RX</link-id>
             <source><source-node>OpenROADM-5-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-1-DEG3-DEG3-CTP-TXtoOpenROADM-5-1-SRG1-SRG1-CP-RX</opposite-link>
@@ -3417,46 +4385,46 @@
             <source><source-node>OpenROADM-5-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-1-SRG1-SRG1-CP-TXtoOpenROADM-5-1-DEG3-DEG3-CTP-RX</opposite-link>
             <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-1XPDR-NW1-TX-toOpenROADM-5-1-SRG1-SRG1-PP1-RX</link-id>
-        <source><source-node>XPONDER-5-1</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-1-SRG1-SRG1-PP1-TX-to-XPONDER-5-1XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-SRG1-SRG1-PP1-TX-to-XPONDER-5-1XPDR-NW1-RX</link-id>
-        <source><source-node>OpenROADM-5-1-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-5-1</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-5-1XPDR-NW1-TX-toOpenROADM-5-1-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-1XPDR-NW2-TX-toOpenROADM-5-1-SRG1-SRG1-PP2-RX</link-id>
-        <source><source-node>XPONDER-5-1</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-1-SRG1-SRG1-PP2-TX-to-XPONDER-5-1XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-SRG1-SRG1-PP2-TX-to-XPONDER-5-1XPDR-NW2-RX</link-id>
-        <source><source-node>OpenROADM-5-1-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-5-1</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-5-1XPDR-NW2-TX-toOpenROADM-5-1-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-1XPDR-NW3-TX-toOpenROADM-5-1-SRG1-SRG1-PP3-RX</link-id>
-        <source><source-node>XPONDER-5-1</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-1-SRG1-SRG1-PP3-TX-to-XPONDER-5-1XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-SRG1-SRG1-PP3-TX-to-XPONDER-5-1XPDR-NW3-RX</link-id>
-        <source><source-node>OpenROADM-5-1-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-5-1</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-5-1XPDR-NW3-TX-toOpenROADM-5-1-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-1XPDR-NW4-TX-toOpenROADM-5-1-SRG1-SRG1-PP4-RX</link-id>
-        <source><source-node>XPONDER-5-1</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-1-SRG1-SRG1-PP4-TX-to-XPONDER-5-1XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-SRG1-SRG1-PP4-TX-to-XPONDER-5-1XPDR-NW4-RX</link-id>
-        <source><source-node>OpenROADM-5-1-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-5-1</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-5-1XPDR-NW4-TX-toOpenROADM-5-1-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-DEG1-DEG1-CTP-TXtoOpenROADM-5-2-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-5-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-2-DEG2-DEG2-CTP-TXtoOpenROADM-5-2-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-DEG1-DEG1-CTP-TXtoOpenROADM-5-2-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-5-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-2-DEG3-DEG3-CTP-TXtoOpenROADM-5-2-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-1XPDR-NW1-TX-toOpenROADM-5-1-SRG1-SRG1-PP1-RX</link-id>
+            <source><source-node>XPONDER-5-1</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-1-SRG1-SRG1-PP1-TX-to-XPONDER-5-1XPDR-NW1-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-SRG1-SRG1-PP1-TX-to-XPONDER-5-1XPDR-NW1-RX</link-id>
+            <source><source-node>OpenROADM-5-1-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-5-1</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-5-1XPDR-NW1-TX-toOpenROADM-5-1-SRG1-SRG1-PP1-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-1XPDR-NW2-TX-toOpenROADM-5-1-SRG1-SRG1-PP2-RX</link-id>
+            <source><source-node>XPONDER-5-1</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-1-SRG1-SRG1-PP2-TX-to-XPONDER-5-1XPDR-NW2-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-SRG1-SRG1-PP2-TX-to-XPONDER-5-1XPDR-NW2-RX</link-id>
+            <source><source-node>OpenROADM-5-1-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-5-1</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-5-1XPDR-NW2-TX-toOpenROADM-5-1-SRG1-SRG1-PP2-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-1XPDR-NW3-TX-toOpenROADM-5-1-SRG1-SRG1-PP3-RX</link-id>
+            <source><source-node>XPONDER-5-1</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-1-SRG1-SRG1-PP3-TX-to-XPONDER-5-1XPDR-NW3-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-SRG1-SRG1-PP3-TX-to-XPONDER-5-1XPDR-NW3-RX</link-id>
+            <source><source-node>OpenROADM-5-1-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-5-1</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-5-1XPDR-NW3-TX-toOpenROADM-5-1-SRG1-SRG1-PP3-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-1XPDR-NW4-TX-toOpenROADM-5-1-SRG1-SRG1-PP4-RX</link-id>
+            <source><source-node>XPONDER-5-1</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-1-SRG1-SRG1-PP4-TX-to-XPONDER-5-1XPDR-NW4-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-SRG1-SRG1-PP4-TX-to-XPONDER-5-1XPDR-NW4-RX</link-id>
+            <source><source-node>OpenROADM-5-1-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-5-1</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-5-1XPDR-NW4-TX-toOpenROADM-5-1-SRG1-SRG1-PP4-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-DEG1-DEG1-CTP-TXtoOpenROADM-5-2-DEG2-DEG2-CTP-RX</link-id>
+            <source><source-node>OpenROADM-5-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-2-DEG2-DEG2-CTP-TXtoOpenROADM-5-2-DEG1-DEG1-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-DEG1-DEG1-CTP-TXtoOpenROADM-5-2-DEG3-DEG3-CTP-RX</link-id>
+            <source><source-node>OpenROADM-5-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-2-DEG3-DEG3-CTP-TXtoOpenROADM-5-2-DEG1-DEG1-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-2-SRG1-SRG1-CP-TXtoOpenROADM-5-2-DEG1-DEG1-CTP-RX</link-id>
             <source><source-node>OpenROADM-5-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-2-DEG1-DEG1-CTP-TXtoOpenROADM-5-2-SRG1-SRG1-CP-RX</opposite-link>
@@ -3465,14 +4433,14 @@
             <source><source-node>OpenROADM-5-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-2-SRG1-SRG1-CP-TXtoOpenROADM-5-2-DEG1-DEG1-CTP-RX</opposite-link>
             <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-DEG2-DEG2-CTP-TXtoOpenROADM-5-2-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-5-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-2-DEG1-DEG1-CTP-TXtoOpenROADM-5-2-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-DEG2-DEG2-CTP-TXtoOpenROADM-5-2-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-5-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-2-DEG3-DEG3-CTP-TXtoOpenROADM-5-2-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-DEG2-DEG2-CTP-TXtoOpenROADM-5-2-DEG1-DEG1-CTP-RX</link-id>
+            <source><source-node>OpenROADM-5-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-2-DEG1-DEG1-CTP-TXtoOpenROADM-5-2-DEG2-DEG2-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-DEG2-DEG2-CTP-TXtoOpenROADM-5-2-DEG3-DEG3-CTP-RX</link-id>
+            <source><source-node>OpenROADM-5-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-2-DEG3-DEG3-CTP-TXtoOpenROADM-5-2-DEG2-DEG2-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-2-SRG1-SRG1-CP-TXtoOpenROADM-5-2-DEG2-DEG2-CTP-RX</link-id>
             <source><source-node>OpenROADM-5-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-2-DEG2-DEG2-CTP-TXtoOpenROADM-5-2-SRG1-SRG1-CP-RX</opposite-link>
@@ -3481,14 +4449,14 @@
             <source><source-node>OpenROADM-5-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-2-SRG1-SRG1-CP-TXtoOpenROADM-5-2-DEG2-DEG2-CTP-RX</opposite-link>
             <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-DEG3-DEG3-CTP-TXtoOpenROADM-5-2-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-5-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-2-DEG1-DEG1-CTP-TXtoOpenROADM-5-2-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-DEG3-DEG3-CTP-TXtoOpenROADM-5-2-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-5-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-2-DEG2-DEG2-CTP-TXtoOpenROADM-5-2-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-DEG3-DEG3-CTP-TXtoOpenROADM-5-2-DEG1-DEG1-CTP-RX</link-id>
+            <source><source-node>OpenROADM-5-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-2-DEG1-DEG1-CTP-TXtoOpenROADM-5-2-DEG3-DEG3-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-DEG3-DEG3-CTP-TXtoOpenROADM-5-2-DEG2-DEG2-CTP-RX</link-id>
+            <source><source-node>OpenROADM-5-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-2-DEG2-DEG2-CTP-TXtoOpenROADM-5-2-DEG3-DEG3-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-2-SRG1-SRG1-CP-TXtoOpenROADM-5-2-DEG3-DEG3-CTP-RX</link-id>
             <source><source-node>OpenROADM-5-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-2-DEG3-DEG3-CTP-TXtoOpenROADM-5-2-SRG1-SRG1-CP-RX</opposite-link>
@@ -3497,46 +4465,46 @@
             <source><source-node>OpenROADM-5-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-2-SRG1-SRG1-CP-TXtoOpenROADM-5-2-DEG3-DEG3-CTP-RX</opposite-link>
             <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-2XPDR-NW1-TX-toOpenROADM-5-2-SRG1-SRG1-PP1-RX</link-id>
-        <source><source-node>XPONDER-5-2</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-2-SRG1-SRG1-PP1-TX-to-XPONDER-5-2XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-SRG1-SRG1-PP1-TX-to-XPONDER-5-2XPDR-NW1-RX</link-id>
-        <source><source-node>OpenROADM-5-2-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-5-2</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-5-2XPDR-NW1-TX-toOpenROADM-5-2-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-2XPDR-NW2-TX-toOpenROADM-5-2-SRG1-SRG1-PP2-RX</link-id>
-        <source><source-node>XPONDER-5-2</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-2-SRG1-SRG1-PP2-TX-to-XPONDER-5-2XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-SRG1-SRG1-PP2-TX-to-XPONDER-5-2XPDR-NW2-RX</link-id>
-        <source><source-node>OpenROADM-5-2-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-5-2</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-5-2XPDR-NW2-TX-toOpenROADM-5-2-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-2XPDR-NW3-TX-toOpenROADM-5-2-SRG1-SRG1-PP3-RX</link-id>
-        <source><source-node>XPONDER-5-2</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-2-SRG1-SRG1-PP3-TX-to-XPONDER-5-2XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-SRG1-SRG1-PP3-TX-to-XPONDER-5-2XPDR-NW3-RX</link-id>
-        <source><source-node>OpenROADM-5-2-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-5-2</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-5-2XPDR-NW3-TX-toOpenROADM-5-2-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-2XPDR-NW4-TX-toOpenROADM-5-2-SRG1-SRG1-PP4-RX</link-id>
-        <source><source-node>XPONDER-5-2</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-2-SRG1-SRG1-PP4-TX-to-XPONDER-5-2XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-SRG1-SRG1-PP4-TX-to-XPONDER-5-2XPDR-NW4-RX</link-id>
-        <source><source-node>OpenROADM-5-2-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-5-2</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-5-2XPDR-NW4-TX-toOpenROADM-5-2-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-3-DEG1-DEG1-CTP-TXtoOpenROADM-5-3-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-5-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-3-DEG2-DEG2-CTP-TXtoOpenROADM-5-3-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-3-DEG1-DEG1-CTP-TXtoOpenROADM-5-3-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-5-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-3-DEG3-DEG3-CTP-TXtoOpenROADM-5-3-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-2XPDR-NW1-TX-toOpenROADM-5-2-SRG1-SRG1-PP1-RX</link-id>
+            <source><source-node>XPONDER-5-2</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-2-SRG1-SRG1-PP1-TX-to-XPONDER-5-2XPDR-NW1-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-SRG1-SRG1-PP1-TX-to-XPONDER-5-2XPDR-NW1-RX</link-id>
+            <source><source-node>OpenROADM-5-2-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-5-2</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-5-2XPDR-NW1-TX-toOpenROADM-5-2-SRG1-SRG1-PP1-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-2XPDR-NW2-TX-toOpenROADM-5-2-SRG1-SRG1-PP2-RX</link-id>
+            <source><source-node>XPONDER-5-2</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-2-SRG1-SRG1-PP2-TX-to-XPONDER-5-2XPDR-NW2-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-SRG1-SRG1-PP2-TX-to-XPONDER-5-2XPDR-NW2-RX</link-id>
+            <source><source-node>OpenROADM-5-2-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-5-2</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-5-2XPDR-NW2-TX-toOpenROADM-5-2-SRG1-SRG1-PP2-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-2XPDR-NW3-TX-toOpenROADM-5-2-SRG1-SRG1-PP3-RX</link-id>
+            <source><source-node>XPONDER-5-2</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-2-SRG1-SRG1-PP3-TX-to-XPONDER-5-2XPDR-NW3-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-SRG1-SRG1-PP3-TX-to-XPONDER-5-2XPDR-NW3-RX</link-id>
+            <source><source-node>OpenROADM-5-2-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-5-2</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-5-2XPDR-NW3-TX-toOpenROADM-5-2-SRG1-SRG1-PP3-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-2XPDR-NW4-TX-toOpenROADM-5-2-SRG1-SRG1-PP4-RX</link-id>
+            <source><source-node>XPONDER-5-2</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-2-SRG1-SRG1-PP4-TX-to-XPONDER-5-2XPDR-NW4-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-SRG1-SRG1-PP4-TX-to-XPONDER-5-2XPDR-NW4-RX</link-id>
+            <source><source-node>OpenROADM-5-2-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-5-2</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-5-2XPDR-NW4-TX-toOpenROADM-5-2-SRG1-SRG1-PP4-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-3-DEG1-DEG1-CTP-TXtoOpenROADM-5-3-DEG2-DEG2-CTP-RX</link-id>
+            <source><source-node>OpenROADM-5-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-3-DEG2-DEG2-CTP-TXtoOpenROADM-5-3-DEG1-DEG1-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-3-DEG1-DEG1-CTP-TXtoOpenROADM-5-3-DEG3-DEG3-CTP-RX</link-id>
+            <source><source-node>OpenROADM-5-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-3-DEG3-DEG3-CTP-TXtoOpenROADM-5-3-DEG1-DEG1-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-3-SRG1-SRG1-CP-TXtoOpenROADM-5-3-DEG1-DEG1-CTP-RX</link-id>
             <source><source-node>OpenROADM-5-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-3-DEG1-DEG1-CTP-TXtoOpenROADM-5-3-SRG1-SRG1-CP-RX</opposite-link>
@@ -3545,14 +4513,14 @@
             <source><source-node>OpenROADM-5-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-3-SRG1-SRG1-CP-TXtoOpenROADM-5-3-DEG1-DEG1-CTP-RX</opposite-link>
             <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-3-DEG2-DEG2-CTP-TXtoOpenROADM-5-3-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-5-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-3-DEG1-DEG1-CTP-TXtoOpenROADM-5-3-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-3-DEG2-DEG2-CTP-TXtoOpenROADM-5-3-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-5-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-3-DEG3-DEG3-CTP-TXtoOpenROADM-5-3-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-3-DEG2-DEG2-CTP-TXtoOpenROADM-5-3-DEG1-DEG1-CTP-RX</link-id>
+            <source><source-node>OpenROADM-5-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-3-DEG1-DEG1-CTP-TXtoOpenROADM-5-3-DEG2-DEG2-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-3-DEG2-DEG2-CTP-TXtoOpenROADM-5-3-DEG3-DEG3-CTP-RX</link-id>
+            <source><source-node>OpenROADM-5-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-3-DEG3-DEG3-CTP-TXtoOpenROADM-5-3-DEG2-DEG2-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-3-SRG1-SRG1-CP-TXtoOpenROADM-5-3-DEG2-DEG2-CTP-RX</link-id>
             <source><source-node>OpenROADM-5-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-3-DEG2-DEG2-CTP-TXtoOpenROADM-5-3-SRG1-SRG1-CP-RX</opposite-link>
@@ -3561,14 +4529,14 @@
             <source><source-node>OpenROADM-5-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-3-SRG1-SRG1-CP-TXtoOpenROADM-5-3-DEG2-DEG2-CTP-RX</opposite-link>
             <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-3-DEG3-DEG3-CTP-TXtoOpenROADM-5-3-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-5-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-3-DEG1-DEG1-CTP-TXtoOpenROADM-5-3-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-3-DEG3-DEG3-CTP-TXtoOpenROADM-5-3-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-5-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-3-DEG2-DEG2-CTP-TXtoOpenROADM-5-3-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-3-DEG3-DEG3-CTP-TXtoOpenROADM-5-3-DEG1-DEG1-CTP-RX</link-id>
+            <source><source-node>OpenROADM-5-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-3-DEG1-DEG1-CTP-TXtoOpenROADM-5-3-DEG3-DEG3-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-3-DEG3-DEG3-CTP-TXtoOpenROADM-5-3-DEG2-DEG2-CTP-RX</link-id>
+            <source><source-node>OpenROADM-5-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-3-DEG2-DEG2-CTP-TXtoOpenROADM-5-3-DEG3-DEG3-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-3-SRG1-SRG1-CP-TXtoOpenROADM-5-3-DEG3-DEG3-CTP-RX</link-id>
             <source><source-node>OpenROADM-5-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-3-DEG3-DEG3-CTP-TXtoOpenROADM-5-3-SRG1-SRG1-CP-RX</opposite-link>
@@ -3577,46 +4545,46 @@
             <source><source-node>OpenROADM-5-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-3-SRG1-SRG1-CP-TXtoOpenROADM-5-3-DEG3-DEG3-CTP-RX</opposite-link>
             <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-3XPDR-NW1-TX-toOpenROADM-5-3-SRG1-SRG1-PP1-RX</link-id>
-        <source><source-node>XPONDER-5-3</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-3-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-3-SRG1-SRG1-PP1-TX-to-XPONDER-5-3XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-3-SRG1-SRG1-PP1-TX-to-XPONDER-5-3XPDR-NW1-RX</link-id>
-        <source><source-node>OpenROADM-5-3-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-5-3</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-5-3XPDR-NW1-TX-toOpenROADM-5-3-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-3XPDR-NW2-TX-toOpenROADM-5-3-SRG1-SRG1-PP2-RX</link-id>
-        <source><source-node>XPONDER-5-3</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-3-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-3-SRG1-SRG1-PP2-TX-to-XPONDER-5-3XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-3-SRG1-SRG1-PP2-TX-to-XPONDER-5-3XPDR-NW2-RX</link-id>
-        <source><source-node>OpenROADM-5-3-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-5-3</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-5-3XPDR-NW2-TX-toOpenROADM-5-3-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-3XPDR-NW3-TX-toOpenROADM-5-3-SRG1-SRG1-PP3-RX</link-id>
-        <source><source-node>XPONDER-5-3</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-3-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-3-SRG1-SRG1-PP3-TX-to-XPONDER-5-3XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-3-SRG1-SRG1-PP3-TX-to-XPONDER-5-3XPDR-NW3-RX</link-id>
-        <source><source-node>OpenROADM-5-3-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-5-3</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-5-3XPDR-NW3-TX-toOpenROADM-5-3-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-3XPDR-NW4-TX-toOpenROADM-5-3-SRG1-SRG1-PP4-RX</link-id>
-        <source><source-node>XPONDER-5-3</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-3-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-3-SRG1-SRG1-PP4-TX-to-XPONDER-5-3XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-3-SRG1-SRG1-PP4-TX-to-XPONDER-5-3XPDR-NW4-RX</link-id>
-        <source><source-node>OpenROADM-5-3-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-5-3</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-5-3XPDR-NW4-TX-toOpenROADM-5-3-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-4-DEG1-DEG1-CTP-TXtoOpenROADM-5-4-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-5-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-4-DEG2-DEG2-CTP-TXtoOpenROADM-5-4-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-4-DEG1-DEG1-CTP-TXtoOpenROADM-5-4-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-5-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-4-DEG3-DEG3-CTP-TXtoOpenROADM-5-4-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-3XPDR-NW1-TX-toOpenROADM-5-3-SRG1-SRG1-PP1-RX</link-id>
+            <source><source-node>XPONDER-5-3</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-3-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-3-SRG1-SRG1-PP1-TX-to-XPONDER-5-3XPDR-NW1-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-3-SRG1-SRG1-PP1-TX-to-XPONDER-5-3XPDR-NW1-RX</link-id>
+            <source><source-node>OpenROADM-5-3-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-5-3</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-5-3XPDR-NW1-TX-toOpenROADM-5-3-SRG1-SRG1-PP1-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-3XPDR-NW2-TX-toOpenROADM-5-3-SRG1-SRG1-PP2-RX</link-id>
+            <source><source-node>XPONDER-5-3</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-3-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-3-SRG1-SRG1-PP2-TX-to-XPONDER-5-3XPDR-NW2-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-3-SRG1-SRG1-PP2-TX-to-XPONDER-5-3XPDR-NW2-RX</link-id>
+            <source><source-node>OpenROADM-5-3-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-5-3</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-5-3XPDR-NW2-TX-toOpenROADM-5-3-SRG1-SRG1-PP2-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-3XPDR-NW3-TX-toOpenROADM-5-3-SRG1-SRG1-PP3-RX</link-id>
+            <source><source-node>XPONDER-5-3</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-3-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-3-SRG1-SRG1-PP3-TX-to-XPONDER-5-3XPDR-NW3-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-3-SRG1-SRG1-PP3-TX-to-XPONDER-5-3XPDR-NW3-RX</link-id>
+            <source><source-node>OpenROADM-5-3-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-5-3</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-5-3XPDR-NW3-TX-toOpenROADM-5-3-SRG1-SRG1-PP3-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-3XPDR-NW4-TX-toOpenROADM-5-3-SRG1-SRG1-PP4-RX</link-id>
+            <source><source-node>XPONDER-5-3</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-3-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-3-SRG1-SRG1-PP4-TX-to-XPONDER-5-3XPDR-NW4-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-3-SRG1-SRG1-PP4-TX-to-XPONDER-5-3XPDR-NW4-RX</link-id>
+            <source><source-node>OpenROADM-5-3-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-5-3</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-5-3XPDR-NW4-TX-toOpenROADM-5-3-SRG1-SRG1-PP4-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-4-DEG1-DEG1-CTP-TXtoOpenROADM-5-4-DEG2-DEG2-CTP-RX</link-id>
+            <source><source-node>OpenROADM-5-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-4-DEG2-DEG2-CTP-TXtoOpenROADM-5-4-DEG1-DEG1-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-4-DEG1-DEG1-CTP-TXtoOpenROADM-5-4-DEG3-DEG3-CTP-RX</link-id>
+            <source><source-node>OpenROADM-5-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-4-DEG3-DEG3-CTP-TXtoOpenROADM-5-4-DEG1-DEG1-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-4-SRG1-SRG1-CP-TXtoOpenROADM-5-4-DEG1-DEG1-CTP-RX</link-id>
             <source><source-node>OpenROADM-5-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-4-DEG1-DEG1-CTP-TXtoOpenROADM-5-4-SRG1-SRG1-CP-RX</opposite-link>
@@ -3625,14 +4593,14 @@
             <source><source-node>OpenROADM-5-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-4-SRG1-SRG1-CP-TXtoOpenROADM-5-4-DEG1-DEG1-CTP-RX</opposite-link>
             <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-4-DEG2-DEG2-CTP-TXtoOpenROADM-5-4-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-5-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-4-DEG1-DEG1-CTP-TXtoOpenROADM-5-4-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-4-DEG2-DEG2-CTP-TXtoOpenROADM-5-4-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-5-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-4-DEG3-DEG3-CTP-TXtoOpenROADM-5-4-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-4-DEG2-DEG2-CTP-TXtoOpenROADM-5-4-DEG1-DEG1-CTP-RX</link-id>
+            <source><source-node>OpenROADM-5-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-4-DEG1-DEG1-CTP-TXtoOpenROADM-5-4-DEG2-DEG2-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-4-DEG2-DEG2-CTP-TXtoOpenROADM-5-4-DEG3-DEG3-CTP-RX</link-id>
+            <source><source-node>OpenROADM-5-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-4-DEG3-DEG3-CTP-TXtoOpenROADM-5-4-DEG2-DEG2-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-4-SRG1-SRG1-CP-TXtoOpenROADM-5-4-DEG2-DEG2-CTP-RX</link-id>
             <source><source-node>OpenROADM-5-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-4-DEG2-DEG2-CTP-TXtoOpenROADM-5-4-SRG1-SRG1-CP-RX</opposite-link>
@@ -3641,14 +4609,14 @@
             <source><source-node>OpenROADM-5-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-4-SRG1-SRG1-CP-TXtoOpenROADM-5-4-DEG2-DEG2-CTP-RX</opposite-link>
             <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-4-DEG3-DEG3-CTP-TXtoOpenROADM-5-4-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-5-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-4-DEG1-DEG1-CTP-TXtoOpenROADM-5-4-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-4-DEG3-DEG3-CTP-TXtoOpenROADM-5-4-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-5-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-4-DEG2-DEG2-CTP-TXtoOpenROADM-5-4-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-4-DEG3-DEG3-CTP-TXtoOpenROADM-5-4-DEG1-DEG1-CTP-RX</link-id>
+            <source><source-node>OpenROADM-5-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-4-DEG1-DEG1-CTP-TXtoOpenROADM-5-4-DEG3-DEG3-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-4-DEG3-DEG3-CTP-TXtoOpenROADM-5-4-DEG2-DEG2-CTP-RX</link-id>
+            <source><source-node>OpenROADM-5-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-4-DEG2-DEG2-CTP-TXtoOpenROADM-5-4-DEG3-DEG3-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-4-SRG1-SRG1-CP-TXtoOpenROADM-5-4-DEG3-DEG3-CTP-RX</link-id>
             <source><source-node>OpenROADM-5-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-4-DEG3-DEG3-CTP-TXtoOpenROADM-5-4-SRG1-SRG1-CP-RX</opposite-link>
@@ -3657,149 +4625,401 @@
             <source><source-node>OpenROADM-5-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-4-SRG1-SRG1-CP-TXtoOpenROADM-5-4-DEG3-DEG3-CTP-RX</opposite-link>
             <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-4XPDR-NW1-TX-toOpenROADM-5-4-SRG1-SRG1-PP1-RX</link-id>
-        <source><source-node>XPONDER-5-4</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-4-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-4-SRG1-SRG1-PP1-TX-to-XPONDER-5-4XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-4-SRG1-SRG1-PP1-TX-to-XPONDER-5-4XPDR-NW1-RX</link-id>
-        <source><source-node>OpenROADM-5-4-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-5-4</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-5-4XPDR-NW1-TX-toOpenROADM-5-4-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-4XPDR-NW2-TX-toOpenROADM-5-4-SRG1-SRG1-PP2-RX</link-id>
-        <source><source-node>XPONDER-5-4</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-4-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-4-SRG1-SRG1-PP2-TX-to-XPONDER-5-4XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-4-SRG1-SRG1-PP2-TX-to-XPONDER-5-4XPDR-NW2-RX</link-id>
-        <source><source-node>OpenROADM-5-4-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-5-4</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-5-4XPDR-NW2-TX-toOpenROADM-5-4-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-4XPDR-NW3-TX-toOpenROADM-5-4-SRG1-SRG1-PP3-RX</link-id>
-        <source><source-node>XPONDER-5-4</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-4-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-4-SRG1-SRG1-PP3-TX-to-XPONDER-5-4XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-4-SRG1-SRG1-PP3-TX-to-XPONDER-5-4XPDR-NW3-RX</link-id>
-        <source><source-node>OpenROADM-5-4-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-5-4</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-5-4XPDR-NW3-TX-toOpenROADM-5-4-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-4XPDR-NW4-TX-toOpenROADM-5-4-SRG1-SRG1-PP4-RX</link-id>
-        <source><source-node>XPONDER-5-4</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-4-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-4-SRG1-SRG1-PP4-TX-to-XPONDER-5-4XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-4-SRG1-SRG1-PP4-TX-to-XPONDER-5-4XPDR-NW4-RX</link-id>
-        <source><source-node>OpenROADM-5-4-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-5-4</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-5-4XPDR-NW4-TX-toOpenROADM-5-4-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-5-1-DEG1-to-OpenROADM-5-2-DEG1</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-2-DEG1-to-OpenROADM-5-1-DEG1</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-5-1-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-5-2-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-5-2-DEG1-to-OpenROADM-5-1-DEG1</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-1-DEG1-to-OpenROADM-5-2-DEG1</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-5-2-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-5-1-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-5-2-DEG2-to-OpenROADM-5-3-DEG2</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-3-DEG2-to-OpenROADM-5-2-DEG2</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-5-2-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-5-3-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-5-3-DEG2-to-OpenROADM-5-2-DEG2</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-2-DEG2-to-OpenROADM-5-3-DEG2</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-5-3-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-5-2-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-5-3-DEG1-to-OpenROADM-5-4-DEG1</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-4-DEG1-to-OpenROADM-5-3-DEG1</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-5-3-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-5-4-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-5-4-DEG1-to-OpenROADM-5-3-DEG1</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-3-DEG1-to-OpenROADM-5-4-DEG1</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-5-4-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-5-3-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-5-4-DEG2-to-OpenROADM-5-1-DEG2</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-1-DEG2-to-OpenROADM-5-4-DEG2</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-5-4-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-5-1-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-5-1-DEG2-to-OpenROADM-5-4-DEG2</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-4-DEG2-to-OpenROADM-5-1-DEG2</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-5-1-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-5-4-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-1-4-DEG3-to-OpenROADM-2-1-DEG3</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-1-DEG3-to-OpenROADM-1-4-DEG3</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-1-4-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-2-1-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-2-1-DEG3-to-OpenROADM-1-4-DEG3</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-4-DEG3-to-OpenROADM-2-1-DEG3</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-2-1-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-1-4-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-1-3-DEG3-to-OpenROADM-2-2-DEG3</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-2-DEG3-to-OpenROADM-1-3-DEG3</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-1-3-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-2-2-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-2-2-DEG3-to-OpenROADM-1-3-DEG3</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-3-DEG3-to-OpenROADM-2-2-DEG3</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-2-2-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-1-3-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-2-4-DEG3-to-OpenROADM-3-1-DEG3</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-1-DEG3-to-OpenROADM-2-4-DEG3</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-2-4-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-3-1-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-3-1-DEG3-to-OpenROADM-2-4-DEG3</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-4-DEG3-to-OpenROADM-3-1-DEG3</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-3-1-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-2-4-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-2-3-DEG3-to-OpenROADM-3-2-DEG3</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-2-DEG3-to-OpenROADM-2-3-DEG3</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-2-3-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-3-2-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-3-2-DEG3-to-OpenROADM-2-3-DEG3</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-3-DEG3-to-OpenROADM-3-2-DEG3</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-3-2-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-2-3-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-3-4-DEG3-to-OpenROADM-4-1-DEG3</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-1-DEG3-to-OpenROADM-3-4-DEG3</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-3-4-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-4-1-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-4-1-DEG3-to-OpenROADM-3-4-DEG3</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-4-DEG3-to-OpenROADM-4-1-DEG3</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-4-1-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-3-4-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-3-3-DEG3-to-OpenROADM-4-2-DEG3</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-2-DEG3-to-OpenROADM-3-3-DEG3</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-3-3-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-4-2-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-4-2-DEG3-to-OpenROADM-3-3-DEG3</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-3-DEG3-to-OpenROADM-4-2-DEG3</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-4-2-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-3-3-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-4-4-DEG3-to-OpenROADM-5-1-DEG3</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-1-DEG3-to-OpenROADM-4-4-DEG3</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-4-4-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-5-1-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-5-1-DEG3-to-OpenROADM-4-4-DEG3</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-4-DEG3-to-OpenROADM-5-1-DEG3</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-5-1-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-4-4-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-4-3-DEG3-to-OpenROADM-5-2-DEG3</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-2-DEG3-to-OpenROADM-4-3-DEG3</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">10</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-4-3-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-5-2-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-5-2-DEG3-to-OpenROADM-4-3-DEG3</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-3-DEG3-to-OpenROADM-5-2-DEG3</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">10</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-5-2-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-4-3-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-5-4-DEG3-to-OpenROADM-1-1-DEG3</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-1-DEG3-to-OpenROADM-5-4-DEG3</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-5-4-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-1-1-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-1-1-DEG3-to-OpenROADM-5-4-DEG3</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-4-DEG3-to-OpenROADM-1-1-DEG3</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-1-1-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-5-4-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-5-3-DEG3-to-OpenROADM-1-2-DEG3</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-2-DEG3-to-OpenROADM-5-3-DEG3</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">10</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-5-3-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-1-2-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-1-2-DEG3-to-OpenROADM-5-3-DEG3</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-3-DEG3-to-OpenROADM-1-2-DEG3</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">10</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-1-2-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-5-3-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>    </link>
-</network>
-</data>
\ No newline at end of file
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-4XPDR-NW1-TX-toOpenROADM-5-4-SRG1-SRG1-PP1-RX</link-id>
+            <source><source-node>XPONDER-5-4</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-4-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-4-SRG1-SRG1-PP1-TX-to-XPONDER-5-4XPDR-NW1-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-4-SRG1-SRG1-PP1-TX-to-XPONDER-5-4XPDR-NW1-RX</link-id>
+            <source><source-node>OpenROADM-5-4-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-5-4</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-5-4XPDR-NW1-TX-toOpenROADM-5-4-SRG1-SRG1-PP1-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-4XPDR-NW2-TX-toOpenROADM-5-4-SRG1-SRG1-PP2-RX</link-id>
+            <source><source-node>XPONDER-5-4</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-4-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-4-SRG1-SRG1-PP2-TX-to-XPONDER-5-4XPDR-NW2-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-4-SRG1-SRG1-PP2-TX-to-XPONDER-5-4XPDR-NW2-RX</link-id>
+            <source><source-node>OpenROADM-5-4-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-5-4</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-5-4XPDR-NW2-TX-toOpenROADM-5-4-SRG1-SRG1-PP2-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-4XPDR-NW3-TX-toOpenROADM-5-4-SRG1-SRG1-PP3-RX</link-id>
+            <source><source-node>XPONDER-5-4</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-4-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-4-SRG1-SRG1-PP3-TX-to-XPONDER-5-4XPDR-NW3-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-4-SRG1-SRG1-PP3-TX-to-XPONDER-5-4XPDR-NW3-RX</link-id>
+            <source><source-node>OpenROADM-5-4-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-5-4</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-5-4XPDR-NW3-TX-toOpenROADM-5-4-SRG1-SRG1-PP3-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-4XPDR-NW4-TX-toOpenROADM-5-4-SRG1-SRG1-PP4-RX</link-id>
+            <source><source-node>XPONDER-5-4</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-4-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-4-SRG1-SRG1-PP4-TX-to-XPONDER-5-4XPDR-NW4-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-4-SRG1-SRG1-PP4-TX-to-XPONDER-5-4XPDR-NW4-RX</link-id>
+            <source><source-node>OpenROADM-5-4-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-5-4</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-5-4XPDR-NW4-TX-toOpenROADM-5-4-SRG1-SRG1-PP4-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-5-1-DEG1-to-OpenROADM-5-2-DEG1</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-2-DEG1-to-OpenROADM-5-1-DEG1</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">50</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-5-1-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-5-2-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>51521</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>51522</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>51523</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>51524</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-5-2-DEG1-to-OpenROADM-5-1-DEG1</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-1-DEG1-to-OpenROADM-5-2-DEG1</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">50</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-5-2-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-5-1-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>52511</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>52512</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>52513</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>52514</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-5-2-DEG2-to-OpenROADM-5-3-DEG2</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-3-DEG2-to-OpenROADM-5-2-DEG2</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">50</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-5-2-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-5-3-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>52531</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>52532</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>52533</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>52534</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-5-3-DEG2-to-OpenROADM-5-2-DEG2</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-2-DEG2-to-OpenROADM-5-3-DEG2</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">50</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-5-3-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-5-2-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>53521</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>53522</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>53523</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>53524</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-5-3-DEG1-to-OpenROADM-5-4-DEG1</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-4-DEG1-to-OpenROADM-5-3-DEG1</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">50</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-5-3-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-5-4-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>53541</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>53542</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>53543</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>53544</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-5-4-DEG1-to-OpenROADM-5-3-DEG1</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-3-DEG1-to-OpenROADM-5-4-DEG1</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">50</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-5-4-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-5-3-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>54531</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>54532</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>54533</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>54534</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-5-4-DEG2-to-OpenROADM-5-1-DEG2</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-1-DEG2-to-OpenROADM-5-4-DEG2</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">50</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-5-4-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-5-1-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>54511</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>54512</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>54513</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>54514</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-5-1-DEG2-to-OpenROADM-5-4-DEG2</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-4-DEG2-to-OpenROADM-5-1-DEG2</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">50</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-5-1-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-5-4-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>51541</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>51542</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>51543</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>51544</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-1-4-DEG3-to-OpenROADM-2-1-DEG3</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-1-DEG3-to-OpenROADM-1-4-DEG3</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">10</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-1-4-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-2-1-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>14211</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>14212</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>14213</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>14214</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-2-1-DEG3-to-OpenROADM-1-4-DEG3</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-4-DEG3-to-OpenROADM-2-1-DEG3</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">10</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-2-1-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-1-4-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>21141</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>21142</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>21143</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>21144</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-1-3-DEG3-to-OpenROADM-2-2-DEG3</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-2-DEG3-to-OpenROADM-1-3-DEG3</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">10</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-1-3-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-2-2-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>13221</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>13222</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>13223</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>13224</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-2-2-DEG3-to-OpenROADM-1-3-DEG3</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-3-DEG3-to-OpenROADM-2-2-DEG3</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">10</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-2-2-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-1-3-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>22131</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>22132</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>22133</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>22134</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-2-4-DEG3-to-OpenROADM-3-1-DEG3</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-1-DEG3-to-OpenROADM-2-4-DEG3</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">20</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-2-4-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-3-1-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>24311</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>24312</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>24313</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>24314</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-3-1-DEG3-to-OpenROADM-2-4-DEG3</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-4-DEG3-to-OpenROADM-3-1-DEG3</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">20</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-3-1-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-2-4-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>31241</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>31242</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>31243</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>31244</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-2-3-DEG3-to-OpenROADM-3-2-DEG3</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-2-DEG3-to-OpenROADM-2-3-DEG3</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">20</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-2-3-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-3-2-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>23321</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>23322</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>23323</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>23324</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-3-2-DEG3-to-OpenROADM-2-3-DEG3</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-3-DEG3-to-OpenROADM-3-2-DEG3</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">20</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-3-2-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-2-3-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>32231</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>32232</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>32233</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>32234</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-3-4-DEG3-to-OpenROADM-4-1-DEG3</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-1-DEG3-to-OpenROADM-3-4-DEG3</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">30</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-3-4-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-4-1-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>34411</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>34412</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>34413</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>34414</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-4-1-DEG3-to-OpenROADM-3-4-DEG3</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-4-DEG3-to-OpenROADM-4-1-DEG3</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">30</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-4-1-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-3-4-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>41341</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>41342</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>41343</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>41344</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-3-3-DEG3-to-OpenROADM-4-2-DEG3</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-2-DEG3-to-OpenROADM-3-3-DEG3</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">30</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-3-3-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-4-2-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>33421</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>33422</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>33423</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>33424</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-4-2-DEG3-to-OpenROADM-3-3-DEG3</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-3-DEG3-to-OpenROADM-4-2-DEG3</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">30</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-4-2-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-3-3-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>42331</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>42332</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>42333</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>42334</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-4-4-DEG3-to-OpenROADM-5-1-DEG3</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-1-DEG3-to-OpenROADM-4-4-DEG3</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">40</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-4-4-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-5-1-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>44511</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>44512</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>44513</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>44514</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-5-1-DEG3-to-OpenROADM-4-4-DEG3</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-4-DEG3-to-OpenROADM-5-1-DEG3</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">40</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-5-1-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-4-4-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>51441</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>51442</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>51443</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>51444</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-4-3-DEG3-to-OpenROADM-5-2-DEG3</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-2-DEG3-to-OpenROADM-4-3-DEG3</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">40</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-4-3-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-5-2-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>43521</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>43522</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>43523</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>43524</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-5-2-DEG3-to-OpenROADM-4-3-DEG3</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-3-DEG3-to-OpenROADM-5-2-DEG3</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">40</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-5-2-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-4-3-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>52431</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>52432</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>52433</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>52434</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-5-4-DEG3-to-OpenROADM-1-1-DEG3</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-1-DEG3-to-OpenROADM-5-4-DEG3</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">50</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-5-4-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-1-1-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>54111</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>54112</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>54113</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>54114</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-1-1-DEG3-to-OpenROADM-5-4-DEG3</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-4-DEG3-to-OpenROADM-1-1-DEG3</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">50</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-1-1-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-5-4-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>11541</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>11542</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>11543</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>11544</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-5-3-DEG3-to-OpenROADM-1-2-DEG3</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-2-DEG3-to-OpenROADM-5-3-DEG3</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">50</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-5-3-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-1-2-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>53121</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>53122</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>53123</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>53124</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-1-2-DEG3-to-OpenROADM-5-3-DEG3</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-3-DEG3-to-OpenROADM-1-2-DEG3</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">50</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-1-2-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-5-3-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>12531</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>12532</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>12533</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>12534</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+    </network>
+</data>

diff --git a/pce/src/test/resources/topologyData/NW-simple-topology.xml b/pce/src/test/resources/topologyData/NW-simple-topology.xml
index 4b5c253049405d83bf626946f7360ae34ebe47fc..bacdfd70a8b978fe83bdc3b8cfc0a6fd7cf52124 100644 (file)
--- a/pce/src/test/resources/topologyData/NW-simple-topology.xml
+++ b/pce/src/test/resources/topologyData/NW-simple-topology.xml
@@ -1,1634 +1,2654 @@
 <data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
-<network xmlns="urn:ietf:params:xml:ns:yang:ietf-network">
- <network-id>openroadm-topology</network-id>
-<node>    <node-id>OpenROADM-1-1-DEG1</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
-  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
-    <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>1</index> </available-wavelengths>
-        <available-wavelengths> <index>2</index> </available-wavelengths>
-        <available-wavelengths> <index>3</index> </available-wavelengths>
-        <available-wavelengths> <index>4</index> </available-wavelengths>
-        <available-wavelengths> <index>5</index> </available-wavelengths>
-        <available-wavelengths> <index>6</index> </available-wavelengths>
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-1</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-1-1-DEG2</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
-  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
-    <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>1</index> </available-wavelengths>
-        <available-wavelengths> <index>2</index> </available-wavelengths>
-        <available-wavelengths> <index>3</index> </available-wavelengths>
-        <available-wavelengths> <index>4</index> </available-wavelengths>
-        <available-wavelengths> <index>5</index> </available-wavelengths>
-        <available-wavelengths> <index>6</index> </available-wavelengths>
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-1</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-1-1-DEG3</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
-  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
-    <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>1</index> </available-wavelengths>
-        <available-wavelengths> <index>2</index> </available-wavelengths>
-        <available-wavelengths> <index>3</index> </available-wavelengths>
-        <available-wavelengths> <index>4</index> </available-wavelengths>
-        <available-wavelengths> <index>5</index> </available-wavelengths>
-        <available-wavelengths> <index>6</index> </available-wavelengths>
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-1</node-ref>    </supporting-node></node>
-<node>   <node-id>OpenROADM-1-1-SRG1</node-id>     <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
-        <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-1</node-ref>    </supporting-node>
-        <srg-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>1</index> </available-wavelengths>
-        <available-wavelengths> <index>2</index> </available-wavelengths>
-        <available-wavelengths> <index>3</index> </available-wavelengths>
-        <available-wavelengths> <index>4</index> </available-wavelengths>
-        <available-wavelengths> <index>5</index> </available-wavelengths>
-        <available-wavelengths> <index>6</index> </available-wavelengths>
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>  <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-CP</tp-type>               </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>  <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-CP</tp-type>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP5-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP5-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
-</node>
-<node>        <node-id>XPONDER-1-1</node-id>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-1-1</node-ref>    </supporting-node>
-    <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-1</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-2</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-3</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-4</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW5-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-5</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW5-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW5-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-5</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW5-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-5</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW5</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
-</node>
-<node>    <node-id>OpenROADM-1-2-DEG1</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
-  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
-    <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>1</index> </available-wavelengths>
-        <available-wavelengths> <index>2</index> </available-wavelengths>
-        <available-wavelengths> <index>3</index> </available-wavelengths>
-        <available-wavelengths> <index>4</index> </available-wavelengths>
-        <available-wavelengths> <index>5</index> </available-wavelengths>
-        <available-wavelengths> <index>6</index> </available-wavelengths>
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-2</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-1-2-DEG2</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
-  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
-    <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>1</index> </available-wavelengths>
-        <available-wavelengths> <index>2</index> </available-wavelengths>
-        <available-wavelengths> <index>3</index> </available-wavelengths>
-        <available-wavelengths> <index>4</index> </available-wavelengths>
-        <available-wavelengths> <index>5</index> </available-wavelengths>
-        <available-wavelengths> <index>6</index> </available-wavelengths>
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-2</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-1-2-DEG3</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
-  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
-    <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>1</index> </available-wavelengths>
-        <available-wavelengths> <index>2</index> </available-wavelengths>
-        <available-wavelengths> <index>3</index> </available-wavelengths>
-        <available-wavelengths> <index>4</index> </available-wavelengths>
-        <available-wavelengths> <index>5</index> </available-wavelengths>
-        <available-wavelengths> <index>6</index> </available-wavelengths>
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-2</node-ref>    </supporting-node></node>
-<node>   <node-id>OpenROADM-1-2-SRG1</node-id>     <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
-        <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-2</node-ref>    </supporting-node>
-        <srg-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>1</index> </available-wavelengths>
-        <available-wavelengths> <index>2</index> </available-wavelengths>
-        <available-wavelengths> <index>3</index> </available-wavelengths>
-        <available-wavelengths> <index>4</index> </available-wavelengths>
-        <available-wavelengths> <index>5</index> </available-wavelengths>
-        <available-wavelengths> <index>6</index> </available-wavelengths>
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>  <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-CP</tp-type>               </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>  <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-CP</tp-type>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP5-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP5-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
-</node>
-<node>        <node-id>XPONDER-1-2</node-id>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-1-2</node-ref>    </supporting-node>
-    <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-1</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-2</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-3</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-4</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW5-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-5</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW5-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW5-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-5</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW5-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-5</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW5</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
-</node>
-<node>    <node-id>OpenROADM-2-1-DEG1</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
-  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
-    <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>3</index> </available-wavelengths>
-        <available-wavelengths> <index>4</index> </available-wavelengths>
-        <available-wavelengths> <index>5</index> </available-wavelengths>
-        <available-wavelengths> <index>6</index> </available-wavelengths>
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <available-wavelengths> <index>11</index> </available-wavelengths>
-        <available-wavelengths> <index>12</index> </available-wavelengths>
-        </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-1</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-2-1-DEG2</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
-  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
-    <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>3</index> </available-wavelengths>
-        <available-wavelengths> <index>4</index> </available-wavelengths>
-        <available-wavelengths> <index>5</index> </available-wavelengths>
-        <available-wavelengths> <index>6</index> </available-wavelengths>
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <available-wavelengths> <index>11</index> </available-wavelengths>
-        <available-wavelengths> <index>12</index> </available-wavelengths>
-        </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-1</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-2-1-DEG3</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
-  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
-    <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>3</index> </available-wavelengths>
-        <available-wavelengths> <index>4</index> </available-wavelengths>
-        <available-wavelengths> <index>5</index> </available-wavelengths>
-        <available-wavelengths> <index>6</index> </available-wavelengths>
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <available-wavelengths> <index>11</index> </available-wavelengths>
-        <available-wavelengths> <index>12</index> </available-wavelengths>
-        </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-1</node-ref>    </supporting-node></node>
-<node>   <node-id>OpenROADM-2-1-SRG1</node-id>     <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
-        <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-1</node-ref>    </supporting-node>
-        <srg-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>3</index> </available-wavelengths>
-        <available-wavelengths> <index>4</index> </available-wavelengths>
-        <available-wavelengths> <index>5</index> </available-wavelengths>
-        <available-wavelengths> <index>6</index> </available-wavelengths>
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <available-wavelengths> <index>11</index> </available-wavelengths>
-        <available-wavelengths> <index>12</index> </available-wavelengths>
-        </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>  <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-CP</tp-type>               </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>  <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-CP</tp-type>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP5-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP5-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
-</node>
-<node>        <node-id>XPONDER-2-1</node-id>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-2-1</node-ref>    </supporting-node>
-    <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-1</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-2</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-3</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-4</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW5-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-5</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW5-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW5-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-5</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW5-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-5</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW5</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
-</node>
-<node>    <node-id>OpenROADM-2-2-DEG1</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
-  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
-    <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>3</index> </available-wavelengths>
-        <available-wavelengths> <index>4</index> </available-wavelengths>
-        <available-wavelengths> <index>5</index> </available-wavelengths>
-        <available-wavelengths> <index>6</index> </available-wavelengths>
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <available-wavelengths> <index>11</index> </available-wavelengths>
-        <available-wavelengths> <index>12</index> </available-wavelengths>
-        </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-2</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-2-2-DEG2</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
-  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
-    <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>3</index> </available-wavelengths>
-        <available-wavelengths> <index>4</index> </available-wavelengths>
-        <available-wavelengths> <index>5</index> </available-wavelengths>
-        <available-wavelengths> <index>6</index> </available-wavelengths>
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <available-wavelengths> <index>11</index> </available-wavelengths>
-        <available-wavelengths> <index>12</index> </available-wavelengths>
-        </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-2</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-2-2-DEG3</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
-  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
-    <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>3</index> </available-wavelengths>
-        <available-wavelengths> <index>4</index> </available-wavelengths>
-        <available-wavelengths> <index>5</index> </available-wavelengths>
-        <available-wavelengths> <index>6</index> </available-wavelengths>
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <available-wavelengths> <index>11</index> </available-wavelengths>
-        <available-wavelengths> <index>12</index> </available-wavelengths>
-        </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-2</node-ref>    </supporting-node></node>
-<node>   <node-id>OpenROADM-2-2-SRG1</node-id>     <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
-        <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-2</node-ref>    </supporting-node>
-        <srg-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>3</index> </available-wavelengths>
-        <available-wavelengths> <index>4</index> </available-wavelengths>
-        <available-wavelengths> <index>5</index> </available-wavelengths>
-        <available-wavelengths> <index>6</index> </available-wavelengths>
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <available-wavelengths> <index>11</index> </available-wavelengths>
-        <available-wavelengths> <index>12</index> </available-wavelengths>
-        </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>  <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-CP</tp-type>               </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>  <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-CP</tp-type>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP5-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP5-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
-</node>
-<node>        <node-id>XPONDER-2-2</node-id>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-2-2</node-ref>    </supporting-node>
-    <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-1</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-2</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-3</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-4</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW5-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-5</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW5-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW5-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-5</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW5-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-5</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW5</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
-</node>
-<node>    <node-id>OpenROADM-3-1-DEG1</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
-  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
-    <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>5</index> </available-wavelengths>
-        <available-wavelengths> <index>6</index> </available-wavelengths>
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <available-wavelengths> <index>11</index> </available-wavelengths>
-        <available-wavelengths> <index>12</index> </available-wavelengths>
-        <available-wavelengths> <index>13</index> </available-wavelengths>
-        <available-wavelengths> <index>14</index> </available-wavelengths>
-        </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-1</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-3-1-DEG2</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
-  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
-    <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>5</index> </available-wavelengths>
-        <available-wavelengths> <index>6</index> </available-wavelengths>
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <available-wavelengths> <index>11</index> </available-wavelengths>
-        <available-wavelengths> <index>12</index> </available-wavelengths>
-        <available-wavelengths> <index>13</index> </available-wavelengths>
-        <available-wavelengths> <index>14</index> </available-wavelengths>
-        </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-1</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-3-1-DEG3</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
-  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
-    <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>5</index> </available-wavelengths>
-        <available-wavelengths> <index>6</index> </available-wavelengths>
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <available-wavelengths> <index>11</index> </available-wavelengths>
-        <available-wavelengths> <index>12</index> </available-wavelengths>
-        <available-wavelengths> <index>13</index> </available-wavelengths>
-        <available-wavelengths> <index>14</index> </available-wavelengths>
-        </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-1</node-ref>    </supporting-node></node>
-<node>   <node-id>OpenROADM-3-1-SRG1</node-id>     <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
-        <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-1</node-ref>    </supporting-node>
-        <srg-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>5</index> </available-wavelengths>
-        <available-wavelengths> <index>6</index> </available-wavelengths>
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <available-wavelengths> <index>11</index> </available-wavelengths>
-        <available-wavelengths> <index>12</index> </available-wavelengths>
-        <available-wavelengths> <index>13</index> </available-wavelengths>
-        <available-wavelengths> <index>14</index> </available-wavelengths>
-        </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>  <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-CP</tp-type>               </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>  <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-CP</tp-type>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP5-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP5-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
-</node>
-<node>        <node-id>XPONDER-3-1</node-id>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-3-1</node-ref>    </supporting-node>
-    <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-1</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-2</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-3</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-4</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW5-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-5</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW5-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW5-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-5</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW5-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-5</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW5</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
-</node>
-<node>    <node-id>OpenROADM-3-2-DEG1</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
-  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
-    <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>5</index> </available-wavelengths>
-        <available-wavelengths> <index>6</index> </available-wavelengths>
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <available-wavelengths> <index>11</index> </available-wavelengths>
-        <available-wavelengths> <index>12</index> </available-wavelengths>
-        <available-wavelengths> <index>13</index> </available-wavelengths>
-        <available-wavelengths> <index>14</index> </available-wavelengths>
-        </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-2</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-3-2-DEG2</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
-  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
-    <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>5</index> </available-wavelengths>
-        <available-wavelengths> <index>6</index> </available-wavelengths>
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <available-wavelengths> <index>11</index> </available-wavelengths>
-        <available-wavelengths> <index>12</index> </available-wavelengths>
-        <available-wavelengths> <index>13</index> </available-wavelengths>
-        <available-wavelengths> <index>14</index> </available-wavelengths>
-        </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-2</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-3-2-DEG3</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
-  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
-    <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>5</index> </available-wavelengths>
-        <available-wavelengths> <index>6</index> </available-wavelengths>
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <available-wavelengths> <index>11</index> </available-wavelengths>
-        <available-wavelengths> <index>12</index> </available-wavelengths>
-        <available-wavelengths> <index>13</index> </available-wavelengths>
-        <available-wavelengths> <index>14</index> </available-wavelengths>
-        </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-2</node-ref>    </supporting-node></node>
-<node>   <node-id>OpenROADM-3-2-SRG1</node-id>     <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
-        <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-2</node-ref>    </supporting-node>
-        <srg-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>5</index> </available-wavelengths>
-        <available-wavelengths> <index>6</index> </available-wavelengths>
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <available-wavelengths> <index>11</index> </available-wavelengths>
-        <available-wavelengths> <index>12</index> </available-wavelengths>
-        <available-wavelengths> <index>13</index> </available-wavelengths>
-        <available-wavelengths> <index>14</index> </available-wavelengths>
-        </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>  <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-CP</tp-type>               </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>  <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-CP</tp-type>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP5-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP5-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
-</node>
-<node>        <node-id>XPONDER-3-2</node-id>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-3-2</node-ref>    </supporting-node>
-    <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-1</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-2</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-3</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-4</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW5-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-5</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW5-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW5-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-5</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW5-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-5</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW5</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
-</node>
-<node>    <node-id>OpenROADM-4-1-DEG1</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
-  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
-    <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <available-wavelengths> <index>11</index> </available-wavelengths>
-        <available-wavelengths> <index>12</index> </available-wavelengths>
-        <available-wavelengths> <index>13</index> </available-wavelengths>
-        <available-wavelengths> <index>14</index> </available-wavelengths>
-        <available-wavelengths> <index>15</index> </available-wavelengths>
-        <available-wavelengths> <index>16</index> </available-wavelengths>
-        </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-1</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-4-1-DEG2</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
-  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
-    <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <available-wavelengths> <index>11</index> </available-wavelengths>
-        <available-wavelengths> <index>12</index> </available-wavelengths>
-        <available-wavelengths> <index>13</index> </available-wavelengths>
-        <available-wavelengths> <index>14</index> </available-wavelengths>
-        <available-wavelengths> <index>15</index> </available-wavelengths>
-        <available-wavelengths> <index>16</index> </available-wavelengths>
-        </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-1</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-4-1-DEG3</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
-  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
-    <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <available-wavelengths> <index>11</index> </available-wavelengths>
-        <available-wavelengths> <index>12</index> </available-wavelengths>
-        <available-wavelengths> <index>13</index> </available-wavelengths>
-        <available-wavelengths> <index>14</index> </available-wavelengths>
-        <available-wavelengths> <index>15</index> </available-wavelengths>
-        <available-wavelengths> <index>16</index> </available-wavelengths>
-        </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-1</node-ref>    </supporting-node></node>
-<node>   <node-id>OpenROADM-4-1-SRG1</node-id>     <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
-        <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-1</node-ref>    </supporting-node>
-        <srg-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <available-wavelengths> <index>11</index> </available-wavelengths>
-        <available-wavelengths> <index>12</index> </available-wavelengths>
-        <available-wavelengths> <index>13</index> </available-wavelengths>
-        <available-wavelengths> <index>14</index> </available-wavelengths>
-        <available-wavelengths> <index>15</index> </available-wavelengths>
-        <available-wavelengths> <index>16</index> </available-wavelengths>
-        </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>  <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-CP</tp-type>               </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>  <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-CP</tp-type>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP5-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP5-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
-</node>
-<node>        <node-id>XPONDER-4-1</node-id>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-4-1</node-ref>    </supporting-node>
-    <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-1</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-2</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-3</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-4</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW5-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-5</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW5-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW5-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-5</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW5-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-5</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW5</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
-</node>
-<node>    <node-id>OpenROADM-4-2-DEG1</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
-  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
-    <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <available-wavelengths> <index>11</index> </available-wavelengths>
-        <available-wavelengths> <index>12</index> </available-wavelengths>
-        <available-wavelengths> <index>13</index> </available-wavelengths>
-        <available-wavelengths> <index>14</index> </available-wavelengths>
-        <available-wavelengths> <index>15</index> </available-wavelengths>
-        <available-wavelengths> <index>16</index> </available-wavelengths>
-        </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-2</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-4-2-DEG2</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
-  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
-    <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <available-wavelengths> <index>11</index> </available-wavelengths>
-        <available-wavelengths> <index>12</index> </available-wavelengths>
-        <available-wavelengths> <index>13</index> </available-wavelengths>
-        <available-wavelengths> <index>14</index> </available-wavelengths>
-        <available-wavelengths> <index>15</index> </available-wavelengths>
-        <available-wavelengths> <index>16</index> </available-wavelengths>
-        </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-2</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-4-2-DEG3</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
-  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
-    <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <available-wavelengths> <index>11</index> </available-wavelengths>
-        <available-wavelengths> <index>12</index> </available-wavelengths>
-        <available-wavelengths> <index>13</index> </available-wavelengths>
-        <available-wavelengths> <index>14</index> </available-wavelengths>
-        <available-wavelengths> <index>15</index> </available-wavelengths>
-        <available-wavelengths> <index>16</index> </available-wavelengths>
-        </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-2</node-ref>    </supporting-node></node>
-<node>   <node-id>OpenROADM-4-2-SRG1</node-id>     <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
-        <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-2</node-ref>    </supporting-node>
-        <srg-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <available-wavelengths> <index>11</index> </available-wavelengths>
-        <available-wavelengths> <index>12</index> </available-wavelengths>
-        <available-wavelengths> <index>13</index> </available-wavelengths>
-        <available-wavelengths> <index>14</index> </available-wavelengths>
-        <available-wavelengths> <index>15</index> </available-wavelengths>
-        <available-wavelengths> <index>16</index> </available-wavelengths>
-        </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>  <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-CP</tp-type>               </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>  <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-CP</tp-type>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP5-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP5-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
-</node>
-<node>        <node-id>XPONDER-4-2</node-id>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-4-2</node-ref>    </supporting-node>
-    <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-1</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-2</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-3</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-4</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW5-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-5</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW5-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW5-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-5</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW5-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-5</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW5</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
-</node>
-<node>    <node-id>OpenROADM-5-1-DEG1</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
-  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
-    <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <available-wavelengths> <index>11</index> </available-wavelengths>
-        <available-wavelengths> <index>12</index> </available-wavelengths>
-        <available-wavelengths> <index>13</index> </available-wavelengths>
-        <available-wavelengths> <index>14</index> </available-wavelengths>
-        <available-wavelengths> <index>15</index> </available-wavelengths>
-        <available-wavelengths> <index>16</index> </available-wavelengths>
-        <available-wavelengths> <index>17</index> </available-wavelengths>
-        <available-wavelengths> <index>18</index> </available-wavelengths>
-        </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-1</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-5-1-DEG2</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
-  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
-    <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <available-wavelengths> <index>11</index> </available-wavelengths>
-        <available-wavelengths> <index>12</index> </available-wavelengths>
-        <available-wavelengths> <index>13</index> </available-wavelengths>
-        <available-wavelengths> <index>14</index> </available-wavelengths>
-        <available-wavelengths> <index>15</index> </available-wavelengths>
-        <available-wavelengths> <index>16</index> </available-wavelengths>
-        <available-wavelengths> <index>17</index> </available-wavelengths>
-        <available-wavelengths> <index>18</index> </available-wavelengths>
-        </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-1</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-5-1-DEG3</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
-  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
-    <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <available-wavelengths> <index>11</index> </available-wavelengths>
-        <available-wavelengths> <index>12</index> </available-wavelengths>
-        <available-wavelengths> <index>13</index> </available-wavelengths>
-        <available-wavelengths> <index>14</index> </available-wavelengths>
-        <available-wavelengths> <index>15</index> </available-wavelengths>
-        <available-wavelengths> <index>16</index> </available-wavelengths>
-        <available-wavelengths> <index>17</index> </available-wavelengths>
-        <available-wavelengths> <index>18</index> </available-wavelengths>
-        </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-1</node-ref>    </supporting-node></node>
-<node>   <node-id>OpenROADM-5-1-SRG1</node-id>     <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
-        <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-1</node-ref>    </supporting-node>
-        <srg-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <available-wavelengths> <index>11</index> </available-wavelengths>
-        <available-wavelengths> <index>12</index> </available-wavelengths>
-        <available-wavelengths> <index>13</index> </available-wavelengths>
-        <available-wavelengths> <index>14</index> </available-wavelengths>
-        <available-wavelengths> <index>15</index> </available-wavelengths>
-        <available-wavelengths> <index>16</index> </available-wavelengths>
-        <available-wavelengths> <index>17</index> </available-wavelengths>
-        <available-wavelengths> <index>18</index> </available-wavelengths>
-        </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>  <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-CP</tp-type>               </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>  <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-CP</tp-type>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP5-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP5-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
-</node>
-<node>        <node-id>XPONDER-5-1</node-id>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-5-1</node-ref>    </supporting-node>
-    <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-1</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-2</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-3</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-4</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW5-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-5</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW5-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW5-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-5</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW5-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-5</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW5</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
-</node>
-<node>    <node-id>OpenROADM-5-2-DEG1</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
-  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
-    <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <available-wavelengths> <index>11</index> </available-wavelengths>
-        <available-wavelengths> <index>12</index> </available-wavelengths>
-        <available-wavelengths> <index>13</index> </available-wavelengths>
-        <available-wavelengths> <index>14</index> </available-wavelengths>
-        <available-wavelengths> <index>15</index> </available-wavelengths>
-        <available-wavelengths> <index>16</index> </available-wavelengths>
-        <available-wavelengths> <index>17</index> </available-wavelengths>
-        <available-wavelengths> <index>18</index> </available-wavelengths>
-        </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-2</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-5-2-DEG2</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
-  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
-    <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <available-wavelengths> <index>11</index> </available-wavelengths>
-        <available-wavelengths> <index>12</index> </available-wavelengths>
-        <available-wavelengths> <index>13</index> </available-wavelengths>
-        <available-wavelengths> <index>14</index> </available-wavelengths>
-        <available-wavelengths> <index>15</index> </available-wavelengths>
-        <available-wavelengths> <index>16</index> </available-wavelengths>
-        <available-wavelengths> <index>17</index> </available-wavelengths>
-        <available-wavelengths> <index>18</index> </available-wavelengths>
-        </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-2</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-5-2-DEG3</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
-  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
-    <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <available-wavelengths> <index>11</index> </available-wavelengths>
-        <available-wavelengths> <index>12</index> </available-wavelengths>
-        <available-wavelengths> <index>13</index> </available-wavelengths>
-        <available-wavelengths> <index>14</index> </available-wavelengths>
-        <available-wavelengths> <index>15</index> </available-wavelengths>
-        <available-wavelengths> <index>16</index> </available-wavelengths>
-        <available-wavelengths> <index>17</index> </available-wavelengths>
-        <available-wavelengths> <index>18</index> </available-wavelengths>
-        </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-2</node-ref>    </supporting-node></node>
-<node>   <node-id>OpenROADM-5-2-SRG1</node-id>     <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
-        <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-2</node-ref>    </supporting-node>
-        <srg-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <available-wavelengths> <index>11</index> </available-wavelengths>
-        <available-wavelengths> <index>12</index> </available-wavelengths>
-        <available-wavelengths> <index>13</index> </available-wavelengths>
-        <available-wavelengths> <index>14</index> </available-wavelengths>
-        <available-wavelengths> <index>15</index> </available-wavelengths>
-        <available-wavelengths> <index>16</index> </available-wavelengths>
-        <available-wavelengths> <index>17</index> </available-wavelengths>
-        <available-wavelengths> <index>18</index> </available-wavelengths>
-        </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>  <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-CP</tp-type>               </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>  <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-CP</tp-type>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP5-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP5-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
-</node>
-<node>        <node-id>XPONDER-5-2</node-id>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-5-2</node-ref>    </supporting-node>
-    <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-1</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-2</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-3</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-4</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW5-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-5</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW5-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW5-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-5</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW5-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-5</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW5</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
-</node>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-1-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-1-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-1-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-1-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-1-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-1-DEG3-DEG3-CTP-TXtoOpenROADM-1-1-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+    <network xmlns="urn:ietf:params:xml:ns:yang:ietf-network">
+        <network-id>openroadm-topology</network-id>
+        <node>    <node-id>OpenROADM-1-1-DEG1</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>1</index> </available-wavelengths>
+                <available-wavelengths> <index>2</index> </available-wavelengths>
+                <available-wavelengths> <index>3</index> </available-wavelengths>
+                <available-wavelengths> <index>4</index> </available-wavelengths>
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-1</node-ref>    </supporting-node></node>
+        <node>    <node-id>OpenROADM-1-1-DEG2</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>1</index> </available-wavelengths>
+                <available-wavelengths> <index>2</index> </available-wavelengths>
+                <available-wavelengths> <index>3</index> </available-wavelengths>
+                <available-wavelengths> <index>4</index> </available-wavelengths>
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-1</node-ref>    </supporting-node></node>
+        <node>    <node-id>OpenROADM-1-1-DEG3</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>1</index> </available-wavelengths>
+                <available-wavelengths> <index>2</index> </available-wavelengths>
+                <available-wavelengths> <index>3</index> </available-wavelengths>
+                <available-wavelengths> <index>4</index> </available-wavelengths>
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-1</node-ref>    </supporting-node></node>
+        <node>   <node-id>OpenROADM-1-1-SRG1</node-id>     <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-1</node-ref>    </supporting-node>
+            <srg-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>1</index> </available-wavelengths>
+                <available-wavelengths> <index>2</index> </available-wavelengths>
+                <available-wavelengths> <index>3</index> </available-wavelengths>
+                <available-wavelengths> <index>4</index> </available-wavelengths>
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+            </srg-attributes>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>       <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-CP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>       <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-CP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+        </node>
+        <node>        <node-id>XPONDER-1-1</node-id>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-1-1</node-ref>    </supporting-node>
+            <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-1</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-2</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-3</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-4</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+        </node>
+        <node>    <node-id>OpenROADM-1-2-DEG1</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>1</index> </available-wavelengths>
+                <available-wavelengths> <index>2</index> </available-wavelengths>
+                <available-wavelengths> <index>3</index> </available-wavelengths>
+                <available-wavelengths> <index>4</index> </available-wavelengths>
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-2</node-ref>    </supporting-node></node>
+        <node>    <node-id>OpenROADM-1-2-DEG2</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>1</index> </available-wavelengths>
+                <available-wavelengths> <index>2</index> </available-wavelengths>
+                <available-wavelengths> <index>3</index> </available-wavelengths>
+                <available-wavelengths> <index>4</index> </available-wavelengths>
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-2</node-ref>    </supporting-node></node>
+        <node>    <node-id>OpenROADM-1-2-DEG3</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>1</index> </available-wavelengths>
+                <available-wavelengths> <index>2</index> </available-wavelengths>
+                <available-wavelengths> <index>3</index> </available-wavelengths>
+                <available-wavelengths> <index>4</index> </available-wavelengths>
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-2</node-ref>    </supporting-node></node>
+        <node>   <node-id>OpenROADM-1-2-SRG1</node-id>     <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-2</node-ref>    </supporting-node>
+            <srg-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>1</index> </available-wavelengths>
+                <available-wavelengths> <index>2</index> </available-wavelengths>
+                <available-wavelengths> <index>3</index> </available-wavelengths>
+                <available-wavelengths> <index>4</index> </available-wavelengths>
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+            </srg-attributes>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>       <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-CP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>       <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-CP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+        </node>
+        <node>        <node-id>XPONDER-1-2</node-id>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-1-2</node-ref>    </supporting-node>
+            <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-1</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-2</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-3</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-4</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+        </node>
+        <node>    <node-id>OpenROADM-1-3-DEG1</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>1</index> </available-wavelengths>
+                <available-wavelengths> <index>2</index> </available-wavelengths>
+                <available-wavelengths> <index>3</index> </available-wavelengths>
+                <available-wavelengths> <index>4</index> </available-wavelengths>
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-3</node-ref>    </supporting-node></node>
+        <node>    <node-id>OpenROADM-1-3-DEG2</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>1</index> </available-wavelengths>
+                <available-wavelengths> <index>2</index> </available-wavelengths>
+                <available-wavelengths> <index>3</index> </available-wavelengths>
+                <available-wavelengths> <index>4</index> </available-wavelengths>
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-3</node-ref>    </supporting-node></node>
+        <node>    <node-id>OpenROADM-1-3-DEG3</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>1</index> </available-wavelengths>
+                <available-wavelengths> <index>2</index> </available-wavelengths>
+                <available-wavelengths> <index>3</index> </available-wavelengths>
+                <available-wavelengths> <index>4</index> </available-wavelengths>
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-3</node-ref>    </supporting-node></node>
+        <node>   <node-id>OpenROADM-1-3-SRG1</node-id>     <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-3</node-ref>    </supporting-node>
+            <srg-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>1</index> </available-wavelengths>
+                <available-wavelengths> <index>2</index> </available-wavelengths>
+                <available-wavelengths> <index>3</index> </available-wavelengths>
+                <available-wavelengths> <index>4</index> </available-wavelengths>
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+            </srg-attributes>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>       <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-CP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>       <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-CP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+        </node>
+        <node>        <node-id>XPONDER-1-3</node-id>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-1-3</node-ref>    </supporting-node>
+            <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-1</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-2</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-3</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-4</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+        </node>
+        <node>    <node-id>OpenROADM-1-4-DEG1</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>1</index> </available-wavelengths>
+                <available-wavelengths> <index>2</index> </available-wavelengths>
+                <available-wavelengths> <index>3</index> </available-wavelengths>
+                <available-wavelengths> <index>4</index> </available-wavelengths>
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-4</node-ref>    </supporting-node></node>
+        <node>    <node-id>OpenROADM-1-4-DEG2</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>1</index> </available-wavelengths>
+                <available-wavelengths> <index>2</index> </available-wavelengths>
+                <available-wavelengths> <index>3</index> </available-wavelengths>
+                <available-wavelengths> <index>4</index> </available-wavelengths>
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-4</node-ref>    </supporting-node></node>
+        <node>    <node-id>OpenROADM-1-4-DEG3</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>1</index> </available-wavelengths>
+                <available-wavelengths> <index>2</index> </available-wavelengths>
+                <available-wavelengths> <index>3</index> </available-wavelengths>
+                <available-wavelengths> <index>4</index> </available-wavelengths>
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-4</node-ref>    </supporting-node></node>
+        <node>   <node-id>OpenROADM-1-4-SRG1</node-id>     <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-4</node-ref>    </supporting-node>
+            <srg-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>1</index> </available-wavelengths>
+                <available-wavelengths> <index>2</index> </available-wavelengths>
+                <available-wavelengths> <index>3</index> </available-wavelengths>
+                <available-wavelengths> <index>4</index> </available-wavelengths>
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+            </srg-attributes>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>       <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-CP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>       <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-CP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+        </node>
+        <node>        <node-id>XPONDER-1-4</node-id>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-1-4</node-ref>    </supporting-node>
+            <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-1</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-2</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-3</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-4</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+        </node>
+        <node>    <node-id>OpenROADM-2-1-DEG1</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>3</index> </available-wavelengths>
+                <available-wavelengths> <index>4</index> </available-wavelengths>
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-1</node-ref>    </supporting-node></node>
+        <node>    <node-id>OpenROADM-2-1-DEG2</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>3</index> </available-wavelengths>
+                <available-wavelengths> <index>4</index> </available-wavelengths>
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-1</node-ref>    </supporting-node></node>
+        <node>    <node-id>OpenROADM-2-1-DEG3</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>3</index> </available-wavelengths>
+                <available-wavelengths> <index>4</index> </available-wavelengths>
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-1</node-ref>    </supporting-node></node>
+        <node>   <node-id>OpenROADM-2-1-SRG1</node-id>     <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-1</node-ref>    </supporting-node>
+            <srg-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>3</index> </available-wavelengths>
+                <available-wavelengths> <index>4</index> </available-wavelengths>
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+            </srg-attributes>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>       <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-CP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>       <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-CP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+        </node>
+        <node>        <node-id>XPONDER-2-1</node-id>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-2-1</node-ref>    </supporting-node>
+            <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-1</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-2</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-3</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-4</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+        </node>
+        <node>    <node-id>OpenROADM-2-2-DEG1</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>3</index> </available-wavelengths>
+                <available-wavelengths> <index>4</index> </available-wavelengths>
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-2</node-ref>    </supporting-node></node>
+        <node>    <node-id>OpenROADM-2-2-DEG2</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>3</index> </available-wavelengths>
+                <available-wavelengths> <index>4</index> </available-wavelengths>
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-2</node-ref>    </supporting-node></node>
+        <node>    <node-id>OpenROADM-2-2-DEG3</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>3</index> </available-wavelengths>
+                <available-wavelengths> <index>4</index> </available-wavelengths>
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-2</node-ref>    </supporting-node></node>
+        <node>   <node-id>OpenROADM-2-2-SRG1</node-id>     <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-2</node-ref>    </supporting-node>
+            <srg-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>3</index> </available-wavelengths>
+                <available-wavelengths> <index>4</index> </available-wavelengths>
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+            </srg-attributes>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>       <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-CP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>       <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-CP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+        </node>
+        <node>        <node-id>XPONDER-2-2</node-id>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-2-2</node-ref>    </supporting-node>
+            <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-1</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-2</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-3</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-4</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+        </node>
+        <node>    <node-id>OpenROADM-2-3-DEG1</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>3</index> </available-wavelengths>
+                <available-wavelengths> <index>4</index> </available-wavelengths>
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-3</node-ref>    </supporting-node></node>
+        <node>    <node-id>OpenROADM-2-3-DEG2</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>3</index> </available-wavelengths>
+                <available-wavelengths> <index>4</index> </available-wavelengths>
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-3</node-ref>    </supporting-node></node>
+        <node>    <node-id>OpenROADM-2-3-DEG3</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>3</index> </available-wavelengths>
+                <available-wavelengths> <index>4</index> </available-wavelengths>
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-3</node-ref>    </supporting-node></node>
+        <node>   <node-id>OpenROADM-2-3-SRG1</node-id>     <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-3</node-ref>    </supporting-node>
+            <srg-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>3</index> </available-wavelengths>
+                <available-wavelengths> <index>4</index> </available-wavelengths>
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+            </srg-attributes>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>       <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-CP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>       <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-CP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+        </node>
+        <node>        <node-id>XPONDER-2-3</node-id>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-2-3</node-ref>    </supporting-node>
+            <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-1</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-2</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-3</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-4</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+        </node>
+        <node>    <node-id>OpenROADM-2-4-DEG1</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>3</index> </available-wavelengths>
+                <available-wavelengths> <index>4</index> </available-wavelengths>
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-4</node-ref>    </supporting-node></node>
+        <node>    <node-id>OpenROADM-2-4-DEG2</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>3</index> </available-wavelengths>
+                <available-wavelengths> <index>4</index> </available-wavelengths>
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-4</node-ref>    </supporting-node></node>
+        <node>    <node-id>OpenROADM-2-4-DEG3</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>3</index> </available-wavelengths>
+                <available-wavelengths> <index>4</index> </available-wavelengths>
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-4</node-ref>    </supporting-node></node>
+        <node>   <node-id>OpenROADM-2-4-SRG1</node-id>     <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-4</node-ref>    </supporting-node>
+            <srg-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>3</index> </available-wavelengths>
+                <available-wavelengths> <index>4</index> </available-wavelengths>
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+            </srg-attributes>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>       <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-CP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>       <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-CP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+        </node>
+        <node>        <node-id>XPONDER-2-4</node-id>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-2-4</node-ref>    </supporting-node>
+            <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-1</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-2</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-3</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-4</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+        </node>
+        <node>    <node-id>OpenROADM-3-1-DEG1</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-1</node-ref>    </supporting-node></node>
+        <node>    <node-id>OpenROADM-3-1-DEG2</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-1</node-ref>    </supporting-node></node>
+        <node>    <node-id>OpenROADM-3-1-DEG3</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-1</node-ref>    </supporting-node></node>
+        <node>   <node-id>OpenROADM-3-1-SRG1</node-id>     <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-1</node-ref>    </supporting-node>
+            <srg-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+            </srg-attributes>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>       <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-CP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>       <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-CP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+        </node>
+        <node>        <node-id>XPONDER-3-1</node-id>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-3-1</node-ref>    </supporting-node>
+            <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-1</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-2</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-3</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-4</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+        </node>
+        <node>    <node-id>OpenROADM-3-2-DEG1</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-2</node-ref>    </supporting-node></node>
+        <node>    <node-id>OpenROADM-3-2-DEG2</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-2</node-ref>    </supporting-node></node>
+        <node>    <node-id>OpenROADM-3-2-DEG3</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-2</node-ref>    </supporting-node></node>
+        <node>   <node-id>OpenROADM-3-2-SRG1</node-id>     <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-2</node-ref>    </supporting-node>
+            <srg-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+            </srg-attributes>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>       <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-CP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>       <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-CP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+        </node>
+        <node>        <node-id>XPONDER-3-2</node-id>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-3-2</node-ref>    </supporting-node>
+            <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-1</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-2</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-3</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-4</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+        </node>
+        <node>    <node-id>OpenROADM-3-3-DEG1</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-3</node-ref>    </supporting-node></node>
+        <node>    <node-id>OpenROADM-3-3-DEG2</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-3</node-ref>    </supporting-node></node>
+        <node>    <node-id>OpenROADM-3-3-DEG3</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-3</node-ref>    </supporting-node></node>
+        <node>   <node-id>OpenROADM-3-3-SRG1</node-id>     <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-3</node-ref>    </supporting-node>
+            <srg-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+            </srg-attributes>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>       <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-CP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>       <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-CP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+        </node>
+        <node>        <node-id>XPONDER-3-3</node-id>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-3-3</node-ref>    </supporting-node>
+            <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-1</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-2</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-3</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-4</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+        </node>
+        <node>    <node-id>OpenROADM-3-4-DEG1</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-4</node-ref>    </supporting-node></node>
+        <node>    <node-id>OpenROADM-3-4-DEG2</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-4</node-ref>    </supporting-node></node>
+        <node>    <node-id>OpenROADM-3-4-DEG3</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-4</node-ref>    </supporting-node></node>
+        <node>   <node-id>OpenROADM-3-4-SRG1</node-id>     <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-4</node-ref>    </supporting-node>
+            <srg-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>5</index> </available-wavelengths>
+                <available-wavelengths> <index>6</index> </available-wavelengths>
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+            </srg-attributes>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>       <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-CP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>       <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-CP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+        </node>
+        <node>        <node-id>XPONDER-3-4</node-id>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-3-4</node-ref>    </supporting-node>
+            <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-1</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-2</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-3</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-4</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+        </node>
+        <node>    <node-id>OpenROADM-4-1-DEG1</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+                <available-wavelengths> <index>11</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-1</node-ref>    </supporting-node></node>
+        <node>    <node-id>OpenROADM-4-1-DEG2</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+                <available-wavelengths> <index>11</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-1</node-ref>    </supporting-node></node>
+        <node>    <node-id>OpenROADM-4-1-DEG3</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+                <available-wavelengths> <index>11</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-1</node-ref>    </supporting-node></node>
+        <node>   <node-id>OpenROADM-4-1-SRG1</node-id>     <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-1</node-ref>    </supporting-node>
+            <srg-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+                <available-wavelengths> <index>11</index> </available-wavelengths>
+            </srg-attributes>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>       <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-CP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>       <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-CP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+        </node>
+        <node>        <node-id>XPONDER-4-1</node-id>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-4-1</node-ref>    </supporting-node>
+            <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-1</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-2</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-3</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-4</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+        </node>
+        <node>    <node-id>OpenROADM-4-2-DEG1</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+                <available-wavelengths> <index>11</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-2</node-ref>    </supporting-node></node>
+        <node>    <node-id>OpenROADM-4-2-DEG2</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+                <available-wavelengths> <index>11</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-2</node-ref>    </supporting-node></node>
+        <node>    <node-id>OpenROADM-4-2-DEG3</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+                <available-wavelengths> <index>11</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-2</node-ref>    </supporting-node></node>
+        <node>   <node-id>OpenROADM-4-2-SRG1</node-id>     <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-2</node-ref>    </supporting-node>
+            <srg-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+                <available-wavelengths> <index>11</index> </available-wavelengths>
+            </srg-attributes>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>       <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-CP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>       <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-CP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+        </node>
+        <node>        <node-id>XPONDER-4-2</node-id>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-4-2</node-ref>    </supporting-node>
+            <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-1</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-2</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-3</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-4</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+        </node>
+        <node>    <node-id>OpenROADM-4-3-DEG1</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+                <available-wavelengths> <index>11</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-3</node-ref>    </supporting-node></node>
+        <node>    <node-id>OpenROADM-4-3-DEG2</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+                <available-wavelengths> <index>11</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-3</node-ref>    </supporting-node></node>
+        <node>    <node-id>OpenROADM-4-3-DEG3</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+                <available-wavelengths> <index>11</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-3</node-ref>    </supporting-node></node>
+        <node>   <node-id>OpenROADM-4-3-SRG1</node-id>     <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-3</node-ref>    </supporting-node>
+            <srg-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+                <available-wavelengths> <index>11</index> </available-wavelengths>
+            </srg-attributes>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>       <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-CP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>       <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-CP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+        </node>
+        <node>        <node-id>XPONDER-4-3</node-id>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-4-3</node-ref>    </supporting-node>
+            <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-1</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-2</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-3</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-4</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+        </node>
+        <node>    <node-id>OpenROADM-4-4-DEG1</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+                <available-wavelengths> <index>11</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-4</node-ref>    </supporting-node></node>
+        <node>    <node-id>OpenROADM-4-4-DEG2</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+                <available-wavelengths> <index>11</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-4</node-ref>    </supporting-node></node>
+        <node>    <node-id>OpenROADM-4-4-DEG3</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+                <available-wavelengths> <index>11</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-4</node-ref>    </supporting-node></node>
+        <node>   <node-id>OpenROADM-4-4-SRG1</node-id>     <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-4</node-ref>    </supporting-node>
+            <srg-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>7</index> </available-wavelengths>
+                <available-wavelengths> <index>8</index> </available-wavelengths>
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+                <available-wavelengths> <index>11</index> </available-wavelengths>
+            </srg-attributes>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>       <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-CP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>       <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-CP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+        </node>
+        <node>        <node-id>XPONDER-4-4</node-id>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-4-4</node-ref>    </supporting-node>
+            <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-1</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-2</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-3</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-4</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+        </node>
+        <node>    <node-id>OpenROADM-5-1-DEG1</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+                <available-wavelengths> <index>11</index> </available-wavelengths>
+                <available-wavelengths> <index>12</index> </available-wavelengths>
+                <available-wavelengths> <index>13</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-1</node-ref>    </supporting-node></node>
+        <node>    <node-id>OpenROADM-5-1-DEG2</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+                <available-wavelengths> <index>11</index> </available-wavelengths>
+                <available-wavelengths> <index>12</index> </available-wavelengths>
+                <available-wavelengths> <index>13</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-1</node-ref>    </supporting-node></node>
+        <node>    <node-id>OpenROADM-5-1-DEG3</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+                <available-wavelengths> <index>11</index> </available-wavelengths>
+                <available-wavelengths> <index>12</index> </available-wavelengths>
+                <available-wavelengths> <index>13</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-1</node-ref>    </supporting-node></node>
+        <node>   <node-id>OpenROADM-5-1-SRG1</node-id>     <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-1</node-ref>    </supporting-node>
+            <srg-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+                <available-wavelengths> <index>11</index> </available-wavelengths>
+                <available-wavelengths> <index>12</index> </available-wavelengths>
+                <available-wavelengths> <index>13</index> </available-wavelengths>
+            </srg-attributes>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>       <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-CP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>       <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-CP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+        </node>
+        <node>        <node-id>XPONDER-5-1</node-id>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-5-1</node-ref>    </supporting-node>
+            <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-1</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-2</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-3</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-4</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+        </node>
+        <node>    <node-id>OpenROADM-5-2-DEG1</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+                <available-wavelengths> <index>11</index> </available-wavelengths>
+                <available-wavelengths> <index>12</index> </available-wavelengths>
+                <available-wavelengths> <index>13</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-2</node-ref>    </supporting-node></node>
+        <node>    <node-id>OpenROADM-5-2-DEG2</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+                <available-wavelengths> <index>11</index> </available-wavelengths>
+                <available-wavelengths> <index>12</index> </available-wavelengths>
+                <available-wavelengths> <index>13</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-2</node-ref>    </supporting-node></node>
+        <node>    <node-id>OpenROADM-5-2-DEG3</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+                <available-wavelengths> <index>11</index> </available-wavelengths>
+                <available-wavelengths> <index>12</index> </available-wavelengths>
+                <available-wavelengths> <index>13</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-2</node-ref>    </supporting-node></node>
+        <node>   <node-id>OpenROADM-5-2-SRG1</node-id>     <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-2</node-ref>    </supporting-node>
+            <srg-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+                <available-wavelengths> <index>11</index> </available-wavelengths>
+                <available-wavelengths> <index>12</index> </available-wavelengths>
+                <available-wavelengths> <index>13</index> </available-wavelengths>
+            </srg-attributes>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>       <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-CP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>       <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-CP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+        </node>
+        <node>        <node-id>XPONDER-5-2</node-id>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-5-2</node-ref>    </supporting-node>
+            <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-1</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-2</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-3</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-4</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+        </node>
+        <node>    <node-id>OpenROADM-5-3-DEG1</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+                <available-wavelengths> <index>11</index> </available-wavelengths>
+                <available-wavelengths> <index>12</index> </available-wavelengths>
+                <available-wavelengths> <index>13</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-3</node-ref>    </supporting-node></node>
+        <node>    <node-id>OpenROADM-5-3-DEG2</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+                <available-wavelengths> <index>11</index> </available-wavelengths>
+                <available-wavelengths> <index>12</index> </available-wavelengths>
+                <available-wavelengths> <index>13</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-3</node-ref>    </supporting-node></node>
+        <node>    <node-id>OpenROADM-5-3-DEG3</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+                <available-wavelengths> <index>11</index> </available-wavelengths>
+                <available-wavelengths> <index>12</index> </available-wavelengths>
+                <available-wavelengths> <index>13</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-3</node-ref>    </supporting-node></node>
+        <node>   <node-id>OpenROADM-5-3-SRG1</node-id>     <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-3</node-ref>    </supporting-node>
+            <srg-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+                <available-wavelengths> <index>11</index> </available-wavelengths>
+                <available-wavelengths> <index>12</index> </available-wavelengths>
+                <available-wavelengths> <index>13</index> </available-wavelengths>
+            </srg-attributes>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>       <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-CP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>       <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-CP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+        </node>
+        <node>        <node-id>XPONDER-5-3</node-id>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-5-3</node-ref>    </supporting-node>
+            <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-1</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-2</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-3</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-4</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+        </node>
+        <node>    <node-id>OpenROADM-5-4-DEG1</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+                <available-wavelengths> <index>11</index> </available-wavelengths>
+                <available-wavelengths> <index>12</index> </available-wavelengths>
+                <available-wavelengths> <index>13</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-4</node-ref>    </supporting-node></node>
+        <node>    <node-id>OpenROADM-5-4-DEG2</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+                <available-wavelengths> <index>11</index> </available-wavelengths>
+                <available-wavelengths> <index>12</index> </available-wavelengths>
+                <available-wavelengths> <index>13</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-4</node-ref>    </supporting-node></node>
+        <node>    <node-id>OpenROADM-5-4-DEG3</node-id>
+            <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>    <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>    <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>    <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+            <degree-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+                <available-wavelengths> <index>11</index> </available-wavelengths>
+                <available-wavelengths> <index>12</index> </available-wavelengths>
+                <available-wavelengths> <index>13</index> </available-wavelengths>
+            </degree-attributes>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-4</node-ref>    </supporting-node></node>
+        <node>   <node-id>OpenROADM-5-4-SRG1</node-id>     <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-4</node-ref>    </supporting-node>
+            <srg-attributes xmlns="http://org/openroadm/network/topology">
+                <available-wavelengths> <index>9</index> </available-wavelengths>
+                <available-wavelengths> <index>10</index> </available-wavelengths>
+                <available-wavelengths> <index>11</index> </available-wavelengths>
+                <available-wavelengths> <index>12</index> </available-wavelengths>
+                <available-wavelengths> <index>13</index> </available-wavelengths>
+            </srg-attributes>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>       <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-CP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>       <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-CP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>         <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type>        </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
+                <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type>               </termination-point>
+        </node>
+        <node>        <node-id>XPONDER-5-4</node-id>
+            <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-5-4</node-ref>    </supporting-node>
+            <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-1</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-1</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-2</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-3</tail-equipment-id><wavelength> <index>2</index> </wavelength></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-3</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+                <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
+                    <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
+            <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-4</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+                <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+        </node>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-1-DEG2-DEG2-CTP-RX</link-id>
+            <source><source-node>OpenROADM-1-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-1-DEG1-DEG1-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-1-DEG3-DEG3-CTP-RX</link-id>
+            <source><source-node>OpenROADM-1-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-1-DEG3-DEG3-CTP-TXtoOpenROADM-1-1-DEG1-DEG1-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-1-SRG1-SRG1-CP-TXtoOpenROADM-1-1-DEG1-DEG1-CTP-RX</link-id>
             <source><source-node>OpenROADM-1-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-1-SRG1-SRG1-CP-RX</opposite-link>
@@ -1637,14 +2657,14 @@
             <source><source-node>OpenROADM-1-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-1-SRG1-SRG1-CP-TXtoOpenROADM-1-1-DEG1-DEG1-CTP-RX</opposite-link>
             <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-1-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-1-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-1-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-1-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-1-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-1-DEG3-DEG3-CTP-TXtoOpenROADM-1-1-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-1-DEG1-DEG1-CTP-RX</link-id>
+            <source><source-node>OpenROADM-1-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-1-DEG2-DEG2-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-1-DEG3-DEG3-CTP-RX</link-id>
+            <source><source-node>OpenROADM-1-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-1-DEG3-DEG3-CTP-TXtoOpenROADM-1-1-DEG2-DEG2-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-1-SRG1-SRG1-CP-TXtoOpenROADM-1-1-DEG2-DEG2-CTP-RX</link-id>
             <source><source-node>OpenROADM-1-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-1-SRG1-SRG1-CP-RX</opposite-link>
@@ -1653,14 +2673,14 @@
             <source><source-node>OpenROADM-1-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-1-SRG1-SRG1-CP-TXtoOpenROADM-1-1-DEG2-DEG2-CTP-RX</opposite-link>
             <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-DEG3-DEG3-CTP-TXtoOpenROADM-1-1-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-1-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-1-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-DEG3-DEG3-CTP-TXtoOpenROADM-1-1-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-1-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-1-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-DEG3-DEG3-CTP-TXtoOpenROADM-1-1-DEG1-DEG1-CTP-RX</link-id>
+            <source><source-node>OpenROADM-1-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-1-DEG3-DEG3-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-DEG3-DEG3-CTP-TXtoOpenROADM-1-1-DEG2-DEG2-CTP-RX</link-id>
+            <source><source-node>OpenROADM-1-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-1-DEG3-DEG3-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-1-SRG1-SRG1-CP-TXtoOpenROADM-1-1-DEG3-DEG3-CTP-RX</link-id>
             <source><source-node>OpenROADM-1-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-1-DEG3-DEG3-CTP-TXtoOpenROADM-1-1-SRG1-SRG1-CP-RX</opposite-link>
@@ -1669,54 +2689,46 @@
             <source><source-node>OpenROADM-1-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-1-SRG1-SRG1-CP-TXtoOpenROADM-1-1-DEG3-DEG3-CTP-RX</opposite-link>
             <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-1XPDR-NW1-TX-toOpenROADM-1-1-SRG1-SRG1-PP1-RX</link-id>
-        <source><source-node>XPONDER-1-1</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-1-SRG1-SRG1-PP1-TX-to-XPONDER-1-1XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-SRG1-SRG1-PP1-TX-to-XPONDER-1-1XPDR-NW1-RX</link-id>
-        <source><source-node>OpenROADM-1-1-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-1-1</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-1-1XPDR-NW1-TX-toOpenROADM-1-1-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-1XPDR-NW2-TX-toOpenROADM-1-1-SRG1-SRG1-PP2-RX</link-id>
-        <source><source-node>XPONDER-1-1</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-1-SRG1-SRG1-PP2-TX-to-XPONDER-1-1XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-SRG1-SRG1-PP2-TX-to-XPONDER-1-1XPDR-NW2-RX</link-id>
-        <source><source-node>OpenROADM-1-1-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-1-1</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-1-1XPDR-NW2-TX-toOpenROADM-1-1-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-1XPDR-NW3-TX-toOpenROADM-1-1-SRG1-SRG1-PP3-RX</link-id>
-        <source><source-node>XPONDER-1-1</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-1-SRG1-SRG1-PP3-TX-to-XPONDER-1-1XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-SRG1-SRG1-PP3-TX-to-XPONDER-1-1XPDR-NW3-RX</link-id>
-        <source><source-node>OpenROADM-1-1-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-1-1</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-1-1XPDR-NW3-TX-toOpenROADM-1-1-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-1XPDR-NW4-TX-toOpenROADM-1-1-SRG1-SRG1-PP4-RX</link-id>
-        <source><source-node>XPONDER-1-1</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-1-SRG1-SRG1-PP4-TX-to-XPONDER-1-1XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-SRG1-SRG1-PP4-TX-to-XPONDER-1-1XPDR-NW4-RX</link-id>
-        <source><source-node>OpenROADM-1-1-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-1-1</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-1-1XPDR-NW4-TX-toOpenROADM-1-1-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-1XPDR-NW5-TX-toOpenROADM-1-1-SRG1-SRG1-PP5-RX</link-id>
-        <source><source-node>XPONDER-1-1</source-node><source-tp>XPDR-NW5-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-SRG1</dest-node><dest-tp>SRG1-PP5-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-1-SRG1-SRG1-PP5-TX-to-XPONDER-1-1XPDR-NW5-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-SRG1-SRG1-PP5-TX-to-XPONDER-1-1XPDR-NW5-RX</link-id>
-        <source><source-node>OpenROADM-1-1-SRG1</source-node><source-tp>SRG1-PP5-TX</source-tp></source>        <destination><dest-node>XPONDER-1-1</dest-node><dest-tp>XPDR-NW5-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-1-1XPDR-NW5-TX-toOpenROADM-1-1-SRG1-SRG1-PP5-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-DEG1-DEG1-CTP-TXtoOpenROADM-1-2-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-1-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-2-DEG2-DEG2-CTP-TXtoOpenROADM-1-2-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-DEG1-DEG1-CTP-TXtoOpenROADM-1-2-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-1-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-2-DEG3-DEG3-CTP-TXtoOpenROADM-1-2-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-1XPDR-NW1-TX-toOpenROADM-1-1-SRG1-SRG1-PP1-RX</link-id>
+            <source><source-node>XPONDER-1-1</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-1-SRG1-SRG1-PP1-TX-to-XPONDER-1-1XPDR-NW1-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-SRG1-SRG1-PP1-TX-to-XPONDER-1-1XPDR-NW1-RX</link-id>
+            <source><source-node>OpenROADM-1-1-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-1-1</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-1-1XPDR-NW1-TX-toOpenROADM-1-1-SRG1-SRG1-PP1-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-1XPDR-NW2-TX-toOpenROADM-1-1-SRG1-SRG1-PP2-RX</link-id>
+            <source><source-node>XPONDER-1-1</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-1-SRG1-SRG1-PP2-TX-to-XPONDER-1-1XPDR-NW2-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-SRG1-SRG1-PP2-TX-to-XPONDER-1-1XPDR-NW2-RX</link-id>
+            <source><source-node>OpenROADM-1-1-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-1-1</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-1-1XPDR-NW2-TX-toOpenROADM-1-1-SRG1-SRG1-PP2-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-1XPDR-NW3-TX-toOpenROADM-1-1-SRG1-SRG1-PP3-RX</link-id>
+            <source><source-node>XPONDER-1-1</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-1-SRG1-SRG1-PP3-TX-to-XPONDER-1-1XPDR-NW3-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-SRG1-SRG1-PP3-TX-to-XPONDER-1-1XPDR-NW3-RX</link-id>
+            <source><source-node>OpenROADM-1-1-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-1-1</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-1-1XPDR-NW3-TX-toOpenROADM-1-1-SRG1-SRG1-PP3-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-1XPDR-NW4-TX-toOpenROADM-1-1-SRG1-SRG1-PP4-RX</link-id>
+            <source><source-node>XPONDER-1-1</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-1-SRG1-SRG1-PP4-TX-to-XPONDER-1-1XPDR-NW4-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-SRG1-SRG1-PP4-TX-to-XPONDER-1-1XPDR-NW4-RX</link-id>
+            <source><source-node>OpenROADM-1-1-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-1-1</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-1-1XPDR-NW4-TX-toOpenROADM-1-1-SRG1-SRG1-PP4-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-DEG1-DEG1-CTP-TXtoOpenROADM-1-2-DEG2-DEG2-CTP-RX</link-id>
+            <source><source-node>OpenROADM-1-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-2-DEG2-DEG2-CTP-TXtoOpenROADM-1-2-DEG1-DEG1-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-DEG1-DEG1-CTP-TXtoOpenROADM-1-2-DEG3-DEG3-CTP-RX</link-id>
+            <source><source-node>OpenROADM-1-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-2-DEG3-DEG3-CTP-TXtoOpenROADM-1-2-DEG1-DEG1-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-2-SRG1-SRG1-CP-TXtoOpenROADM-1-2-DEG1-DEG1-CTP-RX</link-id>
             <source><source-node>OpenROADM-1-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-2-DEG1-DEG1-CTP-TXtoOpenROADM-1-2-SRG1-SRG1-CP-RX</opposite-link>
@@ -1725,14 +2737,14 @@
             <source><source-node>OpenROADM-1-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-2-SRG1-SRG1-CP-TXtoOpenROADM-1-2-DEG1-DEG1-CTP-RX</opposite-link>
             <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-DEG2-DEG2-CTP-TXtoOpenROADM-1-2-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-1-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-2-DEG1-DEG1-CTP-TXtoOpenROADM-1-2-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-DEG2-DEG2-CTP-TXtoOpenROADM-1-2-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-1-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-2-DEG3-DEG3-CTP-TXtoOpenROADM-1-2-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-DEG2-DEG2-CTP-TXtoOpenROADM-1-2-DEG1-DEG1-CTP-RX</link-id>
+            <source><source-node>OpenROADM-1-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-2-DEG1-DEG1-CTP-TXtoOpenROADM-1-2-DEG2-DEG2-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-DEG2-DEG2-CTP-TXtoOpenROADM-1-2-DEG3-DEG3-CTP-RX</link-id>
+            <source><source-node>OpenROADM-1-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-2-DEG3-DEG3-CTP-TXtoOpenROADM-1-2-DEG2-DEG2-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-2-SRG1-SRG1-CP-TXtoOpenROADM-1-2-DEG2-DEG2-CTP-RX</link-id>
             <source><source-node>OpenROADM-1-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-2-DEG2-DEG2-CTP-TXtoOpenROADM-1-2-SRG1-SRG1-CP-RX</opposite-link>
@@ -1741,14 +2753,14 @@
             <source><source-node>OpenROADM-1-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-2-SRG1-SRG1-CP-TXtoOpenROADM-1-2-DEG2-DEG2-CTP-RX</opposite-link>
             <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-DEG3-DEG3-CTP-TXtoOpenROADM-1-2-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-1-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-2-DEG1-DEG1-CTP-TXtoOpenROADM-1-2-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-DEG3-DEG3-CTP-TXtoOpenROADM-1-2-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-1-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-2-DEG2-DEG2-CTP-TXtoOpenROADM-1-2-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-DEG3-DEG3-CTP-TXtoOpenROADM-1-2-DEG1-DEG1-CTP-RX</link-id>
+            <source><source-node>OpenROADM-1-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-2-DEG1-DEG1-CTP-TXtoOpenROADM-1-2-DEG3-DEG3-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-DEG3-DEG3-CTP-TXtoOpenROADM-1-2-DEG2-DEG2-CTP-RX</link-id>
+            <source><source-node>OpenROADM-1-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-2-DEG2-DEG2-CTP-TXtoOpenROADM-1-2-DEG3-DEG3-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-2-SRG1-SRG1-CP-TXtoOpenROADM-1-2-DEG3-DEG3-CTP-RX</link-id>
             <source><source-node>OpenROADM-1-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-2-DEG3-DEG3-CTP-TXtoOpenROADM-1-2-SRG1-SRG1-CP-RX</opposite-link>
@@ -1757,70 +2769,310 @@
             <source><source-node>OpenROADM-1-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-2-SRG1-SRG1-CP-TXtoOpenROADM-1-2-DEG3-DEG3-CTP-RX</opposite-link>
             <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-2XPDR-NW1-TX-toOpenROADM-1-2-SRG1-SRG1-PP1-RX</link-id>
-        <source><source-node>XPONDER-1-2</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-2-SRG1-SRG1-PP1-TX-to-XPONDER-1-2XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-SRG1-SRG1-PP1-TX-to-XPONDER-1-2XPDR-NW1-RX</link-id>
-        <source><source-node>OpenROADM-1-2-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-1-2</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-1-2XPDR-NW1-TX-toOpenROADM-1-2-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-2XPDR-NW2-TX-toOpenROADM-1-2-SRG1-SRG1-PP2-RX</link-id>
-        <source><source-node>XPONDER-1-2</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-2-SRG1-SRG1-PP2-TX-to-XPONDER-1-2XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-SRG1-SRG1-PP2-TX-to-XPONDER-1-2XPDR-NW2-RX</link-id>
-        <source><source-node>OpenROADM-1-2-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-1-2</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-1-2XPDR-NW2-TX-toOpenROADM-1-2-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-2XPDR-NW3-TX-toOpenROADM-1-2-SRG1-SRG1-PP3-RX</link-id>
-        <source><source-node>XPONDER-1-2</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-2-SRG1-SRG1-PP3-TX-to-XPONDER-1-2XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-SRG1-SRG1-PP3-TX-to-XPONDER-1-2XPDR-NW3-RX</link-id>
-        <source><source-node>OpenROADM-1-2-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-1-2</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-1-2XPDR-NW3-TX-toOpenROADM-1-2-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-2XPDR-NW4-TX-toOpenROADM-1-2-SRG1-SRG1-PP4-RX</link-id>
-        <source><source-node>XPONDER-1-2</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-2-SRG1-SRG1-PP4-TX-to-XPONDER-1-2XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-SRG1-SRG1-PP4-TX-to-XPONDER-1-2XPDR-NW4-RX</link-id>
-        <source><source-node>OpenROADM-1-2-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-1-2</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-1-2XPDR-NW4-TX-toOpenROADM-1-2-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-2XPDR-NW5-TX-toOpenROADM-1-2-SRG1-SRG1-PP5-RX</link-id>
-        <source><source-node>XPONDER-1-2</source-node><source-tp>XPDR-NW5-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-SRG1</dest-node><dest-tp>SRG1-PP5-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-2-SRG1-SRG1-PP5-TX-to-XPONDER-1-2XPDR-NW5-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-SRG1-SRG1-PP5-TX-to-XPONDER-1-2XPDR-NW5-RX</link-id>
-        <source><source-node>OpenROADM-1-2-SRG1</source-node><source-tp>SRG1-PP5-TX</source-tp></source>        <destination><dest-node>XPONDER-1-2</dest-node><dest-tp>XPDR-NW5-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-1-2XPDR-NW5-TX-toOpenROADM-1-2-SRG1-SRG1-PP5-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-1-1-DEG1-to-OpenROADM-1-2-DEG1</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-2-DEG1-to-OpenROADM-1-1-DEG1</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-1-1-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-1-2-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-1-2-DEG1-to-OpenROADM-1-1-DEG1</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-1-DEG1-to-OpenROADM-1-2-DEG1</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-1-2-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-1-1-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-1-2-DEG2-to-OpenROADM-1-1-DEG2</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-1-DEG2-to-OpenROADM-1-2-DEG2</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-1-2-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-1-1-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-1-1-DEG2-to-OpenROADM-1-2-DEG2</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-2-DEG2-to-OpenROADM-1-1-DEG2</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-1-1-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-1-2-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-DEG1-DEG1-CTP-TXtoOpenROADM-2-1-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-2-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-1-DEG2-DEG2-CTP-TXtoOpenROADM-2-1-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-DEG1-DEG1-CTP-TXtoOpenROADM-2-1-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-2-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-1-DEG3-DEG3-CTP-TXtoOpenROADM-2-1-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-2XPDR-NW1-TX-toOpenROADM-1-2-SRG1-SRG1-PP1-RX</link-id>
+            <source><source-node>XPONDER-1-2</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-2-SRG1-SRG1-PP1-TX-to-XPONDER-1-2XPDR-NW1-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-SRG1-SRG1-PP1-TX-to-XPONDER-1-2XPDR-NW1-RX</link-id>
+            <source><source-node>OpenROADM-1-2-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-1-2</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-1-2XPDR-NW1-TX-toOpenROADM-1-2-SRG1-SRG1-PP1-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-2XPDR-NW2-TX-toOpenROADM-1-2-SRG1-SRG1-PP2-RX</link-id>
+            <source><source-node>XPONDER-1-2</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-2-SRG1-SRG1-PP2-TX-to-XPONDER-1-2XPDR-NW2-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-SRG1-SRG1-PP2-TX-to-XPONDER-1-2XPDR-NW2-RX</link-id>
+            <source><source-node>OpenROADM-1-2-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-1-2</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-1-2XPDR-NW2-TX-toOpenROADM-1-2-SRG1-SRG1-PP2-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-2XPDR-NW3-TX-toOpenROADM-1-2-SRG1-SRG1-PP3-RX</link-id>
+            <source><source-node>XPONDER-1-2</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-2-SRG1-SRG1-PP3-TX-to-XPONDER-1-2XPDR-NW3-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-SRG1-SRG1-PP3-TX-to-XPONDER-1-2XPDR-NW3-RX</link-id>
+            <source><source-node>OpenROADM-1-2-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-1-2</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-1-2XPDR-NW3-TX-toOpenROADM-1-2-SRG1-SRG1-PP3-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-2XPDR-NW4-TX-toOpenROADM-1-2-SRG1-SRG1-PP4-RX</link-id>
+            <source><source-node>XPONDER-1-2</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-2-SRG1-SRG1-PP4-TX-to-XPONDER-1-2XPDR-NW4-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-SRG1-SRG1-PP4-TX-to-XPONDER-1-2XPDR-NW4-RX</link-id>
+            <source><source-node>OpenROADM-1-2-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-1-2</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-1-2XPDR-NW4-TX-toOpenROADM-1-2-SRG1-SRG1-PP4-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-3-DEG1-DEG1-CTP-TXtoOpenROADM-1-3-DEG2-DEG2-CTP-RX</link-id>
+            <source><source-node>OpenROADM-1-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-3-DEG2-DEG2-CTP-TXtoOpenROADM-1-3-DEG1-DEG1-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-3-DEG1-DEG1-CTP-TXtoOpenROADM-1-3-DEG3-DEG3-CTP-RX</link-id>
+            <source><source-node>OpenROADM-1-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-3-DEG3-DEG3-CTP-TXtoOpenROADM-1-3-DEG1-DEG1-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-3-SRG1-SRG1-CP-TXtoOpenROADM-1-3-DEG1-DEG1-CTP-RX</link-id>
+            <source><source-node>OpenROADM-1-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-3-DEG1-DEG1-CTP-TXtoOpenROADM-1-3-SRG1-SRG1-CP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-3-DEG1-DEG1-CTP-TXtoOpenROADM-1-3-SRG1-SRG1-CP-RX</link-id>
+            <source><source-node>OpenROADM-1-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-3-SRG1-SRG1-CP-TXtoOpenROADM-1-3-DEG1-DEG1-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-3-DEG2-DEG2-CTP-TXtoOpenROADM-1-3-DEG1-DEG1-CTP-RX</link-id>
+            <source><source-node>OpenROADM-1-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-3-DEG1-DEG1-CTP-TXtoOpenROADM-1-3-DEG2-DEG2-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-3-DEG2-DEG2-CTP-TXtoOpenROADM-1-3-DEG3-DEG3-CTP-RX</link-id>
+            <source><source-node>OpenROADM-1-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-3-DEG3-DEG3-CTP-TXtoOpenROADM-1-3-DEG2-DEG2-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-3-SRG1-SRG1-CP-TXtoOpenROADM-1-3-DEG2-DEG2-CTP-RX</link-id>
+            <source><source-node>OpenROADM-1-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-3-DEG2-DEG2-CTP-TXtoOpenROADM-1-3-SRG1-SRG1-CP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-3-DEG2-DEG2-CTP-TXtoOpenROADM-1-3-SRG1-SRG1-CP-RX</link-id>
+            <source><source-node>OpenROADM-1-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-3-SRG1-SRG1-CP-TXtoOpenROADM-1-3-DEG2-DEG2-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-3-DEG3-DEG3-CTP-TXtoOpenROADM-1-3-DEG1-DEG1-CTP-RX</link-id>
+            <source><source-node>OpenROADM-1-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-3-DEG1-DEG1-CTP-TXtoOpenROADM-1-3-DEG3-DEG3-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-3-DEG3-DEG3-CTP-TXtoOpenROADM-1-3-DEG2-DEG2-CTP-RX</link-id>
+            <source><source-node>OpenROADM-1-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-3-DEG2-DEG2-CTP-TXtoOpenROADM-1-3-DEG3-DEG3-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-3-SRG1-SRG1-CP-TXtoOpenROADM-1-3-DEG3-DEG3-CTP-RX</link-id>
+            <source><source-node>OpenROADM-1-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-3-DEG3-DEG3-CTP-TXtoOpenROADM-1-3-SRG1-SRG1-CP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-3-DEG3-DEG3-CTP-TXtoOpenROADM-1-3-SRG1-SRG1-CP-RX</link-id>
+            <source><source-node>OpenROADM-1-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-3-SRG1-SRG1-CP-TXtoOpenROADM-1-3-DEG3-DEG3-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-3XPDR-NW1-TX-toOpenROADM-1-3-SRG1-SRG1-PP1-RX</link-id>
+            <source><source-node>XPONDER-1-3</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-3-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-3-SRG1-SRG1-PP1-TX-to-XPONDER-1-3XPDR-NW1-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-3-SRG1-SRG1-PP1-TX-to-XPONDER-1-3XPDR-NW1-RX</link-id>
+            <source><source-node>OpenROADM-1-3-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-1-3</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-1-3XPDR-NW1-TX-toOpenROADM-1-3-SRG1-SRG1-PP1-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-3XPDR-NW2-TX-toOpenROADM-1-3-SRG1-SRG1-PP2-RX</link-id>
+            <source><source-node>XPONDER-1-3</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-3-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-3-SRG1-SRG1-PP2-TX-to-XPONDER-1-3XPDR-NW2-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-3-SRG1-SRG1-PP2-TX-to-XPONDER-1-3XPDR-NW2-RX</link-id>
+            <source><source-node>OpenROADM-1-3-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-1-3</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-1-3XPDR-NW2-TX-toOpenROADM-1-3-SRG1-SRG1-PP2-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-3XPDR-NW3-TX-toOpenROADM-1-3-SRG1-SRG1-PP3-RX</link-id>
+            <source><source-node>XPONDER-1-3</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-3-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-3-SRG1-SRG1-PP3-TX-to-XPONDER-1-3XPDR-NW3-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-3-SRG1-SRG1-PP3-TX-to-XPONDER-1-3XPDR-NW3-RX</link-id>
+            <source><source-node>OpenROADM-1-3-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-1-3</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-1-3XPDR-NW3-TX-toOpenROADM-1-3-SRG1-SRG1-PP3-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-3XPDR-NW4-TX-toOpenROADM-1-3-SRG1-SRG1-PP4-RX</link-id>
+            <source><source-node>XPONDER-1-3</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-3-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-3-SRG1-SRG1-PP4-TX-to-XPONDER-1-3XPDR-NW4-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-3-SRG1-SRG1-PP4-TX-to-XPONDER-1-3XPDR-NW4-RX</link-id>
+            <source><source-node>OpenROADM-1-3-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-1-3</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-1-3XPDR-NW4-TX-toOpenROADM-1-3-SRG1-SRG1-PP4-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-4-DEG1-DEG1-CTP-TXtoOpenROADM-1-4-DEG2-DEG2-CTP-RX</link-id>
+            <source><source-node>OpenROADM-1-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-4-DEG2-DEG2-CTP-TXtoOpenROADM-1-4-DEG1-DEG1-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-4-DEG1-DEG1-CTP-TXtoOpenROADM-1-4-DEG3-DEG3-CTP-RX</link-id>
+            <source><source-node>OpenROADM-1-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-4-DEG3-DEG3-CTP-TXtoOpenROADM-1-4-DEG1-DEG1-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-4-SRG1-SRG1-CP-TXtoOpenROADM-1-4-DEG1-DEG1-CTP-RX</link-id>
+            <source><source-node>OpenROADM-1-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-4-DEG1-DEG1-CTP-TXtoOpenROADM-1-4-SRG1-SRG1-CP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-4-DEG1-DEG1-CTP-TXtoOpenROADM-1-4-SRG1-SRG1-CP-RX</link-id>
+            <source><source-node>OpenROADM-1-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-4-SRG1-SRG1-CP-TXtoOpenROADM-1-4-DEG1-DEG1-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-4-DEG2-DEG2-CTP-TXtoOpenROADM-1-4-DEG1-DEG1-CTP-RX</link-id>
+            <source><source-node>OpenROADM-1-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-4-DEG1-DEG1-CTP-TXtoOpenROADM-1-4-DEG2-DEG2-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-4-DEG2-DEG2-CTP-TXtoOpenROADM-1-4-DEG3-DEG3-CTP-RX</link-id>
+            <source><source-node>OpenROADM-1-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-4-DEG3-DEG3-CTP-TXtoOpenROADM-1-4-DEG2-DEG2-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-4-SRG1-SRG1-CP-TXtoOpenROADM-1-4-DEG2-DEG2-CTP-RX</link-id>
+            <source><source-node>OpenROADM-1-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-4-DEG2-DEG2-CTP-TXtoOpenROADM-1-4-SRG1-SRG1-CP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-4-DEG2-DEG2-CTP-TXtoOpenROADM-1-4-SRG1-SRG1-CP-RX</link-id>
+            <source><source-node>OpenROADM-1-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-4-SRG1-SRG1-CP-TXtoOpenROADM-1-4-DEG2-DEG2-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-4-DEG3-DEG3-CTP-TXtoOpenROADM-1-4-DEG1-DEG1-CTP-RX</link-id>
+            <source><source-node>OpenROADM-1-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-4-DEG1-DEG1-CTP-TXtoOpenROADM-1-4-DEG3-DEG3-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-4-DEG3-DEG3-CTP-TXtoOpenROADM-1-4-DEG2-DEG2-CTP-RX</link-id>
+            <source><source-node>OpenROADM-1-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-4-DEG2-DEG2-CTP-TXtoOpenROADM-1-4-DEG3-DEG3-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-4-SRG1-SRG1-CP-TXtoOpenROADM-1-4-DEG3-DEG3-CTP-RX</link-id>
+            <source><source-node>OpenROADM-1-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-4-DEG3-DEG3-CTP-TXtoOpenROADM-1-4-SRG1-SRG1-CP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-4-DEG3-DEG3-CTP-TXtoOpenROADM-1-4-SRG1-SRG1-CP-RX</link-id>
+            <source><source-node>OpenROADM-1-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-4-SRG1-SRG1-CP-TXtoOpenROADM-1-4-DEG3-DEG3-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-4XPDR-NW1-TX-toOpenROADM-1-4-SRG1-SRG1-PP1-RX</link-id>
+            <source><source-node>XPONDER-1-4</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-4-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-4-SRG1-SRG1-PP1-TX-to-XPONDER-1-4XPDR-NW1-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-4-SRG1-SRG1-PP1-TX-to-XPONDER-1-4XPDR-NW1-RX</link-id>
+            <source><source-node>OpenROADM-1-4-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-1-4</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-1-4XPDR-NW1-TX-toOpenROADM-1-4-SRG1-SRG1-PP1-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-4XPDR-NW2-TX-toOpenROADM-1-4-SRG1-SRG1-PP2-RX</link-id>
+            <source><source-node>XPONDER-1-4</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-4-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-4-SRG1-SRG1-PP2-TX-to-XPONDER-1-4XPDR-NW2-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-4-SRG1-SRG1-PP2-TX-to-XPONDER-1-4XPDR-NW2-RX</link-id>
+            <source><source-node>OpenROADM-1-4-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-1-4</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-1-4XPDR-NW2-TX-toOpenROADM-1-4-SRG1-SRG1-PP2-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-4XPDR-NW3-TX-toOpenROADM-1-4-SRG1-SRG1-PP3-RX</link-id>
+            <source><source-node>XPONDER-1-4</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-4-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-4-SRG1-SRG1-PP3-TX-to-XPONDER-1-4XPDR-NW3-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-4-SRG1-SRG1-PP3-TX-to-XPONDER-1-4XPDR-NW3-RX</link-id>
+            <source><source-node>OpenROADM-1-4-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-1-4</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-1-4XPDR-NW3-TX-toOpenROADM-1-4-SRG1-SRG1-PP3-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-4XPDR-NW4-TX-toOpenROADM-1-4-SRG1-SRG1-PP4-RX</link-id>
+            <source><source-node>XPONDER-1-4</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-4-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-4-SRG1-SRG1-PP4-TX-to-XPONDER-1-4XPDR-NW4-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-4-SRG1-SRG1-PP4-TX-to-XPONDER-1-4XPDR-NW4-RX</link-id>
+            <source><source-node>OpenROADM-1-4-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-1-4</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-1-4XPDR-NW4-TX-toOpenROADM-1-4-SRG1-SRG1-PP4-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-1-1-DEG1-to-OpenROADM-1-2-DEG1</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-2-DEG1-to-OpenROADM-1-1-DEG1</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">10</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-1-1-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-1-2-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>11121</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>11122</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>11123</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>11124</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-1-2-DEG1-to-OpenROADM-1-1-DEG1</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-1-DEG1-to-OpenROADM-1-2-DEG1</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">10</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-1-2-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-1-1-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>12111</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>12112</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>12113</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>12114</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-1-2-DEG2-to-OpenROADM-1-3-DEG2</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-3-DEG2-to-OpenROADM-1-2-DEG2</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">10</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-1-2-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-1-3-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>12131</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>12132</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>12133</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>12134</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-1-3-DEG2-to-OpenROADM-1-2-DEG2</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-2-DEG2-to-OpenROADM-1-3-DEG2</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">10</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-1-3-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-1-2-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>13121</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>13122</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>13123</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>13124</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-1-3-DEG1-to-OpenROADM-1-4-DEG1</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-4-DEG1-to-OpenROADM-1-3-DEG1</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">10</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-1-3-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-1-4-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>13141</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>13142</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>13143</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>13144</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-1-4-DEG1-to-OpenROADM-1-3-DEG1</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-3-DEG1-to-OpenROADM-1-4-DEG1</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">10</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-1-4-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-1-3-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>14131</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>14132</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>14133</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>14134</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-1-4-DEG2-to-OpenROADM-1-1-DEG2</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-1-DEG2-to-OpenROADM-1-4-DEG2</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">10</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-1-4-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-1-1-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>14111</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>14112</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>14113</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>14114</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-1-1-DEG2-to-OpenROADM-1-4-DEG2</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-4-DEG2-to-OpenROADM-1-1-DEG2</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">10</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-1-1-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-1-4-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>11141</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>11142</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>11143</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>11144</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-DEG1-DEG1-CTP-TXtoOpenROADM-2-1-DEG2-DEG2-CTP-RX</link-id>
+            <source><source-node>OpenROADM-2-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-1-DEG2-DEG2-CTP-TXtoOpenROADM-2-1-DEG1-DEG1-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-DEG1-DEG1-CTP-TXtoOpenROADM-2-1-DEG3-DEG3-CTP-RX</link-id>
+            <source><source-node>OpenROADM-2-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-1-DEG3-DEG3-CTP-TXtoOpenROADM-2-1-DEG1-DEG1-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-1-SRG1-SRG1-CP-TXtoOpenROADM-2-1-DEG1-DEG1-CTP-RX</link-id>
             <source><source-node>OpenROADM-2-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-1-DEG1-DEG1-CTP-TXtoOpenROADM-2-1-SRG1-SRG1-CP-RX</opposite-link>
@@ -1829,14 +3081,14 @@
             <source><source-node>OpenROADM-2-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-1-SRG1-SRG1-CP-TXtoOpenROADM-2-1-DEG1-DEG1-CTP-RX</opposite-link>
             <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-DEG2-DEG2-CTP-TXtoOpenROADM-2-1-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-2-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-1-DEG1-DEG1-CTP-TXtoOpenROADM-2-1-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-DEG2-DEG2-CTP-TXtoOpenROADM-2-1-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-2-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-1-DEG3-DEG3-CTP-TXtoOpenROADM-2-1-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-DEG2-DEG2-CTP-TXtoOpenROADM-2-1-DEG1-DEG1-CTP-RX</link-id>
+            <source><source-node>OpenROADM-2-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-1-DEG1-DEG1-CTP-TXtoOpenROADM-2-1-DEG2-DEG2-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-DEG2-DEG2-CTP-TXtoOpenROADM-2-1-DEG3-DEG3-CTP-RX</link-id>
+            <source><source-node>OpenROADM-2-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-1-DEG3-DEG3-CTP-TXtoOpenROADM-2-1-DEG2-DEG2-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-1-SRG1-SRG1-CP-TXtoOpenROADM-2-1-DEG2-DEG2-CTP-RX</link-id>
             <source><source-node>OpenROADM-2-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-1-DEG2-DEG2-CTP-TXtoOpenROADM-2-1-SRG1-SRG1-CP-RX</opposite-link>
@@ -1845,14 +3097,14 @@
             <source><source-node>OpenROADM-2-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-1-SRG1-SRG1-CP-TXtoOpenROADM-2-1-DEG2-DEG2-CTP-RX</opposite-link>
             <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-DEG3-DEG3-CTP-TXtoOpenROADM-2-1-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-2-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-1-DEG1-DEG1-CTP-TXtoOpenROADM-2-1-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-DEG3-DEG3-CTP-TXtoOpenROADM-2-1-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-2-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-1-DEG2-DEG2-CTP-TXtoOpenROADM-2-1-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-DEG3-DEG3-CTP-TXtoOpenROADM-2-1-DEG1-DEG1-CTP-RX</link-id>
+            <source><source-node>OpenROADM-2-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-1-DEG1-DEG1-CTP-TXtoOpenROADM-2-1-DEG3-DEG3-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-DEG3-DEG3-CTP-TXtoOpenROADM-2-1-DEG2-DEG2-CTP-RX</link-id>
+            <source><source-node>OpenROADM-2-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-1-DEG2-DEG2-CTP-TXtoOpenROADM-2-1-DEG3-DEG3-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-1-SRG1-SRG1-CP-TXtoOpenROADM-2-1-DEG3-DEG3-CTP-RX</link-id>
             <source><source-node>OpenROADM-2-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-1-DEG3-DEG3-CTP-TXtoOpenROADM-2-1-SRG1-SRG1-CP-RX</opposite-link>
@@ -1861,54 +3113,46 @@
             <source><source-node>OpenROADM-2-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-1-SRG1-SRG1-CP-TXtoOpenROADM-2-1-DEG3-DEG3-CTP-RX</opposite-link>
             <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-1XPDR-NW1-TX-toOpenROADM-2-1-SRG1-SRG1-PP1-RX</link-id>
-        <source><source-node>XPONDER-2-1</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-1-SRG1-SRG1-PP1-TX-to-XPONDER-2-1XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-SRG1-SRG1-PP1-TX-to-XPONDER-2-1XPDR-NW1-RX</link-id>
-        <source><source-node>OpenROADM-2-1-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-2-1</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-2-1XPDR-NW1-TX-toOpenROADM-2-1-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-1XPDR-NW2-TX-toOpenROADM-2-1-SRG1-SRG1-PP2-RX</link-id>
-        <source><source-node>XPONDER-2-1</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-1-SRG1-SRG1-PP2-TX-to-XPONDER-2-1XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-SRG1-SRG1-PP2-TX-to-XPONDER-2-1XPDR-NW2-RX</link-id>
-        <source><source-node>OpenROADM-2-1-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-2-1</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-2-1XPDR-NW2-TX-toOpenROADM-2-1-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-1XPDR-NW3-TX-toOpenROADM-2-1-SRG1-SRG1-PP3-RX</link-id>
-        <source><source-node>XPONDER-2-1</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-1-SRG1-SRG1-PP3-TX-to-XPONDER-2-1XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-SRG1-SRG1-PP3-TX-to-XPONDER-2-1XPDR-NW3-RX</link-id>
-        <source><source-node>OpenROADM-2-1-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-2-1</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-2-1XPDR-NW3-TX-toOpenROADM-2-1-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-1XPDR-NW4-TX-toOpenROADM-2-1-SRG1-SRG1-PP4-RX</link-id>
-        <source><source-node>XPONDER-2-1</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-1-SRG1-SRG1-PP4-TX-to-XPONDER-2-1XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-SRG1-SRG1-PP4-TX-to-XPONDER-2-1XPDR-NW4-RX</link-id>
-        <source><source-node>OpenROADM-2-1-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-2-1</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-2-1XPDR-NW4-TX-toOpenROADM-2-1-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-1XPDR-NW5-TX-toOpenROADM-2-1-SRG1-SRG1-PP5-RX</link-id>
-        <source><source-node>XPONDER-2-1</source-node><source-tp>XPDR-NW5-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-SRG1</dest-node><dest-tp>SRG1-PP5-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-1-SRG1-SRG1-PP5-TX-to-XPONDER-2-1XPDR-NW5-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-SRG1-SRG1-PP5-TX-to-XPONDER-2-1XPDR-NW5-RX</link-id>
-        <source><source-node>OpenROADM-2-1-SRG1</source-node><source-tp>SRG1-PP5-TX</source-tp></source>        <destination><dest-node>XPONDER-2-1</dest-node><dest-tp>XPDR-NW5-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-2-1XPDR-NW5-TX-toOpenROADM-2-1-SRG1-SRG1-PP5-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-2-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-2-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-2-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-2-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-2-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-2-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-1XPDR-NW1-TX-toOpenROADM-2-1-SRG1-SRG1-PP1-RX</link-id>
+            <source><source-node>XPONDER-2-1</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-1-SRG1-SRG1-PP1-TX-to-XPONDER-2-1XPDR-NW1-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-SRG1-SRG1-PP1-TX-to-XPONDER-2-1XPDR-NW1-RX</link-id>
+            <source><source-node>OpenROADM-2-1-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-2-1</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-2-1XPDR-NW1-TX-toOpenROADM-2-1-SRG1-SRG1-PP1-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-1XPDR-NW2-TX-toOpenROADM-2-1-SRG1-SRG1-PP2-RX</link-id>
+            <source><source-node>XPONDER-2-1</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-1-SRG1-SRG1-PP2-TX-to-XPONDER-2-1XPDR-NW2-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-SRG1-SRG1-PP2-TX-to-XPONDER-2-1XPDR-NW2-RX</link-id>
+            <source><source-node>OpenROADM-2-1-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-2-1</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-2-1XPDR-NW2-TX-toOpenROADM-2-1-SRG1-SRG1-PP2-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-1XPDR-NW3-TX-toOpenROADM-2-1-SRG1-SRG1-PP3-RX</link-id>
+            <source><source-node>XPONDER-2-1</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-1-SRG1-SRG1-PP3-TX-to-XPONDER-2-1XPDR-NW3-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-SRG1-SRG1-PP3-TX-to-XPONDER-2-1XPDR-NW3-RX</link-id>
+            <source><source-node>OpenROADM-2-1-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-2-1</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-2-1XPDR-NW3-TX-toOpenROADM-2-1-SRG1-SRG1-PP3-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-1XPDR-NW4-TX-toOpenROADM-2-1-SRG1-SRG1-PP4-RX</link-id>
+            <source><source-node>XPONDER-2-1</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-1-SRG1-SRG1-PP4-TX-to-XPONDER-2-1XPDR-NW4-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-SRG1-SRG1-PP4-TX-to-XPONDER-2-1XPDR-NW4-RX</link-id>
+            <source><source-node>OpenROADM-2-1-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-2-1</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-2-1XPDR-NW4-TX-toOpenROADM-2-1-SRG1-SRG1-PP4-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-2-DEG2-DEG2-CTP-RX</link-id>
+            <source><source-node>OpenROADM-2-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-2-DEG1-DEG1-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-2-DEG3-DEG3-CTP-RX</link-id>
+            <source><source-node>OpenROADM-2-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-2-DEG1-DEG1-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-2-SRG1-SRG1-CP-TXtoOpenROADM-2-2-DEG1-DEG1-CTP-RX</link-id>
             <source><source-node>OpenROADM-2-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-2-SRG1-SRG1-CP-RX</opposite-link>
@@ -1917,14 +3161,14 @@
             <source><source-node>OpenROADM-2-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-2-SRG1-SRG1-CP-TXtoOpenROADM-2-2-DEG1-DEG1-CTP-RX</opposite-link>
             <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-2-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-2-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-2-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-2-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-2-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-2-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-2-DEG1-DEG1-CTP-RX</link-id>
+            <source><source-node>OpenROADM-2-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-2-DEG2-DEG2-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-2-DEG3-DEG3-CTP-RX</link-id>
+            <source><source-node>OpenROADM-2-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-2-DEG2-DEG2-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-2-SRG1-SRG1-CP-TXtoOpenROADM-2-2-DEG2-DEG2-CTP-RX</link-id>
             <source><source-node>OpenROADM-2-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-2-SRG1-SRG1-CP-RX</opposite-link>
@@ -1933,14 +3177,14 @@
             <source><source-node>OpenROADM-2-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-2-SRG1-SRG1-CP-TXtoOpenROADM-2-2-DEG2-DEG2-CTP-RX</opposite-link>
             <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-2-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-2-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-2-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-2-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-2-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-2-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-2-DEG1-DEG1-CTP-RX</link-id>
+            <source><source-node>OpenROADM-2-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-2-DEG3-DEG3-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-2-DEG2-DEG2-CTP-RX</link-id>
+            <source><source-node>OpenROADM-2-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-2-DEG3-DEG3-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-2-SRG1-SRG1-CP-TXtoOpenROADM-2-2-DEG3-DEG3-CTP-RX</link-id>
             <source><source-node>OpenROADM-2-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-2-SRG1-SRG1-CP-RX</opposite-link>
@@ -1949,70 +3193,310 @@
             <source><source-node>OpenROADM-2-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-2-SRG1-SRG1-CP-TXtoOpenROADM-2-2-DEG3-DEG3-CTP-RX</opposite-link>
             <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-2XPDR-NW1-TX-toOpenROADM-2-2-SRG1-SRG1-PP1-RX</link-id>
-        <source><source-node>XPONDER-2-2</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-2-SRG1-SRG1-PP1-TX-to-XPONDER-2-2XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-SRG1-SRG1-PP1-TX-to-XPONDER-2-2XPDR-NW1-RX</link-id>
-        <source><source-node>OpenROADM-2-2-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-2-2</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-2-2XPDR-NW1-TX-toOpenROADM-2-2-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-2XPDR-NW2-TX-toOpenROADM-2-2-SRG1-SRG1-PP2-RX</link-id>
-        <source><source-node>XPONDER-2-2</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-2-SRG1-SRG1-PP2-TX-to-XPONDER-2-2XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-SRG1-SRG1-PP2-TX-to-XPONDER-2-2XPDR-NW2-RX</link-id>
-        <source><source-node>OpenROADM-2-2-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-2-2</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-2-2XPDR-NW2-TX-toOpenROADM-2-2-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-2XPDR-NW3-TX-toOpenROADM-2-2-SRG1-SRG1-PP3-RX</link-id>
-        <source><source-node>XPONDER-2-2</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-2-SRG1-SRG1-PP3-TX-to-XPONDER-2-2XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-SRG1-SRG1-PP3-TX-to-XPONDER-2-2XPDR-NW3-RX</link-id>
-        <source><source-node>OpenROADM-2-2-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-2-2</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-2-2XPDR-NW3-TX-toOpenROADM-2-2-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-2XPDR-NW4-TX-toOpenROADM-2-2-SRG1-SRG1-PP4-RX</link-id>
-        <source><source-node>XPONDER-2-2</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-2-SRG1-SRG1-PP4-TX-to-XPONDER-2-2XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-SRG1-SRG1-PP4-TX-to-XPONDER-2-2XPDR-NW4-RX</link-id>
-        <source><source-node>OpenROADM-2-2-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-2-2</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-2-2XPDR-NW4-TX-toOpenROADM-2-2-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-2XPDR-NW5-TX-toOpenROADM-2-2-SRG1-SRG1-PP5-RX</link-id>
-        <source><source-node>XPONDER-2-2</source-node><source-tp>XPDR-NW5-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-SRG1</dest-node><dest-tp>SRG1-PP5-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-2-SRG1-SRG1-PP5-TX-to-XPONDER-2-2XPDR-NW5-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-SRG1-SRG1-PP5-TX-to-XPONDER-2-2XPDR-NW5-RX</link-id>
-        <source><source-node>OpenROADM-2-2-SRG1</source-node><source-tp>SRG1-PP5-TX</source-tp></source>        <destination><dest-node>XPONDER-2-2</dest-node><dest-tp>XPDR-NW5-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-2-2XPDR-NW5-TX-toOpenROADM-2-2-SRG1-SRG1-PP5-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-2-1-DEG1-to-OpenROADM-2-2-DEG1</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-2-DEG1-to-OpenROADM-2-1-DEG1</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-2-1-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-2-2-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-2-2-DEG1-to-OpenROADM-2-1-DEG1</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-1-DEG1-to-OpenROADM-2-2-DEG1</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-2-2-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-2-1-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-2-2-DEG2-to-OpenROADM-2-1-DEG2</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-1-DEG2-to-OpenROADM-2-2-DEG2</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-2-2-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-2-1-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-2-1-DEG2-to-OpenROADM-2-2-DEG2</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-2-DEG2-to-OpenROADM-2-1-DEG2</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-2-1-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-2-2-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-1-DEG1-DEG1-CTP-TXtoOpenROADM-3-1-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-3-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-1-DEG2-DEG2-CTP-TXtoOpenROADM-3-1-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-1-DEG1-DEG1-CTP-TXtoOpenROADM-3-1-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-3-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-1-DEG3-DEG3-CTP-TXtoOpenROADM-3-1-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-2XPDR-NW1-TX-toOpenROADM-2-2-SRG1-SRG1-PP1-RX</link-id>
+            <source><source-node>XPONDER-2-2</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-2-SRG1-SRG1-PP1-TX-to-XPONDER-2-2XPDR-NW1-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-SRG1-SRG1-PP1-TX-to-XPONDER-2-2XPDR-NW1-RX</link-id>
+            <source><source-node>OpenROADM-2-2-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-2-2</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-2-2XPDR-NW1-TX-toOpenROADM-2-2-SRG1-SRG1-PP1-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-2XPDR-NW2-TX-toOpenROADM-2-2-SRG1-SRG1-PP2-RX</link-id>
+            <source><source-node>XPONDER-2-2</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-2-SRG1-SRG1-PP2-TX-to-XPONDER-2-2XPDR-NW2-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-SRG1-SRG1-PP2-TX-to-XPONDER-2-2XPDR-NW2-RX</link-id>
+            <source><source-node>OpenROADM-2-2-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-2-2</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-2-2XPDR-NW2-TX-toOpenROADM-2-2-SRG1-SRG1-PP2-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-2XPDR-NW3-TX-toOpenROADM-2-2-SRG1-SRG1-PP3-RX</link-id>
+            <source><source-node>XPONDER-2-2</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-2-SRG1-SRG1-PP3-TX-to-XPONDER-2-2XPDR-NW3-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-SRG1-SRG1-PP3-TX-to-XPONDER-2-2XPDR-NW3-RX</link-id>
+            <source><source-node>OpenROADM-2-2-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-2-2</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-2-2XPDR-NW3-TX-toOpenROADM-2-2-SRG1-SRG1-PP3-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-2XPDR-NW4-TX-toOpenROADM-2-2-SRG1-SRG1-PP4-RX</link-id>
+            <source><source-node>XPONDER-2-2</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-2-SRG1-SRG1-PP4-TX-to-XPONDER-2-2XPDR-NW4-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-SRG1-SRG1-PP4-TX-to-XPONDER-2-2XPDR-NW4-RX</link-id>
+            <source><source-node>OpenROADM-2-2-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-2-2</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-2-2XPDR-NW4-TX-toOpenROADM-2-2-SRG1-SRG1-PP4-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-3-DEG1-DEG1-CTP-TXtoOpenROADM-2-3-DEG2-DEG2-CTP-RX</link-id>
+            <source><source-node>OpenROADM-2-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-3-DEG2-DEG2-CTP-TXtoOpenROADM-2-3-DEG1-DEG1-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-3-DEG1-DEG1-CTP-TXtoOpenROADM-2-3-DEG3-DEG3-CTP-RX</link-id>
+            <source><source-node>OpenROADM-2-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-3-DEG3-DEG3-CTP-TXtoOpenROADM-2-3-DEG1-DEG1-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-3-SRG1-SRG1-CP-TXtoOpenROADM-2-3-DEG1-DEG1-CTP-RX</link-id>
+            <source><source-node>OpenROADM-2-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-3-DEG1-DEG1-CTP-TXtoOpenROADM-2-3-SRG1-SRG1-CP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-3-DEG1-DEG1-CTP-TXtoOpenROADM-2-3-SRG1-SRG1-CP-RX</link-id>
+            <source><source-node>OpenROADM-2-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-3-SRG1-SRG1-CP-TXtoOpenROADM-2-3-DEG1-DEG1-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-3-DEG2-DEG2-CTP-TXtoOpenROADM-2-3-DEG1-DEG1-CTP-RX</link-id>
+            <source><source-node>OpenROADM-2-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-3-DEG1-DEG1-CTP-TXtoOpenROADM-2-3-DEG2-DEG2-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-3-DEG2-DEG2-CTP-TXtoOpenROADM-2-3-DEG3-DEG3-CTP-RX</link-id>
+            <source><source-node>OpenROADM-2-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-3-DEG3-DEG3-CTP-TXtoOpenROADM-2-3-DEG2-DEG2-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-3-SRG1-SRG1-CP-TXtoOpenROADM-2-3-DEG2-DEG2-CTP-RX</link-id>
+            <source><source-node>OpenROADM-2-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-3-DEG2-DEG2-CTP-TXtoOpenROADM-2-3-SRG1-SRG1-CP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-3-DEG2-DEG2-CTP-TXtoOpenROADM-2-3-SRG1-SRG1-CP-RX</link-id>
+            <source><source-node>OpenROADM-2-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-3-SRG1-SRG1-CP-TXtoOpenROADM-2-3-DEG2-DEG2-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-3-DEG3-DEG3-CTP-TXtoOpenROADM-2-3-DEG1-DEG1-CTP-RX</link-id>
+            <source><source-node>OpenROADM-2-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-3-DEG1-DEG1-CTP-TXtoOpenROADM-2-3-DEG3-DEG3-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-3-DEG3-DEG3-CTP-TXtoOpenROADM-2-3-DEG2-DEG2-CTP-RX</link-id>
+            <source><source-node>OpenROADM-2-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-3-DEG2-DEG2-CTP-TXtoOpenROADM-2-3-DEG3-DEG3-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-3-SRG1-SRG1-CP-TXtoOpenROADM-2-3-DEG3-DEG3-CTP-RX</link-id>
+            <source><source-node>OpenROADM-2-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-3-DEG3-DEG3-CTP-TXtoOpenROADM-2-3-SRG1-SRG1-CP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-3-DEG3-DEG3-CTP-TXtoOpenROADM-2-3-SRG1-SRG1-CP-RX</link-id>
+            <source><source-node>OpenROADM-2-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-3-SRG1-SRG1-CP-TXtoOpenROADM-2-3-DEG3-DEG3-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-3XPDR-NW1-TX-toOpenROADM-2-3-SRG1-SRG1-PP1-RX</link-id>
+            <source><source-node>XPONDER-2-3</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-3-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-3-SRG1-SRG1-PP1-TX-to-XPONDER-2-3XPDR-NW1-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-3-SRG1-SRG1-PP1-TX-to-XPONDER-2-3XPDR-NW1-RX</link-id>
+            <source><source-node>OpenROADM-2-3-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-2-3</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-2-3XPDR-NW1-TX-toOpenROADM-2-3-SRG1-SRG1-PP1-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-3XPDR-NW2-TX-toOpenROADM-2-3-SRG1-SRG1-PP2-RX</link-id>
+            <source><source-node>XPONDER-2-3</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-3-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-3-SRG1-SRG1-PP2-TX-to-XPONDER-2-3XPDR-NW2-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-3-SRG1-SRG1-PP2-TX-to-XPONDER-2-3XPDR-NW2-RX</link-id>
+            <source><source-node>OpenROADM-2-3-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-2-3</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-2-3XPDR-NW2-TX-toOpenROADM-2-3-SRG1-SRG1-PP2-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-3XPDR-NW3-TX-toOpenROADM-2-3-SRG1-SRG1-PP3-RX</link-id>
+            <source><source-node>XPONDER-2-3</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-3-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-3-SRG1-SRG1-PP3-TX-to-XPONDER-2-3XPDR-NW3-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-3-SRG1-SRG1-PP3-TX-to-XPONDER-2-3XPDR-NW3-RX</link-id>
+            <source><source-node>OpenROADM-2-3-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-2-3</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-2-3XPDR-NW3-TX-toOpenROADM-2-3-SRG1-SRG1-PP3-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-3XPDR-NW4-TX-toOpenROADM-2-3-SRG1-SRG1-PP4-RX</link-id>
+            <source><source-node>XPONDER-2-3</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-3-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-3-SRG1-SRG1-PP4-TX-to-XPONDER-2-3XPDR-NW4-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-3-SRG1-SRG1-PP4-TX-to-XPONDER-2-3XPDR-NW4-RX</link-id>
+            <source><source-node>OpenROADM-2-3-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-2-3</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-2-3XPDR-NW4-TX-toOpenROADM-2-3-SRG1-SRG1-PP4-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-4-DEG1-DEG1-CTP-TXtoOpenROADM-2-4-DEG2-DEG2-CTP-RX</link-id>
+            <source><source-node>OpenROADM-2-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-4-DEG2-DEG2-CTP-TXtoOpenROADM-2-4-DEG1-DEG1-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-4-DEG1-DEG1-CTP-TXtoOpenROADM-2-4-DEG3-DEG3-CTP-RX</link-id>
+            <source><source-node>OpenROADM-2-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-4-DEG3-DEG3-CTP-TXtoOpenROADM-2-4-DEG1-DEG1-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-4-SRG1-SRG1-CP-TXtoOpenROADM-2-4-DEG1-DEG1-CTP-RX</link-id>
+            <source><source-node>OpenROADM-2-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-4-DEG1-DEG1-CTP-TXtoOpenROADM-2-4-SRG1-SRG1-CP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-4-DEG1-DEG1-CTP-TXtoOpenROADM-2-4-SRG1-SRG1-CP-RX</link-id>
+            <source><source-node>OpenROADM-2-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-4-SRG1-SRG1-CP-TXtoOpenROADM-2-4-DEG1-DEG1-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-4-DEG2-DEG2-CTP-TXtoOpenROADM-2-4-DEG1-DEG1-CTP-RX</link-id>
+            <source><source-node>OpenROADM-2-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-4-DEG1-DEG1-CTP-TXtoOpenROADM-2-4-DEG2-DEG2-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-4-DEG2-DEG2-CTP-TXtoOpenROADM-2-4-DEG3-DEG3-CTP-RX</link-id>
+            <source><source-node>OpenROADM-2-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-4-DEG3-DEG3-CTP-TXtoOpenROADM-2-4-DEG2-DEG2-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-4-SRG1-SRG1-CP-TXtoOpenROADM-2-4-DEG2-DEG2-CTP-RX</link-id>
+            <source><source-node>OpenROADM-2-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-4-DEG2-DEG2-CTP-TXtoOpenROADM-2-4-SRG1-SRG1-CP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-4-DEG2-DEG2-CTP-TXtoOpenROADM-2-4-SRG1-SRG1-CP-RX</link-id>
+            <source><source-node>OpenROADM-2-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-4-SRG1-SRG1-CP-TXtoOpenROADM-2-4-DEG2-DEG2-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-4-DEG3-DEG3-CTP-TXtoOpenROADM-2-4-DEG1-DEG1-CTP-RX</link-id>
+            <source><source-node>OpenROADM-2-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-4-DEG1-DEG1-CTP-TXtoOpenROADM-2-4-DEG3-DEG3-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-4-DEG3-DEG3-CTP-TXtoOpenROADM-2-4-DEG2-DEG2-CTP-RX</link-id>
+            <source><source-node>OpenROADM-2-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-4-DEG2-DEG2-CTP-TXtoOpenROADM-2-4-DEG3-DEG3-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-4-SRG1-SRG1-CP-TXtoOpenROADM-2-4-DEG3-DEG3-CTP-RX</link-id>
+            <source><source-node>OpenROADM-2-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-4-DEG3-DEG3-CTP-TXtoOpenROADM-2-4-SRG1-SRG1-CP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-4-DEG3-DEG3-CTP-TXtoOpenROADM-2-4-SRG1-SRG1-CP-RX</link-id>
+            <source><source-node>OpenROADM-2-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-4-SRG1-SRG1-CP-TXtoOpenROADM-2-4-DEG3-DEG3-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-4XPDR-NW1-TX-toOpenROADM-2-4-SRG1-SRG1-PP1-RX</link-id>
+            <source><source-node>XPONDER-2-4</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-4-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-4-SRG1-SRG1-PP1-TX-to-XPONDER-2-4XPDR-NW1-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-4-SRG1-SRG1-PP1-TX-to-XPONDER-2-4XPDR-NW1-RX</link-id>
+            <source><source-node>OpenROADM-2-4-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-2-4</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-2-4XPDR-NW1-TX-toOpenROADM-2-4-SRG1-SRG1-PP1-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-4XPDR-NW2-TX-toOpenROADM-2-4-SRG1-SRG1-PP2-RX</link-id>
+            <source><source-node>XPONDER-2-4</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-4-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-4-SRG1-SRG1-PP2-TX-to-XPONDER-2-4XPDR-NW2-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-4-SRG1-SRG1-PP2-TX-to-XPONDER-2-4XPDR-NW2-RX</link-id>
+            <source><source-node>OpenROADM-2-4-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-2-4</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-2-4XPDR-NW2-TX-toOpenROADM-2-4-SRG1-SRG1-PP2-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-4XPDR-NW3-TX-toOpenROADM-2-4-SRG1-SRG1-PP3-RX</link-id>
+            <source><source-node>XPONDER-2-4</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-4-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-4-SRG1-SRG1-PP3-TX-to-XPONDER-2-4XPDR-NW3-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-4-SRG1-SRG1-PP3-TX-to-XPONDER-2-4XPDR-NW3-RX</link-id>
+            <source><source-node>OpenROADM-2-4-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-2-4</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-2-4XPDR-NW3-TX-toOpenROADM-2-4-SRG1-SRG1-PP3-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-4XPDR-NW4-TX-toOpenROADM-2-4-SRG1-SRG1-PP4-RX</link-id>
+            <source><source-node>XPONDER-2-4</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-4-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-4-SRG1-SRG1-PP4-TX-to-XPONDER-2-4XPDR-NW4-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-4-SRG1-SRG1-PP4-TX-to-XPONDER-2-4XPDR-NW4-RX</link-id>
+            <source><source-node>OpenROADM-2-4-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-2-4</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-2-4XPDR-NW4-TX-toOpenROADM-2-4-SRG1-SRG1-PP4-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-2-1-DEG1-to-OpenROADM-2-2-DEG1</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-2-DEG1-to-OpenROADM-2-1-DEG1</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">20</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-2-1-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-2-2-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>21221</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>21222</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>21223</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>21224</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-2-2-DEG1-to-OpenROADM-2-1-DEG1</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-1-DEG1-to-OpenROADM-2-2-DEG1</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">20</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-2-2-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-2-1-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>22211</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>22212</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>22213</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>22214</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-2-2-DEG2-to-OpenROADM-2-3-DEG2</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-3-DEG2-to-OpenROADM-2-2-DEG2</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">20</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-2-2-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-2-3-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>22231</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>22232</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>22233</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>22234</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-2-3-DEG2-to-OpenROADM-2-2-DEG2</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-2-DEG2-to-OpenROADM-2-3-DEG2</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">20</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-2-3-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-2-2-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>23221</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>23222</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>23223</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>23224</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-2-3-DEG1-to-OpenROADM-2-4-DEG1</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-4-DEG1-to-OpenROADM-2-3-DEG1</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">20</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-2-3-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-2-4-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>23241</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>23242</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>23243</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>23244</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-2-4-DEG1-to-OpenROADM-2-3-DEG1</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-3-DEG1-to-OpenROADM-2-4-DEG1</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">20</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-2-4-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-2-3-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>24231</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>24232</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>24233</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>24234</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-2-4-DEG2-to-OpenROADM-2-1-DEG2</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-1-DEG2-to-OpenROADM-2-4-DEG2</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">20</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-2-4-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-2-1-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>24211</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>24212</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>24213</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>24214</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-2-1-DEG2-to-OpenROADM-2-4-DEG2</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-4-DEG2-to-OpenROADM-2-1-DEG2</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">20</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-2-1-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-2-4-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>21241</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>21242</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>21243</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>21244</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-1-DEG1-DEG1-CTP-TXtoOpenROADM-3-1-DEG2-DEG2-CTP-RX</link-id>
+            <source><source-node>OpenROADM-3-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-1-DEG2-DEG2-CTP-TXtoOpenROADM-3-1-DEG1-DEG1-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-1-DEG1-DEG1-CTP-TXtoOpenROADM-3-1-DEG3-DEG3-CTP-RX</link-id>
+            <source><source-node>OpenROADM-3-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-1-DEG3-DEG3-CTP-TXtoOpenROADM-3-1-DEG1-DEG1-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-1-SRG1-SRG1-CP-TXtoOpenROADM-3-1-DEG1-DEG1-CTP-RX</link-id>
             <source><source-node>OpenROADM-3-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-1-DEG1-DEG1-CTP-TXtoOpenROADM-3-1-SRG1-SRG1-CP-RX</opposite-link>
@@ -2021,14 +3505,14 @@
             <source><source-node>OpenROADM-3-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-1-SRG1-SRG1-CP-TXtoOpenROADM-3-1-DEG1-DEG1-CTP-RX</opposite-link>
             <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-1-DEG2-DEG2-CTP-TXtoOpenROADM-3-1-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-3-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-1-DEG1-DEG1-CTP-TXtoOpenROADM-3-1-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-1-DEG2-DEG2-CTP-TXtoOpenROADM-3-1-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-3-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-1-DEG3-DEG3-CTP-TXtoOpenROADM-3-1-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-1-DEG2-DEG2-CTP-TXtoOpenROADM-3-1-DEG1-DEG1-CTP-RX</link-id>
+            <source><source-node>OpenROADM-3-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-1-DEG1-DEG1-CTP-TXtoOpenROADM-3-1-DEG2-DEG2-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-1-DEG2-DEG2-CTP-TXtoOpenROADM-3-1-DEG3-DEG3-CTP-RX</link-id>
+            <source><source-node>OpenROADM-3-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-1-DEG3-DEG3-CTP-TXtoOpenROADM-3-1-DEG2-DEG2-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-1-SRG1-SRG1-CP-TXtoOpenROADM-3-1-DEG2-DEG2-CTP-RX</link-id>
             <source><source-node>OpenROADM-3-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-1-DEG2-DEG2-CTP-TXtoOpenROADM-3-1-SRG1-SRG1-CP-RX</opposite-link>
@@ -2037,14 +3521,14 @@
             <source><source-node>OpenROADM-3-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-1-SRG1-SRG1-CP-TXtoOpenROADM-3-1-DEG2-DEG2-CTP-RX</opposite-link>
             <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-1-DEG3-DEG3-CTP-TXtoOpenROADM-3-1-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-3-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-1-DEG1-DEG1-CTP-TXtoOpenROADM-3-1-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-1-DEG3-DEG3-CTP-TXtoOpenROADM-3-1-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-3-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-1-DEG2-DEG2-CTP-TXtoOpenROADM-3-1-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-1-DEG3-DEG3-CTP-TXtoOpenROADM-3-1-DEG1-DEG1-CTP-RX</link-id>
+            <source><source-node>OpenROADM-3-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-1-DEG1-DEG1-CTP-TXtoOpenROADM-3-1-DEG3-DEG3-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-1-DEG3-DEG3-CTP-TXtoOpenROADM-3-1-DEG2-DEG2-CTP-RX</link-id>
+            <source><source-node>OpenROADM-3-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-1-DEG2-DEG2-CTP-TXtoOpenROADM-3-1-DEG3-DEG3-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-1-SRG1-SRG1-CP-TXtoOpenROADM-3-1-DEG3-DEG3-CTP-RX</link-id>
             <source><source-node>OpenROADM-3-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-1-DEG3-DEG3-CTP-TXtoOpenROADM-3-1-SRG1-SRG1-CP-RX</opposite-link>
@@ -2053,54 +3537,46 @@
             <source><source-node>OpenROADM-3-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-1-SRG1-SRG1-CP-TXtoOpenROADM-3-1-DEG3-DEG3-CTP-RX</opposite-link>
             <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-1XPDR-NW1-TX-toOpenROADM-3-1-SRG1-SRG1-PP1-RX</link-id>
-        <source><source-node>XPONDER-3-1</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-1-SRG1-SRG1-PP1-TX-to-XPONDER-3-1XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-1-SRG1-SRG1-PP1-TX-to-XPONDER-3-1XPDR-NW1-RX</link-id>
-        <source><source-node>OpenROADM-3-1-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-3-1</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-3-1XPDR-NW1-TX-toOpenROADM-3-1-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-1XPDR-NW2-TX-toOpenROADM-3-1-SRG1-SRG1-PP2-RX</link-id>
-        <source><source-node>XPONDER-3-1</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-1-SRG1-SRG1-PP2-TX-to-XPONDER-3-1XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-1-SRG1-SRG1-PP2-TX-to-XPONDER-3-1XPDR-NW2-RX</link-id>
-        <source><source-node>OpenROADM-3-1-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-3-1</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-3-1XPDR-NW2-TX-toOpenROADM-3-1-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-1XPDR-NW3-TX-toOpenROADM-3-1-SRG1-SRG1-PP3-RX</link-id>
-        <source><source-node>XPONDER-3-1</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-1-SRG1-SRG1-PP3-TX-to-XPONDER-3-1XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-1-SRG1-SRG1-PP3-TX-to-XPONDER-3-1XPDR-NW3-RX</link-id>
-        <source><source-node>OpenROADM-3-1-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-3-1</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-3-1XPDR-NW3-TX-toOpenROADM-3-1-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-1XPDR-NW4-TX-toOpenROADM-3-1-SRG1-SRG1-PP4-RX</link-id>
-        <source><source-node>XPONDER-3-1</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-1-SRG1-SRG1-PP4-TX-to-XPONDER-3-1XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-1-SRG1-SRG1-PP4-TX-to-XPONDER-3-1XPDR-NW4-RX</link-id>
-        <source><source-node>OpenROADM-3-1-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-3-1</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-3-1XPDR-NW4-TX-toOpenROADM-3-1-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-1XPDR-NW5-TX-toOpenROADM-3-1-SRG1-SRG1-PP5-RX</link-id>
-        <source><source-node>XPONDER-3-1</source-node><source-tp>XPDR-NW5-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-SRG1</dest-node><dest-tp>SRG1-PP5-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-1-SRG1-SRG1-PP5-TX-to-XPONDER-3-1XPDR-NW5-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-1-SRG1-SRG1-PP5-TX-to-XPONDER-3-1XPDR-NW5-RX</link-id>
-        <source><source-node>OpenROADM-3-1-SRG1</source-node><source-tp>SRG1-PP5-TX</source-tp></source>        <destination><dest-node>XPONDER-3-1</dest-node><dest-tp>XPDR-NW5-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-3-1XPDR-NW5-TX-toOpenROADM-3-1-SRG1-SRG1-PP5-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-DEG1-DEG1-CTP-TXtoOpenROADM-3-2-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-3-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-2-DEG2-DEG2-CTP-TXtoOpenROADM-3-2-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-DEG1-DEG1-CTP-TXtoOpenROADM-3-2-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-3-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-2-DEG3-DEG3-CTP-TXtoOpenROADM-3-2-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-1XPDR-NW1-TX-toOpenROADM-3-1-SRG1-SRG1-PP1-RX</link-id>
+            <source><source-node>XPONDER-3-1</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-1-SRG1-SRG1-PP1-TX-to-XPONDER-3-1XPDR-NW1-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-1-SRG1-SRG1-PP1-TX-to-XPONDER-3-1XPDR-NW1-RX</link-id>
+            <source><source-node>OpenROADM-3-1-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-3-1</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-3-1XPDR-NW1-TX-toOpenROADM-3-1-SRG1-SRG1-PP1-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-1XPDR-NW2-TX-toOpenROADM-3-1-SRG1-SRG1-PP2-RX</link-id>
+            <source><source-node>XPONDER-3-1</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-1-SRG1-SRG1-PP2-TX-to-XPONDER-3-1XPDR-NW2-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-1-SRG1-SRG1-PP2-TX-to-XPONDER-3-1XPDR-NW2-RX</link-id>
+            <source><source-node>OpenROADM-3-1-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-3-1</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-3-1XPDR-NW2-TX-toOpenROADM-3-1-SRG1-SRG1-PP2-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-1XPDR-NW3-TX-toOpenROADM-3-1-SRG1-SRG1-PP3-RX</link-id>
+            <source><source-node>XPONDER-3-1</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-1-SRG1-SRG1-PP3-TX-to-XPONDER-3-1XPDR-NW3-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-1-SRG1-SRG1-PP3-TX-to-XPONDER-3-1XPDR-NW3-RX</link-id>
+            <source><source-node>OpenROADM-3-1-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-3-1</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-3-1XPDR-NW3-TX-toOpenROADM-3-1-SRG1-SRG1-PP3-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-1XPDR-NW4-TX-toOpenROADM-3-1-SRG1-SRG1-PP4-RX</link-id>
+            <source><source-node>XPONDER-3-1</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-1-SRG1-SRG1-PP4-TX-to-XPONDER-3-1XPDR-NW4-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-1-SRG1-SRG1-PP4-TX-to-XPONDER-3-1XPDR-NW4-RX</link-id>
+            <source><source-node>OpenROADM-3-1-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-3-1</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-3-1XPDR-NW4-TX-toOpenROADM-3-1-SRG1-SRG1-PP4-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-DEG1-DEG1-CTP-TXtoOpenROADM-3-2-DEG2-DEG2-CTP-RX</link-id>
+            <source><source-node>OpenROADM-3-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-2-DEG2-DEG2-CTP-TXtoOpenROADM-3-2-DEG1-DEG1-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-DEG1-DEG1-CTP-TXtoOpenROADM-3-2-DEG3-DEG3-CTP-RX</link-id>
+            <source><source-node>OpenROADM-3-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-2-DEG3-DEG3-CTP-TXtoOpenROADM-3-2-DEG1-DEG1-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-2-SRG1-SRG1-CP-TXtoOpenROADM-3-2-DEG1-DEG1-CTP-RX</link-id>
             <source><source-node>OpenROADM-3-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-2-DEG1-DEG1-CTP-TXtoOpenROADM-3-2-SRG1-SRG1-CP-RX</opposite-link>
@@ -2109,14 +3585,14 @@
             <source><source-node>OpenROADM-3-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-2-SRG1-SRG1-CP-TXtoOpenROADM-3-2-DEG1-DEG1-CTP-RX</opposite-link>
             <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-DEG2-DEG2-CTP-TXtoOpenROADM-3-2-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-3-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-2-DEG1-DEG1-CTP-TXtoOpenROADM-3-2-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-DEG2-DEG2-CTP-TXtoOpenROADM-3-2-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-3-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-2-DEG3-DEG3-CTP-TXtoOpenROADM-3-2-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-DEG2-DEG2-CTP-TXtoOpenROADM-3-2-DEG1-DEG1-CTP-RX</link-id>
+            <source><source-node>OpenROADM-3-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-2-DEG1-DEG1-CTP-TXtoOpenROADM-3-2-DEG2-DEG2-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-DEG2-DEG2-CTP-TXtoOpenROADM-3-2-DEG3-DEG3-CTP-RX</link-id>
+            <source><source-node>OpenROADM-3-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-2-DEG3-DEG3-CTP-TXtoOpenROADM-3-2-DEG2-DEG2-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-2-SRG1-SRG1-CP-TXtoOpenROADM-3-2-DEG2-DEG2-CTP-RX</link-id>
             <source><source-node>OpenROADM-3-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-2-DEG2-DEG2-CTP-TXtoOpenROADM-3-2-SRG1-SRG1-CP-RX</opposite-link>
@@ -2125,14 +3601,14 @@
             <source><source-node>OpenROADM-3-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-2-SRG1-SRG1-CP-TXtoOpenROADM-3-2-DEG2-DEG2-CTP-RX</opposite-link>
             <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-DEG3-DEG3-CTP-TXtoOpenROADM-3-2-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-3-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-2-DEG1-DEG1-CTP-TXtoOpenROADM-3-2-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-DEG3-DEG3-CTP-TXtoOpenROADM-3-2-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-3-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-2-DEG2-DEG2-CTP-TXtoOpenROADM-3-2-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-DEG3-DEG3-CTP-TXtoOpenROADM-3-2-DEG1-DEG1-CTP-RX</link-id>
+            <source><source-node>OpenROADM-3-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-2-DEG1-DEG1-CTP-TXtoOpenROADM-3-2-DEG3-DEG3-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-DEG3-DEG3-CTP-TXtoOpenROADM-3-2-DEG2-DEG2-CTP-RX</link-id>
+            <source><source-node>OpenROADM-3-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-2-DEG2-DEG2-CTP-TXtoOpenROADM-3-2-DEG3-DEG3-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-2-SRG1-SRG1-CP-TXtoOpenROADM-3-2-DEG3-DEG3-CTP-RX</link-id>
             <source><source-node>OpenROADM-3-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-2-DEG3-DEG3-CTP-TXtoOpenROADM-3-2-SRG1-SRG1-CP-RX</opposite-link>
@@ -2141,70 +3617,310 @@
             <source><source-node>OpenROADM-3-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-2-SRG1-SRG1-CP-TXtoOpenROADM-3-2-DEG3-DEG3-CTP-RX</opposite-link>
             <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-2XPDR-NW1-TX-toOpenROADM-3-2-SRG1-SRG1-PP1-RX</link-id>
-        <source><source-node>XPONDER-3-2</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-2-SRG1-SRG1-PP1-TX-to-XPONDER-3-2XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-SRG1-SRG1-PP1-TX-to-XPONDER-3-2XPDR-NW1-RX</link-id>
-        <source><source-node>OpenROADM-3-2-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-3-2</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-3-2XPDR-NW1-TX-toOpenROADM-3-2-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-2XPDR-NW2-TX-toOpenROADM-3-2-SRG1-SRG1-PP2-RX</link-id>
-        <source><source-node>XPONDER-3-2</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-2-SRG1-SRG1-PP2-TX-to-XPONDER-3-2XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-SRG1-SRG1-PP2-TX-to-XPONDER-3-2XPDR-NW2-RX</link-id>
-        <source><source-node>OpenROADM-3-2-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-3-2</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-3-2XPDR-NW2-TX-toOpenROADM-3-2-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-2XPDR-NW3-TX-toOpenROADM-3-2-SRG1-SRG1-PP3-RX</link-id>
-        <source><source-node>XPONDER-3-2</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-2-SRG1-SRG1-PP3-TX-to-XPONDER-3-2XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-SRG1-SRG1-PP3-TX-to-XPONDER-3-2XPDR-NW3-RX</link-id>
-        <source><source-node>OpenROADM-3-2-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-3-2</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-3-2XPDR-NW3-TX-toOpenROADM-3-2-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-2XPDR-NW4-TX-toOpenROADM-3-2-SRG1-SRG1-PP4-RX</link-id>
-        <source><source-node>XPONDER-3-2</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-2-SRG1-SRG1-PP4-TX-to-XPONDER-3-2XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-SRG1-SRG1-PP4-TX-to-XPONDER-3-2XPDR-NW4-RX</link-id>
-        <source><source-node>OpenROADM-3-2-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-3-2</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-3-2XPDR-NW4-TX-toOpenROADM-3-2-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-2XPDR-NW5-TX-toOpenROADM-3-2-SRG1-SRG1-PP5-RX</link-id>
-        <source><source-node>XPONDER-3-2</source-node><source-tp>XPDR-NW5-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-SRG1</dest-node><dest-tp>SRG1-PP5-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-2-SRG1-SRG1-PP5-TX-to-XPONDER-3-2XPDR-NW5-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-SRG1-SRG1-PP5-TX-to-XPONDER-3-2XPDR-NW5-RX</link-id>
-        <source><source-node>OpenROADM-3-2-SRG1</source-node><source-tp>SRG1-PP5-TX</source-tp></source>        <destination><dest-node>XPONDER-3-2</dest-node><dest-tp>XPDR-NW5-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-3-2XPDR-NW5-TX-toOpenROADM-3-2-SRG1-SRG1-PP5-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-3-1-DEG1-to-OpenROADM-3-2-DEG1</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-2-DEG1-to-OpenROADM-3-1-DEG1</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-3-1-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-3-2-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-3-2-DEG1-to-OpenROADM-3-1-DEG1</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-1-DEG1-to-OpenROADM-3-2-DEG1</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-3-2-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-3-1-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-3-2-DEG2-to-OpenROADM-3-1-DEG2</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-1-DEG2-to-OpenROADM-3-2-DEG2</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-3-2-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-3-1-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-3-1-DEG2-to-OpenROADM-3-2-DEG2</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-2-DEG2-to-OpenROADM-3-1-DEG2</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-3-1-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-3-2-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-DEG1-DEG1-CTP-TXtoOpenROADM-4-1-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-4-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-1-DEG2-DEG2-CTP-TXtoOpenROADM-4-1-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-DEG1-DEG1-CTP-TXtoOpenROADM-4-1-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-4-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-1-DEG3-DEG3-CTP-TXtoOpenROADM-4-1-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-2XPDR-NW1-TX-toOpenROADM-3-2-SRG1-SRG1-PP1-RX</link-id>
+            <source><source-node>XPONDER-3-2</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-2-SRG1-SRG1-PP1-TX-to-XPONDER-3-2XPDR-NW1-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-SRG1-SRG1-PP1-TX-to-XPONDER-3-2XPDR-NW1-RX</link-id>
+            <source><source-node>OpenROADM-3-2-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-3-2</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-3-2XPDR-NW1-TX-toOpenROADM-3-2-SRG1-SRG1-PP1-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-2XPDR-NW2-TX-toOpenROADM-3-2-SRG1-SRG1-PP2-RX</link-id>
+            <source><source-node>XPONDER-3-2</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-2-SRG1-SRG1-PP2-TX-to-XPONDER-3-2XPDR-NW2-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-SRG1-SRG1-PP2-TX-to-XPONDER-3-2XPDR-NW2-RX</link-id>
+            <source><source-node>OpenROADM-3-2-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-3-2</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-3-2XPDR-NW2-TX-toOpenROADM-3-2-SRG1-SRG1-PP2-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-2XPDR-NW3-TX-toOpenROADM-3-2-SRG1-SRG1-PP3-RX</link-id>
+            <source><source-node>XPONDER-3-2</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-2-SRG1-SRG1-PP3-TX-to-XPONDER-3-2XPDR-NW3-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-SRG1-SRG1-PP3-TX-to-XPONDER-3-2XPDR-NW3-RX</link-id>
+            <source><source-node>OpenROADM-3-2-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-3-2</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-3-2XPDR-NW3-TX-toOpenROADM-3-2-SRG1-SRG1-PP3-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-2XPDR-NW4-TX-toOpenROADM-3-2-SRG1-SRG1-PP4-RX</link-id>
+            <source><source-node>XPONDER-3-2</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-2-SRG1-SRG1-PP4-TX-to-XPONDER-3-2XPDR-NW4-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-SRG1-SRG1-PP4-TX-to-XPONDER-3-2XPDR-NW4-RX</link-id>
+            <source><source-node>OpenROADM-3-2-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-3-2</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-3-2XPDR-NW4-TX-toOpenROADM-3-2-SRG1-SRG1-PP4-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-3-DEG1-DEG1-CTP-TXtoOpenROADM-3-3-DEG2-DEG2-CTP-RX</link-id>
+            <source><source-node>OpenROADM-3-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-3-DEG2-DEG2-CTP-TXtoOpenROADM-3-3-DEG1-DEG1-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-3-DEG1-DEG1-CTP-TXtoOpenROADM-3-3-DEG3-DEG3-CTP-RX</link-id>
+            <source><source-node>OpenROADM-3-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-3-DEG3-DEG3-CTP-TXtoOpenROADM-3-3-DEG1-DEG1-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-3-SRG1-SRG1-CP-TXtoOpenROADM-3-3-DEG1-DEG1-CTP-RX</link-id>
+            <source><source-node>OpenROADM-3-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-3-DEG1-DEG1-CTP-TXtoOpenROADM-3-3-SRG1-SRG1-CP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-3-DEG1-DEG1-CTP-TXtoOpenROADM-3-3-SRG1-SRG1-CP-RX</link-id>
+            <source><source-node>OpenROADM-3-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-3-SRG1-SRG1-CP-TXtoOpenROADM-3-3-DEG1-DEG1-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-3-DEG2-DEG2-CTP-TXtoOpenROADM-3-3-DEG1-DEG1-CTP-RX</link-id>
+            <source><source-node>OpenROADM-3-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-3-DEG1-DEG1-CTP-TXtoOpenROADM-3-3-DEG2-DEG2-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-3-DEG2-DEG2-CTP-TXtoOpenROADM-3-3-DEG3-DEG3-CTP-RX</link-id>
+            <source><source-node>OpenROADM-3-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-3-DEG3-DEG3-CTP-TXtoOpenROADM-3-3-DEG2-DEG2-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-3-SRG1-SRG1-CP-TXtoOpenROADM-3-3-DEG2-DEG2-CTP-RX</link-id>
+            <source><source-node>OpenROADM-3-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-3-DEG2-DEG2-CTP-TXtoOpenROADM-3-3-SRG1-SRG1-CP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-3-DEG2-DEG2-CTP-TXtoOpenROADM-3-3-SRG1-SRG1-CP-RX</link-id>
+            <source><source-node>OpenROADM-3-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-3-SRG1-SRG1-CP-TXtoOpenROADM-3-3-DEG2-DEG2-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-3-DEG3-DEG3-CTP-TXtoOpenROADM-3-3-DEG1-DEG1-CTP-RX</link-id>
+            <source><source-node>OpenROADM-3-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-3-DEG1-DEG1-CTP-TXtoOpenROADM-3-3-DEG3-DEG3-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-3-DEG3-DEG3-CTP-TXtoOpenROADM-3-3-DEG2-DEG2-CTP-RX</link-id>
+            <source><source-node>OpenROADM-3-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-3-DEG2-DEG2-CTP-TXtoOpenROADM-3-3-DEG3-DEG3-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-3-SRG1-SRG1-CP-TXtoOpenROADM-3-3-DEG3-DEG3-CTP-RX</link-id>
+            <source><source-node>OpenROADM-3-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-3-DEG3-DEG3-CTP-TXtoOpenROADM-3-3-SRG1-SRG1-CP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-3-DEG3-DEG3-CTP-TXtoOpenROADM-3-3-SRG1-SRG1-CP-RX</link-id>
+            <source><source-node>OpenROADM-3-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-3-SRG1-SRG1-CP-TXtoOpenROADM-3-3-DEG3-DEG3-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-3XPDR-NW1-TX-toOpenROADM-3-3-SRG1-SRG1-PP1-RX</link-id>
+            <source><source-node>XPONDER-3-3</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-3-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-3-SRG1-SRG1-PP1-TX-to-XPONDER-3-3XPDR-NW1-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-3-SRG1-SRG1-PP1-TX-to-XPONDER-3-3XPDR-NW1-RX</link-id>
+            <source><source-node>OpenROADM-3-3-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-3-3</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-3-3XPDR-NW1-TX-toOpenROADM-3-3-SRG1-SRG1-PP1-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-3XPDR-NW2-TX-toOpenROADM-3-3-SRG1-SRG1-PP2-RX</link-id>
+            <source><source-node>XPONDER-3-3</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-3-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-3-SRG1-SRG1-PP2-TX-to-XPONDER-3-3XPDR-NW2-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-3-SRG1-SRG1-PP2-TX-to-XPONDER-3-3XPDR-NW2-RX</link-id>
+            <source><source-node>OpenROADM-3-3-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-3-3</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-3-3XPDR-NW2-TX-toOpenROADM-3-3-SRG1-SRG1-PP2-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-3XPDR-NW3-TX-toOpenROADM-3-3-SRG1-SRG1-PP3-RX</link-id>
+            <source><source-node>XPONDER-3-3</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-3-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-3-SRG1-SRG1-PP3-TX-to-XPONDER-3-3XPDR-NW3-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-3-SRG1-SRG1-PP3-TX-to-XPONDER-3-3XPDR-NW3-RX</link-id>
+            <source><source-node>OpenROADM-3-3-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-3-3</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-3-3XPDR-NW3-TX-toOpenROADM-3-3-SRG1-SRG1-PP3-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-3XPDR-NW4-TX-toOpenROADM-3-3-SRG1-SRG1-PP4-RX</link-id>
+            <source><source-node>XPONDER-3-3</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-3-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-3-SRG1-SRG1-PP4-TX-to-XPONDER-3-3XPDR-NW4-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-3-SRG1-SRG1-PP4-TX-to-XPONDER-3-3XPDR-NW4-RX</link-id>
+            <source><source-node>OpenROADM-3-3-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-3-3</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-3-3XPDR-NW4-TX-toOpenROADM-3-3-SRG1-SRG1-PP4-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-4-DEG1-DEG1-CTP-TXtoOpenROADM-3-4-DEG2-DEG2-CTP-RX</link-id>
+            <source><source-node>OpenROADM-3-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-4-DEG2-DEG2-CTP-TXtoOpenROADM-3-4-DEG1-DEG1-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-4-DEG1-DEG1-CTP-TXtoOpenROADM-3-4-DEG3-DEG3-CTP-RX</link-id>
+            <source><source-node>OpenROADM-3-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-4-DEG3-DEG3-CTP-TXtoOpenROADM-3-4-DEG1-DEG1-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-4-SRG1-SRG1-CP-TXtoOpenROADM-3-4-DEG1-DEG1-CTP-RX</link-id>
+            <source><source-node>OpenROADM-3-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-4-DEG1-DEG1-CTP-TXtoOpenROADM-3-4-SRG1-SRG1-CP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-4-DEG1-DEG1-CTP-TXtoOpenROADM-3-4-SRG1-SRG1-CP-RX</link-id>
+            <source><source-node>OpenROADM-3-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-4-SRG1-SRG1-CP-TXtoOpenROADM-3-4-DEG1-DEG1-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-4-DEG2-DEG2-CTP-TXtoOpenROADM-3-4-DEG1-DEG1-CTP-RX</link-id>
+            <source><source-node>OpenROADM-3-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-4-DEG1-DEG1-CTP-TXtoOpenROADM-3-4-DEG2-DEG2-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-4-DEG2-DEG2-CTP-TXtoOpenROADM-3-4-DEG3-DEG3-CTP-RX</link-id>
+            <source><source-node>OpenROADM-3-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-4-DEG3-DEG3-CTP-TXtoOpenROADM-3-4-DEG2-DEG2-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-4-SRG1-SRG1-CP-TXtoOpenROADM-3-4-DEG2-DEG2-CTP-RX</link-id>
+            <source><source-node>OpenROADM-3-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-4-DEG2-DEG2-CTP-TXtoOpenROADM-3-4-SRG1-SRG1-CP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-4-DEG2-DEG2-CTP-TXtoOpenROADM-3-4-SRG1-SRG1-CP-RX</link-id>
+            <source><source-node>OpenROADM-3-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-4-SRG1-SRG1-CP-TXtoOpenROADM-3-4-DEG2-DEG2-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-4-DEG3-DEG3-CTP-TXtoOpenROADM-3-4-DEG1-DEG1-CTP-RX</link-id>
+            <source><source-node>OpenROADM-3-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-4-DEG1-DEG1-CTP-TXtoOpenROADM-3-4-DEG3-DEG3-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-4-DEG3-DEG3-CTP-TXtoOpenROADM-3-4-DEG2-DEG2-CTP-RX</link-id>
+            <source><source-node>OpenROADM-3-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-4-DEG2-DEG2-CTP-TXtoOpenROADM-3-4-DEG3-DEG3-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-4-SRG1-SRG1-CP-TXtoOpenROADM-3-4-DEG3-DEG3-CTP-RX</link-id>
+            <source><source-node>OpenROADM-3-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-4-DEG3-DEG3-CTP-TXtoOpenROADM-3-4-SRG1-SRG1-CP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-4-DEG3-DEG3-CTP-TXtoOpenROADM-3-4-SRG1-SRG1-CP-RX</link-id>
+            <source><source-node>OpenROADM-3-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-4-SRG1-SRG1-CP-TXtoOpenROADM-3-4-DEG3-DEG3-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-4XPDR-NW1-TX-toOpenROADM-3-4-SRG1-SRG1-PP1-RX</link-id>
+            <source><source-node>XPONDER-3-4</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-4-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-4-SRG1-SRG1-PP1-TX-to-XPONDER-3-4XPDR-NW1-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-4-SRG1-SRG1-PP1-TX-to-XPONDER-3-4XPDR-NW1-RX</link-id>
+            <source><source-node>OpenROADM-3-4-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-3-4</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-3-4XPDR-NW1-TX-toOpenROADM-3-4-SRG1-SRG1-PP1-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-4XPDR-NW2-TX-toOpenROADM-3-4-SRG1-SRG1-PP2-RX</link-id>
+            <source><source-node>XPONDER-3-4</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-4-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-4-SRG1-SRG1-PP2-TX-to-XPONDER-3-4XPDR-NW2-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-4-SRG1-SRG1-PP2-TX-to-XPONDER-3-4XPDR-NW2-RX</link-id>
+            <source><source-node>OpenROADM-3-4-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-3-4</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-3-4XPDR-NW2-TX-toOpenROADM-3-4-SRG1-SRG1-PP2-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-4XPDR-NW3-TX-toOpenROADM-3-4-SRG1-SRG1-PP3-RX</link-id>
+            <source><source-node>XPONDER-3-4</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-4-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-4-SRG1-SRG1-PP3-TX-to-XPONDER-3-4XPDR-NW3-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-4-SRG1-SRG1-PP3-TX-to-XPONDER-3-4XPDR-NW3-RX</link-id>
+            <source><source-node>OpenROADM-3-4-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-3-4</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-3-4XPDR-NW3-TX-toOpenROADM-3-4-SRG1-SRG1-PP3-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-4XPDR-NW4-TX-toOpenROADM-3-4-SRG1-SRG1-PP4-RX</link-id>
+            <source><source-node>XPONDER-3-4</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-4-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-4-SRG1-SRG1-PP4-TX-to-XPONDER-3-4XPDR-NW4-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-4-SRG1-SRG1-PP4-TX-to-XPONDER-3-4XPDR-NW4-RX</link-id>
+            <source><source-node>OpenROADM-3-4-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-3-4</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-3-4XPDR-NW4-TX-toOpenROADM-3-4-SRG1-SRG1-PP4-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-3-1-DEG1-to-OpenROADM-3-2-DEG1</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-2-DEG1-to-OpenROADM-3-1-DEG1</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">30</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-3-1-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-3-2-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>31321</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>31322</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>31323</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>31324</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-3-2-DEG1-to-OpenROADM-3-1-DEG1</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-1-DEG1-to-OpenROADM-3-2-DEG1</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">30</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-3-2-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-3-1-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>32311</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>32312</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>32313</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>32314</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-3-2-DEG2-to-OpenROADM-3-3-DEG2</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-3-DEG2-to-OpenROADM-3-2-DEG2</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">30</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-3-2-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-3-3-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>32331</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>32332</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>32333</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>32334</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-3-3-DEG2-to-OpenROADM-3-2-DEG2</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-2-DEG2-to-OpenROADM-3-3-DEG2</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">30</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-3-3-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-3-2-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>33321</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>33322</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>33323</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>33324</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-3-3-DEG1-to-OpenROADM-3-4-DEG1</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-4-DEG1-to-OpenROADM-3-3-DEG1</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">30</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-3-3-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-3-4-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>33341</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>33342</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>33343</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>33344</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-3-4-DEG1-to-OpenROADM-3-3-DEG1</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-3-DEG1-to-OpenROADM-3-4-DEG1</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">30</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-3-4-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-3-3-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>34331</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>34332</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>34333</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>34334</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-3-4-DEG2-to-OpenROADM-3-1-DEG2</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-1-DEG2-to-OpenROADM-3-4-DEG2</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">30</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-3-4-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-3-1-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>34311</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>34312</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>34313</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>34314</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-3-1-DEG2-to-OpenROADM-3-4-DEG2</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-4-DEG2-to-OpenROADM-3-1-DEG2</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">30</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-3-1-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-3-4-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>31341</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>31342</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>31343</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>31344</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-DEG1-DEG1-CTP-TXtoOpenROADM-4-1-DEG2-DEG2-CTP-RX</link-id>
+            <source><source-node>OpenROADM-4-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-1-DEG2-DEG2-CTP-TXtoOpenROADM-4-1-DEG1-DEG1-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-DEG1-DEG1-CTP-TXtoOpenROADM-4-1-DEG3-DEG3-CTP-RX</link-id>
+            <source><source-node>OpenROADM-4-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-1-DEG3-DEG3-CTP-TXtoOpenROADM-4-1-DEG1-DEG1-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-1-SRG1-SRG1-CP-TXtoOpenROADM-4-1-DEG1-DEG1-CTP-RX</link-id>
             <source><source-node>OpenROADM-4-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-1-DEG1-DEG1-CTP-TXtoOpenROADM-4-1-SRG1-SRG1-CP-RX</opposite-link>
@@ -2213,14 +3929,14 @@
             <source><source-node>OpenROADM-4-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-1-SRG1-SRG1-CP-TXtoOpenROADM-4-1-DEG1-DEG1-CTP-RX</opposite-link>
             <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-DEG2-DEG2-CTP-TXtoOpenROADM-4-1-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-4-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-1-DEG1-DEG1-CTP-TXtoOpenROADM-4-1-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-DEG2-DEG2-CTP-TXtoOpenROADM-4-1-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-4-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-1-DEG3-DEG3-CTP-TXtoOpenROADM-4-1-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-DEG2-DEG2-CTP-TXtoOpenROADM-4-1-DEG1-DEG1-CTP-RX</link-id>
+            <source><source-node>OpenROADM-4-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-1-DEG1-DEG1-CTP-TXtoOpenROADM-4-1-DEG2-DEG2-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-DEG2-DEG2-CTP-TXtoOpenROADM-4-1-DEG3-DEG3-CTP-RX</link-id>
+            <source><source-node>OpenROADM-4-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-1-DEG3-DEG3-CTP-TXtoOpenROADM-4-1-DEG2-DEG2-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-1-SRG1-SRG1-CP-TXtoOpenROADM-4-1-DEG2-DEG2-CTP-RX</link-id>
             <source><source-node>OpenROADM-4-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-1-DEG2-DEG2-CTP-TXtoOpenROADM-4-1-SRG1-SRG1-CP-RX</opposite-link>
@@ -2229,14 +3945,14 @@
             <source><source-node>OpenROADM-4-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-1-SRG1-SRG1-CP-TXtoOpenROADM-4-1-DEG2-DEG2-CTP-RX</opposite-link>
             <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-DEG3-DEG3-CTP-TXtoOpenROADM-4-1-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-4-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-1-DEG1-DEG1-CTP-TXtoOpenROADM-4-1-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-DEG3-DEG3-CTP-TXtoOpenROADM-4-1-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-4-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-1-DEG2-DEG2-CTP-TXtoOpenROADM-4-1-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-DEG3-DEG3-CTP-TXtoOpenROADM-4-1-DEG1-DEG1-CTP-RX</link-id>
+            <source><source-node>OpenROADM-4-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-1-DEG1-DEG1-CTP-TXtoOpenROADM-4-1-DEG3-DEG3-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-DEG3-DEG3-CTP-TXtoOpenROADM-4-1-DEG2-DEG2-CTP-RX</link-id>
+            <source><source-node>OpenROADM-4-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-1-DEG2-DEG2-CTP-TXtoOpenROADM-4-1-DEG3-DEG3-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-1-SRG1-SRG1-CP-TXtoOpenROADM-4-1-DEG3-DEG3-CTP-RX</link-id>
             <source><source-node>OpenROADM-4-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-1-DEG3-DEG3-CTP-TXtoOpenROADM-4-1-SRG1-SRG1-CP-RX</opposite-link>
@@ -2245,54 +3961,46 @@
             <source><source-node>OpenROADM-4-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-1-SRG1-SRG1-CP-TXtoOpenROADM-4-1-DEG3-DEG3-CTP-RX</opposite-link>
             <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-1XPDR-NW1-TX-toOpenROADM-4-1-SRG1-SRG1-PP1-RX</link-id>
-        <source><source-node>XPONDER-4-1</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-1-SRG1-SRG1-PP1-TX-to-XPONDER-4-1XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-SRG1-SRG1-PP1-TX-to-XPONDER-4-1XPDR-NW1-RX</link-id>
-        <source><source-node>OpenROADM-4-1-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-4-1</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-4-1XPDR-NW1-TX-toOpenROADM-4-1-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-1XPDR-NW2-TX-toOpenROADM-4-1-SRG1-SRG1-PP2-RX</link-id>
-        <source><source-node>XPONDER-4-1</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-1-SRG1-SRG1-PP2-TX-to-XPONDER-4-1XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-SRG1-SRG1-PP2-TX-to-XPONDER-4-1XPDR-NW2-RX</link-id>
-        <source><source-node>OpenROADM-4-1-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-4-1</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-4-1XPDR-NW2-TX-toOpenROADM-4-1-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-1XPDR-NW3-TX-toOpenROADM-4-1-SRG1-SRG1-PP3-RX</link-id>
-        <source><source-node>XPONDER-4-1</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-1-SRG1-SRG1-PP3-TX-to-XPONDER-4-1XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-SRG1-SRG1-PP3-TX-to-XPONDER-4-1XPDR-NW3-RX</link-id>
-        <source><source-node>OpenROADM-4-1-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-4-1</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-4-1XPDR-NW3-TX-toOpenROADM-4-1-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-1XPDR-NW4-TX-toOpenROADM-4-1-SRG1-SRG1-PP4-RX</link-id>
-        <source><source-node>XPONDER-4-1</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-1-SRG1-SRG1-PP4-TX-to-XPONDER-4-1XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-SRG1-SRG1-PP4-TX-to-XPONDER-4-1XPDR-NW4-RX</link-id>
-        <source><source-node>OpenROADM-4-1-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-4-1</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-4-1XPDR-NW4-TX-toOpenROADM-4-1-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-1XPDR-NW5-TX-toOpenROADM-4-1-SRG1-SRG1-PP5-RX</link-id>
-        <source><source-node>XPONDER-4-1</source-node><source-tp>XPDR-NW5-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-SRG1</dest-node><dest-tp>SRG1-PP5-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-1-SRG1-SRG1-PP5-TX-to-XPONDER-4-1XPDR-NW5-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-SRG1-SRG1-PP5-TX-to-XPONDER-4-1XPDR-NW5-RX</link-id>
-        <source><source-node>OpenROADM-4-1-SRG1</source-node><source-tp>SRG1-PP5-TX</source-tp></source>        <destination><dest-node>XPONDER-4-1</dest-node><dest-tp>XPDR-NW5-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-4-1XPDR-NW5-TX-toOpenROADM-4-1-SRG1-SRG1-PP5-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-DEG1-DEG1-CTP-TXtoOpenROADM-4-2-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-4-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-2-DEG2-DEG2-CTP-TXtoOpenROADM-4-2-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-DEG1-DEG1-CTP-TXtoOpenROADM-4-2-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-4-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-2-DEG3-DEG3-CTP-TXtoOpenROADM-4-2-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-1XPDR-NW1-TX-toOpenROADM-4-1-SRG1-SRG1-PP1-RX</link-id>
+            <source><source-node>XPONDER-4-1</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-1-SRG1-SRG1-PP1-TX-to-XPONDER-4-1XPDR-NW1-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-SRG1-SRG1-PP1-TX-to-XPONDER-4-1XPDR-NW1-RX</link-id>
+            <source><source-node>OpenROADM-4-1-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-4-1</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-4-1XPDR-NW1-TX-toOpenROADM-4-1-SRG1-SRG1-PP1-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-1XPDR-NW2-TX-toOpenROADM-4-1-SRG1-SRG1-PP2-RX</link-id>
+            <source><source-node>XPONDER-4-1</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-1-SRG1-SRG1-PP2-TX-to-XPONDER-4-1XPDR-NW2-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-SRG1-SRG1-PP2-TX-to-XPONDER-4-1XPDR-NW2-RX</link-id>
+            <source><source-node>OpenROADM-4-1-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-4-1</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-4-1XPDR-NW2-TX-toOpenROADM-4-1-SRG1-SRG1-PP2-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-1XPDR-NW3-TX-toOpenROADM-4-1-SRG1-SRG1-PP3-RX</link-id>
+            <source><source-node>XPONDER-4-1</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-1-SRG1-SRG1-PP3-TX-to-XPONDER-4-1XPDR-NW3-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-SRG1-SRG1-PP3-TX-to-XPONDER-4-1XPDR-NW3-RX</link-id>
+            <source><source-node>OpenROADM-4-1-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-4-1</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-4-1XPDR-NW3-TX-toOpenROADM-4-1-SRG1-SRG1-PP3-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-1XPDR-NW4-TX-toOpenROADM-4-1-SRG1-SRG1-PP4-RX</link-id>
+            <source><source-node>XPONDER-4-1</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-1-SRG1-SRG1-PP4-TX-to-XPONDER-4-1XPDR-NW4-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-SRG1-SRG1-PP4-TX-to-XPONDER-4-1XPDR-NW4-RX</link-id>
+            <source><source-node>OpenROADM-4-1-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-4-1</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-4-1XPDR-NW4-TX-toOpenROADM-4-1-SRG1-SRG1-PP4-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-DEG1-DEG1-CTP-TXtoOpenROADM-4-2-DEG2-DEG2-CTP-RX</link-id>
+            <source><source-node>OpenROADM-4-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-2-DEG2-DEG2-CTP-TXtoOpenROADM-4-2-DEG1-DEG1-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-DEG1-DEG1-CTP-TXtoOpenROADM-4-2-DEG3-DEG3-CTP-RX</link-id>
+            <source><source-node>OpenROADM-4-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-2-DEG3-DEG3-CTP-TXtoOpenROADM-4-2-DEG1-DEG1-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-2-SRG1-SRG1-CP-TXtoOpenROADM-4-2-DEG1-DEG1-CTP-RX</link-id>
             <source><source-node>OpenROADM-4-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-2-DEG1-DEG1-CTP-TXtoOpenROADM-4-2-SRG1-SRG1-CP-RX</opposite-link>
@@ -2301,14 +4009,14 @@
             <source><source-node>OpenROADM-4-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-2-SRG1-SRG1-CP-TXtoOpenROADM-4-2-DEG1-DEG1-CTP-RX</opposite-link>
             <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-DEG2-DEG2-CTP-TXtoOpenROADM-4-2-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-4-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-2-DEG1-DEG1-CTP-TXtoOpenROADM-4-2-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-DEG2-DEG2-CTP-TXtoOpenROADM-4-2-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-4-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-2-DEG3-DEG3-CTP-TXtoOpenROADM-4-2-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-DEG2-DEG2-CTP-TXtoOpenROADM-4-2-DEG1-DEG1-CTP-RX</link-id>
+            <source><source-node>OpenROADM-4-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-2-DEG1-DEG1-CTP-TXtoOpenROADM-4-2-DEG2-DEG2-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-DEG2-DEG2-CTP-TXtoOpenROADM-4-2-DEG3-DEG3-CTP-RX</link-id>
+            <source><source-node>OpenROADM-4-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-2-DEG3-DEG3-CTP-TXtoOpenROADM-4-2-DEG2-DEG2-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-2-SRG1-SRG1-CP-TXtoOpenROADM-4-2-DEG2-DEG2-CTP-RX</link-id>
             <source><source-node>OpenROADM-4-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-2-DEG2-DEG2-CTP-TXtoOpenROADM-4-2-SRG1-SRG1-CP-RX</opposite-link>
@@ -2317,14 +4025,14 @@
             <source><source-node>OpenROADM-4-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-2-SRG1-SRG1-CP-TXtoOpenROADM-4-2-DEG2-DEG2-CTP-RX</opposite-link>
             <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-DEG3-DEG3-CTP-TXtoOpenROADM-4-2-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-4-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-2-DEG1-DEG1-CTP-TXtoOpenROADM-4-2-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-DEG3-DEG3-CTP-TXtoOpenROADM-4-2-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-4-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-2-DEG2-DEG2-CTP-TXtoOpenROADM-4-2-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-DEG3-DEG3-CTP-TXtoOpenROADM-4-2-DEG1-DEG1-CTP-RX</link-id>
+            <source><source-node>OpenROADM-4-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-2-DEG1-DEG1-CTP-TXtoOpenROADM-4-2-DEG3-DEG3-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-DEG3-DEG3-CTP-TXtoOpenROADM-4-2-DEG2-DEG2-CTP-RX</link-id>
+            <source><source-node>OpenROADM-4-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-2-DEG2-DEG2-CTP-TXtoOpenROADM-4-2-DEG3-DEG3-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-2-SRG1-SRG1-CP-TXtoOpenROADM-4-2-DEG3-DEG3-CTP-RX</link-id>
             <source><source-node>OpenROADM-4-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-2-DEG3-DEG3-CTP-TXtoOpenROADM-4-2-SRG1-SRG1-CP-RX</opposite-link>
@@ -2333,70 +4041,310 @@
             <source><source-node>OpenROADM-4-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-2-SRG1-SRG1-CP-TXtoOpenROADM-4-2-DEG3-DEG3-CTP-RX</opposite-link>
             <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-2XPDR-NW1-TX-toOpenROADM-4-2-SRG1-SRG1-PP1-RX</link-id>
-        <source><source-node>XPONDER-4-2</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-2-SRG1-SRG1-PP1-TX-to-XPONDER-4-2XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-SRG1-SRG1-PP1-TX-to-XPONDER-4-2XPDR-NW1-RX</link-id>
-        <source><source-node>OpenROADM-4-2-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-4-2</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-4-2XPDR-NW1-TX-toOpenROADM-4-2-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-2XPDR-NW2-TX-toOpenROADM-4-2-SRG1-SRG1-PP2-RX</link-id>
-        <source><source-node>XPONDER-4-2</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-2-SRG1-SRG1-PP2-TX-to-XPONDER-4-2XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-SRG1-SRG1-PP2-TX-to-XPONDER-4-2XPDR-NW2-RX</link-id>
-        <source><source-node>OpenROADM-4-2-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-4-2</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-4-2XPDR-NW2-TX-toOpenROADM-4-2-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-2XPDR-NW3-TX-toOpenROADM-4-2-SRG1-SRG1-PP3-RX</link-id>
-        <source><source-node>XPONDER-4-2</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-2-SRG1-SRG1-PP3-TX-to-XPONDER-4-2XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-SRG1-SRG1-PP3-TX-to-XPONDER-4-2XPDR-NW3-RX</link-id>
-        <source><source-node>OpenROADM-4-2-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-4-2</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-4-2XPDR-NW3-TX-toOpenROADM-4-2-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-2XPDR-NW4-TX-toOpenROADM-4-2-SRG1-SRG1-PP4-RX</link-id>
-        <source><source-node>XPONDER-4-2</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-2-SRG1-SRG1-PP4-TX-to-XPONDER-4-2XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-SRG1-SRG1-PP4-TX-to-XPONDER-4-2XPDR-NW4-RX</link-id>
-        <source><source-node>OpenROADM-4-2-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-4-2</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-4-2XPDR-NW4-TX-toOpenROADM-4-2-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-2XPDR-NW5-TX-toOpenROADM-4-2-SRG1-SRG1-PP5-RX</link-id>
-        <source><source-node>XPONDER-4-2</source-node><source-tp>XPDR-NW5-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-SRG1</dest-node><dest-tp>SRG1-PP5-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-2-SRG1-SRG1-PP5-TX-to-XPONDER-4-2XPDR-NW5-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-SRG1-SRG1-PP5-TX-to-XPONDER-4-2XPDR-NW5-RX</link-id>
-        <source><source-node>OpenROADM-4-2-SRG1</source-node><source-tp>SRG1-PP5-TX</source-tp></source>        <destination><dest-node>XPONDER-4-2</dest-node><dest-tp>XPDR-NW5-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-4-2XPDR-NW5-TX-toOpenROADM-4-2-SRG1-SRG1-PP5-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-4-1-DEG1-to-OpenROADM-4-2-DEG1</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-2-DEG1-to-OpenROADM-4-1-DEG1</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-4-1-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-4-2-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-4-2-DEG1-to-OpenROADM-4-1-DEG1</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-1-DEG1-to-OpenROADM-4-2-DEG1</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-4-2-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-4-1-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-4-2-DEG2-to-OpenROADM-4-1-DEG2</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-1-DEG2-to-OpenROADM-4-2-DEG2</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-4-2-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-4-1-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-4-1-DEG2-to-OpenROADM-4-2-DEG2</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-2-DEG2-to-OpenROADM-4-1-DEG2</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-4-1-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-4-2-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-DEG1-DEG1-CTP-TXtoOpenROADM-5-1-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-5-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-1-DEG2-DEG2-CTP-TXtoOpenROADM-5-1-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-DEG1-DEG1-CTP-TXtoOpenROADM-5-1-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-5-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-1-DEG3-DEG3-CTP-TXtoOpenROADM-5-1-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-2XPDR-NW1-TX-toOpenROADM-4-2-SRG1-SRG1-PP1-RX</link-id>
+            <source><source-node>XPONDER-4-2</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-2-SRG1-SRG1-PP1-TX-to-XPONDER-4-2XPDR-NW1-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-SRG1-SRG1-PP1-TX-to-XPONDER-4-2XPDR-NW1-RX</link-id>
+            <source><source-node>OpenROADM-4-2-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-4-2</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-4-2XPDR-NW1-TX-toOpenROADM-4-2-SRG1-SRG1-PP1-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-2XPDR-NW2-TX-toOpenROADM-4-2-SRG1-SRG1-PP2-RX</link-id>
+            <source><source-node>XPONDER-4-2</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-2-SRG1-SRG1-PP2-TX-to-XPONDER-4-2XPDR-NW2-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-SRG1-SRG1-PP2-TX-to-XPONDER-4-2XPDR-NW2-RX</link-id>
+            <source><source-node>OpenROADM-4-2-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-4-2</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-4-2XPDR-NW2-TX-toOpenROADM-4-2-SRG1-SRG1-PP2-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-2XPDR-NW3-TX-toOpenROADM-4-2-SRG1-SRG1-PP3-RX</link-id>
+            <source><source-node>XPONDER-4-2</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-2-SRG1-SRG1-PP3-TX-to-XPONDER-4-2XPDR-NW3-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-SRG1-SRG1-PP3-TX-to-XPONDER-4-2XPDR-NW3-RX</link-id>
+            <source><source-node>OpenROADM-4-2-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-4-2</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-4-2XPDR-NW3-TX-toOpenROADM-4-2-SRG1-SRG1-PP3-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-2XPDR-NW4-TX-toOpenROADM-4-2-SRG1-SRG1-PP4-RX</link-id>
+            <source><source-node>XPONDER-4-2</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-2-SRG1-SRG1-PP4-TX-to-XPONDER-4-2XPDR-NW4-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-SRG1-SRG1-PP4-TX-to-XPONDER-4-2XPDR-NW4-RX</link-id>
+            <source><source-node>OpenROADM-4-2-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-4-2</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-4-2XPDR-NW4-TX-toOpenROADM-4-2-SRG1-SRG1-PP4-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-3-DEG1-DEG1-CTP-TXtoOpenROADM-4-3-DEG2-DEG2-CTP-RX</link-id>
+            <source><source-node>OpenROADM-4-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-3-DEG2-DEG2-CTP-TXtoOpenROADM-4-3-DEG1-DEG1-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-3-DEG1-DEG1-CTP-TXtoOpenROADM-4-3-DEG3-DEG3-CTP-RX</link-id>
+            <source><source-node>OpenROADM-4-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-3-DEG3-DEG3-CTP-TXtoOpenROADM-4-3-DEG1-DEG1-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-3-SRG1-SRG1-CP-TXtoOpenROADM-4-3-DEG1-DEG1-CTP-RX</link-id>
+            <source><source-node>OpenROADM-4-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-3-DEG1-DEG1-CTP-TXtoOpenROADM-4-3-SRG1-SRG1-CP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-3-DEG1-DEG1-CTP-TXtoOpenROADM-4-3-SRG1-SRG1-CP-RX</link-id>
+            <source><source-node>OpenROADM-4-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-3-SRG1-SRG1-CP-TXtoOpenROADM-4-3-DEG1-DEG1-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-3-DEG2-DEG2-CTP-TXtoOpenROADM-4-3-DEG1-DEG1-CTP-RX</link-id>
+            <source><source-node>OpenROADM-4-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-3-DEG1-DEG1-CTP-TXtoOpenROADM-4-3-DEG2-DEG2-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-3-DEG2-DEG2-CTP-TXtoOpenROADM-4-3-DEG3-DEG3-CTP-RX</link-id>
+            <source><source-node>OpenROADM-4-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-3-DEG3-DEG3-CTP-TXtoOpenROADM-4-3-DEG2-DEG2-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-3-SRG1-SRG1-CP-TXtoOpenROADM-4-3-DEG2-DEG2-CTP-RX</link-id>
+            <source><source-node>OpenROADM-4-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-3-DEG2-DEG2-CTP-TXtoOpenROADM-4-3-SRG1-SRG1-CP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-3-DEG2-DEG2-CTP-TXtoOpenROADM-4-3-SRG1-SRG1-CP-RX</link-id>
+            <source><source-node>OpenROADM-4-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-3-SRG1-SRG1-CP-TXtoOpenROADM-4-3-DEG2-DEG2-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-3-DEG3-DEG3-CTP-TXtoOpenROADM-4-3-DEG1-DEG1-CTP-RX</link-id>
+            <source><source-node>OpenROADM-4-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-3-DEG1-DEG1-CTP-TXtoOpenROADM-4-3-DEG3-DEG3-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-3-DEG3-DEG3-CTP-TXtoOpenROADM-4-3-DEG2-DEG2-CTP-RX</link-id>
+            <source><source-node>OpenROADM-4-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-3-DEG2-DEG2-CTP-TXtoOpenROADM-4-3-DEG3-DEG3-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-3-SRG1-SRG1-CP-TXtoOpenROADM-4-3-DEG3-DEG3-CTP-RX</link-id>
+            <source><source-node>OpenROADM-4-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-3-DEG3-DEG3-CTP-TXtoOpenROADM-4-3-SRG1-SRG1-CP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-3-DEG3-DEG3-CTP-TXtoOpenROADM-4-3-SRG1-SRG1-CP-RX</link-id>
+            <source><source-node>OpenROADM-4-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-3-SRG1-SRG1-CP-TXtoOpenROADM-4-3-DEG3-DEG3-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-3XPDR-NW1-TX-toOpenROADM-4-3-SRG1-SRG1-PP1-RX</link-id>
+            <source><source-node>XPONDER-4-3</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-3-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-3-SRG1-SRG1-PP1-TX-to-XPONDER-4-3XPDR-NW1-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-3-SRG1-SRG1-PP1-TX-to-XPONDER-4-3XPDR-NW1-RX</link-id>
+            <source><source-node>OpenROADM-4-3-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-4-3</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-4-3XPDR-NW1-TX-toOpenROADM-4-3-SRG1-SRG1-PP1-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-3XPDR-NW2-TX-toOpenROADM-4-3-SRG1-SRG1-PP2-RX</link-id>
+            <source><source-node>XPONDER-4-3</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-3-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-3-SRG1-SRG1-PP2-TX-to-XPONDER-4-3XPDR-NW2-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-3-SRG1-SRG1-PP2-TX-to-XPONDER-4-3XPDR-NW2-RX</link-id>
+            <source><source-node>OpenROADM-4-3-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-4-3</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-4-3XPDR-NW2-TX-toOpenROADM-4-3-SRG1-SRG1-PP2-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-3XPDR-NW3-TX-toOpenROADM-4-3-SRG1-SRG1-PP3-RX</link-id>
+            <source><source-node>XPONDER-4-3</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-3-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-3-SRG1-SRG1-PP3-TX-to-XPONDER-4-3XPDR-NW3-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-3-SRG1-SRG1-PP3-TX-to-XPONDER-4-3XPDR-NW3-RX</link-id>
+            <source><source-node>OpenROADM-4-3-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-4-3</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-4-3XPDR-NW3-TX-toOpenROADM-4-3-SRG1-SRG1-PP3-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-3XPDR-NW4-TX-toOpenROADM-4-3-SRG1-SRG1-PP4-RX</link-id>
+            <source><source-node>XPONDER-4-3</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-3-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-3-SRG1-SRG1-PP4-TX-to-XPONDER-4-3XPDR-NW4-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-3-SRG1-SRG1-PP4-TX-to-XPONDER-4-3XPDR-NW4-RX</link-id>
+            <source><source-node>OpenROADM-4-3-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-4-3</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-4-3XPDR-NW4-TX-toOpenROADM-4-3-SRG1-SRG1-PP4-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-4-DEG1-DEG1-CTP-TXtoOpenROADM-4-4-DEG2-DEG2-CTP-RX</link-id>
+            <source><source-node>OpenROADM-4-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-4-DEG2-DEG2-CTP-TXtoOpenROADM-4-4-DEG1-DEG1-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-4-DEG1-DEG1-CTP-TXtoOpenROADM-4-4-DEG3-DEG3-CTP-RX</link-id>
+            <source><source-node>OpenROADM-4-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-4-DEG3-DEG3-CTP-TXtoOpenROADM-4-4-DEG1-DEG1-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-4-SRG1-SRG1-CP-TXtoOpenROADM-4-4-DEG1-DEG1-CTP-RX</link-id>
+            <source><source-node>OpenROADM-4-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-4-DEG1-DEG1-CTP-TXtoOpenROADM-4-4-SRG1-SRG1-CP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-4-DEG1-DEG1-CTP-TXtoOpenROADM-4-4-SRG1-SRG1-CP-RX</link-id>
+            <source><source-node>OpenROADM-4-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-4-SRG1-SRG1-CP-TXtoOpenROADM-4-4-DEG1-DEG1-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-4-DEG2-DEG2-CTP-TXtoOpenROADM-4-4-DEG1-DEG1-CTP-RX</link-id>
+            <source><source-node>OpenROADM-4-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-4-DEG1-DEG1-CTP-TXtoOpenROADM-4-4-DEG2-DEG2-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-4-DEG2-DEG2-CTP-TXtoOpenROADM-4-4-DEG3-DEG3-CTP-RX</link-id>
+            <source><source-node>OpenROADM-4-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-4-DEG3-DEG3-CTP-TXtoOpenROADM-4-4-DEG2-DEG2-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-4-SRG1-SRG1-CP-TXtoOpenROADM-4-4-DEG2-DEG2-CTP-RX</link-id>
+            <source><source-node>OpenROADM-4-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-4-DEG2-DEG2-CTP-TXtoOpenROADM-4-4-SRG1-SRG1-CP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-4-DEG2-DEG2-CTP-TXtoOpenROADM-4-4-SRG1-SRG1-CP-RX</link-id>
+            <source><source-node>OpenROADM-4-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-4-SRG1-SRG1-CP-TXtoOpenROADM-4-4-DEG2-DEG2-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-4-DEG3-DEG3-CTP-TXtoOpenROADM-4-4-DEG1-DEG1-CTP-RX</link-id>
+            <source><source-node>OpenROADM-4-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-4-DEG1-DEG1-CTP-TXtoOpenROADM-4-4-DEG3-DEG3-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-4-DEG3-DEG3-CTP-TXtoOpenROADM-4-4-DEG2-DEG2-CTP-RX</link-id>
+            <source><source-node>OpenROADM-4-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-4-DEG2-DEG2-CTP-TXtoOpenROADM-4-4-DEG3-DEG3-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-4-SRG1-SRG1-CP-TXtoOpenROADM-4-4-DEG3-DEG3-CTP-RX</link-id>
+            <source><source-node>OpenROADM-4-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-4-DEG3-DEG3-CTP-TXtoOpenROADM-4-4-SRG1-SRG1-CP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-4-DEG3-DEG3-CTP-TXtoOpenROADM-4-4-SRG1-SRG1-CP-RX</link-id>
+            <source><source-node>OpenROADM-4-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-4-SRG1-SRG1-CP-TXtoOpenROADM-4-4-DEG3-DEG3-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-4XPDR-NW1-TX-toOpenROADM-4-4-SRG1-SRG1-PP1-RX</link-id>
+            <source><source-node>XPONDER-4-4</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-4-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-4-SRG1-SRG1-PP1-TX-to-XPONDER-4-4XPDR-NW1-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-4-SRG1-SRG1-PP1-TX-to-XPONDER-4-4XPDR-NW1-RX</link-id>
+            <source><source-node>OpenROADM-4-4-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-4-4</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-4-4XPDR-NW1-TX-toOpenROADM-4-4-SRG1-SRG1-PP1-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-4XPDR-NW2-TX-toOpenROADM-4-4-SRG1-SRG1-PP2-RX</link-id>
+            <source><source-node>XPONDER-4-4</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-4-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-4-SRG1-SRG1-PP2-TX-to-XPONDER-4-4XPDR-NW2-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-4-SRG1-SRG1-PP2-TX-to-XPONDER-4-4XPDR-NW2-RX</link-id>
+            <source><source-node>OpenROADM-4-4-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-4-4</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-4-4XPDR-NW2-TX-toOpenROADM-4-4-SRG1-SRG1-PP2-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-4XPDR-NW3-TX-toOpenROADM-4-4-SRG1-SRG1-PP3-RX</link-id>
+            <source><source-node>XPONDER-4-4</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-4-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-4-SRG1-SRG1-PP3-TX-to-XPONDER-4-4XPDR-NW3-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-4-SRG1-SRG1-PP3-TX-to-XPONDER-4-4XPDR-NW3-RX</link-id>
+            <source><source-node>OpenROADM-4-4-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-4-4</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-4-4XPDR-NW3-TX-toOpenROADM-4-4-SRG1-SRG1-PP3-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-4XPDR-NW4-TX-toOpenROADM-4-4-SRG1-SRG1-PP4-RX</link-id>
+            <source><source-node>XPONDER-4-4</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-4-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-4-SRG1-SRG1-PP4-TX-to-XPONDER-4-4XPDR-NW4-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-4-SRG1-SRG1-PP4-TX-to-XPONDER-4-4XPDR-NW4-RX</link-id>
+            <source><source-node>OpenROADM-4-4-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-4-4</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-4-4XPDR-NW4-TX-toOpenROADM-4-4-SRG1-SRG1-PP4-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-4-1-DEG1-to-OpenROADM-4-2-DEG1</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-2-DEG1-to-OpenROADM-4-1-DEG1</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">40</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-4-1-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-4-2-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>41421</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>41422</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>41423</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>41424</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-4-2-DEG1-to-OpenROADM-4-1-DEG1</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-1-DEG1-to-OpenROADM-4-2-DEG1</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">40</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-4-2-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-4-1-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>42411</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>42412</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>42413</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>42414</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-4-2-DEG2-to-OpenROADM-4-3-DEG2</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-3-DEG2-to-OpenROADM-4-2-DEG2</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">40</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-4-2-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-4-3-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>42431</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>42432</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>42433</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>42434</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-4-3-DEG2-to-OpenROADM-4-2-DEG2</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-2-DEG2-to-OpenROADM-4-3-DEG2</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">40</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-4-3-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-4-2-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>43421</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>43422</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>43423</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>43424</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-4-3-DEG1-to-OpenROADM-4-4-DEG1</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-4-DEG1-to-OpenROADM-4-3-DEG1</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">40</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-4-3-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-4-4-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>43441</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>43442</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>43443</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>43444</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-4-4-DEG1-to-OpenROADM-4-3-DEG1</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-3-DEG1-to-OpenROADM-4-4-DEG1</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">40</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-4-4-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-4-3-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>44431</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>44432</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>44433</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>44434</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-4-4-DEG2-to-OpenROADM-4-1-DEG2</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-1-DEG2-to-OpenROADM-4-4-DEG2</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">40</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-4-4-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-4-1-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>44411</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>44412</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>44413</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>44414</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-4-1-DEG2-to-OpenROADM-4-4-DEG2</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-4-DEG2-to-OpenROADM-4-1-DEG2</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">40</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-4-1-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-4-4-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>41441</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>41442</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>41443</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>41444</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-DEG1-DEG1-CTP-TXtoOpenROADM-5-1-DEG2-DEG2-CTP-RX</link-id>
+            <source><source-node>OpenROADM-5-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-1-DEG2-DEG2-CTP-TXtoOpenROADM-5-1-DEG1-DEG1-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-DEG1-DEG1-CTP-TXtoOpenROADM-5-1-DEG3-DEG3-CTP-RX</link-id>
+            <source><source-node>OpenROADM-5-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-1-DEG3-DEG3-CTP-TXtoOpenROADM-5-1-DEG1-DEG1-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-1-SRG1-SRG1-CP-TXtoOpenROADM-5-1-DEG1-DEG1-CTP-RX</link-id>
             <source><source-node>OpenROADM-5-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-1-DEG1-DEG1-CTP-TXtoOpenROADM-5-1-SRG1-SRG1-CP-RX</opposite-link>
@@ -2405,14 +4353,14 @@
             <source><source-node>OpenROADM-5-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-1-SRG1-SRG1-CP-TXtoOpenROADM-5-1-DEG1-DEG1-CTP-RX</opposite-link>
             <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-DEG2-DEG2-CTP-TXtoOpenROADM-5-1-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-5-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-1-DEG1-DEG1-CTP-TXtoOpenROADM-5-1-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-DEG2-DEG2-CTP-TXtoOpenROADM-5-1-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-5-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-1-DEG3-DEG3-CTP-TXtoOpenROADM-5-1-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-DEG2-DEG2-CTP-TXtoOpenROADM-5-1-DEG1-DEG1-CTP-RX</link-id>
+            <source><source-node>OpenROADM-5-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-1-DEG1-DEG1-CTP-TXtoOpenROADM-5-1-DEG2-DEG2-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-DEG2-DEG2-CTP-TXtoOpenROADM-5-1-DEG3-DEG3-CTP-RX</link-id>
+            <source><source-node>OpenROADM-5-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-1-DEG3-DEG3-CTP-TXtoOpenROADM-5-1-DEG2-DEG2-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-1-SRG1-SRG1-CP-TXtoOpenROADM-5-1-DEG2-DEG2-CTP-RX</link-id>
             <source><source-node>OpenROADM-5-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-1-DEG2-DEG2-CTP-TXtoOpenROADM-5-1-SRG1-SRG1-CP-RX</opposite-link>
@@ -2421,14 +4369,14 @@
             <source><source-node>OpenROADM-5-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-1-SRG1-SRG1-CP-TXtoOpenROADM-5-1-DEG2-DEG2-CTP-RX</opposite-link>
             <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-DEG3-DEG3-CTP-TXtoOpenROADM-5-1-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-5-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-1-DEG1-DEG1-CTP-TXtoOpenROADM-5-1-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-DEG3-DEG3-CTP-TXtoOpenROADM-5-1-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-5-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-1-DEG2-DEG2-CTP-TXtoOpenROADM-5-1-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-DEG3-DEG3-CTP-TXtoOpenROADM-5-1-DEG1-DEG1-CTP-RX</link-id>
+            <source><source-node>OpenROADM-5-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-1-DEG1-DEG1-CTP-TXtoOpenROADM-5-1-DEG3-DEG3-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-DEG3-DEG3-CTP-TXtoOpenROADM-5-1-DEG2-DEG2-CTP-RX</link-id>
+            <source><source-node>OpenROADM-5-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-1-DEG2-DEG2-CTP-TXtoOpenROADM-5-1-DEG3-DEG3-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-1-SRG1-SRG1-CP-TXtoOpenROADM-5-1-DEG3-DEG3-CTP-RX</link-id>
             <source><source-node>OpenROADM-5-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-1-DEG3-DEG3-CTP-TXtoOpenROADM-5-1-SRG1-SRG1-CP-RX</opposite-link>
@@ -2437,54 +4385,46 @@
             <source><source-node>OpenROADM-5-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-1-SRG1-SRG1-CP-TXtoOpenROADM-5-1-DEG3-DEG3-CTP-RX</opposite-link>
             <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-1XPDR-NW1-TX-toOpenROADM-5-1-SRG1-SRG1-PP1-RX</link-id>
-        <source><source-node>XPONDER-5-1</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-1-SRG1-SRG1-PP1-TX-to-XPONDER-5-1XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-SRG1-SRG1-PP1-TX-to-XPONDER-5-1XPDR-NW1-RX</link-id>
-        <source><source-node>OpenROADM-5-1-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-5-1</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-5-1XPDR-NW1-TX-toOpenROADM-5-1-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-1XPDR-NW2-TX-toOpenROADM-5-1-SRG1-SRG1-PP2-RX</link-id>
-        <source><source-node>XPONDER-5-1</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-1-SRG1-SRG1-PP2-TX-to-XPONDER-5-1XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-SRG1-SRG1-PP2-TX-to-XPONDER-5-1XPDR-NW2-RX</link-id>
-        <source><source-node>OpenROADM-5-1-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-5-1</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-5-1XPDR-NW2-TX-toOpenROADM-5-1-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-1XPDR-NW3-TX-toOpenROADM-5-1-SRG1-SRG1-PP3-RX</link-id>
-        <source><source-node>XPONDER-5-1</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-1-SRG1-SRG1-PP3-TX-to-XPONDER-5-1XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-SRG1-SRG1-PP3-TX-to-XPONDER-5-1XPDR-NW3-RX</link-id>
-        <source><source-node>OpenROADM-5-1-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-5-1</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-5-1XPDR-NW3-TX-toOpenROADM-5-1-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-1XPDR-NW4-TX-toOpenROADM-5-1-SRG1-SRG1-PP4-RX</link-id>
-        <source><source-node>XPONDER-5-1</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-1-SRG1-SRG1-PP4-TX-to-XPONDER-5-1XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-SRG1-SRG1-PP4-TX-to-XPONDER-5-1XPDR-NW4-RX</link-id>
-        <source><source-node>OpenROADM-5-1-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-5-1</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-5-1XPDR-NW4-TX-toOpenROADM-5-1-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-1XPDR-NW5-TX-toOpenROADM-5-1-SRG1-SRG1-PP5-RX</link-id>
-        <source><source-node>XPONDER-5-1</source-node><source-tp>XPDR-NW5-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-SRG1</dest-node><dest-tp>SRG1-PP5-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-1-SRG1-SRG1-PP5-TX-to-XPONDER-5-1XPDR-NW5-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-SRG1-SRG1-PP5-TX-to-XPONDER-5-1XPDR-NW5-RX</link-id>
-        <source><source-node>OpenROADM-5-1-SRG1</source-node><source-tp>SRG1-PP5-TX</source-tp></source>        <destination><dest-node>XPONDER-5-1</dest-node><dest-tp>XPDR-NW5-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-5-1XPDR-NW5-TX-toOpenROADM-5-1-SRG1-SRG1-PP5-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-DEG1-DEG1-CTP-TXtoOpenROADM-5-2-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-5-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-2-DEG2-DEG2-CTP-TXtoOpenROADM-5-2-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-DEG1-DEG1-CTP-TXtoOpenROADM-5-2-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-5-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-2-DEG3-DEG3-CTP-TXtoOpenROADM-5-2-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-1XPDR-NW1-TX-toOpenROADM-5-1-SRG1-SRG1-PP1-RX</link-id>
+            <source><source-node>XPONDER-5-1</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-1-SRG1-SRG1-PP1-TX-to-XPONDER-5-1XPDR-NW1-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-SRG1-SRG1-PP1-TX-to-XPONDER-5-1XPDR-NW1-RX</link-id>
+            <source><source-node>OpenROADM-5-1-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-5-1</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-5-1XPDR-NW1-TX-toOpenROADM-5-1-SRG1-SRG1-PP1-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-1XPDR-NW2-TX-toOpenROADM-5-1-SRG1-SRG1-PP2-RX</link-id>
+            <source><source-node>XPONDER-5-1</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-1-SRG1-SRG1-PP2-TX-to-XPONDER-5-1XPDR-NW2-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-SRG1-SRG1-PP2-TX-to-XPONDER-5-1XPDR-NW2-RX</link-id>
+            <source><source-node>OpenROADM-5-1-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-5-1</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-5-1XPDR-NW2-TX-toOpenROADM-5-1-SRG1-SRG1-PP2-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-1XPDR-NW3-TX-toOpenROADM-5-1-SRG1-SRG1-PP3-RX</link-id>
+            <source><source-node>XPONDER-5-1</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-1-SRG1-SRG1-PP3-TX-to-XPONDER-5-1XPDR-NW3-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-SRG1-SRG1-PP3-TX-to-XPONDER-5-1XPDR-NW3-RX</link-id>
+            <source><source-node>OpenROADM-5-1-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-5-1</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-5-1XPDR-NW3-TX-toOpenROADM-5-1-SRG1-SRG1-PP3-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-1XPDR-NW4-TX-toOpenROADM-5-1-SRG1-SRG1-PP4-RX</link-id>
+            <source><source-node>XPONDER-5-1</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-1-SRG1-SRG1-PP4-TX-to-XPONDER-5-1XPDR-NW4-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-SRG1-SRG1-PP4-TX-to-XPONDER-5-1XPDR-NW4-RX</link-id>
+            <source><source-node>OpenROADM-5-1-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-5-1</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-5-1XPDR-NW4-TX-toOpenROADM-5-1-SRG1-SRG1-PP4-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-DEG1-DEG1-CTP-TXtoOpenROADM-5-2-DEG2-DEG2-CTP-RX</link-id>
+            <source><source-node>OpenROADM-5-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-2-DEG2-DEG2-CTP-TXtoOpenROADM-5-2-DEG1-DEG1-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-DEG1-DEG1-CTP-TXtoOpenROADM-5-2-DEG3-DEG3-CTP-RX</link-id>
+            <source><source-node>OpenROADM-5-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-2-DEG3-DEG3-CTP-TXtoOpenROADM-5-2-DEG1-DEG1-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-2-SRG1-SRG1-CP-TXtoOpenROADM-5-2-DEG1-DEG1-CTP-RX</link-id>
             <source><source-node>OpenROADM-5-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-2-DEG1-DEG1-CTP-TXtoOpenROADM-5-2-SRG1-SRG1-CP-RX</opposite-link>
@@ -2493,14 +4433,14 @@
             <source><source-node>OpenROADM-5-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-2-SRG1-SRG1-CP-TXtoOpenROADM-5-2-DEG1-DEG1-CTP-RX</opposite-link>
             <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-DEG2-DEG2-CTP-TXtoOpenROADM-5-2-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-5-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-2-DEG1-DEG1-CTP-TXtoOpenROADM-5-2-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-DEG2-DEG2-CTP-TXtoOpenROADM-5-2-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-5-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-2-DEG3-DEG3-CTP-TXtoOpenROADM-5-2-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-DEG2-DEG2-CTP-TXtoOpenROADM-5-2-DEG1-DEG1-CTP-RX</link-id>
+            <source><source-node>OpenROADM-5-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-2-DEG1-DEG1-CTP-TXtoOpenROADM-5-2-DEG2-DEG2-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-DEG2-DEG2-CTP-TXtoOpenROADM-5-2-DEG3-DEG3-CTP-RX</link-id>
+            <source><source-node>OpenROADM-5-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-2-DEG3-DEG3-CTP-TXtoOpenROADM-5-2-DEG2-DEG2-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-2-SRG1-SRG1-CP-TXtoOpenROADM-5-2-DEG2-DEG2-CTP-RX</link-id>
             <source><source-node>OpenROADM-5-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-2-DEG2-DEG2-CTP-TXtoOpenROADM-5-2-SRG1-SRG1-CP-RX</opposite-link>
@@ -2509,14 +4449,14 @@
             <source><source-node>OpenROADM-5-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-2-SRG1-SRG1-CP-TXtoOpenROADM-5-2-DEG2-DEG2-CTP-RX</opposite-link>
             <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-DEG3-DEG3-CTP-TXtoOpenROADM-5-2-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-5-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-2-DEG1-DEG1-CTP-TXtoOpenROADM-5-2-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-DEG3-DEG3-CTP-TXtoOpenROADM-5-2-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-5-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-2-DEG2-DEG2-CTP-TXtoOpenROADM-5-2-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-DEG3-DEG3-CTP-TXtoOpenROADM-5-2-DEG1-DEG1-CTP-RX</link-id>
+            <source><source-node>OpenROADM-5-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-2-DEG1-DEG1-CTP-TXtoOpenROADM-5-2-DEG3-DEG3-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-DEG3-DEG3-CTP-TXtoOpenROADM-5-2-DEG2-DEG2-CTP-RX</link-id>
+            <source><source-node>OpenROADM-5-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-2-DEG2-DEG2-CTP-TXtoOpenROADM-5-2-DEG3-DEG3-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-2-SRG1-SRG1-CP-TXtoOpenROADM-5-2-DEG3-DEG3-CTP-RX</link-id>
             <source><source-node>OpenROADM-5-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-2-DEG3-DEG3-CTP-TXtoOpenROADM-5-2-SRG1-SRG1-CP-RX</opposite-link>
@@ -2525,100 +4465,561 @@
             <source><source-node>OpenROADM-5-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-2-SRG1-SRG1-CP-TXtoOpenROADM-5-2-DEG3-DEG3-CTP-RX</opposite-link>
             <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-2XPDR-NW1-TX-toOpenROADM-5-2-SRG1-SRG1-PP1-RX</link-id>
-        <source><source-node>XPONDER-5-2</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-2-SRG1-SRG1-PP1-TX-to-XPONDER-5-2XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-SRG1-SRG1-PP1-TX-to-XPONDER-5-2XPDR-NW1-RX</link-id>
-        <source><source-node>OpenROADM-5-2-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-5-2</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-5-2XPDR-NW1-TX-toOpenROADM-5-2-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-2XPDR-NW2-TX-toOpenROADM-5-2-SRG1-SRG1-PP2-RX</link-id>
-        <source><source-node>XPONDER-5-2</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-2-SRG1-SRG1-PP2-TX-to-XPONDER-5-2XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-SRG1-SRG1-PP2-TX-to-XPONDER-5-2XPDR-NW2-RX</link-id>
-        <source><source-node>OpenROADM-5-2-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-5-2</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-5-2XPDR-NW2-TX-toOpenROADM-5-2-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-2XPDR-NW3-TX-toOpenROADM-5-2-SRG1-SRG1-PP3-RX</link-id>
-        <source><source-node>XPONDER-5-2</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-2-SRG1-SRG1-PP3-TX-to-XPONDER-5-2XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-SRG1-SRG1-PP3-TX-to-XPONDER-5-2XPDR-NW3-RX</link-id>
-        <source><source-node>OpenROADM-5-2-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-5-2</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-5-2XPDR-NW3-TX-toOpenROADM-5-2-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-2XPDR-NW4-TX-toOpenROADM-5-2-SRG1-SRG1-PP4-RX</link-id>
-        <source><source-node>XPONDER-5-2</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-2-SRG1-SRG1-PP4-TX-to-XPONDER-5-2XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-SRG1-SRG1-PP4-TX-to-XPONDER-5-2XPDR-NW4-RX</link-id>
-        <source><source-node>OpenROADM-5-2-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-5-2</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-5-2XPDR-NW4-TX-toOpenROADM-5-2-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-2XPDR-NW5-TX-toOpenROADM-5-2-SRG1-SRG1-PP5-RX</link-id>
-        <source><source-node>XPONDER-5-2</source-node><source-tp>XPDR-NW5-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-SRG1</dest-node><dest-tp>SRG1-PP5-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-2-SRG1-SRG1-PP5-TX-to-XPONDER-5-2XPDR-NW5-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-SRG1-SRG1-PP5-TX-to-XPONDER-5-2XPDR-NW5-RX</link-id>
-        <source><source-node>OpenROADM-5-2-SRG1</source-node><source-tp>SRG1-PP5-TX</source-tp></source>        <destination><dest-node>XPONDER-5-2</dest-node><dest-tp>XPDR-NW5-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-5-2XPDR-NW5-TX-toOpenROADM-5-2-SRG1-SRG1-PP5-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-5-1-DEG1-to-OpenROADM-5-2-DEG1</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-2-DEG1-to-OpenROADM-5-1-DEG1</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-5-1-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-5-2-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-5-2-DEG1-to-OpenROADM-5-1-DEG1</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-1-DEG1-to-OpenROADM-5-2-DEG1</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-5-2-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-5-1-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-5-2-DEG2-to-OpenROADM-5-1-DEG2</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-1-DEG2-to-OpenROADM-5-2-DEG2</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-5-2-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-5-1-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-5-1-DEG2-to-OpenROADM-5-2-DEG2</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-2-DEG2-to-OpenROADM-5-1-DEG2</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-5-1-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-5-2-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-1-2-DEG3-to-OpenROADM-2-1-DEG3</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-1-DEG3-to-OpenROADM-1-2-DEG3</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-1-2-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-2-1-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-2-1-DEG3-to-OpenROADM-1-2-DEG3</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-2-DEG3-to-OpenROADM-2-1-DEG3</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-2-1-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-1-2-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-2-2-DEG3-to-OpenROADM-3-1-DEG3</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-1-DEG3-to-OpenROADM-2-2-DEG3</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-2-2-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-3-1-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-3-1-DEG3-to-OpenROADM-2-2-DEG3</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-2-DEG3-to-OpenROADM-3-1-DEG3</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-3-1-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-2-2-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-3-2-DEG3-to-OpenROADM-4-1-DEG3</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-1-DEG3-to-OpenROADM-3-2-DEG3</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-3-2-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-4-1-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-4-1-DEG3-to-OpenROADM-3-2-DEG3</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-2-DEG3-to-OpenROADM-4-1-DEG3</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-4-1-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-3-2-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-4-2-DEG3-to-OpenROADM-5-1-DEG3</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-1-DEG3-to-OpenROADM-4-2-DEG3</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-4-2-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-5-1-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-5-1-DEG3-to-OpenROADM-4-2-DEG3</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-2-DEG3-to-OpenROADM-5-1-DEG3</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-5-1-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-4-2-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-5-2-DEG3-to-OpenROADM-1-1-DEG3</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-1-DEG3-to-OpenROADM-5-2-DEG3</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-5-2-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-1-1-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-1-1-DEG3-to-OpenROADM-5-2-DEG3</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-2-DEG3-to-OpenROADM-1-1-DEG3</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-1-1-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-5-2-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>    </link>
-</network></data>
\ No newline at end of file
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-2XPDR-NW1-TX-toOpenROADM-5-2-SRG1-SRG1-PP1-RX</link-id>
+            <source><source-node>XPONDER-5-2</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-2-SRG1-SRG1-PP1-TX-to-XPONDER-5-2XPDR-NW1-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-SRG1-SRG1-PP1-TX-to-XPONDER-5-2XPDR-NW1-RX</link-id>
+            <source><source-node>OpenROADM-5-2-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-5-2</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-5-2XPDR-NW1-TX-toOpenROADM-5-2-SRG1-SRG1-PP1-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-2XPDR-NW2-TX-toOpenROADM-5-2-SRG1-SRG1-PP2-RX</link-id>
+            <source><source-node>XPONDER-5-2</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-2-SRG1-SRG1-PP2-TX-to-XPONDER-5-2XPDR-NW2-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-SRG1-SRG1-PP2-TX-to-XPONDER-5-2XPDR-NW2-RX</link-id>
+            <source><source-node>OpenROADM-5-2-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-5-2</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-5-2XPDR-NW2-TX-toOpenROADM-5-2-SRG1-SRG1-PP2-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-2XPDR-NW3-TX-toOpenROADM-5-2-SRG1-SRG1-PP3-RX</link-id>
+            <source><source-node>XPONDER-5-2</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-2-SRG1-SRG1-PP3-TX-to-XPONDER-5-2XPDR-NW3-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-SRG1-SRG1-PP3-TX-to-XPONDER-5-2XPDR-NW3-RX</link-id>
+            <source><source-node>OpenROADM-5-2-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-5-2</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-5-2XPDR-NW3-TX-toOpenROADM-5-2-SRG1-SRG1-PP3-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-2XPDR-NW4-TX-toOpenROADM-5-2-SRG1-SRG1-PP4-RX</link-id>
+            <source><source-node>XPONDER-5-2</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-2-SRG1-SRG1-PP4-TX-to-XPONDER-5-2XPDR-NW4-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-SRG1-SRG1-PP4-TX-to-XPONDER-5-2XPDR-NW4-RX</link-id>
+            <source><source-node>OpenROADM-5-2-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-5-2</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-5-2XPDR-NW4-TX-toOpenROADM-5-2-SRG1-SRG1-PP4-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-3-DEG1-DEG1-CTP-TXtoOpenROADM-5-3-DEG2-DEG2-CTP-RX</link-id>
+            <source><source-node>OpenROADM-5-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-3-DEG2-DEG2-CTP-TXtoOpenROADM-5-3-DEG1-DEG1-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-3-DEG1-DEG1-CTP-TXtoOpenROADM-5-3-DEG3-DEG3-CTP-RX</link-id>
+            <source><source-node>OpenROADM-5-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-3-DEG3-DEG3-CTP-TXtoOpenROADM-5-3-DEG1-DEG1-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-3-SRG1-SRG1-CP-TXtoOpenROADM-5-3-DEG1-DEG1-CTP-RX</link-id>
+            <source><source-node>OpenROADM-5-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-3-DEG1-DEG1-CTP-TXtoOpenROADM-5-3-SRG1-SRG1-CP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-3-DEG1-DEG1-CTP-TXtoOpenROADM-5-3-SRG1-SRG1-CP-RX</link-id>
+            <source><source-node>OpenROADM-5-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-3-SRG1-SRG1-CP-TXtoOpenROADM-5-3-DEG1-DEG1-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-3-DEG2-DEG2-CTP-TXtoOpenROADM-5-3-DEG1-DEG1-CTP-RX</link-id>
+            <source><source-node>OpenROADM-5-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-3-DEG1-DEG1-CTP-TXtoOpenROADM-5-3-DEG2-DEG2-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-3-DEG2-DEG2-CTP-TXtoOpenROADM-5-3-DEG3-DEG3-CTP-RX</link-id>
+            <source><source-node>OpenROADM-5-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-3-DEG3-DEG3-CTP-TXtoOpenROADM-5-3-DEG2-DEG2-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-3-SRG1-SRG1-CP-TXtoOpenROADM-5-3-DEG2-DEG2-CTP-RX</link-id>
+            <source><source-node>OpenROADM-5-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-3-DEG2-DEG2-CTP-TXtoOpenROADM-5-3-SRG1-SRG1-CP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-3-DEG2-DEG2-CTP-TXtoOpenROADM-5-3-SRG1-SRG1-CP-RX</link-id>
+            <source><source-node>OpenROADM-5-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-3-SRG1-SRG1-CP-TXtoOpenROADM-5-3-DEG2-DEG2-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-3-DEG3-DEG3-CTP-TXtoOpenROADM-5-3-DEG1-DEG1-CTP-RX</link-id>
+            <source><source-node>OpenROADM-5-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-3-DEG1-DEG1-CTP-TXtoOpenROADM-5-3-DEG3-DEG3-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-3-DEG3-DEG3-CTP-TXtoOpenROADM-5-3-DEG2-DEG2-CTP-RX</link-id>
+            <source><source-node>OpenROADM-5-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-3-DEG2-DEG2-CTP-TXtoOpenROADM-5-3-DEG3-DEG3-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-3-SRG1-SRG1-CP-TXtoOpenROADM-5-3-DEG3-DEG3-CTP-RX</link-id>
+            <source><source-node>OpenROADM-5-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-3-DEG3-DEG3-CTP-TXtoOpenROADM-5-3-SRG1-SRG1-CP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-3-DEG3-DEG3-CTP-TXtoOpenROADM-5-3-SRG1-SRG1-CP-RX</link-id>
+            <source><source-node>OpenROADM-5-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-3-SRG1-SRG1-CP-TXtoOpenROADM-5-3-DEG3-DEG3-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-3XPDR-NW1-TX-toOpenROADM-5-3-SRG1-SRG1-PP1-RX</link-id>
+            <source><source-node>XPONDER-5-3</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-3-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-3-SRG1-SRG1-PP1-TX-to-XPONDER-5-3XPDR-NW1-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-3-SRG1-SRG1-PP1-TX-to-XPONDER-5-3XPDR-NW1-RX</link-id>
+            <source><source-node>OpenROADM-5-3-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-5-3</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-5-3XPDR-NW1-TX-toOpenROADM-5-3-SRG1-SRG1-PP1-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-3XPDR-NW2-TX-toOpenROADM-5-3-SRG1-SRG1-PP2-RX</link-id>
+            <source><source-node>XPONDER-5-3</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-3-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-3-SRG1-SRG1-PP2-TX-to-XPONDER-5-3XPDR-NW2-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-3-SRG1-SRG1-PP2-TX-to-XPONDER-5-3XPDR-NW2-RX</link-id>
+            <source><source-node>OpenROADM-5-3-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-5-3</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-5-3XPDR-NW2-TX-toOpenROADM-5-3-SRG1-SRG1-PP2-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-3XPDR-NW3-TX-toOpenROADM-5-3-SRG1-SRG1-PP3-RX</link-id>
+            <source><source-node>XPONDER-5-3</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-3-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-3-SRG1-SRG1-PP3-TX-to-XPONDER-5-3XPDR-NW3-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-3-SRG1-SRG1-PP3-TX-to-XPONDER-5-3XPDR-NW3-RX</link-id>
+            <source><source-node>OpenROADM-5-3-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-5-3</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-5-3XPDR-NW3-TX-toOpenROADM-5-3-SRG1-SRG1-PP3-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-3XPDR-NW4-TX-toOpenROADM-5-3-SRG1-SRG1-PP4-RX</link-id>
+            <source><source-node>XPONDER-5-3</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-3-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-3-SRG1-SRG1-PP4-TX-to-XPONDER-5-3XPDR-NW4-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-3-SRG1-SRG1-PP4-TX-to-XPONDER-5-3XPDR-NW4-RX</link-id>
+            <source><source-node>OpenROADM-5-3-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-5-3</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-5-3XPDR-NW4-TX-toOpenROADM-5-3-SRG1-SRG1-PP4-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-4-DEG1-DEG1-CTP-TXtoOpenROADM-5-4-DEG2-DEG2-CTP-RX</link-id>
+            <source><source-node>OpenROADM-5-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-4-DEG2-DEG2-CTP-TXtoOpenROADM-5-4-DEG1-DEG1-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-4-DEG1-DEG1-CTP-TXtoOpenROADM-5-4-DEG3-DEG3-CTP-RX</link-id>
+            <source><source-node>OpenROADM-5-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-4-DEG3-DEG3-CTP-TXtoOpenROADM-5-4-DEG1-DEG1-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-4-SRG1-SRG1-CP-TXtoOpenROADM-5-4-DEG1-DEG1-CTP-RX</link-id>
+            <source><source-node>OpenROADM-5-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-4-DEG1-DEG1-CTP-TXtoOpenROADM-5-4-SRG1-SRG1-CP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-4-DEG1-DEG1-CTP-TXtoOpenROADM-5-4-SRG1-SRG1-CP-RX</link-id>
+            <source><source-node>OpenROADM-5-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-4-SRG1-SRG1-CP-TXtoOpenROADM-5-4-DEG1-DEG1-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-4-DEG2-DEG2-CTP-TXtoOpenROADM-5-4-DEG1-DEG1-CTP-RX</link-id>
+            <source><source-node>OpenROADM-5-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-4-DEG1-DEG1-CTP-TXtoOpenROADM-5-4-DEG2-DEG2-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-4-DEG2-DEG2-CTP-TXtoOpenROADM-5-4-DEG3-DEG3-CTP-RX</link-id>
+            <source><source-node>OpenROADM-5-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-4-DEG3-DEG3-CTP-TXtoOpenROADM-5-4-DEG2-DEG2-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-4-SRG1-SRG1-CP-TXtoOpenROADM-5-4-DEG2-DEG2-CTP-RX</link-id>
+            <source><source-node>OpenROADM-5-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-4-DEG2-DEG2-CTP-TXtoOpenROADM-5-4-SRG1-SRG1-CP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-4-DEG2-DEG2-CTP-TXtoOpenROADM-5-4-SRG1-SRG1-CP-RX</link-id>
+            <source><source-node>OpenROADM-5-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-4-SRG1-SRG1-CP-TXtoOpenROADM-5-4-DEG2-DEG2-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-4-DEG3-DEG3-CTP-TXtoOpenROADM-5-4-DEG1-DEG1-CTP-RX</link-id>
+            <source><source-node>OpenROADM-5-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-4-DEG1-DEG1-CTP-TXtoOpenROADM-5-4-DEG3-DEG3-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-4-DEG3-DEG3-CTP-TXtoOpenROADM-5-4-DEG2-DEG2-CTP-RX</link-id>
+            <source><source-node>OpenROADM-5-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-4-DEG2-DEG2-CTP-TXtoOpenROADM-5-4-DEG3-DEG3-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-4-SRG1-SRG1-CP-TXtoOpenROADM-5-4-DEG3-DEG3-CTP-RX</link-id>
+            <source><source-node>OpenROADM-5-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-4-DEG3-DEG3-CTP-TXtoOpenROADM-5-4-SRG1-SRG1-CP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-4-DEG3-DEG3-CTP-TXtoOpenROADM-5-4-SRG1-SRG1-CP-RX</link-id>
+            <source><source-node>OpenROADM-5-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-4-SRG1-SRG1-CP-TXtoOpenROADM-5-4-DEG3-DEG3-CTP-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-4XPDR-NW1-TX-toOpenROADM-5-4-SRG1-SRG1-PP1-RX</link-id>
+            <source><source-node>XPONDER-5-4</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-4-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-4-SRG1-SRG1-PP1-TX-to-XPONDER-5-4XPDR-NW1-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-4-SRG1-SRG1-PP1-TX-to-XPONDER-5-4XPDR-NW1-RX</link-id>
+            <source><source-node>OpenROADM-5-4-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-5-4</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-5-4XPDR-NW1-TX-toOpenROADM-5-4-SRG1-SRG1-PP1-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-4XPDR-NW2-TX-toOpenROADM-5-4-SRG1-SRG1-PP2-RX</link-id>
+            <source><source-node>XPONDER-5-4</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-4-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-4-SRG1-SRG1-PP2-TX-to-XPONDER-5-4XPDR-NW2-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-4-SRG1-SRG1-PP2-TX-to-XPONDER-5-4XPDR-NW2-RX</link-id>
+            <source><source-node>OpenROADM-5-4-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-5-4</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-5-4XPDR-NW2-TX-toOpenROADM-5-4-SRG1-SRG1-PP2-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-4XPDR-NW3-TX-toOpenROADM-5-4-SRG1-SRG1-PP3-RX</link-id>
+            <source><source-node>XPONDER-5-4</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-4-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-4-SRG1-SRG1-PP3-TX-to-XPONDER-5-4XPDR-NW3-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-4-SRG1-SRG1-PP3-TX-to-XPONDER-5-4XPDR-NW3-RX</link-id>
+            <source><source-node>OpenROADM-5-4-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-5-4</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-5-4XPDR-NW3-TX-toOpenROADM-5-4-SRG1-SRG1-PP3-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-4XPDR-NW4-TX-toOpenROADM-5-4-SRG1-SRG1-PP4-RX</link-id>
+            <source><source-node>XPONDER-5-4</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-4-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-4-SRG1-SRG1-PP4-TX-to-XPONDER-5-4XPDR-NW4-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-4-SRG1-SRG1-PP4-TX-to-XPONDER-5-4XPDR-NW4-RX</link-id>
+            <source><source-node>OpenROADM-5-4-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-5-4</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
+            <opposite-link xmlns="http://org/openroadm/opposite/links">XPONDER-5-4XPDR-NW4-TX-toOpenROADM-5-4-SRG1-SRG1-PP4-RX</opposite-link>
+            <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-5-1-DEG1-to-OpenROADM-5-2-DEG1</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-2-DEG1-to-OpenROADM-5-1-DEG1</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">50</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-5-1-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-5-2-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>51521</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>51522</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>51523</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>51524</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-5-2-DEG1-to-OpenROADM-5-1-DEG1</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-1-DEG1-to-OpenROADM-5-2-DEG1</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">50</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-5-2-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-5-1-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>52511</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>52512</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>52513</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>52514</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-5-2-DEG2-to-OpenROADM-5-3-DEG2</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-3-DEG2-to-OpenROADM-5-2-DEG2</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">50</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-5-2-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-5-3-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>52531</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>52532</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>52533</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>52534</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-5-3-DEG2-to-OpenROADM-5-2-DEG2</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-2-DEG2-to-OpenROADM-5-3-DEG2</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">50</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-5-3-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-5-2-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>53521</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>53522</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>53523</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>53524</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-5-3-DEG1-to-OpenROADM-5-4-DEG1</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-4-DEG1-to-OpenROADM-5-3-DEG1</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">50</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-5-3-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-5-4-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>53541</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>53542</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>53543</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>53544</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-5-4-DEG1-to-OpenROADM-5-3-DEG1</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-3-DEG1-to-OpenROADM-5-4-DEG1</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">50</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-5-4-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-5-3-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>54531</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>54532</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>54533</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>54534</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-5-4-DEG2-to-OpenROADM-5-1-DEG2</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-1-DEG2-to-OpenROADM-5-4-DEG2</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">50</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-5-4-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-5-1-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>54511</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>54512</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>54513</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>54514</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-5-1-DEG2-to-OpenROADM-5-4-DEG2</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-4-DEG2-to-OpenROADM-5-1-DEG2</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">50</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-5-1-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-5-4-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>51541</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>51542</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>51543</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>51544</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-1-4-DEG3-to-OpenROADM-2-1-DEG3</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-1-DEG3-to-OpenROADM-1-4-DEG3</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">10</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-1-4-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-2-1-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>14211</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>14212</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>14213</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>14214</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-2-1-DEG3-to-OpenROADM-1-4-DEG3</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-4-DEG3-to-OpenROADM-2-1-DEG3</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">10</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-2-1-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-1-4-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>21141</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>21142</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>21143</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>21144</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-1-3-DEG3-to-OpenROADM-2-2-DEG3</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-2-DEG3-to-OpenROADM-1-3-DEG3</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">10</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-1-3-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-2-2-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>13221</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>13222</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>13223</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>13224</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-2-2-DEG3-to-OpenROADM-1-3-DEG3</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-3-DEG3-to-OpenROADM-2-2-DEG3</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">10</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-2-2-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-1-3-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>22131</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>22132</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>22133</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>22134</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-2-4-DEG3-to-OpenROADM-3-1-DEG3</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-1-DEG3-to-OpenROADM-2-4-DEG3</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">20</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-2-4-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-3-1-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>24311</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>24312</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>24313</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>24314</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-3-1-DEG3-to-OpenROADM-2-4-DEG3</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-4-DEG3-to-OpenROADM-3-1-DEG3</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">20</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-3-1-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-2-4-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>31241</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>31242</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>31243</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>31244</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-2-3-DEG3-to-OpenROADM-3-2-DEG3</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-2-DEG3-to-OpenROADM-2-3-DEG3</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">20</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-2-3-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-3-2-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>23321</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>23322</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>23323</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>23324</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-3-2-DEG3-to-OpenROADM-2-3-DEG3</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-2-3-DEG3-to-OpenROADM-3-2-DEG3</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">20</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-3-2-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-2-3-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>32231</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>32232</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>32233</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>32234</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-3-4-DEG3-to-OpenROADM-4-1-DEG3</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-1-DEG3-to-OpenROADM-3-4-DEG3</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">30</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-3-4-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-4-1-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>34411</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>34412</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>34413</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>34414</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-4-1-DEG3-to-OpenROADM-3-4-DEG3</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-4-DEG3-to-OpenROADM-4-1-DEG3</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">30</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-4-1-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-3-4-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>41341</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>41342</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>41343</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>41344</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-3-3-DEG3-to-OpenROADM-4-2-DEG3</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-2-DEG3-to-OpenROADM-3-3-DEG3</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">30</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-3-3-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-4-2-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>33421</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>33422</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>33423</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>33424</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-4-2-DEG3-to-OpenROADM-3-3-DEG3</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-3-3-DEG3-to-OpenROADM-4-2-DEG3</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">30</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-4-2-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-3-3-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>42331</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>42332</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>42333</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>42334</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-4-4-DEG3-to-OpenROADM-5-1-DEG3</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-1-DEG3-to-OpenROADM-4-4-DEG3</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">40</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-4-4-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-5-1-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>44511</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>44512</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>44513</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>44514</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-5-1-DEG3-to-OpenROADM-4-4-DEG3</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-4-DEG3-to-OpenROADM-5-1-DEG3</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">40</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-5-1-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-4-4-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>51441</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>51442</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>51443</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>51444</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-4-3-DEG3-to-OpenROADM-5-2-DEG3</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-2-DEG3-to-OpenROADM-4-3-DEG3</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">40</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-4-3-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-5-2-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>43521</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>43522</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>43523</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>43524</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-5-2-DEG3-to-OpenROADM-4-3-DEG3</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-4-3-DEG3-to-OpenROADM-5-2-DEG3</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">40</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-5-2-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-4-3-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>52431</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>52432</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>52433</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>52434</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-5-4-DEG3-to-OpenROADM-1-1-DEG3</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-1-DEG3-to-OpenROADM-5-4-DEG3</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">50</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-5-4-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-1-1-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>54111</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>54112</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>54113</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>54114</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-1-1-DEG3-to-OpenROADM-5-4-DEG3</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-4-DEG3-to-OpenROADM-1-1-DEG3</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">50</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-1-1-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-5-4-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>11541</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>11542</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>11543</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>11544</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-5-3-DEG3-to-OpenROADM-1-2-DEG3</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-1-2-DEG3-to-OpenROADM-5-3-DEG3</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">50</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-5-3-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-1-2-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>53121</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>53122</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>53123</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>53124</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-1-2-DEG3-to-OpenROADM-5-3-DEG3</link-id>    <opposite-link xmlns="http://org/openroadm/opposite/links">OpenROADM-5-3-DEG3-to-OpenROADM-1-2-DEG3</opposite-link>
+            <operational-state xmlns="http://org/openroadm/network/topology">inService</operational-state>
+            <administrative-state xmlns="http://org/openroadm/network/topology">inService</administrative-state>
+            <link-latency xmlns="http://org/openroadm/network/topology">50</link-latency>
+            <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+            <source><source-node>OpenROADM-1-2-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
+            <destination><dest-node>OpenROADM-5-3-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+            <OMS-attributes xmlns="http://org/openroadm/network/topology"><span>       <spanloss-base>10</spanloss-base><spanloss-current>15</spanloss-current>
+                <link-concatenation><SRLG-Id>12531</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>12532</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>12533</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+                <link-concatenation><SRLG-Id>12534</SRLG-Id><fiber-type>eleaf</fiber-type>      </link-concatenation>
+            </span></OMS-attributes></link>
+    </network>
+</data>
\ No newline at end of file