Portmapping-topologies code consolidation

[transportpce.git] / tests / sample_configs / NW-for-test-5-4.xml

diff --git a/tests/sample_configs/NW-for-test-5-4.xml b/tests/sample_configs/NW-for-test-5-4.xml
index 67d90913e289d26e8d3af2ff65edc14e98a1d9d4..e79275c45dc3efd5bc01975182910dc28107bf4f 100644 (file)
--- a/tests/sample_configs/NW-for-test-5-4.xml
+++ b/tests/sample_configs/NW-for-test-5-4.xml
@@ -18,7 +18,8 @@
         <available-wavelengths> <index>9</index> </available-wavelengths>
         <available-wavelengths> <index>10</index> </available-wavelengths>
         </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-1</node-ref>    </supporting-node></node>
+    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-1-1</node-ref>    </supporting-node>
+    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli11</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-1-1-DEG2</node-id>
     <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>
@@ -37,7 +38,8 @@
         <available-wavelengths> <index>9</index> </available-wavelengths>
         <available-wavelengths> <index>10</index> </available-wavelengths>
         </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-1</node-ref>    </supporting-node></node>
+    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-1-1</node-ref>    </supporting-node>
+    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli11</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-1-1-DEG3</node-id>
     <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>
@@ -56,9 +58,11 @@
         <available-wavelengths> <index>9</index> </available-wavelengths>
         <available-wavelengths> <index>10</index> </available-wavelengths>
         </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-1</node-ref>    </supporting-node></node>
+    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-1-1</node-ref>    </supporting-node>
+    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli11</node-ref>    </supporting-node></node>
 <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>
+        <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-1-1</node-ref>    </supporting-node>
+        <supporting-node><network-ref>clli-network</network-ref><node-ref>clli11</node-ref>    </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>1</index> </available-wavelengths>
         <available-wavelengths> <index>2</index> </available-wavelengths>
@@ -83,32 +87,49 @@
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>               </termination-point>
 </node>
 <node>        <node-id>XPONDER-1-1</node-id>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-1-1</node-ref>    </supporting-node>
+    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-1-1</node-ref>    </supporting-node>
+    <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE1</node-ref>    </supporting-node>
     <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/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/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/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/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/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/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/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-NW1-RX</tp-id>
+        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+    </termination-point>
 </node>
 <node>    <node-id>OpenROADM-1-2-DEG1</node-id>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
@@ -128,7 +149,8 @@
         <available-wavelengths> <index>9</index> </available-wavelengths>
         <available-wavelengths> <index>10</index> </available-wavelengths>
         </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-2</node-ref>    </supporting-node></node>
+    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-1-2</node-ref>    </supporting-node>
+    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli12</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-1-2-DEG2</node-id>
     <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>
@@ -147,7 +169,8 @@
         <available-wavelengths> <index>9</index> </available-wavelengths>
         <available-wavelengths> <index>10</index> </available-wavelengths>
         </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-2</node-ref>    </supporting-node></node>
+    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-1-2</node-ref>    </supporting-node>
+    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli12</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-1-2-DEG3</node-id>
     <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>
@@ -166,9 +189,11 @@
         <available-wavelengths> <index>9</index> </available-wavelengths>
         <available-wavelengths> <index>10</index> </available-wavelengths>
         </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-2</node-ref>    </supporting-node></node>
+    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-1-2</node-ref>    </supporting-node>
+    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli12</node-ref>    </supporting-node></node>
 <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>
+        <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-1-2</node-ref>    </supporting-node>
+        <supporting-node><network-ref>clli-network</network-ref><node-ref>clli12</node-ref>    </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>1</index> </available-wavelengths>
         <available-wavelengths> <index>2</index> </available-wavelengths>
@@ -193,32 +218,49 @@
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>               </termination-point>
 </node>
 <node>        <node-id>XPONDER-1-2</node-id>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-1-2</node-ref>    </supporting-node>
+    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-1-2</node-ref>    </supporting-node>
+    <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE1</node-ref>    </supporting-node>
     <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/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/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/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/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/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/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/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-NW1-RX</tp-id>
+        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+    </termination-point>
 </node>
 <node>    <node-id>OpenROADM-1-3-DEG1</node-id>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
@@ -238,7 +280,8 @@
         <available-wavelengths> <index>9</index> </available-wavelengths>
         <available-wavelengths> <index>10</index> </available-wavelengths>
         </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-3</node-ref>    </supporting-node></node>
+    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-1-3</node-ref>    </supporting-node>
+    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli13</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-1-3-DEG2</node-id>
     <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>
@@ -257,7 +300,8 @@
         <available-wavelengths> <index>9</index> </available-wavelengths>
         <available-wavelengths> <index>10</index> </available-wavelengths>
         </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-3</node-ref>    </supporting-node></node>
+    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-1-3</node-ref>    </supporting-node>
+    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli13</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-1-3-DEG3</node-id>
     <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>
@@ -276,9 +320,11 @@
         <available-wavelengths> <index>9</index> </available-wavelengths>
         <available-wavelengths> <index>10</index> </available-wavelengths>
         </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-3</node-ref>    </supporting-node></node>
+    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-1-3</node-ref>    </supporting-node>
+    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli13</node-ref>    </supporting-node></node>
 <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>
+        <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-1-3</node-ref>    </supporting-node>
+        <supporting-node><network-ref>clli-network</network-ref><node-ref>clli13</node-ref>    </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>1</index> </available-wavelengths>
         <available-wavelengths> <index>2</index> </available-wavelengths>
@@ -303,32 +349,49 @@
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>               </termination-point>
 </node>
 <node>        <node-id>XPONDER-1-3</node-id>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-1-3</node-ref>    </supporting-node>
+    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-1-3</node-ref>    </supporting-node>
+    <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE1</node-ref>    </supporting-node>
     <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/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/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/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/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/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/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/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-NW1-RX</tp-id>
+        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+    </termination-point>
 </node>
 <node>    <node-id>OpenROADM-1-4-DEG1</node-id>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
@@ -348,7 +411,8 @@
         <available-wavelengths> <index>9</index> </available-wavelengths>
         <available-wavelengths> <index>10</index> </available-wavelengths>
         </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-4</node-ref>    </supporting-node></node>
+    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-1-4</node-ref>    </supporting-node>
+    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli14</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-1-4-DEG2</node-id>
     <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>
@@ -367,7 +431,8 @@
         <available-wavelengths> <index>9</index> </available-wavelengths>
         <available-wavelengths> <index>10</index> </available-wavelengths>
         </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-4</node-ref>    </supporting-node></node>
+    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-1-4</node-ref>    </supporting-node>
+    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli14</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-1-4-DEG3</node-id>
     <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>
@@ -386,9 +451,11 @@
         <available-wavelengths> <index>9</index> </available-wavelengths>
         <available-wavelengths> <index>10</index> </available-wavelengths>
         </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-4</node-ref>    </supporting-node></node>
+    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-1-4</node-ref>    </supporting-node>
+    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli14</node-ref>    </supporting-node></node>
 <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>
+        <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-1-4</node-ref>    </supporting-node>
+        <supporting-node><network-ref>clli-network</network-ref><node-ref>clli14</node-ref>    </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>1</index> </available-wavelengths>
         <available-wavelengths> <index>2</index> </available-wavelengths>
@@ -413,32 +480,49 @@
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>               </termination-point>
 </node>
 <node>        <node-id>XPONDER-1-4</node-id>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-1-4</node-ref>    </supporting-node>
+    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-1-4</node-ref>    </supporting-node>
+    <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE1</node-ref>    </supporting-node>
     <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/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/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/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/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/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/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/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-NW1-RX</tp-id>
+        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+    </termination-point>
 </node>
 <node>    <node-id>OpenROADM-2-1-DEG1</node-id>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
@@ -452,7 +536,8 @@
         <available-wavelengths> <index>4</index> </available-wavelengths>
         <available-wavelengths> <index>5</index> </available-wavelengths>
          </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-1</node-ref>    </supporting-node></node>
+    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-2-1</node-ref>    </supporting-node>
+    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli21</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-2-1-DEG2</node-id>
     <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>
@@ -465,7 +550,8 @@
         <available-wavelengths> <index>4</index> </available-wavelengths>
         <available-wavelengths> <index>5</index> </available-wavelengths>
         </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-1</node-ref>    </supporting-node></node>
+    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-2-1</node-ref>    </supporting-node>
+    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli21</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-2-1-DEG3</node-id>
     <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>
@@ -478,9 +564,11 @@
         <available-wavelengths> <index>4</index> </available-wavelengths>
         <available-wavelengths> <index>5</index> </available-wavelengths>
         </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-1</node-ref>    </supporting-node></node>
+    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-2-1</node-ref>    </supporting-node>
+    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli21</node-ref>    </supporting-node></node>
 <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>
+        <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-2-1</node-ref>    </supporting-node>
+        <supporting-node><network-ref>clli-network</network-ref><node-ref>clli21</node-ref>    </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>2</index> </available-wavelengths>
         <available-wavelengths> <index>3</index> </available-wavelengths>
@@ -499,32 +587,49 @@
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>               </termination-point>
 </node>
 <node>        <node-id>XPONDER-2-1</node-id>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-2-1</node-ref>    </supporting-node>
+    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-2-1</node-ref>    </supporting-node>
+    <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE2</node-ref>    </supporting-node>
     <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/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/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/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/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/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/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/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-NW1-RX</tp-id>
+        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+    </termination-point>
 </node>
 <node>    <node-id>OpenROADM-2-2-DEG1</node-id>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
@@ -538,7 +643,8 @@
         <available-wavelengths> <index>4</index> </available-wavelengths>
         <available-wavelengths> <index>5</index> </available-wavelengths>
         </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-2</node-ref>    </supporting-node></node>
+    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-2-2</node-ref>    </supporting-node>
+    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli22</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-2-2-DEG2</node-id>
     <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>
@@ -551,7 +657,8 @@
         <available-wavelengths> <index>4</index> </available-wavelengths>
         <available-wavelengths> <index>5</index> </available-wavelengths>
         </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-2</node-ref>    </supporting-node></node>
+    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-2-2</node-ref>    </supporting-node>
+    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli22</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-2-2-DEG3</node-id>
     <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>
@@ -564,9 +671,11 @@
         <available-wavelengths> <index>4</index> </available-wavelengths>
         <available-wavelengths> <index>5</index> </available-wavelengths>
         </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-2</node-ref>    </supporting-node></node>
+    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-2-2</node-ref>    </supporting-node>
+    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli22</node-ref>    </supporting-node></node>
 <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>
+        <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-2-2</node-ref>    </supporting-node>
+        <supporting-node><network-ref>clli-network</network-ref><node-ref>clli22</node-ref>    </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>2</index> </available-wavelengths>
         <available-wavelengths> <index>3</index> </available-wavelengths>
@@ -585,32 +694,49 @@
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>               </termination-point>
 </node>
 <node>        <node-id>XPONDER-2-2</node-id>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-2-2</node-ref>    </supporting-node>
+    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-2-2</node-ref>    </supporting-node>
+    <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE2</node-ref>    </supporting-node>
     <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/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/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/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/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/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/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/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-NW1-RX</tp-id>
+        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+    </termination-point>
 </node>
 <node>    <node-id>OpenROADM-2-3-DEG1</node-id>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
@@ -624,7 +750,8 @@
         <available-wavelengths> <index>4</index> </available-wavelengths>
         <available-wavelengths> <index>5</index> </available-wavelengths>
         </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-3</node-ref>    </supporting-node></node>
+    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-2-3</node-ref>    </supporting-node>
+    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli23</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-2-3-DEG2</node-id>
     <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>
@@ -637,7 +764,8 @@
         <available-wavelengths> <index>4</index> </available-wavelengths>
         <available-wavelengths> <index>5</index> </available-wavelengths>
         </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-3</node-ref>    </supporting-node></node>
+    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-2-3</node-ref>    </supporting-node>
+    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli23</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-2-3-DEG3</node-id>
     <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>
@@ -650,9 +778,11 @@
         <available-wavelengths> <index>4</index> </available-wavelengths>
         <available-wavelengths> <index>5</index> </available-wavelengths>
         </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-3</node-ref>    </supporting-node></node>
+    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-2-3</node-ref>    </supporting-node>
+    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli23</node-ref>    </supporting-node></node>
 <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>
+        <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-2-3</node-ref>    </supporting-node>
+        <supporting-node><network-ref>clli-network</network-ref><node-ref>clli23</node-ref>    </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>2</index> </available-wavelengths>
         <available-wavelengths> <index>3</index> </available-wavelengths>
@@ -671,32 +801,49 @@
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>               </termination-point>
 </node>
 <node>        <node-id>XPONDER-2-3</node-id>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-2-3</node-ref>    </supporting-node>
+    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-2-3</node-ref>    </supporting-node>
+    <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE2</node-ref>    </supporting-node>
     <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/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/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/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/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/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/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/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-NW1-RX</tp-id>
+        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+    </termination-point>
 </node>
 <node>    <node-id>OpenROADM-2-4-DEG1</node-id>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
@@ -710,7 +857,8 @@
         <available-wavelengths> <index>4</index> </available-wavelengths>
         <available-wavelengths> <index>5</index> </available-wavelengths>
         </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-4</node-ref>    </supporting-node></node>
+    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-2-4</node-ref>    </supporting-node>
+    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli24</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-2-4-DEG2</node-id>
     <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>
@@ -723,7 +871,8 @@
         <available-wavelengths> <index>4</index> </available-wavelengths>
         <available-wavelengths> <index>5</index> </available-wavelengths>
         </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-4</node-ref>    </supporting-node></node>
+    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-2-4</node-ref>    </supporting-node>
+    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli24</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-2-4-DEG3</node-id>
     <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>
@@ -736,9 +885,11 @@
         <available-wavelengths> <index>4</index> </available-wavelengths>
         <available-wavelengths> <index>5</index> </available-wavelengths>
         </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-4</node-ref>    </supporting-node></node>
+    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-2-4</node-ref>    </supporting-node>
+    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli24</node-ref>    </supporting-node></node>
 <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>
+        <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-2-4</node-ref>    </supporting-node>
+        <supporting-node><network-ref>clli-network</network-ref><node-ref>clli24</node-ref>    </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>2</index> </available-wavelengths>
         <available-wavelengths> <index>3</index> </available-wavelengths>
@@ -757,32 +908,49 @@
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>               </termination-point>
 </node>
 <node>        <node-id>XPONDER-2-4</node-id>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-2-4</node-ref>    </supporting-node>
+    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-2-4</node-ref>    </supporting-node>
+    <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE2</node-ref>    </supporting-node>
     <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/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/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/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/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/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/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/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-NW1-RX</tp-id>
+        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+    </termination-point>
 </node>
 <node>    <node-id>OpenROADM-3-1-DEG1</node-id>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
@@ -800,7 +968,8 @@
         <available-wavelengths> <index>11</index> </available-wavelengths>
         <available-wavelengths> <index>12</index> </available-wavelengths>
         </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-1</node-ref>    </supporting-node></node>
+    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-3-1</node-ref>    </supporting-node>
+    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli31</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-3-1-DEG2</node-id>
     <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>
@@ -817,7 +986,8 @@
         <available-wavelengths> <index>11</index> </available-wavelengths>
         <available-wavelengths> <index>12</index> </available-wavelengths>
         </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-1</node-ref>    </supporting-node></node>
+    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-3-1</node-ref>    </supporting-node>
+    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli31</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-3-1-DEG3</node-id>
     <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>
@@ -834,9 +1004,11 @@
         <available-wavelengths> <index>11</index> </available-wavelengths>
         <available-wavelengths> <index>12</index> </available-wavelengths>
         </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-1</node-ref>    </supporting-node></node>
+    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-3-1</node-ref>    </supporting-node>
+    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli31</node-ref>    </supporting-node></node>
 <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>
+        <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-3-1</node-ref>    </supporting-node>
+        <supporting-node><network-ref>clli-network</network-ref><node-ref>clli31</node-ref>    </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>5</index> </available-wavelengths>
         <available-wavelengths> <index>6</index> </available-wavelengths>
@@ -859,32 +1031,49 @@
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>               </termination-point>
 </node>
 <node>        <node-id>XPONDER-3-1</node-id>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-3-1</node-ref>    </supporting-node>
+    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-3-1</node-ref>    </supporting-node>
+    <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE3</node-ref>    </supporting-node>
     <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/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/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/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/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/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/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/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-NW1-RX</tp-id>
+        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+    </termination-point>
 </node>
 <node>    <node-id>OpenROADM-3-2-DEG1</node-id>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
@@ -902,7 +1091,8 @@
         <available-wavelengths> <index>11</index> </available-wavelengths>
         <available-wavelengths> <index>12</index> </available-wavelengths>
         </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-2</node-ref>    </supporting-node></node>
+    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-3-2</node-ref>    </supporting-node>
+    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli32</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-3-2-DEG2</node-id>
     <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>
@@ -919,7 +1109,8 @@
         <available-wavelengths> <index>11</index> </available-wavelengths>
         <available-wavelengths> <index>12</index> </available-wavelengths>
         </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-2</node-ref>    </supporting-node></node>
+    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-3-2</node-ref>    </supporting-node>
+    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli32</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-3-2-DEG3</node-id>
     <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>
@@ -936,9 +1127,11 @@
         <available-wavelengths> <index>11</index> </available-wavelengths>
         <available-wavelengths> <index>12</index> </available-wavelengths>
         </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-2</node-ref>    </supporting-node></node>
+    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-3-2</node-ref>    </supporting-node>
+    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli32</node-ref>    </supporting-node></node>
 <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>
+        <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-3-2</node-ref>    </supporting-node>
+        <supporting-node><network-ref>clli-network</network-ref><node-ref>clli32</node-ref>    </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>5</index> </available-wavelengths>
         <available-wavelengths> <index>6</index> </available-wavelengths>
@@ -961,32 +1154,49 @@
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>               </termination-point>
 </node>
 <node>        <node-id>XPONDER-3-2</node-id>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-3-2</node-ref>    </supporting-node>
+    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-3-2</node-ref>    </supporting-node>
+    <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE3</node-ref>    </supporting-node>
     <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/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/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/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/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/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/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/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-NW1-RX</tp-id>
+        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+    </termination-point>
 </node>
 <node>    <node-id>OpenROADM-3-3-DEG1</node-id>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
@@ -1004,7 +1214,8 @@
         <available-wavelengths> <index>11</index> </available-wavelengths>
         <available-wavelengths> <index>12</index> </available-wavelengths>
         </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-3</node-ref>    </supporting-node></node>
+    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-3-3</node-ref>    </supporting-node>
+    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli33</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-3-3-DEG2</node-id>
     <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>
@@ -1021,7 +1232,8 @@
         <available-wavelengths> <index>11</index> </available-wavelengths>
         <available-wavelengths> <index>12</index> </available-wavelengths>
         </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-3</node-ref>    </supporting-node></node>
+    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-3-3</node-ref>    </supporting-node>
+    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli33</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-3-3-DEG3</node-id>
     <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>
@@ -1038,9 +1250,11 @@
         <available-wavelengths> <index>11</index> </available-wavelengths>
         <available-wavelengths> <index>12</index> </available-wavelengths>
         </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-3</node-ref>    </supporting-node></node>
+    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-3-3</node-ref>    </supporting-node>
+    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli33</node-ref>    </supporting-node></node>
 <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>
+        <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-3-3</node-ref>    </supporting-node>
+    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli33</node-ref>    </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>5</index> </available-wavelengths>
         <available-wavelengths> <index>6</index> </available-wavelengths>
@@ -1063,32 +1277,49 @@
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>               </termination-point>
 </node>
 <node>        <node-id>XPONDER-3-3</node-id>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-3-3</node-ref>    </supporting-node>
+    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-3-3</node-ref>    </supporting-node>
+    <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE3</node-ref>    </supporting-node>
     <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/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/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/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/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/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/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/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-NW1-RX</tp-id>
+        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+    </termination-point>
 </node>
 <node>    <node-id>OpenROADM-3-4-DEG1</node-id>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
@@ -1106,7 +1337,8 @@
         <available-wavelengths> <index>11</index> </available-wavelengths>
         <available-wavelengths> <index>12</index> </available-wavelengths>
         </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-4</node-ref>    </supporting-node></node>
+    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-3-4</node-ref>    </supporting-node>
+    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli34</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-3-4-DEG2</node-id>
     <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>
@@ -1123,7 +1355,8 @@
         <available-wavelengths> <index>11</index> </available-wavelengths>
         <available-wavelengths> <index>12</index> </available-wavelengths>
         </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-4</node-ref>    </supporting-node></node>
+    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-3-4</node-ref>    </supporting-node>
+    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli34</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-3-4-DEG3</node-id>
     <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>
@@ -1140,9 +1373,11 @@
         <available-wavelengths> <index>11</index> </available-wavelengths>
         <available-wavelengths> <index>12</index> </available-wavelengths>
         </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-4</node-ref>    </supporting-node></node>
+    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-3-4</node-ref>    </supporting-node>
+    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli34</node-ref>    </supporting-node></node>
 <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>
+        <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-3-4</node-ref>    </supporting-node>
+        <supporting-node><network-ref>clli-network</network-ref><node-ref>clli34</node-ref>    </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>5</index> </available-wavelengths>
         <available-wavelengths> <index>6</index> </available-wavelengths>
@@ -1165,32 +1400,49 @@
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>               </termination-point>
 </node>
 <node>        <node-id>XPONDER-3-4</node-id>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-3-4</node-ref>    </supporting-node>
+    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-3-4</node-ref>    </supporting-node>
+    <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE3</node-ref>    </supporting-node>
     <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/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/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/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/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/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/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/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-NW1-RX</tp-id>
+        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+    </termination-point>
 </node>
 <node>    <node-id>OpenROADM-4-1-DEG1</node-id>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
@@ -1207,7 +1459,8 @@
         <available-wavelengths> <index>12</index> </available-wavelengths>
         <available-wavelengths> <index>13</index> </available-wavelengths>
         </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-1</node-ref>    </supporting-node></node>
+    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-4-1</node-ref>    </supporting-node>
+    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli41</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-4-1-DEG2</node-id>
     <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>
@@ -1223,7 +1476,8 @@
         <available-wavelengths> <index>12</index> </available-wavelengths>
         <available-wavelengths> <index>13</index> </available-wavelengths>
         </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-1</node-ref>    </supporting-node></node>
+    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-4-1</node-ref>    </supporting-node>
+    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli41</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-4-1-DEG3</node-id>
     <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>
@@ -1239,9 +1493,11 @@
         <available-wavelengths> <index>12</index> </available-wavelengths>
         <available-wavelengths> <index>13</index> </available-wavelengths>
         </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-1</node-ref>    </supporting-node></node>
+    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-4-1</node-ref>    </supporting-node>
+    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli41</node-ref>    </supporting-node></node>
 <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>
+        <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-4-1</node-ref>    </supporting-node>
+        <supporting-node><network-ref>clli-network</network-ref><node-ref>clli41</node-ref>    </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>7</index> </available-wavelengths>
         <available-wavelengths> <index>8</index> </available-wavelengths>
@@ -1263,32 +1519,49 @@
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>               </termination-point>
 </node>
 <node>        <node-id>XPONDER-4-1</node-id>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-4-1</node-ref>    </supporting-node>
+    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-4-1</node-ref>    </supporting-node>
+    <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE4</node-ref>    </supporting-node>
     <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/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/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/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/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/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/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/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-NW1-RX</tp-id>
+        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+    </termination-point>
 </node>
 <node>    <node-id>OpenROADM-4-2-DEG1</node-id>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
@@ -1305,7 +1578,8 @@
         <available-wavelengths> <index>12</index> </available-wavelengths>
         <available-wavelengths> <index>13</index> </available-wavelengths>
         </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-2</node-ref>    </supporting-node></node>
+    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-4-2</node-ref>    </supporting-node>
+    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli42</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-4-2-DEG2</node-id>
     <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>
@@ -1321,7 +1595,8 @@
         <available-wavelengths> <index>12</index> </available-wavelengths>
         <available-wavelengths> <index>13</index> </available-wavelengths>
         </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-2</node-ref>    </supporting-node></node>
+    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-4-2</node-ref>    </supporting-node>
+    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli42</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-4-2-DEG3</node-id>
     <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>
@@ -1337,9 +1612,11 @@
         <available-wavelengths> <index>12</index> </available-wavelengths>
         <available-wavelengths> <index>13</index> </available-wavelengths>
         </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-2</node-ref>    </supporting-node></node>
+    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-4-2</node-ref>    </supporting-node>
+    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli42</node-ref>    </supporting-node></node>
 <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>
+        <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-4-2</node-ref>    </supporting-node>
+        <supporting-node><network-ref>clli-network</network-ref><node-ref>clli42</node-ref>    </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>7</index> </available-wavelengths>
         <available-wavelengths> <index>8</index> </available-wavelengths>
@@ -1361,32 +1638,49 @@
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>               </termination-point>
 </node>
 <node>        <node-id>XPONDER-4-2</node-id>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-4-2</node-ref>    </supporting-node>
+    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-4-2</node-ref>    </supporting-node>
+    <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE4</node-ref>    </supporting-node>
     <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/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/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/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/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/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/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/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-NW1-RX</tp-id>
+        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+    </termination-point>
 </node>
 <node>    <node-id>OpenROADM-4-3-DEG1</node-id>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
@@ -1403,7 +1697,8 @@
         <available-wavelengths> <index>12</index> </available-wavelengths>
         <available-wavelengths> <index>13</index> </available-wavelengths>
         </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-3</node-ref>    </supporting-node></node>
+    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-4-3</node-ref>    </supporting-node>
+    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli43</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-4-3-DEG2</node-id>
     <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>
@@ -1419,7 +1714,8 @@
         <available-wavelengths> <index>12</index> </available-wavelengths>
         <available-wavelengths> <index>13</index> </available-wavelengths>
         </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-3</node-ref>    </supporting-node></node>
+    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-4-3</node-ref>    </supporting-node>
+    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli43</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-4-3-DEG3</node-id>
     <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>
@@ -1435,9 +1731,11 @@
         <available-wavelengths> <index>12</index> </available-wavelengths>
         <available-wavelengths> <index>13</index> </available-wavelengths>
         </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-3</node-ref>    </supporting-node></node>
+    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-4-3</node-ref>    </supporting-node>
+    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli43</node-ref>    </supporting-node></node>
 <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>
+        <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-4-3</node-ref>    </supporting-node>
+        <supporting-node><network-ref>clli-network</network-ref><node-ref>clli43</node-ref>    </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>7</index> </available-wavelengths>
         <available-wavelengths> <index>8</index> </available-wavelengths>
@@ -1459,32 +1757,49 @@
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>               </termination-point>
 </node>
 <node>        <node-id>XPONDER-4-3</node-id>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-4-3</node-ref>    </supporting-node>
+    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-4-3</node-ref>    </supporting-node>
+    <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE4</node-ref>    </supporting-node>
     <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/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/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/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/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/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/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/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-NW1-RX</tp-id>
+        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+    </termination-point>
 </node>
 <node>    <node-id>OpenROADM-4-4-DEG1</node-id>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
@@ -1501,7 +1816,8 @@
         <available-wavelengths> <index>12</index> </available-wavelengths>
         <available-wavelengths> <index>13</index> </available-wavelengths>
         </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-4</node-ref>    </supporting-node></node>
+    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-4-4</node-ref>    </supporting-node>
+    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli44</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-4-4-DEG2</node-id>
     <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>
@@ -1517,7 +1833,8 @@
         <available-wavelengths> <index>12</index> </available-wavelengths>
         <available-wavelengths> <index>13</index> </available-wavelengths>
         </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-4</node-ref>    </supporting-node></node>
+    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-4-4</node-ref>    </supporting-node>
+    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli44</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-4-4-DEG3</node-id>
     <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>
@@ -1533,9 +1850,11 @@
         <available-wavelengths> <index>12</index> </available-wavelengths>
         <available-wavelengths> <index>13</index> </available-wavelengths>
         </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-4</node-ref>    </supporting-node></node>
+    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-4-4</node-ref>    </supporting-node>
+    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli44</node-ref>    </supporting-node></node>
 <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>
+        <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-4-4</node-ref>    </supporting-node>
+        <supporting-node><network-ref>clli-network</network-ref><node-ref>clli44</node-ref>    </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>7</index> </available-wavelengths>
         <available-wavelengths> <index>8</index> </available-wavelengths>
@@ -1557,32 +1876,49 @@
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>               </termination-point>
 </node>
 <node>        <node-id>XPONDER-4-4</node-id>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-4-4</node-ref>    </supporting-node>
+    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-4-4</node-ref>    </supporting-node>
+    <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE4</node-ref>    </supporting-node>
     <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/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/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/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/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/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/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/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-NW1-RX</tp-id>
+        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+    </termination-point>
 </node>
 <node>    <node-id>OpenROADM-5-1-DEG1</node-id>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
@@ -1598,7 +1934,8 @@
         <available-wavelengths> <index>13</index> </available-wavelengths>
         <available-wavelengths> <index>14</index> </available-wavelengths>
         </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-1</node-ref>    </supporting-node></node>
+    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-5-1</node-ref>    </supporting-node>
+    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli51</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-5-1-DEG2</node-id>
     <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>
@@ -1613,7 +1950,8 @@
         <available-wavelengths> <index>13</index> </available-wavelengths>
         <available-wavelengths> <index>14</index> </available-wavelengths>
         </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-1</node-ref>    </supporting-node></node>
+    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-5-1</node-ref>    </supporting-node>
+    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli51</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-5-1-DEG3</node-id>
     <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>
@@ -1628,9 +1966,11 @@
         <available-wavelengths> <index>13</index> </available-wavelengths>
         <available-wavelengths> <index>14</index> </available-wavelengths>
         </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-1</node-ref>    </supporting-node></node>
+    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-5-1</node-ref>    </supporting-node>
+    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli51</node-ref>    </supporting-node></node>
 <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>
+        <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-5-1</node-ref>    </supporting-node>
+        <supporting-node><network-ref>clli-network</network-ref><node-ref>clli51</node-ref>    </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>9</index> </available-wavelengths>
         <available-wavelengths> <index>10</index> </available-wavelengths>
@@ -1651,32 +1991,49 @@
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>               </termination-point>
 </node>
 <node>        <node-id>XPONDER-5-1</node-id>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-5-1</node-ref>    </supporting-node>
+    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-5-1</node-ref>    </supporting-node>
+    <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE5</node-ref>    </supporting-node>
     <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/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/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/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/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/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/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/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-NW1-RX</tp-id>
+        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+    </termination-point>
 </node>
 <node>    <node-id>OpenROADM-5-2-DEG1</node-id>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
@@ -1692,7 +2049,8 @@
         <available-wavelengths> <index>13</index> </available-wavelengths>
         <available-wavelengths> <index>14</index> </available-wavelengths>
         </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-2</node-ref>    </supporting-node></node>
+    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-5-2</node-ref>    </supporting-node>
+    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli52</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-5-2-DEG2</node-id>
     <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>
@@ -1707,7 +2065,8 @@
         <available-wavelengths> <index>13</index> </available-wavelengths>
         <available-wavelengths> <index>14</index> </available-wavelengths>
         </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-2</node-ref>    </supporting-node></node>
+    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-5-2</node-ref>    </supporting-node>
+    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli52</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-5-2-DEG3</node-id>
     <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>
@@ -1722,9 +2081,11 @@
         <available-wavelengths> <index>13</index> </available-wavelengths>
         <available-wavelengths> <index>14</index> </available-wavelengths>
         </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-2</node-ref>    </supporting-node></node>
+    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-5-2</node-ref>    </supporting-node>
+    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli52</node-ref>    </supporting-node></node>
 <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>
+        <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-5-2</node-ref>    </supporting-node>
+        <supporting-node><network-ref>clli-network</network-ref><node-ref>clli52</node-ref>    </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>9</index> </available-wavelengths>
         <available-wavelengths> <index>10</index> </available-wavelengths>
@@ -1745,32 +2106,49 @@
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>               </termination-point>
 </node>
 <node>        <node-id>XPONDER-5-2</node-id>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-5-2</node-ref>    </supporting-node>
+    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-5-2</node-ref>    </supporting-node>
+    <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE5</node-ref>    </supporting-node>
     <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/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/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/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/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/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/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/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-NW1-RX</tp-id>
+        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+    </termination-point>
 </node>
 <node>    <node-id>OpenROADM-5-3-DEG1</node-id>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
@@ -1786,7 +2164,8 @@
         <available-wavelengths> <index>13</index> </available-wavelengths>
         <available-wavelengths> <index>14</index> </available-wavelengths>
         </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-3</node-ref>    </supporting-node></node>
+    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-5-3</node-ref>    </supporting-node>
+    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli53</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-5-3-DEG2</node-id>
     <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>
@@ -1801,7 +2180,8 @@
         <available-wavelengths> <index>13</index> </available-wavelengths>
         <available-wavelengths> <index>14</index> </available-wavelengths>
         </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-3</node-ref>    </supporting-node></node>
+    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-5-3</node-ref>    </supporting-node>
+    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli53</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-5-3-DEG3</node-id>
     <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>
@@ -1816,9 +2196,11 @@
         <available-wavelengths> <index>13</index> </available-wavelengths>
         <available-wavelengths> <index>14</index> </available-wavelengths>
         </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-3</node-ref>    </supporting-node></node>
+    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-5-3</node-ref>    </supporting-node>
+    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli53</node-ref>    </supporting-node></node>
 <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>
+        <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-5-3</node-ref>    </supporting-node>
+        <supporting-node><network-ref>clli-network</network-ref><node-ref>clli53</node-ref>    </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>9</index> </available-wavelengths>
         <available-wavelengths> <index>10</index> </available-wavelengths>
@@ -1839,32 +2221,49 @@
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>               </termination-point>
 </node>
 <node>        <node-id>XPONDER-5-3</node-id>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-5-3</node-ref>    </supporting-node>
+    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-5-3</node-ref>    </supporting-node>
+    <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE5</node-ref>    </supporting-node>
     <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/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/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/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/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/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/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/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-NW1-RX</tp-id>
+        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+    </termination-point>
 </node>
 <node>    <node-id>OpenROADM-5-4-DEG1</node-id>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
@@ -1880,7 +2279,8 @@
         <available-wavelengths> <index>13</index> </available-wavelengths>
         <available-wavelengths> <index>14</index> </available-wavelengths>
         </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-4</node-ref>    </supporting-node></node>
+    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-5-4</node-ref>    </supporting-node>
+    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli54</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-5-4-DEG2</node-id>
     <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>
@@ -1895,7 +2295,8 @@
         <available-wavelengths> <index>13</index> </available-wavelengths>
         <available-wavelengths> <index>14</index> </available-wavelengths>
         </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-4</node-ref>    </supporting-node></node>
+    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-5-4</node-ref>    </supporting-node>
+    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli54</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-5-4-DEG3</node-id>
     <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>
@@ -1910,9 +2311,11 @@
         <available-wavelengths> <index>13</index> </available-wavelengths>
         <available-wavelengths> <index>14</index> </available-wavelengths>
         </degree-attributes>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-4</node-ref>    </supporting-node></node>
+    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-5-4</node-ref>    </supporting-node>
+    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli54</node-ref>    </supporting-node></node>
 <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>
+        <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-5-4</node-ref>    </supporting-node>
+        <supporting-node><network-ref>clli-network</network-ref><node-ref>clli54</node-ref>    </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
         <available-wavelengths> <index>9</index> </available-wavelengths>
         <available-wavelengths> <index>10</index> </available-wavelengths>
@@ -1933,32 +2336,49 @@
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>               </termination-point>
 </node>
 <node>        <node-id>XPONDER-5-4</node-id>
-    <supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-5-4</node-ref>    </supporting-node>
+    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-5-4</node-ref>    </supporting-node>
+    <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE5</node-ref>    </supporting-node>
     <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/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/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/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/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/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/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/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-NW1-RX</tp-id>
+        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+    </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/common/network">XPONDER-NETWORK</tp-type>
+        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+    </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>
@@ -5064,4 +5484,4 @@
         </span>
     </OMS-attributes>
 </link>
-</network>
+</network>
\ No newline at end of file