X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=tests%2Fsample_configs%2FNW-for-test-5-4.xml;h=67d90913e289d26e8d3af2ff65edc14e98a1d9d4;hb=66ccddbe00692f230350a19e1a222f09d6abd9a7;hp=8457c2e6b1aff594ff0ac55724d5a4dd79f2bd01;hpb=1bf8f74f6404b719d1f1b038596bb1546cc87f14;p=transportpce.git

diff --git a/tests/sample_configs/NW-for-test-5-4.xml b/tests/sample_configs/NW-for-test-5-4.xml
index 8457c2e6b..67d90913e 100644
--- a/tests/sample_configs/NW-for-test-5-4.xml
+++ b/tests/sample_configs/NW-for-test-5-4.xml
@@ -1,11 +1,11 @@
 <network xmlns="urn:ietf:params:xml:ns:yang:ietf-network">
  <network-id>openroadm-topology</network-id>
 <node>    <node-id>OpenROADM-1-1-DEG1</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>1</index> </available-wavelengths>
         <available-wavelengths> <index>2</index> </available-wavelengths>
@@ -20,11 +20,11 @@
         </degree-attributes>
     <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-1</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-1-1-DEG2</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>1</index> </available-wavelengths>
         <available-wavelengths> <index>2</index> </available-wavelengths>
@@ -39,11 +39,11 @@
         </degree-attributes>
     <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-1</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-1-1-DEG3</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>1</index> </available-wavelengths>
         <available-wavelengths> <index>2</index> </available-wavelengths>
@@ -57,7 +57,7 @@
         <available-wavelengths> <index>10</index> </available-wavelengths>
         </degree-attributes>
     <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-1</node-ref>    </supporting-node></node>
-<node>   <node-id>OpenROADM-1-1-SRG1</node-id>     <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+<node>   <node-id>OpenROADM-1-1-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
         <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-1</node-ref>    </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>1</index> </available-wavelengths>
@@ -84,38 +84,38 @@
 </node>
 <node>        <node-id>XPONDER-1-1</node-id>
     <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-1-1</node-ref>    </supporting-node>
-    <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+    <node-type xmlns="http://org/openroadm/common/network">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/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<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/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<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/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<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/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
 </node>
 <node>    <node-id>OpenROADM-1-2-DEG1</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>1</index> </available-wavelengths>
         <available-wavelengths> <index>2</index> </available-wavelengths>
@@ -130,11 +130,11 @@
         </degree-attributes>
     <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-2</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-1-2-DEG2</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>1</index> </available-wavelengths>
         <available-wavelengths> <index>2</index> </available-wavelengths>
@@ -149,11 +149,11 @@
         </degree-attributes>
     <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-2</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-1-2-DEG3</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>1</index> </available-wavelengths>
         <available-wavelengths> <index>2</index> </available-wavelengths>
@@ -167,7 +167,7 @@
         <available-wavelengths> <index>10</index> </available-wavelengths>
         </degree-attributes>
     <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-2</node-ref>    </supporting-node></node>
-<node>   <node-id>OpenROADM-1-2-SRG1</node-id>     <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+<node>   <node-id>OpenROADM-1-2-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
         <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-2</node-ref>    </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>1</index> </available-wavelengths>
@@ -194,38 +194,38 @@
 </node>
 <node>        <node-id>XPONDER-1-2</node-id>
     <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-1-2</node-ref>    </supporting-node>
-    <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+    <node-type xmlns="http://org/openroadm/common/network">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/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<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/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<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/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<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/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
 </node>
 <node>    <node-id>OpenROADM-1-3-DEG1</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>1</index> </available-wavelengths>
         <available-wavelengths> <index>2</index> </available-wavelengths>
@@ -240,11 +240,11 @@
         </degree-attributes>
     <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-3</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-1-3-DEG2</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>1</index> </available-wavelengths>
         <available-wavelengths> <index>2</index> </available-wavelengths>
@@ -259,11 +259,11 @@
         </degree-attributes>
     <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-3</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-1-3-DEG3</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>1</index> </available-wavelengths>
         <available-wavelengths> <index>2</index> </available-wavelengths>
@@ -277,7 +277,7 @@
         <available-wavelengths> <index>10</index> </available-wavelengths>
         </degree-attributes>
     <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-3</node-ref>    </supporting-node></node>
-<node>   <node-id>OpenROADM-1-3-SRG1</node-id>     <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+<node>   <node-id>OpenROADM-1-3-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
         <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-3</node-ref>    </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>1</index> </available-wavelengths>
@@ -304,38 +304,38 @@
 </node>
 <node>        <node-id>XPONDER-1-3</node-id>
     <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-1-3</node-ref>    </supporting-node>
-    <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+    <node-type xmlns="http://org/openroadm/common/network">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/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<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/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<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/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<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/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
 </node>
 <node>    <node-id>OpenROADM-1-4-DEG1</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>1</index> </available-wavelengths>
         <available-wavelengths> <index>2</index> </available-wavelengths>
@@ -350,11 +350,11 @@
         </degree-attributes>
     <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-4</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-1-4-DEG2</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>1</index> </available-wavelengths>
         <available-wavelengths> <index>2</index> </available-wavelengths>
@@ -369,11 +369,11 @@
         </degree-attributes>
     <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-4</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-1-4-DEG3</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>1</index> </available-wavelengths>
         <available-wavelengths> <index>2</index> </available-wavelengths>
@@ -387,7 +387,7 @@
         <available-wavelengths> <index>10</index> </available-wavelengths>
         </degree-attributes>
     <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-4</node-ref>    </supporting-node></node>
-<node>   <node-id>OpenROADM-1-4-SRG1</node-id>     <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+<node>   <node-id>OpenROADM-1-4-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
         <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-4</node-ref>    </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>1</index> </available-wavelengths>
@@ -414,38 +414,38 @@
 </node>
 <node>        <node-id>XPONDER-1-4</node-id>
     <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-1-4</node-ref>    </supporting-node>
-    <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+    <node-type xmlns="http://org/openroadm/common/network">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/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<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/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<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/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<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/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
 </node>
 <node>    <node-id>OpenROADM-2-1-DEG1</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>2</index> </available-wavelengths>
         <available-wavelengths> <index>3</index> </available-wavelengths>
@@ -454,11 +454,11 @@
          </degree-attributes>
     <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-1</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-2-1-DEG2</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>2</index> </available-wavelengths>
         <available-wavelengths> <index>3</index> </available-wavelengths>
@@ -467,11 +467,11 @@
         </degree-attributes>
     <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-1</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-2-1-DEG3</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>2</index> </available-wavelengths>
         <available-wavelengths> <index>3</index> </available-wavelengths>
@@ -479,7 +479,7 @@
         <available-wavelengths> <index>5</index> </available-wavelengths>
         </degree-attributes>
     <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-1</node-ref>    </supporting-node></node>
-<node>   <node-id>OpenROADM-2-1-SRG1</node-id>     <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+<node>   <node-id>OpenROADM-2-1-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
         <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-1</node-ref>    </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>2</index> </available-wavelengths>
@@ -500,38 +500,38 @@
 </node>
 <node>        <node-id>XPONDER-2-1</node-id>
     <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-2-1</node-ref>    </supporting-node>
-    <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+    <node-type xmlns="http://org/openroadm/common/network">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/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<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/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<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/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<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/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
 </node>
 <node>    <node-id>OpenROADM-2-2-DEG1</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>2</index> </available-wavelengths>
         <available-wavelengths> <index>3</index> </available-wavelengths>
@@ -540,11 +540,11 @@
         </degree-attributes>
     <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-2</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-2-2-DEG2</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>2</index> </available-wavelengths>
         <available-wavelengths> <index>3</index> </available-wavelengths>
@@ -553,11 +553,11 @@
         </degree-attributes>
     <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-2</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-2-2-DEG3</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>2</index> </available-wavelengths>
         <available-wavelengths> <index>3</index> </available-wavelengths>
@@ -565,7 +565,7 @@
         <available-wavelengths> <index>5</index> </available-wavelengths>
         </degree-attributes>
     <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-2</node-ref>    </supporting-node></node>
-<node>   <node-id>OpenROADM-2-2-SRG1</node-id>     <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+<node>   <node-id>OpenROADM-2-2-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
         <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-2</node-ref>    </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>2</index> </available-wavelengths>
@@ -586,38 +586,38 @@
 </node>
 <node>        <node-id>XPONDER-2-2</node-id>
     <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-2-2</node-ref>    </supporting-node>
-    <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+    <node-type xmlns="http://org/openroadm/common/network">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/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<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/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<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/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<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/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
 </node>
 <node>    <node-id>OpenROADM-2-3-DEG1</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>2</index> </available-wavelengths>
         <available-wavelengths> <index>3</index> </available-wavelengths>
@@ -626,11 +626,11 @@
         </degree-attributes>
     <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-3</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-2-3-DEG2</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>2</index> </available-wavelengths>
         <available-wavelengths> <index>3</index> </available-wavelengths>
@@ -639,11 +639,11 @@
         </degree-attributes>
     <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-3</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-2-3-DEG3</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>2</index> </available-wavelengths>
         <available-wavelengths> <index>3</index> </available-wavelengths>
@@ -651,7 +651,7 @@
         <available-wavelengths> <index>5</index> </available-wavelengths>
         </degree-attributes>
     <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-3</node-ref>    </supporting-node></node>
-<node>   <node-id>OpenROADM-2-3-SRG1</node-id>     <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+<node>   <node-id>OpenROADM-2-3-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
         <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-3</node-ref>    </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>2</index> </available-wavelengths>
@@ -672,38 +672,38 @@
 </node>
 <node>        <node-id>XPONDER-2-3</node-id>
     <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-2-3</node-ref>    </supporting-node>
-    <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+    <node-type xmlns="http://org/openroadm/common/network">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/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<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/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<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/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<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/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
 </node>
 <node>    <node-id>OpenROADM-2-4-DEG1</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>2</index> </available-wavelengths>
         <available-wavelengths> <index>3</index> </available-wavelengths>
@@ -712,11 +712,11 @@
         </degree-attributes>
     <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-4</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-2-4-DEG2</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>2</index> </available-wavelengths>
         <available-wavelengths> <index>3</index> </available-wavelengths>
@@ -725,11 +725,11 @@
         </degree-attributes>
     <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-4</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-2-4-DEG3</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>2</index> </available-wavelengths>
         <available-wavelengths> <index>3</index> </available-wavelengths>
@@ -737,7 +737,7 @@
         <available-wavelengths> <index>5</index> </available-wavelengths>
         </degree-attributes>
     <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-4</node-ref>    </supporting-node></node>
-<node>   <node-id>OpenROADM-2-4-SRG1</node-id>     <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+<node>   <node-id>OpenROADM-2-4-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
         <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-4</node-ref>    </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>2</index> </available-wavelengths>
@@ -758,38 +758,38 @@
 </node>
 <node>        <node-id>XPONDER-2-4</node-id>
     <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-2-4</node-ref>    </supporting-node>
-    <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+    <node-type xmlns="http://org/openroadm/common/network">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/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<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/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<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/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<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/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
 </node>
 <node>    <node-id>OpenROADM-3-1-DEG1</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>5</index> </available-wavelengths>
         <available-wavelengths> <index>6</index> </available-wavelengths>
@@ -802,11 +802,11 @@
         </degree-attributes>
     <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-1</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-3-1-DEG2</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
          <available-wavelengths> <index>5</index> </available-wavelengths>
         <available-wavelengths> <index>6</index> </available-wavelengths>
@@ -819,11 +819,11 @@
         </degree-attributes>
     <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-1</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-3-1-DEG3</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>5</index> </available-wavelengths>
         <available-wavelengths> <index>6</index> </available-wavelengths>
@@ -835,7 +835,7 @@
         <available-wavelengths> <index>12</index> </available-wavelengths>
         </degree-attributes>
     <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-1</node-ref>    </supporting-node></node>
-<node>   <node-id>OpenROADM-3-1-SRG1</node-id>     <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+<node>   <node-id>OpenROADM-3-1-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
         <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-1</node-ref>    </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>5</index> </available-wavelengths>
@@ -860,38 +860,38 @@
 </node>
 <node>        <node-id>XPONDER-3-1</node-id>
     <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-3-1</node-ref>    </supporting-node>
-    <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+    <node-type xmlns="http://org/openroadm/common/network">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/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<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/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<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/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<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/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
 </node>
 <node>    <node-id>OpenROADM-3-2-DEG1</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>5</index> </available-wavelengths>
         <available-wavelengths> <index>6</index> </available-wavelengths>
@@ -904,11 +904,11 @@
         </degree-attributes>
     <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-2</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-3-2-DEG2</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>5</index> </available-wavelengths>
         <available-wavelengths> <index>6</index> </available-wavelengths>
@@ -921,11 +921,11 @@
         </degree-attributes>
     <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-2</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-3-2-DEG3</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>5</index> </available-wavelengths>
         <available-wavelengths> <index>6</index> </available-wavelengths>
@@ -937,7 +937,7 @@
         <available-wavelengths> <index>12</index> </available-wavelengths>
         </degree-attributes>
     <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-2</node-ref>    </supporting-node></node>
-<node>   <node-id>OpenROADM-3-2-SRG1</node-id>     <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+<node>   <node-id>OpenROADM-3-2-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
         <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-2</node-ref>    </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>5</index> </available-wavelengths>
@@ -962,38 +962,38 @@
 </node>
 <node>        <node-id>XPONDER-3-2</node-id>
     <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-3-2</node-ref>    </supporting-node>
-    <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+    <node-type xmlns="http://org/openroadm/common/network">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/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<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/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<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/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<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/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
 </node>
 <node>    <node-id>OpenROADM-3-3-DEG1</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>5</index> </available-wavelengths>
         <available-wavelengths> <index>6</index> </available-wavelengths>
@@ -1006,11 +1006,11 @@
         </degree-attributes>
     <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-3</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-3-3-DEG2</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>5</index> </available-wavelengths>
         <available-wavelengths> <index>6</index> </available-wavelengths>
@@ -1023,11 +1023,11 @@
         </degree-attributes>
     <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-3</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-3-3-DEG3</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>5</index> </available-wavelengths>
         <available-wavelengths> <index>6</index> </available-wavelengths>
@@ -1039,7 +1039,7 @@
         <available-wavelengths> <index>12</index> </available-wavelengths>
         </degree-attributes>
     <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-3</node-ref>    </supporting-node></node>
-<node>   <node-id>OpenROADM-3-3-SRG1</node-id>     <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+<node>   <node-id>OpenROADM-3-3-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
         <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-3</node-ref>    </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>5</index> </available-wavelengths>
@@ -1064,38 +1064,38 @@
 </node>
 <node>        <node-id>XPONDER-3-3</node-id>
     <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-3-3</node-ref>    </supporting-node>
-    <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+    <node-type xmlns="http://org/openroadm/common/network">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/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<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/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<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/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<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/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
 </node>
 <node>    <node-id>OpenROADM-3-4-DEG1</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>5</index> </available-wavelengths>
         <available-wavelengths> <index>6</index> </available-wavelengths>
@@ -1108,11 +1108,11 @@
         </degree-attributes>
     <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-4</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-3-4-DEG2</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>5</index> </available-wavelengths>
         <available-wavelengths> <index>6</index> </available-wavelengths>
@@ -1125,11 +1125,11 @@
         </degree-attributes>
     <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-4</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-3-4-DEG3</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>5</index> </available-wavelengths>
         <available-wavelengths> <index>6</index> </available-wavelengths>
@@ -1141,7 +1141,7 @@
         <available-wavelengths> <index>12</index> </available-wavelengths>
         </degree-attributes>
     <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-4</node-ref>    </supporting-node></node>
-<node>   <node-id>OpenROADM-3-4-SRG1</node-id>     <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+<node>   <node-id>OpenROADM-3-4-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
         <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-4</node-ref>    </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>5</index> </available-wavelengths>
@@ -1166,38 +1166,38 @@
 </node>
 <node>        <node-id>XPONDER-3-4</node-id>
     <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-3-4</node-ref>    </supporting-node>
-    <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+    <node-type xmlns="http://org/openroadm/common/network">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/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<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/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<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/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<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/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
 </node>
 <node>    <node-id>OpenROADM-4-1-DEG1</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>7</index> </available-wavelengths>
         <available-wavelengths> <index>8</index> </available-wavelengths>
@@ -1209,11 +1209,11 @@
         </degree-attributes>
     <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-1</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-4-1-DEG2</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>7</index> </available-wavelengths>
         <available-wavelengths> <index>8</index> </available-wavelengths>
@@ -1225,11 +1225,11 @@
         </degree-attributes>
     <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-1</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-4-1-DEG3</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>7</index> </available-wavelengths>
         <available-wavelengths> <index>8</index> </available-wavelengths>
@@ -1240,7 +1240,7 @@
         <available-wavelengths> <index>13</index> </available-wavelengths>
         </degree-attributes>
     <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-1</node-ref>    </supporting-node></node>
-<node>   <node-id>OpenROADM-4-1-SRG1</node-id>     <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+<node>   <node-id>OpenROADM-4-1-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
         <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-1</node-ref>    </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>7</index> </available-wavelengths>
@@ -1264,38 +1264,38 @@
 </node>
 <node>        <node-id>XPONDER-4-1</node-id>
     <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-4-1</node-ref>    </supporting-node>
-    <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+    <node-type xmlns="http://org/openroadm/common/network">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/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<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/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<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/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<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/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
 </node>
 <node>    <node-id>OpenROADM-4-2-DEG1</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>7</index> </available-wavelengths>
         <available-wavelengths> <index>8</index> </available-wavelengths>
@@ -1307,11 +1307,11 @@
         </degree-attributes>
     <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-2</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-4-2-DEG2</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>7</index> </available-wavelengths>
         <available-wavelengths> <index>8</index> </available-wavelengths>
@@ -1323,11 +1323,11 @@
         </degree-attributes>
     <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-2</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-4-2-DEG3</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>7</index> </available-wavelengths>
         <available-wavelengths> <index>8</index> </available-wavelengths>
@@ -1338,7 +1338,7 @@
         <available-wavelengths> <index>13</index> </available-wavelengths>
         </degree-attributes>
     <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-2</node-ref>    </supporting-node></node>
-<node>   <node-id>OpenROADM-4-2-SRG1</node-id>     <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+<node>   <node-id>OpenROADM-4-2-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
         <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-2</node-ref>    </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>7</index> </available-wavelengths>
@@ -1362,38 +1362,38 @@
 </node>
 <node>        <node-id>XPONDER-4-2</node-id>
     <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-4-2</node-ref>    </supporting-node>
-    <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+    <node-type xmlns="http://org/openroadm/common/network">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/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<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/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<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/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<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/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
 </node>
 <node>    <node-id>OpenROADM-4-3-DEG1</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>7</index> </available-wavelengths>
         <available-wavelengths> <index>8</index> </available-wavelengths>
@@ -1405,11 +1405,11 @@
         </degree-attributes>
     <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-3</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-4-3-DEG2</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>7</index> </available-wavelengths>
         <available-wavelengths> <index>8</index> </available-wavelengths>
@@ -1421,11 +1421,11 @@
         </degree-attributes>
     <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-3</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-4-3-DEG3</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>7</index> </available-wavelengths>
         <available-wavelengths> <index>8</index> </available-wavelengths>
@@ -1436,7 +1436,7 @@
         <available-wavelengths> <index>13</index> </available-wavelengths>
         </degree-attributes>
     <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-3</node-ref>    </supporting-node></node>
-<node>   <node-id>OpenROADM-4-3-SRG1</node-id>     <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+<node>   <node-id>OpenROADM-4-3-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
         <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-3</node-ref>    </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>7</index> </available-wavelengths>
@@ -1460,38 +1460,38 @@
 </node>
 <node>        <node-id>XPONDER-4-3</node-id>
     <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-4-3</node-ref>    </supporting-node>
-    <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+    <node-type xmlns="http://org/openroadm/common/network">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/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<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/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<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/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<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/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
 </node>
 <node>    <node-id>OpenROADM-4-4-DEG1</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>7</index> </available-wavelengths>
         <available-wavelengths> <index>8</index> </available-wavelengths>
@@ -1503,11 +1503,11 @@
         </degree-attributes>
     <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-4</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-4-4-DEG2</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>7</index> </available-wavelengths>
         <available-wavelengths> <index>8</index> </available-wavelengths>
@@ -1519,11 +1519,11 @@
         </degree-attributes>
     <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-4</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-4-4-DEG3</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>7</index> </available-wavelengths>
         <available-wavelengths> <index>8</index> </available-wavelengths>
@@ -1534,7 +1534,7 @@
         <available-wavelengths> <index>13</index> </available-wavelengths>
         </degree-attributes>
     <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-4</node-ref>    </supporting-node></node>
-<node>   <node-id>OpenROADM-4-4-SRG1</node-id>     <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+<node>   <node-id>OpenROADM-4-4-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
         <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-4</node-ref>    </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>7</index> </available-wavelengths>
@@ -1558,38 +1558,38 @@
 </node>
 <node>        <node-id>XPONDER-4-4</node-id>
     <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-4-4</node-ref>    </supporting-node>
-    <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+    <node-type xmlns="http://org/openroadm/common/network">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/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<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/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<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/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<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/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
 </node>
 <node>    <node-id>OpenROADM-5-1-DEG1</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>9</index> </available-wavelengths>
         <available-wavelengths> <index>10</index> </available-wavelengths>
@@ -1600,11 +1600,11 @@
         </degree-attributes>
     <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-1</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-5-1-DEG2</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>9</index> </available-wavelengths>
         <available-wavelengths> <index>10</index> </available-wavelengths>
@@ -1615,11 +1615,11 @@
         </degree-attributes>
     <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-1</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-5-1-DEG3</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>9</index> </available-wavelengths>
         <available-wavelengths> <index>10</index> </available-wavelengths>
@@ -1629,7 +1629,7 @@
         <available-wavelengths> <index>14</index> </available-wavelengths>
         </degree-attributes>
     <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-1</node-ref>    </supporting-node></node>
-<node>   <node-id>OpenROADM-5-1-SRG1</node-id>     <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+<node>   <node-id>OpenROADM-5-1-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
         <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-1</node-ref>    </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>9</index> </available-wavelengths>
@@ -1652,38 +1652,38 @@
 </node>
 <node>        <node-id>XPONDER-5-1</node-id>
     <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-5-1</node-ref>    </supporting-node>
-    <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+    <node-type xmlns="http://org/openroadm/common/network">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/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<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/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<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/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<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/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
 </node>
 <node>    <node-id>OpenROADM-5-2-DEG1</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>9</index> </available-wavelengths>
         <available-wavelengths> <index>10</index> </available-wavelengths>
@@ -1694,11 +1694,11 @@
         </degree-attributes>
     <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-2</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-5-2-DEG2</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>9</index> </available-wavelengths>
         <available-wavelengths> <index>10</index> </available-wavelengths>
@@ -1709,11 +1709,11 @@
         </degree-attributes>
     <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-2</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-5-2-DEG3</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>9</index> </available-wavelengths>
         <available-wavelengths> <index>10</index> </available-wavelengths>
@@ -1723,7 +1723,7 @@
         <available-wavelengths> <index>14</index> </available-wavelengths>
         </degree-attributes>
     <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-2</node-ref>    </supporting-node></node>
-<node>   <node-id>OpenROADM-5-2-SRG1</node-id>     <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+<node>   <node-id>OpenROADM-5-2-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
         <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-2</node-ref>    </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>9</index> </available-wavelengths>
@@ -1746,38 +1746,38 @@
 </node>
 <node>        <node-id>XPONDER-5-2</node-id>
     <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-5-2</node-ref>    </supporting-node>
-    <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+    <node-type xmlns="http://org/openroadm/common/network">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/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<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/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<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/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<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/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
 </node>
 <node>    <node-id>OpenROADM-5-3-DEG1</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>9</index> </available-wavelengths>
         <available-wavelengths> <index>10</index> </available-wavelengths>
@@ -1788,11 +1788,11 @@
         </degree-attributes>
     <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-3</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-5-3-DEG2</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>9</index> </available-wavelengths>
         <available-wavelengths> <index>10</index> </available-wavelengths>
@@ -1803,11 +1803,11 @@
         </degree-attributes>
     <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-3</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-5-3-DEG3</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>9</index> </available-wavelengths>
         <available-wavelengths> <index>10</index> </available-wavelengths>
@@ -1817,7 +1817,7 @@
         <available-wavelengths> <index>14</index> </available-wavelengths>
         </degree-attributes>
     <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-3</node-ref>    </supporting-node></node>
-<node>   <node-id>OpenROADM-5-3-SRG1</node-id>     <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+<node>   <node-id>OpenROADM-5-3-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
         <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-3</node-ref>    </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>9</index> </available-wavelengths>
@@ -1840,38 +1840,38 @@
 </node>
 <node>        <node-id>XPONDER-5-3</node-id>
     <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-5-3</node-ref>    </supporting-node>
-    <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+    <node-type xmlns="http://org/openroadm/common/network">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/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<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/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<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/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<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/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
 </node>
 <node>    <node-id>OpenROADM-5-4-DEG1</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>9</index> </available-wavelengths>
         <available-wavelengths> <index>10</index> </available-wavelengths>
@@ -1882,11 +1882,11 @@
         </degree-attributes>
     <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-4</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-5-4-DEG2</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>9</index> </available-wavelengths>
         <available-wavelengths> <index>10</index> </available-wavelengths>
@@ -1897,11 +1897,11 @@
         </degree-attributes>
     <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-4</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-5-4-DEG3</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>9</index> </available-wavelengths>
         <available-wavelengths> <index>10</index> </available-wavelengths>
@@ -1911,7 +1911,7 @@
         <available-wavelengths> <index>14</index> </available-wavelengths>
         </degree-attributes>
     <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-4</node-ref>    </supporting-node></node>
-<node>   <node-id>OpenROADM-5-4-SRG1</node-id>     <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+<node>   <node-id>OpenROADM-5-4-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
         <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-4</node-ref>    </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>9</index> </available-wavelengths>
@@ -1934,1870 +1934,3134 @@
 </node>
 <node>        <node-id>XPONDER-5-4</node-id>
     <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-5-4</node-ref>    </supporting-node>
-    <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+    <node-type xmlns="http://org/openroadm/common/network">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/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<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/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<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/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<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/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
 </node>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-1-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-1-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/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-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>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/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-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>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/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-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>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/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-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>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/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-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>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/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-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>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/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-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>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/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-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>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/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-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>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/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-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>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/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-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>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/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-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>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/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-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-3-DEG1-DEG1-CTP-TXtoOpenROADM-1-3-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-1-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-DEG2-DEG2-CTP-TXtoOpenROADM-1-3-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-3-DEG1-DEG1-CTP-TXtoOpenROADM-1-3-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-1-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-DEG3-DEG3-CTP-TXtoOpenROADM-1-3-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-3-SRG1-SRG1-CP-TXtoOpenROADM-1-3-DEG1-DEG1-CTP-RX</link-id>
             <source><source-node>OpenROADM-1-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-DEG1-DEG1-CTP-TXtoOpenROADM-1-3-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-3-DEG1-DEG1-CTP-TXtoOpenROADM-1-3-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-1-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-SRG1-SRG1-CP-TXtoOpenROADM-1-3-DEG1-DEG1-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-3-DEG2-DEG2-CTP-TXtoOpenROADM-1-3-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-1-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-DEG1-DEG1-CTP-TXtoOpenROADM-1-3-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-3-DEG2-DEG2-CTP-TXtoOpenROADM-1-3-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-1-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-DEG3-DEG3-CTP-TXtoOpenROADM-1-3-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-3-SRG1-SRG1-CP-TXtoOpenROADM-1-3-DEG2-DEG2-CTP-RX</link-id>
             <source><source-node>OpenROADM-1-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-DEG2-DEG2-CTP-TXtoOpenROADM-1-3-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-3-DEG2-DEG2-CTP-TXtoOpenROADM-1-3-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-1-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-SRG1-SRG1-CP-TXtoOpenROADM-1-3-DEG2-DEG2-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-3-DEG3-DEG3-CTP-TXtoOpenROADM-1-3-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-1-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-DEG1-DEG1-CTP-TXtoOpenROADM-1-3-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-3-DEG3-DEG3-CTP-TXtoOpenROADM-1-3-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-1-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-DEG2-DEG2-CTP-TXtoOpenROADM-1-3-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-3-SRG1-SRG1-CP-TXtoOpenROADM-1-3-DEG3-DEG3-CTP-RX</link-id>
             <source><source-node>OpenROADM-1-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-DEG3-DEG3-CTP-TXtoOpenROADM-1-3-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-3-DEG3-DEG3-CTP-TXtoOpenROADM-1-3-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-1-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-SRG1-SRG1-CP-TXtoOpenROADM-1-3-DEG3-DEG3-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-3XPDR-NW1-TX-toOpenROADM-1-3-SRG1-SRG1-PP1-RX</link-id>
         <source><source-node>XPONDER-1-3</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-3-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-SRG1-SRG1-PP1-TX-to-XPONDER-1-3XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-3-SRG1-SRG1-PP1-TX-to-XPONDER-1-3XPDR-NW1-RX</link-id>
         <source><source-node>OpenROADM-1-3-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-1-3</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-3XPDR-NW1-TX-toOpenROADM-1-3-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-3XPDR-NW2-TX-toOpenROADM-1-3-SRG1-SRG1-PP2-RX</link-id>
         <source><source-node>XPONDER-1-3</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-3-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-SRG1-SRG1-PP2-TX-to-XPONDER-1-3XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-3-SRG1-SRG1-PP2-TX-to-XPONDER-1-3XPDR-NW2-RX</link-id>
         <source><source-node>OpenROADM-1-3-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-1-3</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-3XPDR-NW2-TX-toOpenROADM-1-3-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-3XPDR-NW3-TX-toOpenROADM-1-3-SRG1-SRG1-PP3-RX</link-id>
         <source><source-node>XPONDER-1-3</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-3-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-SRG1-SRG1-PP3-TX-to-XPONDER-1-3XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-3-SRG1-SRG1-PP3-TX-to-XPONDER-1-3XPDR-NW3-RX</link-id>
         <source><source-node>OpenROADM-1-3-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-1-3</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-3XPDR-NW3-TX-toOpenROADM-1-3-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-3XPDR-NW4-TX-toOpenROADM-1-3-SRG1-SRG1-PP4-RX</link-id>
         <source><source-node>XPONDER-1-3</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-3-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-SRG1-SRG1-PP4-TX-to-XPONDER-1-3XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-3-SRG1-SRG1-PP4-TX-to-XPONDER-1-3XPDR-NW4-RX</link-id>
         <source><source-node>OpenROADM-1-3-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-1-3</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-3XPDR-NW4-TX-toOpenROADM-1-3-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-4-DEG1-DEG1-CTP-TXtoOpenROADM-1-4-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-1-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-DEG2-DEG2-CTP-TXtoOpenROADM-1-4-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-4-DEG1-DEG1-CTP-TXtoOpenROADM-1-4-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-1-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-DEG3-DEG3-CTP-TXtoOpenROADM-1-4-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-4-SRG1-SRG1-CP-TXtoOpenROADM-1-4-DEG1-DEG1-CTP-RX</link-id>
             <source><source-node>OpenROADM-1-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-DEG1-DEG1-CTP-TXtoOpenROADM-1-4-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-4-DEG1-DEG1-CTP-TXtoOpenROADM-1-4-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-1-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-SRG1-SRG1-CP-TXtoOpenROADM-1-4-DEG1-DEG1-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-4-DEG2-DEG2-CTP-TXtoOpenROADM-1-4-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-1-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-DEG1-DEG1-CTP-TXtoOpenROADM-1-4-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-4-DEG2-DEG2-CTP-TXtoOpenROADM-1-4-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-1-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-DEG3-DEG3-CTP-TXtoOpenROADM-1-4-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-4-SRG1-SRG1-CP-TXtoOpenROADM-1-4-DEG2-DEG2-CTP-RX</link-id>
             <source><source-node>OpenROADM-1-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-DEG2-DEG2-CTP-TXtoOpenROADM-1-4-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-4-DEG2-DEG2-CTP-TXtoOpenROADM-1-4-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-1-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-SRG1-SRG1-CP-TXtoOpenROADM-1-4-DEG2-DEG2-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-4-DEG3-DEG3-CTP-TXtoOpenROADM-1-4-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-1-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-DEG1-DEG1-CTP-TXtoOpenROADM-1-4-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-4-DEG3-DEG3-CTP-TXtoOpenROADM-1-4-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-1-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-DEG2-DEG2-CTP-TXtoOpenROADM-1-4-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-4-SRG1-SRG1-CP-TXtoOpenROADM-1-4-DEG3-DEG3-CTP-RX</link-id>
             <source><source-node>OpenROADM-1-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-DEG3-DEG3-CTP-TXtoOpenROADM-1-4-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-4-DEG3-DEG3-CTP-TXtoOpenROADM-1-4-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-1-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-SRG1-SRG1-CP-TXtoOpenROADM-1-4-DEG3-DEG3-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-4XPDR-NW1-TX-toOpenROADM-1-4-SRG1-SRG1-PP1-RX</link-id>
         <source><source-node>XPONDER-1-4</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-4-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-SRG1-SRG1-PP1-TX-to-XPONDER-1-4XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-4-SRG1-SRG1-PP1-TX-to-XPONDER-1-4XPDR-NW1-RX</link-id>
         <source><source-node>OpenROADM-1-4-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-1-4</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-4XPDR-NW1-TX-toOpenROADM-1-4-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-4XPDR-NW2-TX-toOpenROADM-1-4-SRG1-SRG1-PP2-RX</link-id>
         <source><source-node>XPONDER-1-4</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-4-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-SRG1-SRG1-PP2-TX-to-XPONDER-1-4XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-4-SRG1-SRG1-PP2-TX-to-XPONDER-1-4XPDR-NW2-RX</link-id>
         <source><source-node>OpenROADM-1-4-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-1-4</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-4XPDR-NW2-TX-toOpenROADM-1-4-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-4XPDR-NW3-TX-toOpenROADM-1-4-SRG1-SRG1-PP3-RX</link-id>
         <source><source-node>XPONDER-1-4</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-4-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-SRG1-SRG1-PP3-TX-to-XPONDER-1-4XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-4-SRG1-SRG1-PP3-TX-to-XPONDER-1-4XPDR-NW3-RX</link-id>
         <source><source-node>OpenROADM-1-4-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-1-4</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-4XPDR-NW3-TX-toOpenROADM-1-4-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-4XPDR-NW4-TX-toOpenROADM-1-4-SRG1-SRG1-PP4-RX</link-id>
         <source><source-node>XPONDER-1-4</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-4-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-SRG1-SRG1-PP4-TX-to-XPONDER-1-4XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-4-SRG1-SRG1-PP4-TX-to-XPONDER-1-4XPDR-NW4-RX</link-id>
         <source><source-node>OpenROADM-1-4-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-1-4</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-4XPDR-NW4-TX-toOpenROADM-1-4-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-1-1-DEG1-to-OpenROADM-1-2-DEG1</link-id>    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-DEG1-to-OpenROADM-1-1-DEG1</opposite-link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <link-id>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/common/network">OpenROADM-1-1-DEG1-to-OpenROADM-1-2-DEG1</opposite-link>
+    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
+    <source><source-node>OpenROADM-1-1-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
+    <destination><dest-node>OpenROADM-1-2-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+    <OMS-attributes xmlns="http://org/openroadm/network/topology">
+        <opposite-link>OpenROADM-1-2-DEG1-to-OpenROADM-1-1-DEG1</opposite-link>
+        <TE-metric>10</TE-metric>
+        <span>
+            <clfi>fiber1</clfi>
+            <auto-spanloss>true</auto-spanloss>
+            <spanloss-base>11.4</spanloss-base>
+            <spanloss-current>12</spanloss-current>
+            <engineered-spanloss>12.2</engineered-spanloss>
+            <link-concatenation>
+                <SRLG-Id>0</SRLG-Id>
+                <fiber-type>smf</fiber-type>
+                <SRLG-length>100000</SRLG-length>
+                <pmd>0.5</pmd>
+            </link-concatenation>
+        </span>
+    </OMS-attributes>
+</link>
+<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <link-id>OpenROADM-1-2-DEG1-to-OpenROADM-1-1-DEG1</link-id>
+    <opposite-link xmlns="http://org/openroadm/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-3-DEG2</link-id>    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-DEG2-to-OpenROADM-1-2-DEG2</opposite-link>
+    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
+    <source><source-node>OpenROADM-1-2-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
+    <destination><dest-node>OpenROADM-1-1-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+    <OMS-attributes xmlns="http://org/openroadm/network/topology">
+        <opposite-link>OpenROADM-1-1-DEG1-to-OpenROADM-1-2-DEG1</opposite-link>
+        <TE-metric>10</TE-metric>
+        <span>
+            <clfi>fiber2</clfi>
+            <auto-spanloss>true</auto-spanloss>
+            <spanloss-base>11.4</spanloss-base>
+            <spanloss-current>12</spanloss-current>
+            <engineered-spanloss>12.2</engineered-spanloss>
+            <link-concatenation>
+                <SRLG-Id>0</SRLG-Id>
+                <fiber-type>smf</fiber-type>
+                <SRLG-length>100000</SRLG-length>
+                <pmd>0.5</pmd>
+            </link-concatenation>
+        </span>
+    </OMS-attributes>
+</link>
+<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <link-id>OpenROADM-1-2-DEG2-to-OpenROADM-1-3-DEG2</link-id>
+    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-DEG2-to-OpenROADM-1-2-DEG2</opposite-link>
     <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-1-2-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-1-3-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-1-3-DEG2-to-OpenROADM-1-2-DEG2</link-id>    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-DEG2-to-OpenROADM-1-3-DEG2</opposite-link>
+    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
+    <source><source-node>OpenROADM-1-2-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
+    <destination><dest-node>OpenROADM-1-3-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+    <OMS-attributes xmlns="http://org/openroadm/network/topology">
+        <opposite-link>OpenROADM-1-3-DEG2-to-OpenROADM-1-2-DEG2</opposite-link>
+        <TE-metric>10</TE-metric>
+        <span>
+            <clfi>fiber56</clfi>
+            <auto-spanloss>true</auto-spanloss>
+            <spanloss-base>11.4</spanloss-base>
+            <spanloss-current>12</spanloss-current>
+            <engineered-spanloss>12.2</engineered-spanloss>
+            <link-concatenation>
+                <SRLG-Id>0</SRLG-Id>
+                <fiber-type>smf</fiber-type>
+                <SRLG-length>100000</SRLG-length>
+                <pmd>0.5</pmd>
+            </link-concatenation>
+        </span>
+    </OMS-attributes>
+</link>
+<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <link-id>OpenROADM-1-3-DEG2-to-OpenROADM-1-2-DEG2</link-id>
+    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-DEG2-to-OpenROADM-1-3-DEG2</opposite-link>
     <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-1-3-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-1-2-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-1-3-DEG1-to-OpenROADM-1-4-DEG1</link-id>    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-DEG1-to-OpenROADM-1-3-DEG1</opposite-link>
+    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
+    <source><source-node>OpenROADM-1-3-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
+    <destination><dest-node>OpenROADM-1-2-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+    <OMS-attributes xmlns="http://org/openroadm/network/topology">
+        <opposite-link>OpenROADM-1-2-DEG2-to-OpenROADM-1-3-DEG2</opposite-link>
+        <TE-metric>10</TE-metric>
+        <span>
+            <clfi>fiber3</clfi>
+            <auto-spanloss>true</auto-spanloss>
+            <spanloss-base>11.4</spanloss-base>
+            <spanloss-current>12</spanloss-current>
+            <engineered-spanloss>12.2</engineered-spanloss>
+            <link-concatenation>
+                <SRLG-Id>0</SRLG-Id>
+                <fiber-type>smf</fiber-type>
+                <SRLG-length>100000</SRLG-length>
+                <pmd>0.5</pmd>
+            </link-concatenation>
+        </span>
+    </OMS-attributes>
+</link>
+<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <link-id>OpenROADM-1-3-DEG1-to-OpenROADM-1-4-DEG1</link-id>
+    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-DEG1-to-OpenROADM-1-3-DEG1</opposite-link>
     <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-1-3-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-1-4-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-1-4-DEG1-to-OpenROADM-1-3-DEG1</link-id>    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-DEG1-to-OpenROADM-1-4-DEG1</opposite-link>
+    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
+    <source><source-node>OpenROADM-1-3-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
+    <destination><dest-node>OpenROADM-1-4-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+    <OMS-attributes xmlns="http://org/openroadm/network/topology">
+        <opposite-link>OpenROADM-1-4-DEG1-to-OpenROADM-1-3-DEG1</opposite-link>
+        <TE-metric>10</TE-metric>
+        <span>
+            <clfi>fiber</clfi>
+            <auto-spanloss>true</auto-spanloss>
+            <spanloss-base>11.4</spanloss-base>
+            <spanloss-current>12</spanloss-current>
+            <engineered-spanloss>12.2</engineered-spanloss>
+            <link-concatenation>
+                <SRLG-Id>0</SRLG-Id>
+                <fiber-type>smf</fiber-type>
+                <SRLG-length>100000</SRLG-length>
+                <pmd>0.5</pmd>
+            </link-concatenation>
+        </span>
+    </OMS-attributes>
+</link>
+<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <link-id>OpenROADM-1-4-DEG1-to-OpenROADM-1-3-DEG1</link-id>
+    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-DEG1-to-OpenROADM-1-4-DEG1</opposite-link>
     <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-1-4-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-1-3-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-1-4-DEG2-to-OpenROADM-1-1-DEG2</link-id>    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-DEG2-to-OpenROADM-1-4-DEG2</opposite-link>
+    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
+    <source><source-node>OpenROADM-1-4-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
+    <destination><dest-node>OpenROADM-1-3-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+    <OMS-attributes xmlns="http://org/openroadm/network/topology">
+        <opposite-link>OpenROADM-1-3-DEG1-to-OpenROADM-1-4-DEG1</opposite-link>
+        <TE-metric>10</TE-metric>
+        <span>
+            <clfi>fiber4</clfi>
+            <auto-spanloss>true</auto-spanloss>
+            <spanloss-base>11.4</spanloss-base>
+            <spanloss-current>12</spanloss-current>
+            <engineered-spanloss>12.2</engineered-spanloss>
+            <link-concatenation>
+                <SRLG-Id>0</SRLG-Id>
+                <fiber-type>smf</fiber-type>
+                <SRLG-length>100000</SRLG-length>
+                <pmd>0.5</pmd>
+            </link-concatenation>
+        </span>
+    </OMS-attributes>
+</link>
+<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <link-id>OpenROADM-1-4-DEG2-to-OpenROADM-1-1-DEG2</link-id>
+    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-DEG2-to-OpenROADM-1-4-DEG2</opposite-link>
     <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-1-4-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-1-1-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-1-1-DEG2-to-OpenROADM-1-4-DEG2</link-id>    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-DEG2-to-OpenROADM-1-1-DEG2</opposite-link>
+    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
+    <source><source-node>OpenROADM-1-4-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
+    <destination><dest-node>OpenROADM-1-1-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+    <OMS-attributes xmlns="http://org/openroadm/network/topology">
+        <opposite-link>OpenROADM-1-1-DEG2-to-OpenROADM-1-4-DEG2</opposite-link>
+        <TE-metric>10</TE-metric>
+        <span>
+            <clfi>fiber57</clfi>
+            <auto-spanloss>true</auto-spanloss>
+            <spanloss-base>11.4</spanloss-base>
+            <spanloss-current>12</spanloss-current>
+            <engineered-spanloss>12.2</engineered-spanloss>
+            <link-concatenation>
+                <SRLG-Id>0</SRLG-Id>
+                <fiber-type>smf</fiber-type>
+                <SRLG-length>100000</SRLG-length>
+                <pmd>0.5</pmd>
+            </link-concatenation>
+        </span>
+    </OMS-attributes>
+</link>
+<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <link-id>OpenROADM-1-1-DEG2-to-OpenROADM-1-4-DEG2</link-id>
+    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-DEG2-to-OpenROADM-1-1-DEG2</opposite-link>
     <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-1-1-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-1-4-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>    </link>
+    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
+    <source><source-node>OpenROADM-1-1-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
+    <destination><dest-node>OpenROADM-1-4-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+    <OMS-attributes xmlns="http://org/openroadm/network/topology">
+        <opposite-link>OpenROADM-1-4-DEG2-to-OpenROADM-1-1-DEG2</opposite-link>
+        <TE-metric>10</TE-metric>
+        <span>
+            <clfi>fiber5</clfi>
+            <auto-spanloss>true</auto-spanloss>
+            <spanloss-base>11.4</spanloss-base>
+            <spanloss-current>12</spanloss-current>
+            <engineered-spanloss>12.2</engineered-spanloss>
+            <link-concatenation>
+                <SRLG-Id>0</SRLG-Id>
+                <fiber-type>smf</fiber-type>
+                <SRLG-length>100000</SRLG-length>
+                <pmd>0.5</pmd>
+            </link-concatenation>
+        </span>
+    </OMS-attributes>
+</link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-DEG1-DEG1-CTP-TXtoOpenROADM-2-1-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-2-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/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-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>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/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-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>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/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-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>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/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-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>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/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-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>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/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-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>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/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-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>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/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-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>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/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-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>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/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-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>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/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-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>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/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-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>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/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-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-3-DEG1-DEG1-CTP-TXtoOpenROADM-2-3-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-2-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-DEG2-DEG2-CTP-TXtoOpenROADM-2-3-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-3-DEG1-DEG1-CTP-TXtoOpenROADM-2-3-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-2-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-DEG3-DEG3-CTP-TXtoOpenROADM-2-3-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-3-SRG1-SRG1-CP-TXtoOpenROADM-2-3-DEG1-DEG1-CTP-RX</link-id>
             <source><source-node>OpenROADM-2-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-DEG1-DEG1-CTP-TXtoOpenROADM-2-3-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-3-DEG1-DEG1-CTP-TXtoOpenROADM-2-3-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-2-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-SRG1-SRG1-CP-TXtoOpenROADM-2-3-DEG1-DEG1-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-3-DEG2-DEG2-CTP-TXtoOpenROADM-2-3-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-2-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-DEG1-DEG1-CTP-TXtoOpenROADM-2-3-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-3-DEG2-DEG2-CTP-TXtoOpenROADM-2-3-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-2-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-DEG3-DEG3-CTP-TXtoOpenROADM-2-3-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-3-SRG1-SRG1-CP-TXtoOpenROADM-2-3-DEG2-DEG2-CTP-RX</link-id>
             <source><source-node>OpenROADM-2-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-DEG2-DEG2-CTP-TXtoOpenROADM-2-3-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-3-DEG2-DEG2-CTP-TXtoOpenROADM-2-3-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-2-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-SRG1-SRG1-CP-TXtoOpenROADM-2-3-DEG2-DEG2-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-3-DEG3-DEG3-CTP-TXtoOpenROADM-2-3-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-2-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-DEG1-DEG1-CTP-TXtoOpenROADM-2-3-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-3-DEG3-DEG3-CTP-TXtoOpenROADM-2-3-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-2-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-DEG2-DEG2-CTP-TXtoOpenROADM-2-3-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-3-SRG1-SRG1-CP-TXtoOpenROADM-2-3-DEG3-DEG3-CTP-RX</link-id>
             <source><source-node>OpenROADM-2-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-DEG3-DEG3-CTP-TXtoOpenROADM-2-3-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-3-DEG3-DEG3-CTP-TXtoOpenROADM-2-3-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-2-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-SRG1-SRG1-CP-TXtoOpenROADM-2-3-DEG3-DEG3-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-3XPDR-NW1-TX-toOpenROADM-2-3-SRG1-SRG1-PP1-RX</link-id>
         <source><source-node>XPONDER-2-3</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-3-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-SRG1-SRG1-PP1-TX-to-XPONDER-2-3XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-3-SRG1-SRG1-PP1-TX-to-XPONDER-2-3XPDR-NW1-RX</link-id>
         <source><source-node>OpenROADM-2-3-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-2-3</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-3XPDR-NW1-TX-toOpenROADM-2-3-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-3XPDR-NW2-TX-toOpenROADM-2-3-SRG1-SRG1-PP2-RX</link-id>
         <source><source-node>XPONDER-2-3</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-3-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-SRG1-SRG1-PP2-TX-to-XPONDER-2-3XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-3-SRG1-SRG1-PP2-TX-to-XPONDER-2-3XPDR-NW2-RX</link-id>
         <source><source-node>OpenROADM-2-3-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-2-3</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-3XPDR-NW2-TX-toOpenROADM-2-3-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-3XPDR-NW3-TX-toOpenROADM-2-3-SRG1-SRG1-PP3-RX</link-id>
         <source><source-node>XPONDER-2-3</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-3-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-SRG1-SRG1-PP3-TX-to-XPONDER-2-3XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-3-SRG1-SRG1-PP3-TX-to-XPONDER-2-3XPDR-NW3-RX</link-id>
         <source><source-node>OpenROADM-2-3-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-2-3</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-3XPDR-NW3-TX-toOpenROADM-2-3-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-3XPDR-NW4-TX-toOpenROADM-2-3-SRG1-SRG1-PP4-RX</link-id>
         <source><source-node>XPONDER-2-3</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-3-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-SRG1-SRG1-PP4-TX-to-XPONDER-2-3XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-3-SRG1-SRG1-PP4-TX-to-XPONDER-2-3XPDR-NW4-RX</link-id>
         <source><source-node>OpenROADM-2-3-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-2-3</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-3XPDR-NW4-TX-toOpenROADM-2-3-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-4-DEG1-DEG1-CTP-TXtoOpenROADM-2-4-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-2-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-DEG2-DEG2-CTP-TXtoOpenROADM-2-4-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-4-DEG1-DEG1-CTP-TXtoOpenROADM-2-4-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-2-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-DEG3-DEG3-CTP-TXtoOpenROADM-2-4-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-4-SRG1-SRG1-CP-TXtoOpenROADM-2-4-DEG1-DEG1-CTP-RX</link-id>
             <source><source-node>OpenROADM-2-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-DEG1-DEG1-CTP-TXtoOpenROADM-2-4-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-4-DEG1-DEG1-CTP-TXtoOpenROADM-2-4-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-2-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-SRG1-SRG1-CP-TXtoOpenROADM-2-4-DEG1-DEG1-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-4-DEG2-DEG2-CTP-TXtoOpenROADM-2-4-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-2-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-DEG1-DEG1-CTP-TXtoOpenROADM-2-4-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-4-DEG2-DEG2-CTP-TXtoOpenROADM-2-4-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-2-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-DEG3-DEG3-CTP-TXtoOpenROADM-2-4-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-4-SRG1-SRG1-CP-TXtoOpenROADM-2-4-DEG2-DEG2-CTP-RX</link-id>
             <source><source-node>OpenROADM-2-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-DEG2-DEG2-CTP-TXtoOpenROADM-2-4-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-4-DEG2-DEG2-CTP-TXtoOpenROADM-2-4-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-2-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-SRG1-SRG1-CP-TXtoOpenROADM-2-4-DEG2-DEG2-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-4-DEG3-DEG3-CTP-TXtoOpenROADM-2-4-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-2-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-DEG1-DEG1-CTP-TXtoOpenROADM-2-4-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-4-DEG3-DEG3-CTP-TXtoOpenROADM-2-4-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-2-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-DEG2-DEG2-CTP-TXtoOpenROADM-2-4-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-4-SRG1-SRG1-CP-TXtoOpenROADM-2-4-DEG3-DEG3-CTP-RX</link-id>
             <source><source-node>OpenROADM-2-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-DEG3-DEG3-CTP-TXtoOpenROADM-2-4-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-4-DEG3-DEG3-CTP-TXtoOpenROADM-2-4-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-2-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-SRG1-SRG1-CP-TXtoOpenROADM-2-4-DEG3-DEG3-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-4XPDR-NW1-TX-toOpenROADM-2-4-SRG1-SRG1-PP1-RX</link-id>
         <source><source-node>XPONDER-2-4</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-4-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-SRG1-SRG1-PP1-TX-to-XPONDER-2-4XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-4-SRG1-SRG1-PP1-TX-to-XPONDER-2-4XPDR-NW1-RX</link-id>
         <source><source-node>OpenROADM-2-4-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-2-4</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-4XPDR-NW1-TX-toOpenROADM-2-4-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-4XPDR-NW2-TX-toOpenROADM-2-4-SRG1-SRG1-PP2-RX</link-id>
         <source><source-node>XPONDER-2-4</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-4-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-SRG1-SRG1-PP2-TX-to-XPONDER-2-4XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-4-SRG1-SRG1-PP2-TX-to-XPONDER-2-4XPDR-NW2-RX</link-id>
         <source><source-node>OpenROADM-2-4-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-2-4</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-4XPDR-NW2-TX-toOpenROADM-2-4-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-4XPDR-NW3-TX-toOpenROADM-2-4-SRG1-SRG1-PP3-RX</link-id>
         <source><source-node>XPONDER-2-4</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-4-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-SRG1-SRG1-PP3-TX-to-XPONDER-2-4XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-4-SRG1-SRG1-PP3-TX-to-XPONDER-2-4XPDR-NW3-RX</link-id>
         <source><source-node>OpenROADM-2-4-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-2-4</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-4XPDR-NW3-TX-toOpenROADM-2-4-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-4XPDR-NW4-TX-toOpenROADM-2-4-SRG1-SRG1-PP4-RX</link-id>
         <source><source-node>XPONDER-2-4</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-4-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-SRG1-SRG1-PP4-TX-to-XPONDER-2-4XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-4-SRG1-SRG1-PP4-TX-to-XPONDER-2-4XPDR-NW4-RX</link-id>
         <source><source-node>OpenROADM-2-4-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-2-4</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-4XPDR-NW4-TX-toOpenROADM-2-4-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-2-1-DEG1-to-OpenROADM-2-2-DEG1</link-id>    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-DEG1-to-OpenROADM-2-1-DEG1</opposite-link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <link-id>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/common/network">OpenROADM-2-1-DEG1-to-OpenROADM-2-2-DEG1</opposite-link>
+    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
+    <source><source-node>OpenROADM-2-1-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
+    <destination><dest-node>OpenROADM-2-2-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+    <OMS-attributes xmlns="http://org/openroadm/network/topology">
+        <opposite-link>OpenROADM-2-2-DEG1-to-OpenROADM-2-1-DEG1</opposite-link>
+        <TE-metric>10</TE-metric>
+        <span>
+            <clfi>fiber6</clfi>
+            <auto-spanloss>true</auto-spanloss>
+            <spanloss-base>11.4</spanloss-base>
+            <spanloss-current>12</spanloss-current>
+            <engineered-spanloss>12.2</engineered-spanloss>
+            <link-concatenation>
+                <SRLG-Id>0</SRLG-Id>
+                <fiber-type>smf</fiber-type>
+                <SRLG-length>100000</SRLG-length>
+                <pmd>0.5</pmd>
+            </link-concatenation>
+        </span>
+    </OMS-attributes>
+</link>
+<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <link-id>OpenROADM-2-2-DEG1-to-OpenROADM-2-1-DEG1</link-id>
+    <opposite-link xmlns="http://org/openroadm/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-3-DEG2</link-id>    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-DEG2-to-OpenROADM-2-2-DEG2</opposite-link>
+    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
+    <source><source-node>OpenROADM-2-2-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
+    <destination><dest-node>OpenROADM-2-1-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+    <OMS-attributes xmlns="http://org/openroadm/network/topology">
+        <opposite-link>OpenROADM-2-1-DEG1-to-OpenROADM-2-2-DEG1</opposite-link>
+        <TE-metric>10</TE-metric>
+        <span>
+            <clfi>fiber7</clfi>
+            <auto-spanloss>true</auto-spanloss>
+            <spanloss-base>11.4</spanloss-base>
+            <spanloss-current>12</spanloss-current>
+            <engineered-spanloss>12.2</engineered-spanloss>
+            <link-concatenation>
+                <SRLG-Id>0</SRLG-Id>
+                <fiber-type>smf</fiber-type>
+                <SRLG-length>100000</SRLG-length>
+                <pmd>0.5</pmd>
+            </link-concatenation>
+        </span>
+    </OMS-attributes>
+</link>
+<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <link-id>OpenROADM-2-2-DEG2-to-OpenROADM-2-3-DEG2</link-id>
+    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-DEG2-to-OpenROADM-2-2-DEG2</opposite-link>
     <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-2-2-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-2-3-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-2-3-DEG2-to-OpenROADM-2-2-DEG2</link-id>    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-DEG2-to-OpenROADM-2-3-DEG2</opposite-link>
+    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
+    <source><source-node>OpenROADM-2-2-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
+    <destination><dest-node>OpenROADM-2-3-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+    <OMS-attributes xmlns="http://org/openroadm/network/topology">
+        <opposite-link>OpenROADM-2-3-DEG2-to-OpenROADM-2-2-DEG2</opposite-link>
+        <TE-metric>10</TE-metric>
+        <span>
+            <clfi>fiber8</clfi>
+            <auto-spanloss>true</auto-spanloss>
+            <spanloss-base>11.4</spanloss-base>
+            <spanloss-current>12</spanloss-current>
+            <engineered-spanloss>12.2</engineered-spanloss>
+            <link-concatenation>
+                <SRLG-Id>0</SRLG-Id>
+                <fiber-type>smf</fiber-type>
+                <SRLG-length>100000</SRLG-length>
+                <pmd>0.5</pmd>
+            </link-concatenation>
+        </span>
+    </OMS-attributes>
+</link>
+<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <link-id>OpenROADM-2-3-DEG2-to-OpenROADM-2-2-DEG2</link-id>
+    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-DEG2-to-OpenROADM-2-3-DEG2</opposite-link>
     <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-2-3-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-2-2-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-2-3-DEG1-to-OpenROADM-2-4-DEG1</link-id>    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-DEG1-to-OpenROADM-2-3-DEG1</opposite-link>
+    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
+    <source><source-node>OpenROADM-2-3-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
+    <destination><dest-node>OpenROADM-2-2-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+    <OMS-attributes xmlns="http://org/openroadm/network/topology">
+        <opposite-link>OpenROADM-2-2-DEG2-to-OpenROADM-2-3-DEG2</opposite-link>
+        <TE-metric>10</TE-metric>
+        <span>
+            <clfi>fiber9</clfi>
+            <auto-spanloss>true</auto-spanloss>
+            <spanloss-base>11.4</spanloss-base>
+            <spanloss-current>12</spanloss-current>
+            <engineered-spanloss>12.2</engineered-spanloss>
+            <link-concatenation>
+                <SRLG-Id>0</SRLG-Id>
+                <fiber-type>smf</fiber-type>
+                <SRLG-length>100000</SRLG-length>
+                <pmd>0.5</pmd>
+            </link-concatenation>
+        </span>
+    </OMS-attributes>
+</link>
+<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <link-id>OpenROADM-2-3-DEG1-to-OpenROADM-2-4-DEG1</link-id>
+    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-DEG1-to-OpenROADM-2-3-DEG1</opposite-link>
     <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-2-3-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-2-4-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-2-4-DEG1-to-OpenROADM-2-3-DEG1</link-id>    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-DEG1-to-OpenROADM-2-4-DEG1</opposite-link>
+    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
+    <source><source-node>OpenROADM-2-3-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
+    <destination><dest-node>OpenROADM-2-4-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+    <OMS-attributes xmlns="http://org/openroadm/network/topology">
+        <opposite-link>OpenROADM-2-4-DEG1-to-OpenROADM-2-3-DEG1</opposite-link>
+        <TE-metric>10</TE-metric>
+        <span>
+            <clfi>fiber10</clfi>
+            <auto-spanloss>true</auto-spanloss>
+            <spanloss-base>11.4</spanloss-base>
+            <spanloss-current>12</spanloss-current>
+            <engineered-spanloss>12.2</engineered-spanloss>
+            <link-concatenation>
+                <SRLG-Id>0</SRLG-Id>
+                <fiber-type>smf</fiber-type>
+                <SRLG-length>100000</SRLG-length>
+                <pmd>0.5</pmd>
+            </link-concatenation>
+        </span>
+    </OMS-attributes>
+</link>
+<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <link-id>OpenROADM-2-4-DEG1-to-OpenROADM-2-3-DEG1</link-id>
+    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-DEG1-to-OpenROADM-2-4-DEG1</opposite-link>
     <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-2-4-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-2-3-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-2-4-DEG2-to-OpenROADM-2-1-DEG2</link-id>    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-DEG2-to-OpenROADM-2-4-DEG2</opposite-link>
+    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
+    <source><source-node>OpenROADM-2-4-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
+    <destination><dest-node>OpenROADM-2-3-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+    <OMS-attributes xmlns="http://org/openroadm/network/topology">
+        <opposite-link>OpenROADM-2-3-DEG1-to-OpenROADM-2-4-DEG1</opposite-link>
+        <TE-metric>10</TE-metric>
+        <span>
+            <clfi>fiber11</clfi>
+            <auto-spanloss>true</auto-spanloss>
+            <spanloss-base>11.4</spanloss-base>
+            <spanloss-current>12</spanloss-current>
+            <engineered-spanloss>12.2</engineered-spanloss>
+            <link-concatenation>
+                <SRLG-Id>0</SRLG-Id>
+                <fiber-type>smf</fiber-type>
+                <SRLG-length>100000</SRLG-length>
+                <pmd>0.5</pmd>
+            </link-concatenation>
+        </span>
+    </OMS-attributes>
+</link>
+<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <link-id>OpenROADM-2-4-DEG2-to-OpenROADM-2-1-DEG2</link-id>
+    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-DEG2-to-OpenROADM-2-4-DEG2</opposite-link>
     <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-2-4-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-2-1-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-2-1-DEG2-to-OpenROADM-2-4-DEG2</link-id>    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-DEG2-to-OpenROADM-2-1-DEG2</opposite-link>
+    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
+    <source><source-node>OpenROADM-2-4-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
+    <destination><dest-node>OpenROADM-2-1-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+    <OMS-attributes xmlns="http://org/openroadm/network/topology">
+        <opposite-link>OpenROADM-2-1-DEG2-to-OpenROADM-2-4-DEG2</opposite-link>
+        <TE-metric>10</TE-metric>
+        <span>
+            <clfi>fiber58</clfi>
+            <auto-spanloss>true</auto-spanloss>
+            <spanloss-base>11.4</spanloss-base>
+            <spanloss-current>12</spanloss-current>
+            <engineered-spanloss>12.2</engineered-spanloss>
+            <link-concatenation>
+                <SRLG-Id>0</SRLG-Id>
+                <fiber-type>smf</fiber-type>
+                <SRLG-length>100000</SRLG-length>
+                <pmd>0.5</pmd>
+            </link-concatenation>
+        </span>
+    </OMS-attributes>
+</link>
+<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <link-id>OpenROADM-2-1-DEG2-to-OpenROADM-2-4-DEG2</link-id>
+    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-DEG2-to-OpenROADM-2-1-DEG2</opposite-link>
     <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-2-1-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-2-4-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-1-DEG1-DEG1-CTP-TXtoOpenROADM-3-1-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-3-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
+    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
+    <source><source-node>OpenROADM-2-1-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
+    <destination><dest-node>OpenROADM-2-4-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+    <OMS-attributes xmlns="http://org/openroadm/network/topology">
+        <opposite-link>OpenROADM-2-4-DEG2-to-OpenROADM-2-1-DEG2</opposite-link>
+        <TE-metric>10</TE-metric>
+        <span>
+            <clfi>fiber12</clfi>
+            <auto-spanloss>true</auto-spanloss>
+            <spanloss-base>11.4</spanloss-base>
+            <spanloss-current>12</spanloss-current>
+            <engineered-spanloss>12.2</engineered-spanloss>
+            <link-concatenation>
+                <SRLG-Id>0</SRLG-Id>
+                <fiber-type>smf</fiber-type>
+                <SRLG-length>100000</SRLG-length>
+                <pmd>0.5</pmd>
+            </link-concatenation>
+        </span>
+    </OMS-attributes>
+</link>
+    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+        <link-id>OpenROADM-3-1-DEG1-DEG1-CTP-TXtoOpenROADM-3-1-DEG2-DEG2-CTP-RX</link-id>
+        <source><source-node>OpenROADM-3-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>
+        <destination><dest-node>OpenROADM-3-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/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>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+    </link>
+    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+        <link-id>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/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-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>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/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-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>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/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-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>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/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-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>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/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-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>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/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-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>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/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-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>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/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-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>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/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-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>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/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-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>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/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-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>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/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-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>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/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-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-3-DEG1-DEG1-CTP-TXtoOpenROADM-3-3-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-3-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-DEG2-DEG2-CTP-TXtoOpenROADM-3-3-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-3-DEG1-DEG1-CTP-TXtoOpenROADM-3-3-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-3-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-DEG3-DEG3-CTP-TXtoOpenROADM-3-3-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-3-SRG1-SRG1-CP-TXtoOpenROADM-3-3-DEG1-DEG1-CTP-RX</link-id>
             <source><source-node>OpenROADM-3-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-DEG1-DEG1-CTP-TXtoOpenROADM-3-3-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-3-DEG1-DEG1-CTP-TXtoOpenROADM-3-3-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-3-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-SRG1-SRG1-CP-TXtoOpenROADM-3-3-DEG1-DEG1-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-3-DEG2-DEG2-CTP-TXtoOpenROADM-3-3-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-3-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-DEG1-DEG1-CTP-TXtoOpenROADM-3-3-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-3-DEG2-DEG2-CTP-TXtoOpenROADM-3-3-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-3-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-DEG3-DEG3-CTP-TXtoOpenROADM-3-3-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-3-SRG1-SRG1-CP-TXtoOpenROADM-3-3-DEG2-DEG2-CTP-RX</link-id>
             <source><source-node>OpenROADM-3-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-DEG2-DEG2-CTP-TXtoOpenROADM-3-3-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-3-DEG2-DEG2-CTP-TXtoOpenROADM-3-3-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-3-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-SRG1-SRG1-CP-TXtoOpenROADM-3-3-DEG2-DEG2-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-3-DEG3-DEG3-CTP-TXtoOpenROADM-3-3-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-3-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-DEG1-DEG1-CTP-TXtoOpenROADM-3-3-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-3-DEG3-DEG3-CTP-TXtoOpenROADM-3-3-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-3-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-DEG2-DEG2-CTP-TXtoOpenROADM-3-3-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-3-SRG1-SRG1-CP-TXtoOpenROADM-3-3-DEG3-DEG3-CTP-RX</link-id>
             <source><source-node>OpenROADM-3-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-DEG3-DEG3-CTP-TXtoOpenROADM-3-3-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-3-DEG3-DEG3-CTP-TXtoOpenROADM-3-3-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-3-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-SRG1-SRG1-CP-TXtoOpenROADM-3-3-DEG3-DEG3-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-3XPDR-NW1-TX-toOpenROADM-3-3-SRG1-SRG1-PP1-RX</link-id>
         <source><source-node>XPONDER-3-3</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-3-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-SRG1-SRG1-PP1-TX-to-XPONDER-3-3XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-3-SRG1-SRG1-PP1-TX-to-XPONDER-3-3XPDR-NW1-RX</link-id>
         <source><source-node>OpenROADM-3-3-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-3-3</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-3XPDR-NW1-TX-toOpenROADM-3-3-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-3XPDR-NW2-TX-toOpenROADM-3-3-SRG1-SRG1-PP2-RX</link-id>
         <source><source-node>XPONDER-3-3</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-3-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-SRG1-SRG1-PP2-TX-to-XPONDER-3-3XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-3-SRG1-SRG1-PP2-TX-to-XPONDER-3-3XPDR-NW2-RX</link-id>
         <source><source-node>OpenROADM-3-3-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-3-3</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-3XPDR-NW2-TX-toOpenROADM-3-3-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-3XPDR-NW3-TX-toOpenROADM-3-3-SRG1-SRG1-PP3-RX</link-id>
         <source><source-node>XPONDER-3-3</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-3-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-SRG1-SRG1-PP3-TX-to-XPONDER-3-3XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-3-SRG1-SRG1-PP3-TX-to-XPONDER-3-3XPDR-NW3-RX</link-id>
         <source><source-node>OpenROADM-3-3-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-3-3</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-3XPDR-NW3-TX-toOpenROADM-3-3-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-3XPDR-NW4-TX-toOpenROADM-3-3-SRG1-SRG1-PP4-RX</link-id>
         <source><source-node>XPONDER-3-3</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-3-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-SRG1-SRG1-PP4-TX-to-XPONDER-3-3XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-3-SRG1-SRG1-PP4-TX-to-XPONDER-3-3XPDR-NW4-RX</link-id>
         <source><source-node>OpenROADM-3-3-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-3-3</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-3XPDR-NW4-TX-toOpenROADM-3-3-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-4-DEG1-DEG1-CTP-TXtoOpenROADM-3-4-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-3-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-DEG2-DEG2-CTP-TXtoOpenROADM-3-4-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-4-DEG1-DEG1-CTP-TXtoOpenROADM-3-4-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-3-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-DEG3-DEG3-CTP-TXtoOpenROADM-3-4-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-4-SRG1-SRG1-CP-TXtoOpenROADM-3-4-DEG1-DEG1-CTP-RX</link-id>
             <source><source-node>OpenROADM-3-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-DEG1-DEG1-CTP-TXtoOpenROADM-3-4-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-4-DEG1-DEG1-CTP-TXtoOpenROADM-3-4-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-3-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-SRG1-SRG1-CP-TXtoOpenROADM-3-4-DEG1-DEG1-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-4-DEG2-DEG2-CTP-TXtoOpenROADM-3-4-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-3-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-DEG1-DEG1-CTP-TXtoOpenROADM-3-4-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-4-DEG2-DEG2-CTP-TXtoOpenROADM-3-4-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-3-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-DEG3-DEG3-CTP-TXtoOpenROADM-3-4-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-4-SRG1-SRG1-CP-TXtoOpenROADM-3-4-DEG2-DEG2-CTP-RX</link-id>
             <source><source-node>OpenROADM-3-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-DEG2-DEG2-CTP-TXtoOpenROADM-3-4-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-4-DEG2-DEG2-CTP-TXtoOpenROADM-3-4-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-3-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-SRG1-SRG1-CP-TXtoOpenROADM-3-4-DEG2-DEG2-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-4-DEG3-DEG3-CTP-TXtoOpenROADM-3-4-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-3-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-DEG1-DEG1-CTP-TXtoOpenROADM-3-4-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-4-DEG3-DEG3-CTP-TXtoOpenROADM-3-4-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-3-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-DEG2-DEG2-CTP-TXtoOpenROADM-3-4-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-4-SRG1-SRG1-CP-TXtoOpenROADM-3-4-DEG3-DEG3-CTP-RX</link-id>
             <source><source-node>OpenROADM-3-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-DEG3-DEG3-CTP-TXtoOpenROADM-3-4-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-4-DEG3-DEG3-CTP-TXtoOpenROADM-3-4-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-3-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-SRG1-SRG1-CP-TXtoOpenROADM-3-4-DEG3-DEG3-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-4XPDR-NW1-TX-toOpenROADM-3-4-SRG1-SRG1-PP1-RX</link-id>
         <source><source-node>XPONDER-3-4</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-4-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-SRG1-SRG1-PP1-TX-to-XPONDER-3-4XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-4-SRG1-SRG1-PP1-TX-to-XPONDER-3-4XPDR-NW1-RX</link-id>
         <source><source-node>OpenROADM-3-4-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-3-4</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-4XPDR-NW1-TX-toOpenROADM-3-4-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-4XPDR-NW2-TX-toOpenROADM-3-4-SRG1-SRG1-PP2-RX</link-id>
         <source><source-node>XPONDER-3-4</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-4-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-SRG1-SRG1-PP2-TX-to-XPONDER-3-4XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-4-SRG1-SRG1-PP2-TX-to-XPONDER-3-4XPDR-NW2-RX</link-id>
         <source><source-node>OpenROADM-3-4-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-3-4</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-4XPDR-NW2-TX-toOpenROADM-3-4-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-4XPDR-NW3-TX-toOpenROADM-3-4-SRG1-SRG1-PP3-RX</link-id>
         <source><source-node>XPONDER-3-4</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-4-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-SRG1-SRG1-PP3-TX-to-XPONDER-3-4XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-4-SRG1-SRG1-PP3-TX-to-XPONDER-3-4XPDR-NW3-RX</link-id>
         <source><source-node>OpenROADM-3-4-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-3-4</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-4XPDR-NW3-TX-toOpenROADM-3-4-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-4XPDR-NW4-TX-toOpenROADM-3-4-SRG1-SRG1-PP4-RX</link-id>
         <source><source-node>XPONDER-3-4</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-4-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-SRG1-SRG1-PP4-TX-to-XPONDER-3-4XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-4-SRG1-SRG1-PP4-TX-to-XPONDER-3-4XPDR-NW4-RX</link-id>
         <source><source-node>OpenROADM-3-4-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-3-4</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-4XPDR-NW4-TX-toOpenROADM-3-4-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-3-1-DEG1-to-OpenROADM-3-2-DEG1</link-id>    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-DEG1-to-OpenROADM-3-1-DEG1</opposite-link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <link-id>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/common/network">OpenROADM-3-1-DEG1-to-OpenROADM-3-2-DEG1</opposite-link>
+    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
+    <source><source-node>OpenROADM-3-1-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
+    <destination><dest-node>OpenROADM-3-2-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+    <OMS-attributes xmlns="http://org/openroadm/network/topology">
+        <opposite-link>OpenROADM-3-2-DEG1-to-OpenROADM-3-1-DEG1</opposite-link>
+        <TE-metric>10</TE-metric>
+        <span>
+            <clfi>fiber13</clfi>
+            <auto-spanloss>true</auto-spanloss>
+            <spanloss-base>11.4</spanloss-base>
+            <spanloss-current>12</spanloss-current>
+            <engineered-spanloss>12.2</engineered-spanloss>
+            <link-concatenation>
+                <SRLG-Id>0</SRLG-Id>
+                <fiber-type>smf</fiber-type>
+                <SRLG-length>100000</SRLG-length>
+                <pmd>0.5</pmd>
+            </link-concatenation>
+        </span>
+    </OMS-attributes>
+</link>
+<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <link-id>OpenROADM-3-2-DEG1-to-OpenROADM-3-1-DEG1</link-id>
+    <opposite-link xmlns="http://org/openroadm/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-3-DEG2</link-id>    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-DEG2-to-OpenROADM-3-2-DEG2</opposite-link>
+    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
+    <source><source-node>OpenROADM-3-2-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
+    <destination><dest-node>OpenROADM-3-1-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+    <OMS-attributes xmlns="http://org/openroadm/network/topology">
+        <opposite-link>OpenROADM-3-1-DEG1-to-OpenROADM-3-2-DEG1</opposite-link>
+        <TE-metric>10</TE-metric>
+        <span>
+            <clfi>fiber14</clfi>
+            <auto-spanloss>true</auto-spanloss>
+            <spanloss-base>11.4</spanloss-base>
+            <spanloss-current>12</spanloss-current>
+            <engineered-spanloss>12.2</engineered-spanloss>
+            <link-concatenation>
+                <SRLG-Id>0</SRLG-Id>
+                <fiber-type>smf</fiber-type>
+                <SRLG-length>100000</SRLG-length>
+                <pmd>0.5</pmd>
+            </link-concatenation>
+        </span>
+    </OMS-attributes>
+</link>
+<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <link-id>OpenROADM-3-2-DEG2-to-OpenROADM-3-3-DEG2</link-id>
+    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-DEG2-to-OpenROADM-3-2-DEG2</opposite-link>
     <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-3-2-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-3-3-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-3-3-DEG2-to-OpenROADM-3-2-DEG2</link-id>    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-DEG2-to-OpenROADM-3-3-DEG2</opposite-link>
+    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
+    <source><source-node>OpenROADM-3-2-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
+    <destination><dest-node>OpenROADM-3-3-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+    <OMS-attributes xmlns="http://org/openroadm/network/topology">
+        <opposite-link>OpenROADM-3-3-DEG2-to-OpenROADM-3-2-DEG2</opposite-link>
+        <TE-metric>10</TE-metric>
+        <span>
+            <clfi>fiber15</clfi>
+            <auto-spanloss>true</auto-spanloss>
+            <spanloss-base>11.4</spanloss-base>
+            <spanloss-current>12</spanloss-current>
+            <engineered-spanloss>12.2</engineered-spanloss>
+            <link-concatenation>
+                <SRLG-Id>0</SRLG-Id>
+                <fiber-type>smf</fiber-type>
+                <SRLG-length>100000</SRLG-length>
+                <pmd>0.5</pmd>
+            </link-concatenation>
+        </span>
+    </OMS-attributes>
+</link>
+<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <link-id>OpenROADM-3-3-DEG2-to-OpenROADM-3-2-DEG2</link-id>
+    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-DEG2-to-OpenROADM-3-3-DEG2</opposite-link>
     <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-3-3-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-3-2-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-3-3-DEG1-to-OpenROADM-3-4-DEG1</link-id>    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-DEG1-to-OpenROADM-3-3-DEG1</opposite-link>
+    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
+    <source><source-node>OpenROADM-3-3-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
+    <destination><dest-node>OpenROADM-3-2-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+    <OMS-attributes xmlns="http://org/openroadm/network/topology">
+        <opposite-link>OpenROADM-3-2-DEG2-to-OpenROADM-3-3-DEG2</opposite-link>
+        <TE-metric>10</TE-metric>
+        <span>
+            <clfi>fiber16</clfi>
+            <auto-spanloss>true</auto-spanloss>
+            <spanloss-base>11.4</spanloss-base>
+            <spanloss-current>12</spanloss-current>
+            <engineered-spanloss>12.2</engineered-spanloss>
+            <link-concatenation>
+                <SRLG-Id>0</SRLG-Id>
+                <fiber-type>smf</fiber-type>
+                <SRLG-length>100000</SRLG-length>
+                <pmd>0.5</pmd>
+            </link-concatenation>
+        </span>
+    </OMS-attributes>
+</link>
+<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <link-id>OpenROADM-3-3-DEG1-to-OpenROADM-3-4-DEG1</link-id>
+    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-DEG1-to-OpenROADM-3-3-DEG1</opposite-link>
     <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-3-3-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-3-4-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-3-4-DEG1-to-OpenROADM-3-3-DEG1</link-id>    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-DEG1-to-OpenROADM-3-4-DEG1</opposite-link>
+    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
+    <source><source-node>OpenROADM-3-3-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
+    <destination><dest-node>OpenROADM-3-4-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+    <OMS-attributes xmlns="http://org/openroadm/network/topology">
+        <opposite-link>OpenROADM-3-4-DEG1-to-OpenROADM-3-3-DEG1</opposite-link>
+        <TE-metric>10</TE-metric>
+        <span>
+            <clfi>fiber17</clfi>
+            <auto-spanloss>true</auto-spanloss>
+            <spanloss-base>11.4</spanloss-base>
+            <spanloss-current>12</spanloss-current>
+            <engineered-spanloss>12.2</engineered-spanloss>
+            <link-concatenation>
+                <SRLG-Id>0</SRLG-Id>
+                <fiber-type>smf</fiber-type>
+                <SRLG-length>100000</SRLG-length>
+                <pmd>0.5</pmd>
+            </link-concatenation>
+        </span>
+    </OMS-attributes>
+</link>
+<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <link-id>OpenROADM-3-4-DEG1-to-OpenROADM-3-3-DEG1</link-id>
+    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-DEG1-to-OpenROADM-3-4-DEG1</opposite-link>
     <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-3-4-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-3-3-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-3-4-DEG2-to-OpenROADM-3-1-DEG2</link-id>    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-DEG2-to-OpenROADM-3-4-DEG2</opposite-link>
+    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
+    <source><source-node>OpenROADM-3-4-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
+    <destination><dest-node>OpenROADM-3-3-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+    <OMS-attributes xmlns="http://org/openroadm/network/topology">
+        <opposite-link>OpenROADM-3-3-DEG1-to-OpenROADM-3-4-DEG1</opposite-link>
+        <TE-metric>10</TE-metric>
+        <span>
+            <clfi>fiber18</clfi>
+            <auto-spanloss>true</auto-spanloss>
+            <spanloss-base>11.4</spanloss-base>
+            <spanloss-current>12</spanloss-current>
+            <engineered-spanloss>12.2</engineered-spanloss>
+            <link-concatenation>
+                <SRLG-Id>0</SRLG-Id>
+                <fiber-type>smf</fiber-type>
+                <SRLG-length>100000</SRLG-length>
+                <pmd>0.5</pmd>
+            </link-concatenation>
+        </span>
+    </OMS-attributes>
+</link>
+<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <link-id>OpenROADM-3-4-DEG2-to-OpenROADM-3-1-DEG2</link-id>
+    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-DEG2-to-OpenROADM-3-4-DEG2</opposite-link>
     <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-3-4-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-3-1-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-3-1-DEG2-to-OpenROADM-3-4-DEG2</link-id>    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-DEG2-to-OpenROADM-3-1-DEG2</opposite-link>
+    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
+    <source><source-node>OpenROADM-3-4-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
+    <destination><dest-node>OpenROADM-3-1-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+    <OMS-attributes xmlns="http://org/openroadm/network/topology">
+        <opposite-link>OpenROADM-3-1-DEG2-to-OpenROADM-3-4-DEG2</opposite-link>
+        <TE-metric>10</TE-metric>
+        <span>
+            <clfi>fiber19</clfi>
+            <auto-spanloss>true</auto-spanloss>
+            <spanloss-base>11.4</spanloss-base>
+            <spanloss-current>12</spanloss-current>
+            <engineered-spanloss>12.2</engineered-spanloss>
+            <link-concatenation>
+                <SRLG-Id>0</SRLG-Id>
+                <fiber-type>smf</fiber-type>
+                <SRLG-length>100000</SRLG-length>
+                <pmd>0.5</pmd>
+            </link-concatenation>
+        </span>
+    </OMS-attributes>
+</link>
+<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <link-id>OpenROADM-3-1-DEG2-to-OpenROADM-3-4-DEG2</link-id>
+    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-DEG2-to-OpenROADM-3-1-DEG2</opposite-link>
     <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-3-1-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-3-4-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>    </link>
+    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
+    <source><source-node>OpenROADM-3-1-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
+    <destination><dest-node>OpenROADM-3-4-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+    <OMS-attributes xmlns="http://org/openroadm/network/topology">
+        <opposite-link>OpenROADM-3-4-DEG2-to-OpenROADM-3-1-DEG2</opposite-link>
+        <TE-metric>10</TE-metric>
+        <span>
+            <clfi>fiber20</clfi>
+            <auto-spanloss>true</auto-spanloss>
+            <spanloss-base>11.4</spanloss-base>
+            <spanloss-current>12</spanloss-current>
+            <engineered-spanloss>12.2</engineered-spanloss>
+            <link-concatenation>
+                <SRLG-Id>0</SRLG-Id>
+                <fiber-type>smf</fiber-type>
+                <SRLG-length>100000</SRLG-length>
+                <pmd>0.5</pmd>
+            </link-concatenation>
+        </span>
+    </OMS-attributes>
+</link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-DEG1-DEG1-CTP-TXtoOpenROADM-4-1-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-4-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/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-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>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/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-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>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/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-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>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/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-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>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/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-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>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/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-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>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/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-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>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/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-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>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/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-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>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/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-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>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/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-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>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/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-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>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/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-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-3-DEG1-DEG1-CTP-TXtoOpenROADM-4-3-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-4-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-DEG2-DEG2-CTP-TXtoOpenROADM-4-3-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-3-DEG1-DEG1-CTP-TXtoOpenROADM-4-3-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-4-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-DEG3-DEG3-CTP-TXtoOpenROADM-4-3-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-3-SRG1-SRG1-CP-TXtoOpenROADM-4-3-DEG1-DEG1-CTP-RX</link-id>
             <source><source-node>OpenROADM-4-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-DEG1-DEG1-CTP-TXtoOpenROADM-4-3-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-3-DEG1-DEG1-CTP-TXtoOpenROADM-4-3-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-4-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-SRG1-SRG1-CP-TXtoOpenROADM-4-3-DEG1-DEG1-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-3-DEG2-DEG2-CTP-TXtoOpenROADM-4-3-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-4-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-DEG1-DEG1-CTP-TXtoOpenROADM-4-3-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-3-DEG2-DEG2-CTP-TXtoOpenROADM-4-3-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-4-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-DEG3-DEG3-CTP-TXtoOpenROADM-4-3-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-3-SRG1-SRG1-CP-TXtoOpenROADM-4-3-DEG2-DEG2-CTP-RX</link-id>
             <source><source-node>OpenROADM-4-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-DEG2-DEG2-CTP-TXtoOpenROADM-4-3-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-3-DEG2-DEG2-CTP-TXtoOpenROADM-4-3-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-4-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-SRG1-SRG1-CP-TXtoOpenROADM-4-3-DEG2-DEG2-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-3-DEG3-DEG3-CTP-TXtoOpenROADM-4-3-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-4-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-DEG1-DEG1-CTP-TXtoOpenROADM-4-3-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-3-DEG3-DEG3-CTP-TXtoOpenROADM-4-3-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-4-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-DEG2-DEG2-CTP-TXtoOpenROADM-4-3-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-3-SRG1-SRG1-CP-TXtoOpenROADM-4-3-DEG3-DEG3-CTP-RX</link-id>
             <source><source-node>OpenROADM-4-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-DEG3-DEG3-CTP-TXtoOpenROADM-4-3-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-3-DEG3-DEG3-CTP-TXtoOpenROADM-4-3-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-4-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-SRG1-SRG1-CP-TXtoOpenROADM-4-3-DEG3-DEG3-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-3XPDR-NW1-TX-toOpenROADM-4-3-SRG1-SRG1-PP1-RX</link-id>
         <source><source-node>XPONDER-4-3</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-3-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-SRG1-SRG1-PP1-TX-to-XPONDER-4-3XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-3-SRG1-SRG1-PP1-TX-to-XPONDER-4-3XPDR-NW1-RX</link-id>
         <source><source-node>OpenROADM-4-3-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-4-3</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-3XPDR-NW1-TX-toOpenROADM-4-3-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-3XPDR-NW2-TX-toOpenROADM-4-3-SRG1-SRG1-PP2-RX</link-id>
         <source><source-node>XPONDER-4-3</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-3-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-SRG1-SRG1-PP2-TX-to-XPONDER-4-3XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-3-SRG1-SRG1-PP2-TX-to-XPONDER-4-3XPDR-NW2-RX</link-id>
         <source><source-node>OpenROADM-4-3-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-4-3</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-3XPDR-NW2-TX-toOpenROADM-4-3-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-3XPDR-NW3-TX-toOpenROADM-4-3-SRG1-SRG1-PP3-RX</link-id>
         <source><source-node>XPONDER-4-3</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-3-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-SRG1-SRG1-PP3-TX-to-XPONDER-4-3XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-3-SRG1-SRG1-PP3-TX-to-XPONDER-4-3XPDR-NW3-RX</link-id>
         <source><source-node>OpenROADM-4-3-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-4-3</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-3XPDR-NW3-TX-toOpenROADM-4-3-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-3XPDR-NW4-TX-toOpenROADM-4-3-SRG1-SRG1-PP4-RX</link-id>
         <source><source-node>XPONDER-4-3</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-3-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-SRG1-SRG1-PP4-TX-to-XPONDER-4-3XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-3-SRG1-SRG1-PP4-TX-to-XPONDER-4-3XPDR-NW4-RX</link-id>
         <source><source-node>OpenROADM-4-3-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-4-3</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-3XPDR-NW4-TX-toOpenROADM-4-3-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-4-DEG1-DEG1-CTP-TXtoOpenROADM-4-4-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-4-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-DEG2-DEG2-CTP-TXtoOpenROADM-4-4-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-4-DEG1-DEG1-CTP-TXtoOpenROADM-4-4-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-4-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-DEG3-DEG3-CTP-TXtoOpenROADM-4-4-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-4-SRG1-SRG1-CP-TXtoOpenROADM-4-4-DEG1-DEG1-CTP-RX</link-id>
             <source><source-node>OpenROADM-4-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-DEG1-DEG1-CTP-TXtoOpenROADM-4-4-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-4-DEG1-DEG1-CTP-TXtoOpenROADM-4-4-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-4-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-SRG1-SRG1-CP-TXtoOpenROADM-4-4-DEG1-DEG1-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-4-DEG2-DEG2-CTP-TXtoOpenROADM-4-4-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-4-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-DEG1-DEG1-CTP-TXtoOpenROADM-4-4-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-4-DEG2-DEG2-CTP-TXtoOpenROADM-4-4-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-4-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-DEG3-DEG3-CTP-TXtoOpenROADM-4-4-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-4-SRG1-SRG1-CP-TXtoOpenROADM-4-4-DEG2-DEG2-CTP-RX</link-id>
             <source><source-node>OpenROADM-4-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-DEG2-DEG2-CTP-TXtoOpenROADM-4-4-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-4-DEG2-DEG2-CTP-TXtoOpenROADM-4-4-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-4-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-SRG1-SRG1-CP-TXtoOpenROADM-4-4-DEG2-DEG2-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-4-DEG3-DEG3-CTP-TXtoOpenROADM-4-4-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-4-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-DEG1-DEG1-CTP-TXtoOpenROADM-4-4-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-4-DEG3-DEG3-CTP-TXtoOpenROADM-4-4-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-4-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-DEG2-DEG2-CTP-TXtoOpenROADM-4-4-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-4-SRG1-SRG1-CP-TXtoOpenROADM-4-4-DEG3-DEG3-CTP-RX</link-id>
             <source><source-node>OpenROADM-4-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-DEG3-DEG3-CTP-TXtoOpenROADM-4-4-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-4-DEG3-DEG3-CTP-TXtoOpenROADM-4-4-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-4-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-SRG1-SRG1-CP-TXtoOpenROADM-4-4-DEG3-DEG3-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-4XPDR-NW1-TX-toOpenROADM-4-4-SRG1-SRG1-PP1-RX</link-id>
         <source><source-node>XPONDER-4-4</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-4-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-SRG1-SRG1-PP1-TX-to-XPONDER-4-4XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-4-SRG1-SRG1-PP1-TX-to-XPONDER-4-4XPDR-NW1-RX</link-id>
         <source><source-node>OpenROADM-4-4-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-4-4</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-4XPDR-NW1-TX-toOpenROADM-4-4-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-4XPDR-NW2-TX-toOpenROADM-4-4-SRG1-SRG1-PP2-RX</link-id>
         <source><source-node>XPONDER-4-4</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-4-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-SRG1-SRG1-PP2-TX-to-XPONDER-4-4XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-4-SRG1-SRG1-PP2-TX-to-XPONDER-4-4XPDR-NW2-RX</link-id>
         <source><source-node>OpenROADM-4-4-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-4-4</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-4XPDR-NW2-TX-toOpenROADM-4-4-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-4XPDR-NW3-TX-toOpenROADM-4-4-SRG1-SRG1-PP3-RX</link-id>
         <source><source-node>XPONDER-4-4</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-4-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-SRG1-SRG1-PP3-TX-to-XPONDER-4-4XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-4-SRG1-SRG1-PP3-TX-to-XPONDER-4-4XPDR-NW3-RX</link-id>
         <source><source-node>OpenROADM-4-4-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-4-4</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-4XPDR-NW3-TX-toOpenROADM-4-4-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-4XPDR-NW4-TX-toOpenROADM-4-4-SRG1-SRG1-PP4-RX</link-id>
         <source><source-node>XPONDER-4-4</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-4-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-SRG1-SRG1-PP4-TX-to-XPONDER-4-4XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-4-SRG1-SRG1-PP4-TX-to-XPONDER-4-4XPDR-NW4-RX</link-id>
         <source><source-node>OpenROADM-4-4-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-4-4</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-4XPDR-NW4-TX-toOpenROADM-4-4-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-4-1-DEG1-to-OpenROADM-4-2-DEG1</link-id>    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-DEG1-to-OpenROADM-4-1-DEG1</opposite-link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <link-id>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/common/network">OpenROADM-4-1-DEG1-to-OpenROADM-4-2-DEG1</opposite-link>
+    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
+    <source><source-node>OpenROADM-4-1-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
+    <destination><dest-node>OpenROADM-4-2-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+    <OMS-attributes xmlns="http://org/openroadm/network/topology">
+        <opposite-link>OpenROADM-4-2-DEG1-to-OpenROADM-4-1-DEG1</opposite-link>
+        <TE-metric>10</TE-metric>
+        <span>
+            <clfi>fiber21</clfi>
+            <auto-spanloss>true</auto-spanloss>
+            <spanloss-base>11.4</spanloss-base>
+            <spanloss-current>12</spanloss-current>
+            <engineered-spanloss>12.2</engineered-spanloss>
+            <link-concatenation>
+                <SRLG-Id>0</SRLG-Id>
+                <fiber-type>smf</fiber-type>
+                <SRLG-length>100000</SRLG-length>
+                <pmd>0.5</pmd>
+            </link-concatenation>
+        </span>
+    </OMS-attributes>
+</link>
+<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <link-id>OpenROADM-4-2-DEG1-to-OpenROADM-4-1-DEG1</link-id>
+    <opposite-link xmlns="http://org/openroadm/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-3-DEG2</link-id>    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-DEG2-to-OpenROADM-4-2-DEG2</opposite-link>
+    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
+    <source><source-node>OpenROADM-4-2-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
+    <destination><dest-node>OpenROADM-4-1-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+    <OMS-attributes xmlns="http://org/openroadm/network/topology">
+        <opposite-link>OpenROADM-4-1-DEG1-to-OpenROADM-4-2-DEG1</opposite-link>
+        <TE-metric>10</TE-metric>
+        <span>
+            <clfi>fiber22</clfi>
+            <auto-spanloss>true</auto-spanloss>
+            <spanloss-base>11.4</spanloss-base>
+            <spanloss-current>12</spanloss-current>
+            <engineered-spanloss>12.2</engineered-spanloss>
+            <link-concatenation>
+                <SRLG-Id>0</SRLG-Id>
+                <fiber-type>smf</fiber-type>
+                <SRLG-length>100000</SRLG-length>
+                <pmd>0.5</pmd>
+            </link-concatenation>
+        </span>
+    </OMS-attributes>
+</link>
+<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <link-id>OpenROADM-4-2-DEG2-to-OpenROADM-4-3-DEG2</link-id>
+    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-DEG2-to-OpenROADM-4-2-DEG2</opposite-link>
     <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-4-2-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-4-3-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-4-3-DEG2-to-OpenROADM-4-2-DEG2</link-id>    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-DEG2-to-OpenROADM-4-3-DEG2</opposite-link>
+    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
+    <source><source-node>OpenROADM-4-2-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
+    <destination><dest-node>OpenROADM-4-3-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+    <OMS-attributes xmlns="http://org/openroadm/network/topology">
+        <opposite-link>OpenROADM-4-3-DEG2-to-OpenROADM-4-2-DEG2</opposite-link>
+        <TE-metric>10</TE-metric>
+        <span>
+            <clfi>fiber23</clfi>
+            <auto-spanloss>true</auto-spanloss>
+            <spanloss-base>11.4</spanloss-base>
+            <spanloss-current>12</spanloss-current>
+            <engineered-spanloss>12.2</engineered-spanloss>
+            <link-concatenation>
+                <SRLG-Id>0</SRLG-Id>
+                <fiber-type>smf</fiber-type>
+                <SRLG-length>100000</SRLG-length>
+                <pmd>0.5</pmd>
+            </link-concatenation>
+        </span>
+    </OMS-attributes>
+</link>
+<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <link-id>OpenROADM-4-3-DEG2-to-OpenROADM-4-2-DEG2</link-id>
+    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-DEG2-to-OpenROADM-4-3-DEG2</opposite-link>
     <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-4-3-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-4-2-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-4-3-DEG1-to-OpenROADM-4-4-DEG1</link-id>    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-DEG1-to-OpenROADM-4-3-DEG1</opposite-link>
+    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
+    <source><source-node>OpenROADM-4-3-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
+    <destination><dest-node>OpenROADM-4-2-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+    <OMS-attributes xmlns="http://org/openroadm/network/topology">
+        <opposite-link>OpenROADM-4-2-DEG2-to-OpenROADM-4-3-DEG2</opposite-link>
+        <TE-metric>10</TE-metric>
+        <span>
+            <clfi>fiber24</clfi>
+            <auto-spanloss>true</auto-spanloss>
+            <spanloss-base>11.4</spanloss-base>
+            <spanloss-current>12</spanloss-current>
+            <engineered-spanloss>12.2</engineered-spanloss>
+            <link-concatenation>
+                <SRLG-Id>0</SRLG-Id>
+                <fiber-type>smf</fiber-type>
+                <SRLG-length>100000</SRLG-length>
+                <pmd>0.5</pmd>
+            </link-concatenation>
+        </span>
+    </OMS-attributes>
+</link>
+<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <link-id>OpenROADM-4-3-DEG1-to-OpenROADM-4-4-DEG1</link-id>
+    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-DEG1-to-OpenROADM-4-3-DEG1</opposite-link>
     <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-4-3-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-4-4-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-4-4-DEG1-to-OpenROADM-4-3-DEG1</link-id>    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-DEG1-to-OpenROADM-4-4-DEG1</opposite-link>
+    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
+    <source><source-node>OpenROADM-4-3-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
+    <destination><dest-node>OpenROADM-4-4-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+    <OMS-attributes xmlns="http://org/openroadm/network/topology">
+        <opposite-link>OpenROADM-4-4-DEG1-to-OpenROADM-4-3-DEG1</opposite-link>
+        <TE-metric>10</TE-metric>
+        <span>
+            <clfi>fiber25</clfi>
+            <auto-spanloss>true</auto-spanloss>
+            <spanloss-base>11.4</spanloss-base>
+            <spanloss-current>12</spanloss-current>
+            <engineered-spanloss>12.2</engineered-spanloss>
+            <link-concatenation>
+                <SRLG-Id>0</SRLG-Id>
+                <fiber-type>smf</fiber-type>
+                <SRLG-length>100000</SRLG-length>
+                <pmd>0.5</pmd>
+            </link-concatenation>
+        </span>
+    </OMS-attributes>
+</link>
+<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <link-id>OpenROADM-4-4-DEG1-to-OpenROADM-4-3-DEG1</link-id>
+    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-DEG1-to-OpenROADM-4-4-DEG1</opposite-link>
     <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-4-4-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-4-3-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-4-4-DEG2-to-OpenROADM-4-1-DEG2</link-id>    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-DEG2-to-OpenROADM-4-4-DEG2</opposite-link>
+    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
+    <source><source-node>OpenROADM-4-4-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
+    <destination><dest-node>OpenROADM-4-3-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+    <OMS-attributes xmlns="http://org/openroadm/network/topology">
+        <opposite-link>OpenROADM-4-3-DEG1-to-OpenROADM-4-4-DEG1</opposite-link>
+        <TE-metric>10</TE-metric>
+        <span>
+            <clfi>fiber26</clfi>
+            <auto-spanloss>true</auto-spanloss>
+            <spanloss-base>11.4</spanloss-base>
+            <spanloss-current>12</spanloss-current>
+            <engineered-spanloss>12.2</engineered-spanloss>
+            <link-concatenation>
+                <SRLG-Id>0</SRLG-Id>
+                <fiber-type>smf</fiber-type>
+                <SRLG-length>100000</SRLG-length>
+                <pmd>0.5</pmd>
+            </link-concatenation>
+        </span>
+    </OMS-attributes>
+</link>
+<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <link-id>OpenROADM-4-4-DEG2-to-OpenROADM-4-1-DEG2</link-id>
+    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-DEG2-to-OpenROADM-4-4-DEG2</opposite-link>
     <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-4-4-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-4-1-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-4-1-DEG2-to-OpenROADM-4-4-DEG2</link-id>    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-DEG2-to-OpenROADM-4-1-DEG2</opposite-link>
+    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
+    <source><source-node>OpenROADM-4-4-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
+    <destination><dest-node>OpenROADM-4-1-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+    <OMS-attributes xmlns="http://org/openroadm/network/topology">
+        <opposite-link>OpenROADM-4-1-DEG2-to-OpenROADM-4-4-DEG2</opposite-link>
+        <TE-metric>10</TE-metric>
+        <span>
+            <clfi>fiber27</clfi>
+            <auto-spanloss>true</auto-spanloss>
+            <spanloss-base>11.4</spanloss-base>
+            <spanloss-current>12</spanloss-current>
+            <engineered-spanloss>12.2</engineered-spanloss>
+            <link-concatenation>
+                <SRLG-Id>0</SRLG-Id>
+                <fiber-type>smf</fiber-type>
+                <SRLG-length>100000</SRLG-length>
+                <pmd>0.5</pmd>
+            </link-concatenation>
+        </span>
+    </OMS-attributes>
+</link>
+<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <link-id>OpenROADM-4-1-DEG2-to-OpenROADM-4-4-DEG2</link-id>
+    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-DEG2-to-OpenROADM-4-1-DEG2</opposite-link>
     <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-4-1-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-4-4-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>    </link>
+    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
+    <source><source-node>OpenROADM-4-1-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
+    <destination><dest-node>OpenROADM-4-4-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+    <OMS-attributes xmlns="http://org/openroadm/network/topology">
+        <opposite-link>OpenROADM-4-4-DEG2-to-OpenROADM-4-1-DEG2</opposite-link>
+        <TE-metric>10</TE-metric>
+        <span>
+            <clfi>fiber28</clfi>
+            <auto-spanloss>true</auto-spanloss>
+            <spanloss-base>11.4</spanloss-base>
+            <spanloss-current>12</spanloss-current>
+            <engineered-spanloss>12.2</engineered-spanloss>
+            <link-concatenation>
+                <SRLG-Id>0</SRLG-Id>
+                <fiber-type>smf</fiber-type>
+                <SRLG-length>100000</SRLG-length>
+                <pmd>0.5</pmd>
+            </link-concatenation>
+        </span>
+    </OMS-attributes>
+</link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-DEG1-DEG1-CTP-TXtoOpenROADM-5-1-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-5-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/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-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>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/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-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>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/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-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>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/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-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>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/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-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>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/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-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>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/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-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>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/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-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>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/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-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>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/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-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>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/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-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>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/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-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>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/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-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>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/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-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-3-DEG1-DEG1-CTP-TXtoOpenROADM-5-3-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-5-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-DEG2-DEG2-CTP-TXtoOpenROADM-5-3-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-3-DEG1-DEG1-CTP-TXtoOpenROADM-5-3-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-5-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-DEG3-DEG3-CTP-TXtoOpenROADM-5-3-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-3-SRG1-SRG1-CP-TXtoOpenROADM-5-3-DEG1-DEG1-CTP-RX</link-id>
             <source><source-node>OpenROADM-5-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-DEG1-DEG1-CTP-TXtoOpenROADM-5-3-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-3-DEG1-DEG1-CTP-TXtoOpenROADM-5-3-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-5-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-SRG1-SRG1-CP-TXtoOpenROADM-5-3-DEG1-DEG1-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-3-DEG2-DEG2-CTP-TXtoOpenROADM-5-3-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-5-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-DEG1-DEG1-CTP-TXtoOpenROADM-5-3-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-3-DEG2-DEG2-CTP-TXtoOpenROADM-5-3-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-5-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-DEG3-DEG3-CTP-TXtoOpenROADM-5-3-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-3-SRG1-SRG1-CP-TXtoOpenROADM-5-3-DEG2-DEG2-CTP-RX</link-id>
             <source><source-node>OpenROADM-5-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-DEG2-DEG2-CTP-TXtoOpenROADM-5-3-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-3-DEG2-DEG2-CTP-TXtoOpenROADM-5-3-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-5-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-SRG1-SRG1-CP-TXtoOpenROADM-5-3-DEG2-DEG2-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-3-DEG3-DEG3-CTP-TXtoOpenROADM-5-3-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-5-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-DEG1-DEG1-CTP-TXtoOpenROADM-5-3-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-3-DEG3-DEG3-CTP-TXtoOpenROADM-5-3-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-5-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-DEG2-DEG2-CTP-TXtoOpenROADM-5-3-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-3-SRG1-SRG1-CP-TXtoOpenROADM-5-3-DEG3-DEG3-CTP-RX</link-id>
             <source><source-node>OpenROADM-5-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-DEG3-DEG3-CTP-TXtoOpenROADM-5-3-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-3-DEG3-DEG3-CTP-TXtoOpenROADM-5-3-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-5-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-SRG1-SRG1-CP-TXtoOpenROADM-5-3-DEG3-DEG3-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-3XPDR-NW1-TX-toOpenROADM-5-3-SRG1-SRG1-PP1-RX</link-id>
         <source><source-node>XPONDER-5-3</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-3-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-SRG1-SRG1-PP1-TX-to-XPONDER-5-3XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-3-SRG1-SRG1-PP1-TX-to-XPONDER-5-3XPDR-NW1-RX</link-id>
         <source><source-node>OpenROADM-5-3-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-5-3</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-3XPDR-NW1-TX-toOpenROADM-5-3-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-3XPDR-NW2-TX-toOpenROADM-5-3-SRG1-SRG1-PP2-RX</link-id>
         <source><source-node>XPONDER-5-3</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-3-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-SRG1-SRG1-PP2-TX-to-XPONDER-5-3XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-3-SRG1-SRG1-PP2-TX-to-XPONDER-5-3XPDR-NW2-RX</link-id>
         <source><source-node>OpenROADM-5-3-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-5-3</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-3XPDR-NW2-TX-toOpenROADM-5-3-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-3XPDR-NW3-TX-toOpenROADM-5-3-SRG1-SRG1-PP3-RX</link-id>
         <source><source-node>XPONDER-5-3</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-3-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-SRG1-SRG1-PP3-TX-to-XPONDER-5-3XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-3-SRG1-SRG1-PP3-TX-to-XPONDER-5-3XPDR-NW3-RX</link-id>
         <source><source-node>OpenROADM-5-3-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-5-3</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-3XPDR-NW3-TX-toOpenROADM-5-3-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-3XPDR-NW4-TX-toOpenROADM-5-3-SRG1-SRG1-PP4-RX</link-id>
         <source><source-node>XPONDER-5-3</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-3-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-SRG1-SRG1-PP4-TX-to-XPONDER-5-3XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-3-SRG1-SRG1-PP4-TX-to-XPONDER-5-3XPDR-NW4-RX</link-id>
         <source><source-node>OpenROADM-5-3-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-5-3</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-3XPDR-NW4-TX-toOpenROADM-5-3-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-4-DEG1-DEG1-CTP-TXtoOpenROADM-5-4-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-5-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-DEG2-DEG2-CTP-TXtoOpenROADM-5-4-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-4-DEG1-DEG1-CTP-TXtoOpenROADM-5-4-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-5-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-DEG3-DEG3-CTP-TXtoOpenROADM-5-4-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-4-SRG1-SRG1-CP-TXtoOpenROADM-5-4-DEG1-DEG1-CTP-RX</link-id>
             <source><source-node>OpenROADM-5-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-DEG1-DEG1-CTP-TXtoOpenROADM-5-4-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-4-DEG1-DEG1-CTP-TXtoOpenROADM-5-4-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-5-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-SRG1-SRG1-CP-TXtoOpenROADM-5-4-DEG1-DEG1-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-4-DEG2-DEG2-CTP-TXtoOpenROADM-5-4-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-5-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-DEG1-DEG1-CTP-TXtoOpenROADM-5-4-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-4-DEG2-DEG2-CTP-TXtoOpenROADM-5-4-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-5-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-DEG3-DEG3-CTP-TXtoOpenROADM-5-4-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-4-SRG1-SRG1-CP-TXtoOpenROADM-5-4-DEG2-DEG2-CTP-RX</link-id>
             <source><source-node>OpenROADM-5-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-DEG2-DEG2-CTP-TXtoOpenROADM-5-4-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-4-DEG2-DEG2-CTP-TXtoOpenROADM-5-4-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-5-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-SRG1-SRG1-CP-TXtoOpenROADM-5-4-DEG2-DEG2-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-4-DEG3-DEG3-CTP-TXtoOpenROADM-5-4-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-5-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-DEG1-DEG1-CTP-TXtoOpenROADM-5-4-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-4-DEG3-DEG3-CTP-TXtoOpenROADM-5-4-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-5-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-DEG2-DEG2-CTP-TXtoOpenROADM-5-4-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-4-SRG1-SRG1-CP-TXtoOpenROADM-5-4-DEG3-DEG3-CTP-RX</link-id>
             <source><source-node>OpenROADM-5-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-DEG3-DEG3-CTP-TXtoOpenROADM-5-4-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-4-DEG3-DEG3-CTP-TXtoOpenROADM-5-4-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-5-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-SRG1-SRG1-CP-TXtoOpenROADM-5-4-DEG3-DEG3-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-4XPDR-NW1-TX-toOpenROADM-5-4-SRG1-SRG1-PP1-RX</link-id>
         <source><source-node>XPONDER-5-4</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-4-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-SRG1-SRG1-PP1-TX-to-XPONDER-5-4XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-4-SRG1-SRG1-PP1-TX-to-XPONDER-5-4XPDR-NW1-RX</link-id>
         <source><source-node>OpenROADM-5-4-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-5-4</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-4XPDR-NW1-TX-toOpenROADM-5-4-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-4XPDR-NW2-TX-toOpenROADM-5-4-SRG1-SRG1-PP2-RX</link-id>
         <source><source-node>XPONDER-5-4</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-4-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-SRG1-SRG1-PP2-TX-to-XPONDER-5-4XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-4-SRG1-SRG1-PP2-TX-to-XPONDER-5-4XPDR-NW2-RX</link-id>
         <source><source-node>OpenROADM-5-4-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-5-4</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-4XPDR-NW2-TX-toOpenROADM-5-4-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-4XPDR-NW3-TX-toOpenROADM-5-4-SRG1-SRG1-PP3-RX</link-id>
         <source><source-node>XPONDER-5-4</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-4-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-SRG1-SRG1-PP3-TX-to-XPONDER-5-4XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-4-SRG1-SRG1-PP3-TX-to-XPONDER-5-4XPDR-NW3-RX</link-id>
         <source><source-node>OpenROADM-5-4-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-5-4</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-4XPDR-NW3-TX-toOpenROADM-5-4-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-4XPDR-NW4-TX-toOpenROADM-5-4-SRG1-SRG1-PP4-RX</link-id>
         <source><source-node>XPONDER-5-4</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-4-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-SRG1-SRG1-PP4-TX-to-XPONDER-5-4XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-4-SRG1-SRG1-PP4-TX-to-XPONDER-5-4XPDR-NW4-RX</link-id>
         <source><source-node>OpenROADM-5-4-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-5-4</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-4XPDR-NW4-TX-toOpenROADM-5-4-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-5-1-DEG1-to-OpenROADM-5-2-DEG1</link-id>    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-DEG1-to-OpenROADM-5-1-DEG1</opposite-link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <link-id>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/common/network">OpenROADM-5-1-DEG1-to-OpenROADM-5-2-DEG1</opposite-link>
+    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
+    <source><source-node>OpenROADM-5-1-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
+    <destination><dest-node>OpenROADM-5-2-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+    <OMS-attributes xmlns="http://org/openroadm/network/topology">
+        <opposite-link>OpenROADM-5-2-DEG1-to-OpenROADM-5-1-DEG1</opposite-link>
+        <TE-metric>10</TE-metric>
+        <span>
+            <clfi>fiber29</clfi>
+            <auto-spanloss>true</auto-spanloss>
+            <spanloss-base>11.4</spanloss-base>
+            <spanloss-current>12</spanloss-current>
+            <engineered-spanloss>12.2</engineered-spanloss>
+            <link-concatenation>
+                <SRLG-Id>0</SRLG-Id>
+                <fiber-type>smf</fiber-type>
+                <SRLG-length>100000</SRLG-length>
+                <pmd>0.5</pmd>
+            </link-concatenation>
+        </span>
+    </OMS-attributes>
+</link>
+<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <link-id>OpenROADM-5-2-DEG1-to-OpenROADM-5-1-DEG1</link-id>
+    <opposite-link xmlns="http://org/openroadm/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-3-DEG2</link-id>    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-DEG2-to-OpenROADM-5-2-DEG2</opposite-link>
+    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
+    <source><source-node>OpenROADM-5-2-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
+    <destination><dest-node>OpenROADM-5-1-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+    <OMS-attributes xmlns="http://org/openroadm/network/topology">
+        <opposite-link>OpenROADM-5-1-DEG1-to-OpenROADM-5-2-DEG1</opposite-link>
+        <TE-metric>10</TE-metric>
+        <span>
+            <clfi>fiber30</clfi>
+            <auto-spanloss>true</auto-spanloss>
+            <spanloss-base>11.4</spanloss-base>
+            <spanloss-current>12</spanloss-current>
+            <engineered-spanloss>12.2</engineered-spanloss>
+            <link-concatenation>
+                <SRLG-Id>0</SRLG-Id>
+                <fiber-type>smf</fiber-type>
+                <SRLG-length>100000</SRLG-length>
+                <pmd>0.5</pmd>
+            </link-concatenation>
+        </span>
+    </OMS-attributes>
+</link>
+<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <link-id>OpenROADM-5-2-DEG2-to-OpenROADM-5-3-DEG2</link-id>
+    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-DEG2-to-OpenROADM-5-2-DEG2</opposite-link>
     <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-5-2-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-5-3-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-5-3-DEG2-to-OpenROADM-5-2-DEG2</link-id>    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-DEG2-to-OpenROADM-5-3-DEG2</opposite-link>
+    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
+    <source><source-node>OpenROADM-5-2-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
+    <destination><dest-node>OpenROADM-5-3-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+    <OMS-attributes xmlns="http://org/openroadm/network/topology">
+        <opposite-link>OpenROADM-5-3-DEG2-to-OpenROADM-5-2-DEG2</opposite-link>
+        <TE-metric>10</TE-metric>
+        <span>
+            <clfi>fiber31</clfi>
+            <auto-spanloss>true</auto-spanloss>
+            <spanloss-base>11.4</spanloss-base>
+            <spanloss-current>12</spanloss-current>
+            <engineered-spanloss>12.2</engineered-spanloss>
+            <link-concatenation>
+                <SRLG-Id>0</SRLG-Id>
+                <fiber-type>smf</fiber-type>
+                <SRLG-length>100000</SRLG-length>
+                <pmd>0.5</pmd>
+            </link-concatenation>
+        </span>
+    </OMS-attributes>
+</link>
+<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <link-id>OpenROADM-5-3-DEG2-to-OpenROADM-5-2-DEG2</link-id>
+    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-DEG2-to-OpenROADM-5-3-DEG2</opposite-link>
     <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-5-3-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-5-2-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-5-3-DEG1-to-OpenROADM-5-4-DEG1</link-id>    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-DEG1-to-OpenROADM-5-3-DEG1</opposite-link>
+    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
+    <source><source-node>OpenROADM-5-3-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
+    <destination><dest-node>OpenROADM-5-2-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+    <OMS-attributes xmlns="http://org/openroadm/network/topology">
+        <opposite-link>OpenROADM-5-2-DEG2-to-OpenROADM-5-3-DEG2</opposite-link>
+        <TE-metric>10</TE-metric>
+        <span>
+            <clfi>fiber32</clfi>
+            <auto-spanloss>true</auto-spanloss>
+            <spanloss-base>11.4</spanloss-base>
+            <spanloss-current>12</spanloss-current>
+            <engineered-spanloss>12.2</engineered-spanloss>
+            <link-concatenation>
+                <SRLG-Id>0</SRLG-Id>
+                <fiber-type>smf</fiber-type>
+                <SRLG-length>100000</SRLG-length>
+                <pmd>0.5</pmd>
+            </link-concatenation>
+        </span>
+    </OMS-attributes>
+</link>
+<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <link-id>OpenROADM-5-3-DEG1-to-OpenROADM-5-4-DEG1</link-id>
+    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-DEG1-to-OpenROADM-5-3-DEG1</opposite-link>
     <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-5-3-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-5-4-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-5-4-DEG1-to-OpenROADM-5-3-DEG1</link-id>    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-DEG1-to-OpenROADM-5-4-DEG1</opposite-link>
+    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
+    <source><source-node>OpenROADM-5-3-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
+    <destination><dest-node>OpenROADM-5-4-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+    <OMS-attributes xmlns="http://org/openroadm/network/topology">
+        <opposite-link>OpenROADM-5-4-DEG1-to-OpenROADM-5-3-DEG1</opposite-link>
+        <TE-metric>10</TE-metric>
+        <span>
+            <clfi>fiber33</clfi>
+            <auto-spanloss>true</auto-spanloss>
+            <spanloss-base>11.4</spanloss-base>
+            <spanloss-current>12</spanloss-current>
+            <engineered-spanloss>12.2</engineered-spanloss>
+            <link-concatenation>
+                <SRLG-Id>0</SRLG-Id>
+                <fiber-type>smf</fiber-type>
+                <SRLG-length>100000</SRLG-length>
+                <pmd>0.5</pmd>
+            </link-concatenation>
+        </span>
+    </OMS-attributes>
+</link>
+<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <link-id>OpenROADM-5-4-DEG1-to-OpenROADM-5-3-DEG1</link-id>
+    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-DEG1-to-OpenROADM-5-4-DEG1</opposite-link>
     <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-5-4-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-5-3-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-5-4-DEG2-to-OpenROADM-5-1-DEG2</link-id>    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-DEG2-to-OpenROADM-5-4-DEG2</opposite-link>
+    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
+    <source><source-node>OpenROADM-5-4-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
+    <destination><dest-node>OpenROADM-5-3-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+    <OMS-attributes xmlns="http://org/openroadm/network/topology">
+        <opposite-link>OpenROADM-5-3-DEG1-to-OpenROADM-5-4-DEG1</opposite-link>
+        <TE-metric>10</TE-metric>
+        <span>
+            <clfi>fiber34</clfi>
+            <auto-spanloss>true</auto-spanloss>
+            <spanloss-base>11.4</spanloss-base>
+            <spanloss-current>12</spanloss-current>
+            <engineered-spanloss>12.2</engineered-spanloss>
+            <link-concatenation>
+                <SRLG-Id>0</SRLG-Id>
+                <fiber-type>smf</fiber-type>
+                <SRLG-length>100000</SRLG-length>
+                <pmd>0.5</pmd>
+            </link-concatenation>
+        </span>
+    </OMS-attributes>
+</link>
+<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <link-id>OpenROADM-5-4-DEG2-to-OpenROADM-5-1-DEG2</link-id>
+    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-DEG2-to-OpenROADM-5-4-DEG2</opposite-link>
     <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-5-4-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-5-1-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-5-1-DEG2-to-OpenROADM-5-4-DEG2</link-id>    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-DEG2-to-OpenROADM-5-1-DEG2</opposite-link>
+    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
+    <source><source-node>OpenROADM-5-4-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
+    <destination><dest-node>OpenROADM-5-1-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+    <OMS-attributes xmlns="http://org/openroadm/network/topology">
+        <opposite-link>OpenROADM-5-1-DEG2-to-OpenROADM-5-4-DEG2</opposite-link>
+        <TE-metric>10</TE-metric>
+        <span>
+            <clfi>fiber35</clfi>
+            <auto-spanloss>true</auto-spanloss>
+            <spanloss-base>11.4</spanloss-base>
+            <spanloss-current>12</spanloss-current>
+            <engineered-spanloss>12.2</engineered-spanloss>
+            <link-concatenation>
+                <SRLG-Id>0</SRLG-Id>
+                <fiber-type>smf</fiber-type>
+                <SRLG-length>100000</SRLG-length>
+                <pmd>0.5</pmd>
+            </link-concatenation>
+        </span>
+    </OMS-attributes>
+</link>
+<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <link-id>OpenROADM-5-1-DEG2-to-OpenROADM-5-4-DEG2</link-id>
+    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-DEG2-to-OpenROADM-5-1-DEG2</opposite-link>
     <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-5-1-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-5-4-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-1-4-DEG3-to-OpenROADM-2-1-DEG3</link-id>    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-DEG3-to-OpenROADM-1-4-DEG3</opposite-link>
+    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
+    <source><source-node>OpenROADM-5-1-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
+    <destination><dest-node>OpenROADM-5-4-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+    <OMS-attributes xmlns="http://org/openroadm/network/topology">
+        <opposite-link>OpenROADM-5-4-DEG2-to-OpenROADM-5-1-DEG2</opposite-link>
+        <TE-metric>10</TE-metric>
+        <span>
+            <clfi>fiber36</clfi>
+            <auto-spanloss>true</auto-spanloss>
+            <spanloss-base>11.4</spanloss-base>
+            <spanloss-current>12</spanloss-current>
+            <engineered-spanloss>12.2</engineered-spanloss>
+            <link-concatenation>
+                <SRLG-Id>0</SRLG-Id>
+                <fiber-type>smf</fiber-type>
+                <SRLG-length>100000</SRLG-length>
+                <pmd>0.5</pmd>
+            </link-concatenation>
+        </span>
+    </OMS-attributes>
+</link>
+<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <link-id>OpenROADM-1-4-DEG3-to-OpenROADM-2-1-DEG3</link-id>
+    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-DEG3-to-OpenROADM-1-4-DEG3</opposite-link>
     <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-1-4-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-2-1-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-2-1-DEG3-to-OpenROADM-1-4-DEG3</link-id>    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-DEG3-to-OpenROADM-2-1-DEG3</opposite-link>
+    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
+    <source><source-node>OpenROADM-1-4-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
+    <destination><dest-node>OpenROADM-2-1-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+    <OMS-attributes xmlns="http://org/openroadm/network/topology">
+        <opposite-link>OpenROADM-2-1-DEG3-to-OpenROADM-1-4-DEG3</opposite-link>
+        <TE-metric>10</TE-metric>
+        <span>
+            <clfi>fiber37</clfi>
+            <auto-spanloss>true</auto-spanloss>
+            <spanloss-base>11.4</spanloss-base>
+            <spanloss-current>12</spanloss-current>
+            <engineered-spanloss>12.2</engineered-spanloss>
+            <link-concatenation>
+                <SRLG-Id>0</SRLG-Id>
+                <fiber-type>smf</fiber-type>
+                <SRLG-length>100000</SRLG-length>
+                <pmd>0.5</pmd>
+            </link-concatenation>
+        </span>
+    </OMS-attributes>
+</link>
+<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <link-id>OpenROADM-2-1-DEG3-to-OpenROADM-1-4-DEG3</link-id>
+    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-DEG3-to-OpenROADM-2-1-DEG3</opposite-link>
     <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-2-1-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-1-4-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-1-3-DEG3-to-OpenROADM-2-2-DEG3</link-id>    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-DEG3-to-OpenROADM-1-3-DEG3</opposite-link>
+    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
+    <source><source-node>OpenROADM-2-1-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
+    <destination><dest-node>OpenROADM-1-4-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+    <OMS-attributes xmlns="http://org/openroadm/network/topology">
+        <opposite-link>OpenROADM-1-4-DEG3-to-OpenROADM-2-1-DEG3</opposite-link>
+        <TE-metric>10</TE-metric>
+        <span>
+            <clfi>fiber38</clfi>
+            <auto-spanloss>true</auto-spanloss>
+            <spanloss-base>11.4</spanloss-base>
+            <spanloss-current>12</spanloss-current>
+            <engineered-spanloss>12.2</engineered-spanloss>
+            <link-concatenation>
+                <SRLG-Id>0</SRLG-Id>
+                <fiber-type>smf</fiber-type>
+                <SRLG-length>100000</SRLG-length>
+                <pmd>0.5</pmd>
+            </link-concatenation>
+        </span>
+    </OMS-attributes>
+</link>
+<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <link-id>OpenROADM-1-3-DEG3-to-OpenROADM-2-2-DEG3</link-id>
+    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-DEG3-to-OpenROADM-1-3-DEG3</opposite-link>
     <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-1-3-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-2-2-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-2-2-DEG3-to-OpenROADM-1-3-DEG3</link-id>    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-DEG3-to-OpenROADM-2-2-DEG3</opposite-link>
+    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
+    <source><source-node>OpenROADM-1-3-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
+    <destination><dest-node>OpenROADM-2-2-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+    <OMS-attributes xmlns="http://org/openroadm/network/topology">
+        <opposite-link>OpenROADM-2-2-DEG3-to-OpenROADM-1-3-DEG3</opposite-link>
+        <TE-metric>10</TE-metric>
+        <span>
+            <clfi>fiber39</clfi>
+            <auto-spanloss>true</auto-spanloss>
+            <spanloss-base>11.4</spanloss-base>
+            <spanloss-current>12</spanloss-current>
+            <engineered-spanloss>12.2</engineered-spanloss>
+            <link-concatenation>
+                <SRLG-Id>0</SRLG-Id>
+                <fiber-type>smf</fiber-type>
+                <SRLG-length>100000</SRLG-length>
+                <pmd>0.5</pmd>
+            </link-concatenation>
+        </span>
+    </OMS-attributes>
+</link>
+<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <link-id>OpenROADM-2-2-DEG3-to-OpenROADM-1-3-DEG3</link-id>
+    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-DEG3-to-OpenROADM-2-2-DEG3</opposite-link>
     <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-2-2-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-1-3-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-2-4-DEG3-to-OpenROADM-3-1-DEG3</link-id>    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-DEG3-to-OpenROADM-2-4-DEG3</opposite-link>
+    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
+    <source><source-node>OpenROADM-2-2-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
+    <destination><dest-node>OpenROADM-1-3-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+    <OMS-attributes xmlns="http://org/openroadm/network/topology">
+        <opposite-link>OpenROADM-1-3-DEG3-to-OpenROADM-2-2-DEG3</opposite-link>
+        <TE-metric>10</TE-metric>
+        <span>
+            <clfi>fiber40</clfi>
+            <auto-spanloss>true</auto-spanloss>
+            <spanloss-base>11.4</spanloss-base>
+            <spanloss-current>12</spanloss-current>
+            <engineered-spanloss>12.2</engineered-spanloss>
+            <link-concatenation>
+                <SRLG-Id>0</SRLG-Id>
+                <fiber-type>smf</fiber-type>
+                <SRLG-length>100000</SRLG-length>
+                <pmd>0.5</pmd>
+            </link-concatenation>
+        </span>
+    </OMS-attributes>
+</link>
+<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <link-id>OpenROADM-2-4-DEG3-to-OpenROADM-3-1-DEG3</link-id>
+    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-DEG3-to-OpenROADM-2-4-DEG3</opposite-link>
     <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-2-4-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-3-1-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-3-1-DEG3-to-OpenROADM-2-4-DEG3</link-id>    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-DEG3-to-OpenROADM-3-1-DEG3</opposite-link>
+    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
+    <source><source-node>OpenROADM-2-4-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
+    <destination><dest-node>OpenROADM-3-1-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+    <OMS-attributes xmlns="http://org/openroadm/network/topology">
+        <opposite-link>OpenROADM-3-1-DEG3-to-OpenROADM-2-4-DEG3</opposite-link>
+        <TE-metric>10</TE-metric>
+        <span>
+            <clfi>fiber41</clfi>
+            <auto-spanloss>true</auto-spanloss>
+            <spanloss-base>11.4</spanloss-base>
+            <spanloss-current>12</spanloss-current>
+            <engineered-spanloss>12.2</engineered-spanloss>
+            <link-concatenation>
+                <SRLG-Id>0</SRLG-Id>
+                <fiber-type>smf</fiber-type>
+                <SRLG-length>100000</SRLG-length>
+                <pmd>0.5</pmd>
+            </link-concatenation>
+        </span>
+    </OMS-attributes>
+</link>
+<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <link-id>OpenROADM-3-1-DEG3-to-OpenROADM-2-4-DEG3</link-id>
+    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-DEG3-to-OpenROADM-3-1-DEG3</opposite-link>
     <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-3-1-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-2-4-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-2-3-DEG3-to-OpenROADM-3-2-DEG3</link-id>    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-DEG3-to-OpenROADM-2-3-DEG3</opposite-link>
+    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
+    <source><source-node>OpenROADM-3-1-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
+    <destination><dest-node>OpenROADM-2-4-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+    <OMS-attributes xmlns="http://org/openroadm/network/topology">
+        <opposite-link>OpenROADM-2-4-DEG3-to-OpenROADM-3-1-DEG3</opposite-link>
+        <TE-metric>10</TE-metric>
+        <span>
+            <clfi>fiber42</clfi>
+            <auto-spanloss>true</auto-spanloss>
+            <spanloss-base>11.4</spanloss-base>
+            <spanloss-current>12</spanloss-current>
+            <engineered-spanloss>12.2</engineered-spanloss>
+            <link-concatenation>
+                <SRLG-Id>0</SRLG-Id>
+                <fiber-type>smf</fiber-type>
+                <SRLG-length>100000</SRLG-length>
+                <pmd>0.5</pmd>
+            </link-concatenation>
+        </span>
+    </OMS-attributes>
+</link>
+<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <link-id>OpenROADM-2-3-DEG3-to-OpenROADM-3-2-DEG3</link-id>
+    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-DEG3-to-OpenROADM-2-3-DEG3</opposite-link>
     <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-2-3-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-3-2-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-3-2-DEG3-to-OpenROADM-2-3-DEG3</link-id>    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-DEG3-to-OpenROADM-3-2-DEG3</opposite-link>
+    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
+    <source><source-node>OpenROADM-2-3-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
+    <destination><dest-node>OpenROADM-3-2-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+    <OMS-attributes xmlns="http://org/openroadm/network/topology">
+        <opposite-link>OpenROADM-3-2-DEG3-to-OpenROADM-2-3-DEG3</opposite-link>
+        <TE-metric>10</TE-metric>
+        <span>
+            <clfi>fiber43</clfi>
+            <auto-spanloss>true</auto-spanloss>
+            <spanloss-base>11.4</spanloss-base>
+            <spanloss-current>12</spanloss-current>
+            <engineered-spanloss>12.2</engineered-spanloss>
+            <link-concatenation>
+                <SRLG-Id>0</SRLG-Id>
+                <fiber-type>smf</fiber-type>
+                <SRLG-length>100000</SRLG-length>
+                <pmd>0.5</pmd>
+            </link-concatenation>
+        </span>
+    </OMS-attributes>
+</link>
+<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> 
+   <link-id>OpenROADM-3-2-DEG3-to-OpenROADM-2-3-DEG3</link-id>
+    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-DEG3-to-OpenROADM-3-2-DEG3</opposite-link>
     <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-3-2-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-2-3-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-3-4-DEG3-to-OpenROADM-4-1-DEG3</link-id>    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-DEG3-to-OpenROADM-3-4-DEG3</opposite-link>
+    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
+    <source><source-node>OpenROADM-3-2-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
+    <destination><dest-node>OpenROADM-2-3-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+    <OMS-attributes xmlns="http://org/openroadm/network/topology">
+        <opposite-link>OpenROADM-2-3-DEG3-to-OpenROADM-3-2-DEG3</opposite-link>
+        <TE-metric>10</TE-metric>
+        <span>
+            <clfi>fiber44</clfi>
+            <auto-spanloss>true</auto-spanloss>
+            <spanloss-base>11.4</spanloss-base>
+            <spanloss-current>12</spanloss-current>
+            <engineered-spanloss>12.2</engineered-spanloss>
+            <link-concatenation>
+                <SRLG-Id>0</SRLG-Id>
+                <fiber-type>smf</fiber-type>
+                <SRLG-length>100000</SRLG-length>
+                <pmd>0.5</pmd>
+            </link-concatenation>
+        </span>
+    </OMS-attributes>
+</link>
+<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <link-id>OpenROADM-3-4-DEG3-to-OpenROADM-4-1-DEG3</link-id>
+    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-DEG3-to-OpenROADM-3-4-DEG3</opposite-link>
     <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-3-4-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-4-1-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-4-1-DEG3-to-OpenROADM-3-4-DEG3</link-id>    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-DEG3-to-OpenROADM-4-1-DEG3</opposite-link>
+    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
+    <source><source-node>OpenROADM-3-4-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
+    <destination><dest-node>OpenROADM-4-1-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+    <OMS-attributes xmlns="http://org/openroadm/network/topology">
+        <opposite-link>OpenROADM-4-1-DEG3-to-OpenROADM-3-4-DEG3</opposite-link>
+        <TE-metric>10</TE-metric>
+        <span>
+            <clfi>fiber45</clfi>
+            <auto-spanloss>true</auto-spanloss>
+            <spanloss-base>11.4</spanloss-base>
+            <spanloss-current>12</spanloss-current>
+            <engineered-spanloss>12.2</engineered-spanloss>
+            <link-concatenation>
+                <SRLG-Id>0</SRLG-Id>
+                <fiber-type>smf</fiber-type>
+                <SRLG-length>100000</SRLG-length>
+                <pmd>0.5</pmd>
+            </link-concatenation>
+        </span>
+    </OMS-attributes>
+</link>
+<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <link-id>OpenROADM-4-1-DEG3-to-OpenROADM-3-4-DEG3</link-id>
+    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-DEG3-to-OpenROADM-4-1-DEG3</opposite-link>
     <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-4-1-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-3-4-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-3-3-DEG3-to-OpenROADM-4-2-DEG3</link-id>    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-DEG3-to-OpenROADM-3-3-DEG3</opposite-link>
+    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
+    <source><source-node>OpenROADM-4-1-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
+    <destination><dest-node>OpenROADM-3-4-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+    <OMS-attributes xmlns="http://org/openroadm/network/topology">
+        <opposite-link>OpenROADM-3-4-DEG3-to-OpenROADM-4-1-DEG3</opposite-link>
+        <TE-metric>10</TE-metric>
+        <span>
+            <clfi>fiber46</clfi>
+            <auto-spanloss>true</auto-spanloss>
+            <spanloss-base>11.4</spanloss-base>
+            <spanloss-current>12</spanloss-current>
+            <engineered-spanloss>12.2</engineered-spanloss>
+            <link-concatenation>
+                <SRLG-Id>0</SRLG-Id>
+                <fiber-type>smf</fiber-type>
+                <SRLG-length>100000</SRLG-length>
+                <pmd>0.5</pmd>
+            </link-concatenation>
+        </span>
+    </OMS-attributes>
+</link>
+<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <link-id>OpenROADM-3-3-DEG3-to-OpenROADM-4-2-DEG3</link-id>
+    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-DEG3-to-OpenROADM-3-3-DEG3</opposite-link>
     <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-3-3-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-4-2-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-4-2-DEG3-to-OpenROADM-3-3-DEG3</link-id>    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-DEG3-to-OpenROADM-4-2-DEG3</opposite-link>
+    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
+    <source><source-node>OpenROADM-3-3-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
+    <destination><dest-node>OpenROADM-4-2-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+    <OMS-attributes xmlns="http://org/openroadm/network/topology">
+        <opposite-link>OpenROADM-4-2-DEG3-to-OpenROADM-3-3-DEG3</opposite-link>
+        <TE-metric>10</TE-metric>
+        <span>
+            <clfi>fiber47</clfi>
+            <auto-spanloss>true</auto-spanloss>
+            <spanloss-base>11.4</spanloss-base>
+            <spanloss-current>12</spanloss-current>
+            <engineered-spanloss>12.2</engineered-spanloss>
+            <link-concatenation>
+                <SRLG-Id>0</SRLG-Id>
+                <fiber-type>smf</fiber-type>
+                <SRLG-length>100000</SRLG-length>
+                <pmd>0.5</pmd>
+            </link-concatenation>
+        </span>
+    </OMS-attributes>
+</link>
+<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <link-id>OpenROADM-4-2-DEG3-to-OpenROADM-3-3-DEG3</link-id>
+    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-DEG3-to-OpenROADM-4-2-DEG3</opposite-link>
     <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-4-2-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-3-3-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-4-4-DEG3-to-OpenROADM-5-1-DEG3</link-id>    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-DEG3-to-OpenROADM-4-4-DEG3</opposite-link>
+    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
+    <source><source-node>OpenROADM-4-2-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
+    <destination><dest-node>OpenROADM-3-3-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+    <OMS-attributes xmlns="http://org/openroadm/network/topology">
+        <opposite-link>OpenROADM-3-3-DEG3-to-OpenROADM-4-2-DEG3</opposite-link>
+        <TE-metric>10</TE-metric>
+        <span>
+            <clfi>fiber48</clfi>
+            <auto-spanloss>true</auto-spanloss>
+            <spanloss-base>11.4</spanloss-base>
+            <spanloss-current>12</spanloss-current>
+            <engineered-spanloss>12.2</engineered-spanloss>
+            <link-concatenation>
+                <SRLG-Id>0</SRLG-Id>
+                <fiber-type>smf</fiber-type>
+                <SRLG-length>100000</SRLG-length>
+                <pmd>0.5</pmd>
+            </link-concatenation>
+        </span>
+    </OMS-attributes>
+</link>
+<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <link-id>OpenROADM-4-4-DEG3-to-OpenROADM-5-1-DEG3</link-id>
+    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-DEG3-to-OpenROADM-4-4-DEG3</opposite-link>
     <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-4-4-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-5-1-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-5-1-DEG3-to-OpenROADM-4-4-DEG3</link-id>    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-DEG3-to-OpenROADM-5-1-DEG3</opposite-link>
+    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
+    <source><source-node>OpenROADM-4-4-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
+    <destination><dest-node>OpenROADM-5-1-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+    <OMS-attributes xmlns="http://org/openroadm/network/topology">
+        <opposite-link>OpenROADM-5-1-DEG3-to-OpenROADM-4-4-DEG3</opposite-link>
+        <TE-metric>10</TE-metric>
+        <span>
+            <clfi>fiber49</clfi>
+            <auto-spanloss>true</auto-spanloss>
+            <spanloss-base>11.4</spanloss-base>
+            <spanloss-current>12</spanloss-current>
+            <engineered-spanloss>12.2</engineered-spanloss>
+            <link-concatenation>
+                <SRLG-Id>0</SRLG-Id>
+                <fiber-type>smf</fiber-type>
+                <SRLG-length>100000</SRLG-length>
+                <pmd>0.5</pmd>
+            </link-concatenation>
+        </span>
+    </OMS-attributes>
+</link>
+<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <link-id>OpenROADM-5-1-DEG3-to-OpenROADM-4-4-DEG3</link-id>
+    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-DEG3-to-OpenROADM-5-1-DEG3</opposite-link>
     <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-5-1-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-4-4-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-4-3-DEG3-to-OpenROADM-5-2-DEG3</link-id>    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-DEG3-to-OpenROADM-4-3-DEG3</opposite-link>
+    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
+    <source><source-node>OpenROADM-5-1-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
+    <destination><dest-node>OpenROADM-4-4-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+    <OMS-attributes xmlns="http://org/openroadm/network/topology">
+        <opposite-link>OpenROADM-4-4-DEG3-to-OpenROADM-5-1-DEG3</opposite-link>
+        <TE-metric>10</TE-metric>
+        <span>
+            <clfi>fiber50</clfi>
+            <auto-spanloss>true</auto-spanloss>
+            <spanloss-base>11.4</spanloss-base>
+            <spanloss-current>12</spanloss-current>
+            <engineered-spanloss>12.2</engineered-spanloss>
+            <link-concatenation>
+                <SRLG-Id>0</SRLG-Id>
+                <fiber-type>smf</fiber-type>
+                <SRLG-length>100000</SRLG-length>
+                <pmd>0.5</pmd>
+            </link-concatenation>
+        </span>
+    </OMS-attributes>
+</link>
+<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <link-id>OpenROADM-4-3-DEG3-to-OpenROADM-5-2-DEG3</link-id>
+    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-DEG3-to-OpenROADM-4-3-DEG3</opposite-link>
     <link-latency xmlns="http://org/openroadm/network/topology">10</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-4-3-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-5-2-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-5-2-DEG3-to-OpenROADM-4-3-DEG3</link-id>    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-DEG3-to-OpenROADM-5-2-DEG3</opposite-link>
+    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
+    <source><source-node>OpenROADM-4-3-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
+    <destination><dest-node>OpenROADM-5-2-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+    <OMS-attributes xmlns="http://org/openroadm/network/topology">
+        <opposite-link>OpenROADM-5-2-DEG3-to-OpenROADM-4-3-DEG3</opposite-link>
+        <TE-metric>10</TE-metric>
+        <span>
+            <clfi>fiber51</clfi>
+            <auto-spanloss>true</auto-spanloss>
+            <spanloss-base>11.4</spanloss-base>
+            <spanloss-current>12</spanloss-current>
+            <engineered-spanloss>12.2</engineered-spanloss>
+            <link-concatenation>
+                <SRLG-Id>0</SRLG-Id>
+                <fiber-type>smf</fiber-type>
+                <SRLG-length>100000</SRLG-length>
+                <pmd>0.5</pmd>
+            </link-concatenation>
+        </span>
+    </OMS-attributes>
+</link>
+<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <link-id>OpenROADM-5-2-DEG3-to-OpenROADM-4-3-DEG3</link-id>
+    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-DEG3-to-OpenROADM-5-2-DEG3</opposite-link>
     <link-latency xmlns="http://org/openroadm/network/topology">10</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-5-2-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-4-3-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-5-4-DEG3-to-OpenROADM-1-1-DEG3</link-id>    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-DEG3-to-OpenROADM-5-4-DEG3</opposite-link>
+    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
+    <source><source-node>OpenROADM-5-2-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
+    <destination><dest-node>OpenROADM-4-3-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+    <OMS-attributes xmlns="http://org/openroadm/network/topology">
+        <opposite-link>OpenROADM-4-3-DEG3-to-OpenROADM-5-2-DEG3</opposite-link>
+        <TE-metric>10</TE-metric>
+        <span>
+            <clfi>fiber52</clfi>
+            <auto-spanloss>true</auto-spanloss>
+            <spanloss-base>11.4</spanloss-base>
+            <spanloss-current>12</spanloss-current>
+            <engineered-spanloss>12.2</engineered-spanloss>
+            <link-concatenation>
+                <SRLG-Id>0</SRLG-Id>
+                <fiber-type>smf</fiber-type>
+                <SRLG-length>100000</SRLG-length>
+                <pmd>0.5</pmd>
+            </link-concatenation>
+        </span>
+    </OMS-attributes>
+</link>
+<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <link-id>OpenROADM-5-4-DEG3-to-OpenROADM-1-1-DEG3</link-id>
+    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-DEG3-to-OpenROADM-5-4-DEG3</opposite-link>
     <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-5-4-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-1-1-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-1-1-DEG3-to-OpenROADM-5-4-DEG3</link-id>    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-DEG3-to-OpenROADM-1-1-DEG3</opposite-link>
+    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
+    <source><source-node>OpenROADM-5-4-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
+    <destination><dest-node>OpenROADM-1-1-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+    <OMS-attributes xmlns="http://org/openroadm/network/topology">
+        <opposite-link>OpenROADM-1-1-DEG3-to-OpenROADM-5-4-DEG3</opposite-link>
+        <TE-metric>10</TE-metric>
+        <span>
+            <clfi>fiber53</clfi>
+            <auto-spanloss>true</auto-spanloss>
+            <spanloss-base>11.4</spanloss-base>
+            <spanloss-current>12</spanloss-current>
+            <engineered-spanloss>12.2</engineered-spanloss>
+            <link-concatenation>
+                <SRLG-Id>0</SRLG-Id>
+                <fiber-type>smf</fiber-type>
+                <SRLG-length>100000</SRLG-length>
+                <pmd>0.5</pmd>
+            </link-concatenation>
+        </span>
+    </OMS-attributes>
+</link>
+<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <link-id>OpenROADM-1-1-DEG3-to-OpenROADM-5-4-DEG3</link-id>
+    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-DEG3-to-OpenROADM-1-1-DEG3</opposite-link>
     <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-1-1-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-5-4-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-5-3-DEG3-to-OpenROADM-1-2-DEG3</link-id>    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-DEG3-to-OpenROADM-5-3-DEG3</opposite-link>
+    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
+    <source><source-node>OpenROADM-1-1-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
+    <destination><dest-node>OpenROADM-5-4-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+    <OMS-attributes xmlns="http://org/openroadm/network/topology">
+        <opposite-link>OpenROADM-5-4-DEG3-to-OpenROADM-1-1-DEG3</opposite-link>
+        <TE-metric>10</TE-metric>
+        <span>
+            <clfi>fiber54</clfi>
+            <auto-spanloss>true</auto-spanloss>
+            <spanloss-base>11.4</spanloss-base>
+            <spanloss-current>12</spanloss-current>
+            <engineered-spanloss>12.2</engineered-spanloss>
+            <link-concatenation>
+                <SRLG-Id>0</SRLG-Id>
+                <fiber-type>smf</fiber-type>
+                <SRLG-length>100000</SRLG-length>
+                <pmd>0.5</pmd>
+            </link-concatenation>
+        </span>
+    </OMS-attributes>
+</link>
+<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <link-id>OpenROADM-5-3-DEG3-to-OpenROADM-1-2-DEG3</link-id>
+    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-DEG3-to-OpenROADM-5-3-DEG3</opposite-link>
     <link-latency xmlns="http://org/openroadm/network/topology">10</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-5-3-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-1-2-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <link-id>OpenROADM-1-2-DEG3-to-OpenROADM-5-3-DEG3</link-id>    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-DEG3-to-OpenROADM-1-2-DEG3</opposite-link>
+    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
+    <source><source-node>OpenROADM-5-3-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
+    <destination><dest-node>OpenROADM-1-2-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+    <OMS-attributes xmlns="http://org/openroadm/network/topology">
+        <opposite-link>OpenROADM-1-2-DEG3-to-OpenROADM-5-3-DEG3</opposite-link>
+        <TE-metric>10</TE-metric>
+        <span>
+            <clfi>fiber55</clfi>
+            <auto-spanloss>true</auto-spanloss>
+            <spanloss-base>11.4</spanloss-base>
+            <spanloss-current>12</spanloss-current>
+            <engineered-spanloss>12.2</engineered-spanloss>
+            <link-concatenation>
+                <SRLG-Id>0</SRLG-Id>
+                <fiber-type>smf</fiber-type>
+                <SRLG-length>100000</SRLG-length>
+                <pmd>0.5</pmd>
+            </link-concatenation>
+        </span>
+    </OMS-attributes>
+</link>
+<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+    <link-id>OpenROADM-1-2-DEG3-to-OpenROADM-5-3-DEG3</link-id>
+    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-DEG3-to-OpenROADM-1-2-DEG3</opposite-link>
     <link-latency xmlns="http://org/openroadm/network/topology">10</link-latency>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-1-2-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>    <destination><dest-node>OpenROADM-5-3-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>    </link>
+    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
+    <source><source-node>OpenROADM-1-2-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
+    <destination><dest-node>OpenROADM-5-3-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+    <OMS-attributes xmlns="http://org/openroadm/network/topology">
+        <opposite-link>OpenROADM-5-3-DEG3-to-OpenROADM-1-2-DEG3</opposite-link>
+        <TE-metric>10</TE-metric>
+        <span>
+            <clfi>fiber56</clfi>
+            <auto-spanloss>true</auto-spanloss>
+            <spanloss-base>11.4</spanloss-base>
+            <spanloss-current>12</spanloss-current>
+            <engineered-spanloss>12.2</engineered-spanloss>
+            <link-concatenation>
+                <SRLG-Id>0</SRLG-Id>
+                <fiber-type>smf</fiber-type>
+                <SRLG-length>100000</SRLG-length>
+                <pmd>0.5</pmd>
+            </link-concatenation>
+        </span>
+    </OMS-attributes>
+</link>
 </network>