X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=tests%2Fsample_configs%2FNW-simple-topology.xml;h=9252519c81a012fda2cb79d7b4e96803ec1f4bbb;hb=3237056b2b522d1cb3c9278c8c4062076f6814c1;hp=77609370aabc22133844ffcf1eeb8264aefc0487;hpb=f1333ba85fbbe086ab540d759a3b6a898c52a135;p=transportpce.git

diff --git a/tests/sample_configs/NW-simple-topology.xml b/tests/sample_configs/NW-simple-topology.xml
index 77609370a..9252519c8 100644
--- a/tests/sample_configs/NW-simple-topology.xml
+++ b/tests/sample_configs/NW-simple-topology.xml
@@ -113,11 +113,11 @@
     <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>
+        <tail-equipment-id>Client-1</tail-equipment-id></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>
+        <tail-equipment-id>Client-1</tail-equipment-id></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>
@@ -133,11 +133,11 @@
         <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>
+        <tail-equipment-id>Client-3</tail-equipment-id></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>
+        <tail-equipment-id>Client-3</tail-equipment-id></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>
@@ -153,11 +153,11 @@
         <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>
+        <tail-equipment-id>Client-5</tail-equipment-id></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>
+        <tail-equipment-id>Client-5</tail-equipment-id></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>
@@ -275,11 +275,12 @@
     <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>
+        <tail-equipment-id>Client-1</tail-equipment-id>
+</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>
+        <tail-equipment-id>Client-1</tail-equipment-id></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>
@@ -295,11 +296,11 @@
         <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>
+        <tail-equipment-id>Client-3</tail-equipment-id></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>
+        <tail-equipment-id>Client-3</tail-equipment-id></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>
@@ -315,11 +316,11 @@
         <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>
+        <tail-equipment-id>Client-5</tail-equipment-id></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>
+        <tail-equipment-id>Client-5</tail-equipment-id></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>
@@ -437,11 +438,11 @@
     <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>
+        <tail-equipment-id>Client-1</tail-equipment-id></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>
+        <tail-equipment-id>Client-1</tail-equipment-id></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>
@@ -457,11 +458,11 @@
         <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>
+        <tail-equipment-id>Client-3</tail-equipment-id></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>
+        <tail-equipment-id>Client-3</tail-equipment-id></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>
@@ -477,11 +478,11 @@
         <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>
+        <tail-equipment-id>Client-5</tail-equipment-id></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>
+        <tail-equipment-id>Client-5</tail-equipment-id></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>
@@ -599,11 +600,11 @@
     <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>
+        <tail-equipment-id>Client-1</tail-equipment-id></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>
+        <tail-equipment-id>Client-1</tail-equipment-id></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>
@@ -619,11 +620,11 @@
         <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>
+        <tail-equipment-id>Client-3</tail-equipment-id></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>
+        <tail-equipment-id>Client-3</tail-equipment-id></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>
@@ -639,11 +640,11 @@
         <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>
+        <tail-equipment-id>Client-5</tail-equipment-id></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>
+        <tail-equipment-id>Client-5</tail-equipment-id></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>
@@ -761,11 +762,11 @@
     <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>
+        <tail-equipment-id>Client-1</tail-equipment-id></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>
+        <tail-equipment-id>Client-1</tail-equipment-id></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>
@@ -781,11 +782,11 @@
         <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>
+        <tail-equipment-id>Client-3</tail-equipment-id></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>
+        <tail-equipment-id>Client-3</tail-equipment-id></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>
@@ -801,11 +802,11 @@
         <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>
+        <tail-equipment-id>Client-5</tail-equipment-id></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>
+        <tail-equipment-id>Client-5</tail-equipment-id></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>
@@ -923,11 +924,11 @@
     <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>
+        <tail-equipment-id>Client-1</tail-equipment-id></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>
+        <tail-equipment-id>Client-1</tail-equipment-id></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>
@@ -943,11 +944,11 @@
         <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>
+        <tail-equipment-id>Client-3</tail-equipment-id></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>
+        <tail-equipment-id>Client-3</tail-equipment-id></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>
@@ -963,11 +964,11 @@
         <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>
+        <tail-equipment-id>Client-5</tail-equipment-id></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>
+        <tail-equipment-id>Client-5</tail-equipment-id></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>
@@ -1085,11 +1086,11 @@
     <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>
+        <tail-equipment-id>Client-1</tail-equipment-id></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>
+        <tail-equipment-id>Client-1</tail-equipment-id></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>
@@ -1105,11 +1106,11 @@
         <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>
+        <tail-equipment-id>Client-3</tail-equipment-id></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>
+        <tail-equipment-id>Client-3</tail-equipment-id></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>
@@ -1125,11 +1126,11 @@
         <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>
+        <tail-equipment-id>Client-5</tail-equipment-id></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>
+        <tail-equipment-id>Client-5</tail-equipment-id></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>
@@ -1247,11 +1248,11 @@
     <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>
+        <tail-equipment-id>Client-1</tail-equipment-id></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>
+        <tail-equipment-id>Client-1</tail-equipment-id></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>
@@ -1267,11 +1268,11 @@
         <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>
+        <tail-equipment-id>Client-3</tail-equipment-id></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>
+        <tail-equipment-id>Client-3</tail-equipment-id></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>
@@ -1287,11 +1288,11 @@
         <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>
+        <tail-equipment-id>Client-5</tail-equipment-id></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>
+        <tail-equipment-id>Client-5</tail-equipment-id></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>
@@ -1409,11 +1410,11 @@
     <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>
+        <tail-equipment-id>Client-1</tail-equipment-id></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>
+        <tail-equipment-id>Client-1</tail-equipment-id></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>
@@ -1429,11 +1430,11 @@
         <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>
+        <tail-equipment-id>Client-3</tail-equipment-id></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>
+        <tail-equipment-id>Client-3</tail-equipment-id></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>
@@ -1449,11 +1450,11 @@
         <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>
+        <tail-equipment-id>Client-5</tail-equipment-id></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>
+        <tail-equipment-id>Client-5</tail-equipment-id></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>
@@ -1571,11 +1572,11 @@
     <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>
+        <tail-equipment-id>Client-1</tail-equipment-id></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>
+        <tail-equipment-id>Client-1</tail-equipment-id></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>
@@ -1591,11 +1592,11 @@
         <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>
+        <tail-equipment-id>Client-3</tail-equipment-id></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>
+        <tail-equipment-id>Client-3</tail-equipment-id></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>
@@ -1611,1012 +1612,1012 @@
         <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>
+        <tail-equipment-id>Client-5</tail-equipment-id></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>
+        <tail-equipment-id>Client-5</tail-equipment-id></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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-1-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-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-1-SRG1-SRG1-CP-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-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>
+            <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-1-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-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-1-SRG1-SRG1-CP-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-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>
+            <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-DEG3-DEG3-CTP-TXtoOpenROADM-1-1-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-1-DEG3-DEG3-CTP-TXtoOpenROADM-1-1-SRG1-SRG1-CP-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-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>
+            <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-DEG1-DEG1-CTP-TXtoOpenROADM-1-2-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-2-DEG1-DEG1-CTP-TXtoOpenROADM-1-2-SRG1-SRG1-CP-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-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>
+            <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-DEG2-DEG2-CTP-TXtoOpenROADM-1-2-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-2-DEG2-DEG2-CTP-TXtoOpenROADM-1-2-SRG1-SRG1-CP-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-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>
+            <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-DEG3-DEG3-CTP-TXtoOpenROADM-1-2-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-2-DEG3-DEG3-CTP-TXtoOpenROADM-1-2-SRG1-SRG1-CP-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-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>
+            <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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 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/common/network">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 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/common/network">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 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/common/network">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 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/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-DEG1-DEG1-CTP-TXtoOpenROADM-2-1-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-1-DEG1-DEG1-CTP-TXtoOpenROADM-2-1-SRG1-SRG1-CP-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-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>
+            <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-DEG2-DEG2-CTP-TXtoOpenROADM-2-1-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-1-DEG2-DEG2-CTP-TXtoOpenROADM-2-1-SRG1-SRG1-CP-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-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>
+            <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-DEG3-DEG3-CTP-TXtoOpenROADM-2-1-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-1-DEG3-DEG3-CTP-TXtoOpenROADM-2-1-SRG1-SRG1-CP-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-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>
+            <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-2-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-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-2-SRG1-SRG1-CP-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-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>
+            <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-2-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-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-2-SRG1-SRG1-CP-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-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>
+            <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-2-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-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-2-SRG1-SRG1-CP-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-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>
+            <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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 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/common/network">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 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/common/network">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 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/common/network">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 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/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-DEG1-DEG1-CTP-TXtoOpenROADM-3-1-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-1-DEG1-DEG1-CTP-TXtoOpenROADM-3-1-SRG1-SRG1-CP-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-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>
+            <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-DEG2-DEG2-CTP-TXtoOpenROADM-3-1-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-1-DEG2-DEG2-CTP-TXtoOpenROADM-3-1-SRG1-SRG1-CP-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-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>
+            <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-DEG3-DEG3-CTP-TXtoOpenROADM-3-1-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-1-DEG3-DEG3-CTP-TXtoOpenROADM-3-1-SRG1-SRG1-CP-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-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>
+            <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-DEG1-DEG1-CTP-TXtoOpenROADM-3-2-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-2-DEG1-DEG1-CTP-TXtoOpenROADM-3-2-SRG1-SRG1-CP-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-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>
+            <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-DEG2-DEG2-CTP-TXtoOpenROADM-3-2-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-2-DEG2-DEG2-CTP-TXtoOpenROADM-3-2-SRG1-SRG1-CP-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-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>
+            <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-DEG3-DEG3-CTP-TXtoOpenROADM-3-2-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-2-DEG3-DEG3-CTP-TXtoOpenROADM-3-2-SRG1-SRG1-CP-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-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>
+            <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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 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/common/network">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 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/common/network">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 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/common/network">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 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/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-DEG1-DEG1-CTP-TXtoOpenROADM-4-1-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-1-DEG1-DEG1-CTP-TXtoOpenROADM-4-1-SRG1-SRG1-CP-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-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>
+            <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-DEG2-DEG2-CTP-TXtoOpenROADM-4-1-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-1-DEG2-DEG2-CTP-TXtoOpenROADM-4-1-SRG1-SRG1-CP-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-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>
+            <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-DEG3-DEG3-CTP-TXtoOpenROADM-4-1-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-1-DEG3-DEG3-CTP-TXtoOpenROADM-4-1-SRG1-SRG1-CP-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-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>
+            <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-DEG1-DEG1-CTP-TXtoOpenROADM-4-2-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-2-DEG1-DEG1-CTP-TXtoOpenROADM-4-2-SRG1-SRG1-CP-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-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>
+            <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-DEG2-DEG2-CTP-TXtoOpenROADM-4-2-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-2-DEG2-DEG2-CTP-TXtoOpenROADM-4-2-SRG1-SRG1-CP-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-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>
+            <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-DEG3-DEG3-CTP-TXtoOpenROADM-4-2-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-2-DEG3-DEG3-CTP-TXtoOpenROADM-4-2-SRG1-SRG1-CP-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-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>
+            <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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 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/common/network">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 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/common/network">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 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/common/network">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 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/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-DEG1-DEG1-CTP-TXtoOpenROADM-5-1-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-1-DEG1-DEG1-CTP-TXtoOpenROADM-5-1-SRG1-SRG1-CP-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-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>
+            <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-DEG2-DEG2-CTP-TXtoOpenROADM-5-1-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-1-DEG2-DEG2-CTP-TXtoOpenROADM-5-1-SRG1-SRG1-CP-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-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>
+            <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-DEG3-DEG3-CTP-TXtoOpenROADM-5-1-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-1-DEG3-DEG3-CTP-TXtoOpenROADM-5-1-SRG1-SRG1-CP-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-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>
+            <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-DEG1-DEG1-CTP-TXtoOpenROADM-5-2-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-2-DEG1-DEG1-CTP-TXtoOpenROADM-5-2-SRG1-SRG1-CP-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-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>
+            <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-DEG2-DEG2-CTP-TXtoOpenROADM-5-2-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-2-DEG2-DEG2-CTP-TXtoOpenROADM-5-2-SRG1-SRG1-CP-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-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>
+            <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-DEG3-DEG3-CTP-TXtoOpenROADM-5-2-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-2-DEG3-DEG3-CTP-TXtoOpenROADM-5-2-SRG1-SRG1-CP-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-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>
+            <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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>
+        <opposite-link xmlns="http://org/openroadm/common/network">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 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/common/network">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 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/common/network">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 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/common/network">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 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/common/network">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 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/common/network">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 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/common/network">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 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/common/network">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 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/common/network">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 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/common/network">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 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/common/network">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 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/common/network">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 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/common/network">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 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/common/network">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 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/common/network">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>