Update naming following flexgrid specification

[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 e335b70c8edae3f899368e0855a118d779b8eab3..1a1f1086aae892af20e71f3f14a2375b329708fc 100644 (file)
--- a/tests/sample_configs/NW-for-test-5-4.xml
+++ b/tests/sample_configs/NW-for-test-5-4.xml
@@ -11,7 +11,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>s>
@@ -29,7 +29,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -47,7 +47,7 @@
         <map-name>cband</map-name>
         <start-edge-freq>191.325</start-edge-freq>
         <freq-map-granularity>6.25</freq-map-granularity>
-        <effective-bits>8</effective-bits>
+        <effective-bits>768</effective-bits>
         <freq-map>/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
         </freq-map>
       </avail-freq-maps>
@@ -62,21 +62,52 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
         </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>               </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>               </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-CP-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-CP-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP1-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP1-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP2-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP2-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP3-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP3-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP4-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP4-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+        </termination-point>
+
 </node>
 <node>        <node-id>XPONDER-1-1</node-id>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-1-1</node-ref>    </supporting-node>
@@ -134,7 +165,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -152,7 +183,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -170,7 +201,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -185,21 +216,52 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
         </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>               </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>               </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-CP-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-CP-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP1-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP1-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP2-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP2-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP3-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP3-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP4-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP4-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+        </termination-point>
+
 </node>
 <node>        <node-id>XPONDER-1-2</node-id>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-1-2</node-ref>    </supporting-node>
@@ -257,7 +319,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -275,7 +337,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -293,7 +355,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -308,21 +370,52 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
         </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>               </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>               </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-CP-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-CP-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP1-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP1-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP2-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP2-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP3-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP3-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP4-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP4-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+        </termination-point>
+
 </node>
 <node>        <node-id>XPONDER-1-3</node-id>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-1-3</node-ref>    </supporting-node>
@@ -380,7 +473,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -398,7 +491,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -416,7 +509,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -431,21 +524,52 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
         </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>               </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>               </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-CP-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-CP-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP1-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP1-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP2-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP2-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP3-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP3-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP4-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP4-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+        </termination-point>
+
 </node>
 <node>        <node-id>XPONDER-1-4</node-id>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-1-4</node-ref>    </supporting-node>
@@ -503,7 +627,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AP////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -521,7 +645,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AP////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -539,7 +663,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AP////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -554,21 +678,52 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AP////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
         </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>               </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>               </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-CP-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-CP-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP1-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP1-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP2-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP2-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP3-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP3-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP4-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP4-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+        </termination-point>
+
 </node>
 <node>        <node-id>XPONDER-2-1</node-id>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-2-1</node-ref>    </supporting-node>
@@ -626,7 +781,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AP////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -644,7 +799,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AP////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -662,7 +817,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AP////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -677,21 +832,52 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AP////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
         </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>               </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>               </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-CP-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-CP-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP1-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP1-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP2-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP2-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP3-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP3-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP4-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP4-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+        </termination-point>
+
 </node>
 <node>        <node-id>XPONDER-2-2</node-id>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-2-2</node-ref>    </supporting-node>
@@ -749,7 +935,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AP////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -767,7 +953,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AP////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -785,7 +971,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AP////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>>
@@ -800,21 +986,52 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AP////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>>
         </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>               </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>               </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-CP-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-CP-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP1-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP1-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP2-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP2-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP3-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP3-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP4-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP4-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+        </termination-point>
+
 </node>
 <node>        <node-id>XPONDER-2-3</node-id>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-2-3</node-ref>    </supporting-node>
@@ -872,7 +1089,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AP////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -890,7 +1107,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AP////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -908,7 +1125,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AP////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -923,21 +1140,52 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AP////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
         </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>               </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>               </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-CP-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-CP-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP1-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP1-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP2-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP2-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP3-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP3-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP4-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP4-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+        </termination-point>
+
 </node>
 <node>        <node-id>XPONDER-2-4</node-id>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-2-4</node-ref>    </supporting-node>
@@ -995,7 +1243,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -1013,7 +1261,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -1031,7 +1279,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -1046,21 +1294,52 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
         </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>               </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>               </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-CP-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-CP-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP1-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP1-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP2-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP2-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP3-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP3-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP4-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP4-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+        </termination-point>
+
 </node>
 <node>        <node-id>XPONDER-3-1</node-id>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-3-1</node-ref>    </supporting-node>
@@ -1118,7 +1397,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -1136,7 +1415,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -1154,7 +1433,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -1169,21 +1448,52 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>>
         </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>               </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>               </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-CP-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-CP-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP1-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP1-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP2-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP2-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP3-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP3-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP4-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP4-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+        </termination-point>
+
 </node>
 <node>        <node-id>XPONDER-3-2</node-id>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-3-2</node-ref>    </supporting-node>
@@ -1241,7 +1551,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -1259,7 +1569,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -1277,7 +1587,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -1292,21 +1602,52 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
         </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>               </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>               </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-CP-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-CP-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP1-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP1-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP2-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP2-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP3-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP3-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP4-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP4-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+        </termination-point>
+
 </node>
 <node>        <node-id>XPONDER-3-3</node-id>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-3-3</node-ref>    </supporting-node>
@@ -1364,7 +1705,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -1382,7 +1723,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -1400,7 +1741,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -1415,21 +1756,52 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
         </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>               </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>               </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-CP-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-CP-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP1-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP1-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP2-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP2-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP3-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP3-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP4-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP4-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+        </termination-point>
+
 </node>
 <node>        <node-id>XPONDER-3-4</node-id>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-3-4</node-ref>    </supporting-node>
@@ -1487,7 +1859,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAAAA/////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -1505,7 +1877,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAAAA/////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -1523,7 +1895,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAAAA/////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -1538,21 +1910,52 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAAAA/////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>>
         </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>               </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>               </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-CP-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-CP-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP1-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP1-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP2-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP2-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP3-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP3-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP4-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP4-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+        </termination-point>
+
 </node>
 <node>        <node-id>XPONDER-4-1</node-id>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-4-1</node-ref>    </supporting-node>
@@ -1610,7 +2013,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAAAA/////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -1628,7 +2031,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAAAA/////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -1646,7 +2049,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAAAA/////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -1661,21 +2064,52 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAAAA/////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
         </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>               </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>               </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-CP-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-CP-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP1-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP1-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP2-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP2-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP3-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP3-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP4-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP4-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+        </termination-point>
+
 </node>
 <node>        <node-id>XPONDER-4-2</node-id>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-4-2</node-ref>    </supporting-node>
@@ -1733,7 +2167,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAAAA/////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -1751,7 +2185,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAAAA/////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>>
@@ -1769,7 +2203,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAAAA/////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -1784,21 +2218,52 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAAAA/////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
         </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>               </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>               </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-CP-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-CP-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP1-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP1-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP2-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP2-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP3-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP3-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP4-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP4-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+        </termination-point>
+
 </node>
 <node>        <node-id>XPONDER-4-3</node-id>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-4-3</node-ref>    </supporting-node>
@@ -1856,7 +2321,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAAAA/////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -1874,7 +2339,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAAAA/////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>s>
@@ -1892,7 +2357,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAAAA/////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -1907,21 +2372,52 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAAAA/////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
         </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>               </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>               </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-CP-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-CP-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP1-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP1-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP2-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP2-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP3-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP3-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP4-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP4-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+        </termination-point>
+
 </node>
 <node>        <node-id>XPONDER-4-4</node-id>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-4-4</node-ref>    </supporting-node>
@@ -1979,7 +2475,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAAAAAAD///////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -1997,7 +2493,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAAAAAAD///////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -2015,7 +2511,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAAAAAAD///////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -2030,21 +2526,52 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAAAAAAD///////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
         </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>               </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>               </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-CP-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-CP-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP1-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP1-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP2-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP2-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP3-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP3-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP4-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP4-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+        </termination-point>
+
 </node>
 <node>        <node-id>XPONDER-5-1</node-id>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-5-1</node-ref>    </supporting-node>
@@ -2102,7 +2629,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAAAAAAD///////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -2120,7 +2647,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAAAAAAD///////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -2138,7 +2665,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAAAAAAD///////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -2153,21 +2680,52 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAAAAAAD///////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
         </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>               </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>               </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-CP-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-CP-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP1-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP1-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP2-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP2-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP3-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP3-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP4-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP4-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+        </termination-point>
+
 </node>
 <node>        <node-id>XPONDER-5-2</node-id>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-5-2</node-ref>    </supporting-node>
@@ -2225,7 +2783,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAAAAAAD///////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -2243,7 +2801,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAAAAAAD///////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -2261,7 +2819,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAAAAAAD///////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -2276,21 +2834,52 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAAAAAAD///////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
         </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>               </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>               </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-CP-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-CP-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP1-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP1-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP2-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP2-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP3-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP3-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP4-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP4-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+        </termination-point>
+
 </node>
 <node>        <node-id>XPONDER-5-3</node-id>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-5-3</node-ref>    </supporting-node>
@@ -2348,7 +2937,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAAAAAAD///////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -2366,7 +2955,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAAAAAAD///////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -2384,7 +2973,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAAAAAAD///////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -2399,21 +2988,52 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAAAAAAD///////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
         </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>               </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>               </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-CP-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-CP-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP1-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP1-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP2-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP2-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP3-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP3-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP4-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+        </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-PP4-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+        </termination-point>
+
 </node>
 <node>        <node-id>XPONDER-5-4</node-id>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-5-4</node-ref>    </supporting-node>