Update topology input files for Tapi topology UT

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

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