X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=tests%2Fsample_configs%2Fhoneynode-topo.xml;h=8798b8b96adb3a587ec8e3008b828ed1777698e5;hb=66ccddbe00692f230350a19e1a222f09d6abd9a7;hp=84dba1fd85f99288ca70173f443a4382999fc25c;hpb=7c90be243c9c65418b81768e1e0ed6ac58bad4a8;p=transportpce.git

diff --git a/tests/sample_configs/honeynode-topo.xml b/tests/sample_configs/honeynode-topo.xml
index 84dba1fd8..8798b8b96 100644
--- a/tests/sample_configs/honeynode-topo.xml
+++ b/tests/sample_configs/honeynode-topo.xml
@@ -1,135 +1,135 @@
 <network xmlns="urn:ietf:params:xml:ns:yang:ietf-network">
     <network-id>openroadm-topology</network-id>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <link-id>ROADMA-DEG2-DEG2-CTP-TXRXtoROADMA-DEG1-DEG1-CTP-TXRX</link-id>
-        <opposite-link xmlns="http://org/openroadm/common/network">ROADMA-DEG1-DEG1-CTP-TXRXtoROADMA-DEG2-DEG2-CTP-TXRX</opposite-link>
+        <link-id>ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX</link-id>
+        <opposite-link xmlns="http://org/openroadm/common/network">ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX</opposite-link>
         <destination>
             <dest-tp>DEG1-CTP-TXRX</dest-tp>
-            <dest-node>ROADMA-DEG1</dest-node>
+            <dest-node>ROADMA01-DEG1</dest-node>
         </destination>
         <source>
-            <source-node>ROADMA-DEG2</source-node>
+            <source-node>ROADMA01-DEG2</source-node>
             <source-tp>DEG2-CTP-TXRX</source-tp>
         </source>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type>
+        <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>ROADMC-SRG1-SRG1-CP-TXRXtoROADMC-DEG2-DEG2-CTP-TXRX</link-id>
-        <opposite-link xmlns="http://org/openroadm/common/network">ROADMC-DEG2-DEG2-CTP-TXRXtoROADMC-SRG1-SRG1-CP-TXRX</opposite-link>
+        <link-id>ROADMC01-SRG1-SRG1-CP-TXRXtoROADMC01-DEG2-DEG2-CTP-TXRX</link-id>
+        <opposite-link xmlns="http://org/openroadm/common/network">ROADMC01-DEG2-DEG2-CTP-TXRXtoROADMC01-SRG1-SRG1-CP-TXRX</opposite-link>
         <destination>
             <dest-tp>DEG2-CTP-TXRX</dest-tp>
-            <dest-node>ROADMC-DEG2</dest-node>
+            <dest-node>ROADMC01-DEG2</dest-node>
         </destination>
         <source>
-            <source-node>ROADMC-SRG1</source-node>
+            <source-node>ROADMC01-SRG1</source-node>
             <source-tp>SRG1-CP-TXRX</source-tp>
         </source>
-        <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type>
+        <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>ROADMA-SRG1-SRG1-CP-TXRXtoROADMA-DEG1-DEG1-CTP-TXRX</link-id>
-        <opposite-link xmlns="http://org/openroadm/common/network">ROADMA-DEG1-DEG1-CTP-TXRXtoROADMA-SRG1-SRG1-CP-TXRX</opposite-link>
+        <link-id>ROADMA01-SRG1-SRG1-CP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX</link-id>
+        <opposite-link xmlns="http://org/openroadm/common/network">ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-SRG1-SRG1-CP-TXRX</opposite-link>
         <destination>
             <dest-tp>DEG1-CTP-TXRX</dest-tp>
-            <dest-node>ROADMA-DEG1</dest-node>
+            <dest-node>ROADMA01-DEG1</dest-node>
         </destination>
         <source>
-            <source-node>ROADMA-SRG1</source-node>
+            <source-node>ROADMA01-SRG1</source-node>
             <source-tp>SRG1-CP-TXRX</source-tp>
         </source>
-        <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type>
+        <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>XPDRA-XPDR1-XPDR1-NETWORK1toROADMA-SRG1-SRG1-PP1-TXRX</link-id>
-        <opposite-link xmlns="http://org/openroadm/common/network">ROADMA-SRG1-SRG1-PP1-TXRXtoXPDRA-XPDR1-XPDR1-NETWORK1</opposite-link>
+        <link-id>XPDRA01-XPDR1-XPDR1-NETWORK1toROADMA01-SRG1-SRG1-PP1-TXRX</link-id>
+        <opposite-link xmlns="http://org/openroadm/common/network">ROADMA01-SRG1-SRG1-PP1-TXRXtoXPDRA01-XPDR1-XPDR1-NETWORK1</opposite-link>
         <destination>
             <dest-tp>SRG1-PP1-TXRX</dest-tp>
-            <dest-node>ROADMA-SRG1</dest-node>
+            <dest-node>ROADMA01-SRG1</dest-node>
         </destination>
         <source>
-            <source-node>XPDRA-XPDR1</source-node>
+            <source-node>XPDRA01-XPDR1</source-node>
             <source-tp>XPDR1-NETWORK1</source-tp>
         </source>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type>
+        <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>ROADMA-DEG1-DEG1-CTP-TXRXtoROADMA-DEG2-DEG2-CTP-TXRX</link-id>
-        <opposite-link xmlns="http://org/openroadm/common/network">ROADMA-DEG2-DEG2-CTP-TXRXtoROADMA-DEG1-DEG1-CTP-TXRX</opposite-link>
+        <link-id>ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX</link-id>
+        <opposite-link xmlns="http://org/openroadm/common/network">ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX</opposite-link>
         <destination>
             <dest-tp>DEG2-CTP-TXRX</dest-tp>
-            <dest-node>ROADMA-DEG2</dest-node>
+            <dest-node>ROADMA01-DEG2</dest-node>
         </destination>
         <source>
-            <source-node>ROADMA-DEG1</source-node>
+            <source-node>ROADMA01-DEG1</source-node>
             <source-tp>DEG1-CTP-TXRX</source-tp>
         </source>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type>
+        <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>ROADMC-DEG2-DEG2-CTP-TXRXtoROADMC-DEG1-DEG1-CTP-TXRX</link-id>
-        <opposite-link xmlns="http://org/openroadm/common/network">ROADMC-DEG1-DEG1-CTP-TXRXtoROADMC-DEG2-DEG2-CTP-TXRX</opposite-link>
+        <link-id>ROADMC01-DEG2-DEG2-CTP-TXRXtoROADMC01-DEG1-DEG1-CTP-TXRX</link-id>
+        <opposite-link xmlns="http://org/openroadm/common/network">ROADMC01-DEG1-DEG1-CTP-TXRXtoROADMC01-DEG2-DEG2-CTP-TXRX</opposite-link>
         <destination>
             <dest-tp>DEG1-CTP-TXRX</dest-tp>
-            <dest-node>ROADMC-DEG1</dest-node>
+            <dest-node>ROADMC01-DEG1</dest-node>
         </destination>
         <source>
-            <source-node>ROADMC-DEG2</source-node>
+            <source-node>ROADMC01-DEG2</source-node>
             <source-tp>DEG2-CTP-TXRX</source-tp>
         </source>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type>
+        <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>ROADMC-DEG1-DEG1-CTP-TXRXtoROADMC-DEG2-DEG2-CTP-TXRX</link-id>
-        <opposite-link xmlns="http://org/openroadm/common/network">ROADMC-DEG2-DEG2-CTP-TXRXtoROADMC-DEG1-DEG1-CTP-TXRX</opposite-link>
+        <link-id>ROADMC01-DEG1-DEG1-CTP-TXRXtoROADMC01-DEG2-DEG2-CTP-TXRX</link-id>
+        <opposite-link xmlns="http://org/openroadm/common/network">ROADMC01-DEG2-DEG2-CTP-TXRXtoROADMC01-DEG1-DEG1-CTP-TXRX</opposite-link>
         <destination>
             <dest-tp>DEG2-CTP-TXRX</dest-tp>
-            <dest-node>ROADMC-DEG2</dest-node>
+            <dest-node>ROADMC01-DEG2</dest-node>
         </destination>
         <source>
-            <source-node>ROADMC-DEG1</source-node>
+            <source-node>ROADMC01-DEG1</source-node>
             <source-tp>DEG1-CTP-TXRX</source-tp>
         </source>
-        <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type>
+        <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>ROADMA-DEG1-DEG1-CTP-TXRXtoROADMA-SRG1-SRG1-CP-TXRX</link-id>
-        <opposite-link xmlns="http://org/openroadm/common/network">ROADMA-SRG1-SRG1-CP-TXRXtoROADMA-DEG1-DEG1-CTP-TXRX</opposite-link>
+        <link-id>ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-SRG1-SRG1-CP-TXRX</link-id>
+        <opposite-link xmlns="http://org/openroadm/common/network">ROADMA01-SRG1-SRG1-CP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX</opposite-link>
         <destination>
             <dest-tp>SRG1-CP-TXRX</dest-tp>
-            <dest-node>ROADMA-SRG1</dest-node>
+            <dest-node>ROADMA01-SRG1</dest-node>
         </destination>
         <source>
-            <source-node>ROADMA-DEG1</source-node>
+            <source-node>ROADMA01-DEG1</source-node>
             <source-tp>DEG1-CTP-TXRX</source-tp>
         </source>
-        <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type>
+        <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>ROADMA-DEG2-DEG2-CTP-TXRXtoROADMA-SRG1-SRG1-CP-TXRX</link-id>
-        <opposite-link xmlns="http://org/openroadm/common/network">ROADMA-SRG1-SRG1-CP-TXRXtoROADMA-DEG2-DEG2-CTP-TXRX</opposite-link>
+        <link-id>ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-SRG1-SRG1-CP-TXRX</link-id>
+        <opposite-link xmlns="http://org/openroadm/common/network">ROADMA01-SRG1-SRG1-CP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX</opposite-link>
         <destination>
             <dest-tp>SRG1-CP-TXRX</dest-tp>
-            <dest-node>ROADMA-SRG1</dest-node>
+            <dest-node>ROADMA01-SRG1</dest-node>
         </destination>
         <source>
-            <source-node>ROADMA-DEG2</source-node>
+            <source-node>ROADMA01-DEG2</source-node>
             <source-tp>DEG2-CTP-TXRX</source-tp>
         </source>
-        <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type>
+        <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>ROADMA-DEG1-DEG1-TTP-TXRXtoROADMC-DEG2-DEG2-TTP-TXRX</link-id>
-        <opposite-link xmlns="http://org/openroadm/common/network">ROADMC-DEG2-DEG2-TTP-TXRXtoROADMA-DEG1-DEG1-TTP-TXRX</opposite-link>
+        <link-id>ROADMA01-DEG1-DEG1-TTP-TXRXtoROADMC01-DEG2-DEG2-TTP-TXRX</link-id>
+        <opposite-link xmlns="http://org/openroadm/common/network">ROADMC01-DEG2-DEG2-TTP-TXRXtoROADMA01-DEG1-DEG1-TTP-TXRX</opposite-link>
         <destination>
             <dest-tp>DEG2-TTP-TXRX</dest-tp>
-            <dest-node>ROADMC-DEG2</dest-node>
+            <dest-node>ROADMC01-DEG2</dest-node>
         </destination>
         <source>
-            <source-node>ROADMA-DEG1</source-node>
+            <source-node>ROADMA01-DEG1</source-node>
             <source-tp>DEG1-TTP-TXRX</source-tp>
         </source>
         <OMS-attributes xmlns="http://org/openroadm/network/topology">
-            <opposite-link>ROADMC-DEG2-DEG2-TTP-TXRXtoROADMA-DEG1-DEG1-TTP-TXRX</opposite-link>
+            <opposite-link>ROADMC01-DEG2-DEG2-TTP-TXRXtoROADMA01-DEG1-DEG1-TTP-TXRX</opposite-link>
             <TE-metric>10</TE-metric>
             <span>
                 <clfi>fiber1</clfi>
@@ -145,35 +145,35 @@
                 </link-concatenation>
             </span>
         </OMS-attributes>
-        <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+        <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
         <link-latency xmlns="http://org/openroadm/common/network">0</link-latency>
     </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <link-id>ROADMA-SRG1-SRG1-PP1-TXRXtoXPDRA-XPDR1-XPDR1-NETWORK1</link-id>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPDRA-XPDR1-XPDR1-NETWORK1toROADMA-SRG1-SRG1-PP1-TXRX</opposite-link>
+        <link-id>ROADMA01-SRG1-SRG1-PP1-TXRXtoXPDRA01-XPDR1-XPDR1-NETWORK1</link-id>
+        <opposite-link xmlns="http://org/openroadm/common/network">XPDRA01-XPDR1-XPDR1-NETWORK1toROADMA01-SRG1-SRG1-PP1-TXRX</opposite-link>
         <destination>
             <dest-tp>XPDR1-NETWORK1</dest-tp>
-            <dest-node>XPDRA-XPDR1</dest-node>
+            <dest-node>XPDRA01-XPDR1</dest-node>
         </destination>
         <source>
-            <source-node>ROADMA-SRG1</source-node>
+            <source-node>ROADMA01-SRG1</source-node>
             <source-tp>SRG1-PP1-TXRX</source-tp>
         </source>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type>
+        <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>ROADMC-DEG2-DEG2-TTP-TXRXtoROADMA-DEG1-DEG1-TTP-TXRX</link-id>
-        <opposite-link xmlns="http://org/openroadm/common/network">ROADMA-DEG1-DEG1-TTP-TXRXtoROADMC-DEG2-DEG2-TTP-TXRX</opposite-link>
+        <link-id>ROADMC01-DEG2-DEG2-TTP-TXRXtoROADMA01-DEG1-DEG1-TTP-TXRX</link-id>
+        <opposite-link xmlns="http://org/openroadm/common/network">ROADMA01-DEG1-DEG1-TTP-TXRXtoROADMC01-DEG2-DEG2-TTP-TXRX</opposite-link>
         <destination>
             <dest-tp>DEG1-TTP-TXRX</dest-tp>
-            <dest-node>ROADMA-DEG1</dest-node>
+            <dest-node>ROADMA01-DEG1</dest-node>
         </destination>
         <source>
-            <source-node>ROADMC-DEG2</source-node>
+            <source-node>ROADMC01-DEG2</source-node>
             <source-tp>DEG2-TTP-TXRX</source-tp>
         </source>
         <OMS-attributes xmlns="http://org/openroadm/network/topology">
-            <opposite-link>ROADMA-DEG1-DEG1-TTP-TXRXtoROADMC-DEG2-DEG2-TTP-TXRX</opposite-link>
+            <opposite-link>ROADMA01-DEG1-DEG1-TTP-TXRXtoROADMC01-DEG2-DEG2-TTP-TXRX</opposite-link>
             <TE-metric>10</TE-metric>
             <span>
                 <clfi>fiber2</clfi>
@@ -189,163 +189,163 @@
                 </link-concatenation>
             </span>
         </OMS-attributes>
-        <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+        <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
         <link-latency xmlns="http://org/openroadm/common/network">0</link-latency>
     </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <link-id>ROADMC-DEG1-DEG1-CTP-TXRXtoROADMC-SRG1-SRG1-CP-TXRX</link-id>
-        <opposite-link xmlns="http://org/openroadm/common/network">ROADMC-SRG1-SRG1-CP-TXRXtoROADMC-DEG1-DEG1-CTP-TXRX</opposite-link>
+        <link-id>ROADMC01-DEG1-DEG1-CTP-TXRXtoROADMC01-SRG1-SRG1-CP-TXRX</link-id>
+        <opposite-link xmlns="http://org/openroadm/common/network">ROADMC01-SRG1-SRG1-CP-TXRXtoROADMC01-DEG1-DEG1-CTP-TXRX</opposite-link>
         <destination>
             <dest-tp>SRG1-CP-TXRX</dest-tp>
-            <dest-node>ROADMC-SRG1</dest-node>
+            <dest-node>ROADMC01-SRG1</dest-node>
         </destination>
         <source>
-            <source-node>ROADMC-DEG1</source-node>
+            <source-node>ROADMC01-DEG1</source-node>
             <source-tp>DEG1-CTP-TXRX</source-tp>
         </source>
-        <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type>
+        <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>ROADMC-SRG1-SRG1-CP-TXRXtoROADMC-DEG1-DEG1-CTP-TXRX</link-id>
-        <opposite-link xmlns="http://org/openroadm/common/network">ROADMC-DEG1-DEG1-CTP-TXRXtoROADMC-SRG1-SRG1-CP-TXRX</opposite-link>
+        <link-id>ROADMC01-SRG1-SRG1-CP-TXRXtoROADMC01-DEG1-DEG1-CTP-TXRX</link-id>
+        <opposite-link xmlns="http://org/openroadm/common/network">ROADMC01-DEG1-DEG1-CTP-TXRXtoROADMC01-SRG1-SRG1-CP-TXRX</opposite-link>
         <destination>
             <dest-tp>DEG1-CTP-TXRX</dest-tp>
-            <dest-node>ROADMC-DEG1</dest-node>
+            <dest-node>ROADMC01-DEG1</dest-node>
         </destination>
         <source>
-            <source-node>ROADMC-SRG1</source-node>
+            <source-node>ROADMC01-SRG1</source-node>
             <source-tp>SRG1-CP-TXRX</source-tp>
         </source>
-        <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type>
+        <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>ROADMC-DEG2-DEG2-CTP-TXRXtoROADMC-SRG1-SRG1-CP-TXRX</link-id>
-        <opposite-link xmlns="http://org/openroadm/common/network">ROADMC-SRG1-SRG1-CP-TXRXtoROADMC-DEG2-DEG2-CTP-TXRX</opposite-link>
+        <link-id>ROADMC01-DEG2-DEG2-CTP-TXRXtoROADMC01-SRG1-SRG1-CP-TXRX</link-id>
+        <opposite-link xmlns="http://org/openroadm/common/network">ROADMC01-SRG1-SRG1-CP-TXRXtoROADMC01-DEG2-DEG2-CTP-TXRX</opposite-link>
         <destination>
             <dest-tp>SRG1-CP-TXRX</dest-tp>
-            <dest-node>ROADMC-SRG1</dest-node>
+            <dest-node>ROADMC01-SRG1</dest-node>
         </destination>
         <source>
-            <source-node>ROADMC-DEG2</source-node>
+            <source-node>ROADMC01-DEG2</source-node>
             <source-tp>DEG2-CTP-TXRX</source-tp>
         </source>
-        <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type>
+        <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>ROADMC-SRG1-SRG1-PP1-TXRXtoXPDRC-XPDR1-XPDR1-NETWORK1</link-id>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPDRC-XPDR1-XPDR1-NETWORK1toROADMC-SRG1-SRG1-PP1-TXRX</opposite-link>
+        <link-id>ROADMC01-SRG1-SRG1-PP1-TXRXtoXPDRC01-XPDR1-XPDR1-NETWORK1</link-id>
+        <opposite-link xmlns="http://org/openroadm/common/network">XPDRC01-XPDR1-XPDR1-NETWORK1toROADMC01-SRG1-SRG1-PP1-TXRX</opposite-link>
         <destination>
             <dest-tp>XPDR1-NETWORK1</dest-tp>
-            <dest-node>XPDRC-XPDR1</dest-node>
+            <dest-node>XPDRC01-XPDR1</dest-node>
         </destination>
         <source>
-            <source-node>ROADMC-SRG1</source-node>
+            <source-node>ROADMC01-SRG1</source-node>
             <source-tp>SRG1-PP1-TXRX</source-tp>
         </source>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type>
+        <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>ROADMA-SRG1-SRG1-CP-TXRXtoROADMA-DEG2-DEG2-CTP-TXRX</link-id>
-        <opposite-link xmlns="http://org/openroadm/common/network">ROADMA-DEG2-DEG2-CTP-TXRXtoROADMA-SRG1-SRG1-CP-TXRX</opposite-link>
+        <link-id>ROADMA01-SRG1-SRG1-CP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX</link-id>
+        <opposite-link xmlns="http://org/openroadm/common/network">ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-SRG1-SRG1-CP-TXRX</opposite-link>
         <destination>
             <dest-tp>DEG2-CTP-TXRX</dest-tp>
-            <dest-node>ROADMA-DEG2</dest-node>
+            <dest-node>ROADMA01-DEG2</dest-node>
         </destination>
         <source>
-            <source-node>ROADMA-SRG1</source-node>
+            <source-node>ROADMA01-SRG1</source-node>
             <source-tp>SRG1-CP-TXRX</source-tp>
         </source>
-        <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type>
+        <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>XPDRC-XPDR1-XPDR1-NETWORK1toROADMC-SRG1-SRG1-PP1-TXRX</link-id>
-        <opposite-link xmlns="http://org/openroadm/common/network">ROADMC-SRG1-SRG1-PP1-TXRXtoXPDRC-XPDR1-XPDR1-NETWORK1</opposite-link>
+        <link-id>XPDRC01-XPDR1-XPDR1-NETWORK1toROADMC01-SRG1-SRG1-PP1-TXRX</link-id>
+        <opposite-link xmlns="http://org/openroadm/common/network">ROADMC01-SRG1-SRG1-PP1-TXRXtoXPDRC01-XPDR1-XPDR1-NETWORK1</opposite-link>
         <destination>
             <dest-tp>SRG1-PP1-TXRX</dest-tp>
-            <dest-node>ROADMC-SRG1</dest-node>
+            <dest-node>ROADMC01-SRG1</dest-node>
         </destination>
         <source>
-            <source-node>XPDRC-XPDR1</source-node>
+            <source-node>XPDRC01-XPDR1</source-node>
             <source-tp>XPDR1-NETWORK1</source-tp>
         </source>
-        <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
     </link>
     <network-types>
         <openroadm-common-network xmlns="http://org/openroadm/common/network"></openroadm-common-network>
     </network-types>
     <node>
-        <node-id>ROADMC-SRG1</node-id>
+        <node-id>ROADMC01-SRG1</node-id>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP12-TXRX</tp-id>
-            <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-PP</tp-type>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP15-TXRX</tp-id>
-            <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-PP</tp-type>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP1-TXRX</tp-id>
-            <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-PP</tp-type>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP2-TXRX</tp-id>
-            <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-PP</tp-type>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-CP-TXRX</tp-id>
-            <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-CP</tp-type>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-CP</tp-type>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP5-TXRX</tp-id>
-            <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-PP</tp-type>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP8-TXRX</tp-id>
-            <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-PP</tp-type>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP6-TXRX</tp-id>
-            <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-PP</tp-type>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP9-TXRX</tp-id>
-            <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-PP</tp-type>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP3-TXRX</tp-id>
-            <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-PP</tp-type>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP10-TXRX</tp-id>
-            <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-PP</tp-type>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP14-TXRX</tp-id>
-            <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-PP</tp-type>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP16-TXRX</tp-id>
-            <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-PP</tp-type>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP7-TXRX</tp-id>
-            <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-PP</tp-type>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP11-TXRX</tp-id>
-            <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-PP</tp-type>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP13-TXRX</tp-id>
-            <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-PP</tp-type>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP4-TXRX</tp-id>
-            <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-PP</tp-type>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
         </termination-point>
         <supporting-node>
             <network-ref>openroadm-network</network-ref>
-            <node-ref>ROADMC</node-ref>
+            <node-ref>ROADMC01</node-ref>
         </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
             <available-wavelengths>
@@ -637,23 +637,23 @@
                 <index>28</index>
             </available-wavelengths>
         </srg-attributes>
-        <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+        <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
     </node>
     <node>
-        <node-id>ROADMC-DEG1</node-id>
+        <node-id>ROADMC01-DEG1</node-id>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>DEG1-CTP-TXRX</tp-id>
-            <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TXRX-CTP</tp-type>
+            <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TXRX-CTP</tp-type>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>DEG1-TTP-TXRX</tp-id>
-            <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TXRX-TTP</tp-type>
+            <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TXRX-TTP</tp-type>
         </termination-point>
         <supporting-node>
             <network-ref>openroadm-network</network-ref>
-            <node-ref>ROADMC</node-ref>
+            <node-ref>ROADMC01</node-ref>
         </supporting-node>
-        <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+        <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
         <degree-attributes xmlns="http://org/openroadm/network/topology">
             <degree-number>1</degree-number>
             <available-wavelengths>
@@ -947,20 +947,20 @@
         </degree-attributes>
     </node>
     <node>
-        <node-id>ROADMC-DEG2</node-id>
+        <node-id>ROADMC01-DEG2</node-id>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>DEG2-TTP-TXRX</tp-id>
-            <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TXRX-TTP</tp-type>
+            <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TXRX-TTP</tp-type>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>DEG2-CTP-TXRX</tp-id>
-            <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TXRX-CTP</tp-type>
+            <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TXRX-CTP</tp-type>
         </termination-point>
         <supporting-node>
             <network-ref>openroadm-network</network-ref>
-            <node-ref>ROADMC</node-ref>
+            <node-ref>ROADMC01</node-ref>
         </supporting-node>
-        <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+        <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
         <degree-attributes xmlns="http://org/openroadm/network/topology">
             <degree-number>2</degree-number>
             <available-wavelengths>
@@ -1254,78 +1254,78 @@
         </degree-attributes>
     </node>
     <node>
-        <node-id>ROADMA-SRG1</node-id>
+        <node-id>ROADMA01-SRG1</node-id>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP12-TXRX</tp-id>
-            <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-PP</tp-type>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP15-TXRX</tp-id>
-            <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-PP</tp-type>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP1-TXRX</tp-id>
-            <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-PP</tp-type>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP2-TXRX</tp-id>
-            <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-PP</tp-type>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-CP-TXRX</tp-id>
-            <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-CP</tp-type>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-CP</tp-type>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP5-TXRX</tp-id>
-            <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-PP</tp-type>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP8-TXRX</tp-id>
-            <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-PP</tp-type>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP6-TXRX</tp-id>
-            <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-PP</tp-type>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP9-TXRX</tp-id>
-            <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-PP</tp-type>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP3-TXRX</tp-id>
-            <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-PP</tp-type>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP10-TXRX</tp-id>
-            <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-PP</tp-type>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP14-TXRX</tp-id>
-            <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-PP</tp-type>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP16-TXRX</tp-id>
-            <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-PP</tp-type>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP7-TXRX</tp-id>
-            <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-PP</tp-type>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP11-TXRX</tp-id>
-            <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-PP</tp-type>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP13-TXRX</tp-id>
-            <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-PP</tp-type>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP4-TXRX</tp-id>
-            <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-PP</tp-type>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
         </termination-point>
         <supporting-node>
             <network-ref>openroadm-network</network-ref>
-            <node-ref>ROADMA</node-ref>
+            <node-ref>ROADMA01</node-ref>
         </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
             <available-wavelengths>
@@ -1617,13 +1617,13 @@
                 <index>28</index>
             </available-wavelengths>
         </srg-attributes>
-        <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+        <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
     </node>
     <node>
-        <node-id>XPDRA-XPDR1</node-id>
+        <node-id>XPDRA01-XPDR1</node-id>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>XPDR1-NETWORK2</tp-id>
-            <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+            <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
             <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">
                 <tail-equipment-id>XPDR1-NETWORK1</tail-equipment-id>
             </xpdr-client-attributes>
@@ -1633,21 +1633,21 @@
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>XPDR1-CLIENT2</tp-id>
-            <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+            <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
             <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">
                 <tail-equipment-id>XPDR1-NETWORK2</tail-equipment-id>
             </xpdr-client-attributes>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>XPDR1-CLIENT1</tp-id>
-            <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+            <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
             <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">
                 <tail-equipment-id>XPDR1-NETWORK1</tail-equipment-id>
             </xpdr-client-attributes>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>XPDR1-NETWORK1</tp-id>
-            <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+            <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
             <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">
                 <tail-equipment-id>XPDR1-NETWORK1</tail-equipment-id>
             </xpdr-client-attributes>
@@ -1657,25 +1657,25 @@
         </termination-point>
         <supporting-node>
             <network-ref>openroadm-network</network-ref>
-            <node-ref>XPDRA</node-ref>
+            <node-ref>XPDRA01</node-ref>
         </supporting-node>
-        <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
+        <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
     </node>
     <node>
-        <node-id>ROADMA-DEG2</node-id>
+        <node-id>ROADMA01-DEG2</node-id>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>DEG2-TTP-TXRX</tp-id>
-            <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TXRX-TTP</tp-type>
+            <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TXRX-TTP</tp-type>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>DEG2-CTP-TXRX</tp-id>
-            <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TXRX-CTP</tp-type>
+            <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TXRX-CTP</tp-type>
         </termination-point>
         <supporting-node>
             <network-ref>openroadm-network</network-ref>
-            <node-ref>ROADMA</node-ref>
+            <node-ref>ROADMA01</node-ref>
         </supporting-node>
-        <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+        <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
         <degree-attributes xmlns="http://org/openroadm/network/topology">
             <degree-number>2</degree-number>
             <available-wavelengths>
@@ -1969,10 +1969,10 @@
         </degree-attributes>
     </node>
     <node>
-        <node-id>XPDRC-XPDR1</node-id>
+        <node-id>XPDRC01-XPDR1</node-id>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>XPDR1-NETWORK2</tp-id>
-            <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+            <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
             <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">
                 <tail-equipment-id>XPDR1-NETWORK1</tail-equipment-id>
             </xpdr-client-attributes>
@@ -1982,21 +1982,21 @@
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>XPDR1-CLIENT2</tp-id>
-            <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+            <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
             <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">
                 <tail-equipment-id>XPDR1-NETWORK2</tail-equipment-id>
             </xpdr-client-attributes>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>XPDR1-CLIENT1</tp-id>
-            <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+            <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
             <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">
                 <tail-equipment-id>XPDR1-NETWORK1</tail-equipment-id>
             </xpdr-client-attributes>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>XPDR1-NETWORK1</tp-id>
-            <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+            <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
             <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">
                 <tail-equipment-id>XPDR1-NETWORK1</tail-equipment-id>
             </xpdr-client-attributes>
@@ -2006,25 +2006,25 @@
         </termination-point>
         <supporting-node>
             <network-ref>openroadm-network</network-ref>
-            <node-ref>XPDRC</node-ref>
+            <node-ref>XPDRC01</node-ref>
         </supporting-node>
-        <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
+        <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
     </node>
     <node>
-        <node-id>ROADMA-DEG1</node-id>
+        <node-id>ROADMA01-DEG1</node-id>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>DEG1-CTP-TXRX</tp-id>
-            <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TXRX-CTP</tp-type>
+            <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TXRX-CTP</tp-type>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>DEG1-TTP-TXRX</tp-id>
-            <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TXRX-TTP</tp-type>
+            <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TXRX-TTP</tp-type>
         </termination-point>
         <supporting-node>
             <network-ref>openroadm-network</network-ref>
-            <node-ref>ROADMA</node-ref>
+            <node-ref>ROADMA01</node-ref>
         </supporting-node>
-        <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+        <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
         <degree-attributes xmlns="http://org/openroadm/network/topology">
             <degree-number>1</degree-number>
             <available-wavelengths>