X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=tests%2Fsample_configs%2Fhoneynode-topo.xml;h=86f80015b039260d09fb63742dc35484cecfc0c7;hb=48f7364d64b0c3095f4b5823c74374ac7d45d0ae;hp=bc18c1359391a093213686481fc08c37c82d6186;hpb=aafa2ea596dc9ea93b5ce5a7156ae68acf4b403f;p=transportpce.git

diff --git a/tests/sample_configs/honeynode-topo.xml b/tests/sample_configs/honeynode-topo.xml
index bc18c1359..86f80015b 100644
--- a/tests/sample_configs/honeynode-topo.xml
+++ b/tests/sample_configs/honeynode-topo.xml
@@ -3,6 +3,8 @@
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <link-id>ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX</link-id>
         <opposite-link xmlns="http://org/openroadm/common/network">ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX</opposite-link>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <destination>
             <dest-tp>DEG1-CTP-TXRX</dest-tp>
             <dest-node>ROADMA01-DEG1</dest-node>
@@ -16,6 +18,8 @@
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <link-id>ROADMC01-SRG1-SRG1-CP-TXRXtoROADMC01-DEG2-DEG2-CTP-TXRX</link-id>
         <opposite-link xmlns="http://org/openroadm/common/network">ROADMC01-DEG2-DEG2-CTP-TXRXtoROADMC01-SRG1-SRG1-CP-TXRX</opposite-link>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <destination>
             <dest-tp>DEG2-CTP-TXRX</dest-tp>
             <dest-node>ROADMC01-DEG2</dest-node>
@@ -29,6 +33,8 @@
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <link-id>ROADMA01-SRG1-SRG1-CP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX</link-id>
         <opposite-link xmlns="http://org/openroadm/common/network">ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-SRG1-SRG1-CP-TXRX</opposite-link>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <destination>
             <dest-tp>DEG1-CTP-TXRX</dest-tp>
             <dest-node>ROADMA01-DEG1</dest-node>
@@ -42,6 +48,8 @@
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <link-id>XPDRA01-XPDR1-XPDR1-NETWORK1toROADMA01-SRG1-SRG1-PP1-TXRX</link-id>
         <opposite-link xmlns="http://org/openroadm/common/network">ROADMA01-SRG1-SRG1-PP1-TXRXtoXPDRA01-XPDR1-XPDR1-NETWORK1</opposite-link>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <destination>
             <dest-tp>SRG1-PP1-TXRX</dest-tp>
             <dest-node>ROADMA01-SRG1</dest-node>
@@ -55,6 +63,8 @@
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <link-id>ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX</link-id>
         <opposite-link xmlns="http://org/openroadm/common/network">ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX</opposite-link>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <destination>
             <dest-tp>DEG2-CTP-TXRX</dest-tp>
             <dest-node>ROADMA01-DEG2</dest-node>
@@ -68,6 +78,8 @@
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <link-id>ROADMC01-DEG2-DEG2-CTP-TXRXtoROADMC01-DEG1-DEG1-CTP-TXRX</link-id>
         <opposite-link xmlns="http://org/openroadm/common/network">ROADMC01-DEG1-DEG1-CTP-TXRXtoROADMC01-DEG2-DEG2-CTP-TXRX</opposite-link>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <destination>
             <dest-tp>DEG1-CTP-TXRX</dest-tp>
             <dest-node>ROADMC01-DEG1</dest-node>
@@ -81,6 +93,8 @@
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <link-id>ROADMC01-DEG1-DEG1-CTP-TXRXtoROADMC01-DEG2-DEG2-CTP-TXRX</link-id>
         <opposite-link xmlns="http://org/openroadm/common/network">ROADMC01-DEG2-DEG2-CTP-TXRXtoROADMC01-DEG1-DEG1-CTP-TXRX</opposite-link>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <destination>
             <dest-tp>DEG2-CTP-TXRX</dest-tp>
             <dest-node>ROADMC01-DEG2</dest-node>
@@ -94,6 +108,8 @@
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <link-id>ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-SRG1-SRG1-CP-TXRX</link-id>
         <opposite-link xmlns="http://org/openroadm/common/network">ROADMA01-SRG1-SRG1-CP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX</opposite-link>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <destination>
             <dest-tp>SRG1-CP-TXRX</dest-tp>
             <dest-node>ROADMA01-SRG1</dest-node>
@@ -107,6 +123,8 @@
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <link-id>ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-SRG1-SRG1-CP-TXRX</link-id>
         <opposite-link xmlns="http://org/openroadm/common/network">ROADMA01-SRG1-SRG1-CP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX</opposite-link>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <destination>
             <dest-tp>SRG1-CP-TXRX</dest-tp>
             <dest-node>ROADMA01-SRG1</dest-node>
@@ -120,6 +138,10 @@
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <link-id>ROADMA01-DEG1-DEG1-TTP-TXRXtoROADMC01-DEG2-DEG2-TTP-TXRX</link-id>
         <opposite-link xmlns="http://org/openroadm/common/network">ROADMC01-DEG2-DEG2-TTP-TXRXtoROADMA01-DEG1-DEG1-TTP-TXRX</opposite-link>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        <clfi xmlns="http://org/openroadm/common/network">fiberA01C01</clfi>
+        <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
         <destination>
             <dest-tp>DEG2-TTP-TXRX</dest-tp>
             <dest-node>ROADMC01-DEG2</dest-node>
@@ -129,10 +151,7 @@
             <source-tp>DEG1-TTP-TXRX</source-tp>
         </source>
         <OMS-attributes xmlns="http://org/openroadm/network/topology">
-            <opposite-link>ROADMC01-DEG2-DEG2-TTP-TXRXtoROADMA01-DEG1-DEG1-TTP-TXRX</opposite-link>
-            <TE-metric>10</TE-metric>
             <span>
-                <clfi>fiber1</clfi>
                 <auto-spanloss>true</auto-spanloss>
                 <spanloss-base>11.4</spanloss-base>
                 <spanloss-current>12</spanloss-current>
@@ -151,6 +170,8 @@
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <link-id>ROADMA01-SRG1-SRG1-PP1-TXRXtoXPDRA01-XPDR1-XPDR1-NETWORK1</link-id>
         <opposite-link xmlns="http://org/openroadm/common/network">XPDRA01-XPDR1-XPDR1-NETWORK1toROADMA01-SRG1-SRG1-PP1-TXRX</opposite-link>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <destination>
             <dest-tp>XPDR1-NETWORK1</dest-tp>
             <dest-node>XPDRA01-XPDR1</dest-node>
@@ -164,6 +185,10 @@
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <link-id>ROADMC01-DEG2-DEG2-TTP-TXRXtoROADMA01-DEG1-DEG1-TTP-TXRX</link-id>
         <opposite-link xmlns="http://org/openroadm/common/network">ROADMA01-DEG1-DEG1-TTP-TXRXtoROADMC01-DEG2-DEG2-TTP-TXRX</opposite-link>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        <clfi xmlns="http://org/openroadm/common/network">fiberC01A01</clfi>
+        <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
         <destination>
             <dest-tp>DEG1-TTP-TXRX</dest-tp>
             <dest-node>ROADMA01-DEG1</dest-node>
@@ -173,10 +198,7 @@
             <source-tp>DEG2-TTP-TXRX</source-tp>
         </source>
         <OMS-attributes xmlns="http://org/openroadm/network/topology">
-            <opposite-link>ROADMA01-DEG1-DEG1-TTP-TXRXtoROADMC01-DEG2-DEG2-TTP-TXRX</opposite-link>
-            <TE-metric>10</TE-metric>
             <span>
-                <clfi>fiber2</clfi>
                 <auto-spanloss>true</auto-spanloss>
                 <spanloss-base>11.4</spanloss-base>
                 <spanloss-current>12</spanloss-current>
@@ -195,6 +217,8 @@
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <link-id>ROADMC01-DEG1-DEG1-CTP-TXRXtoROADMC01-SRG1-SRG1-CP-TXRX</link-id>
         <opposite-link xmlns="http://org/openroadm/common/network">ROADMC01-SRG1-SRG1-CP-TXRXtoROADMC01-DEG1-DEG1-CTP-TXRX</opposite-link>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <destination>
             <dest-tp>SRG1-CP-TXRX</dest-tp>
             <dest-node>ROADMC01-SRG1</dest-node>
@@ -208,6 +232,8 @@
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <link-id>ROADMC01-SRG1-SRG1-CP-TXRXtoROADMC01-DEG1-DEG1-CTP-TXRX</link-id>
         <opposite-link xmlns="http://org/openroadm/common/network">ROADMC01-DEG1-DEG1-CTP-TXRXtoROADMC01-SRG1-SRG1-CP-TXRX</opposite-link>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <destination>
             <dest-tp>DEG1-CTP-TXRX</dest-tp>
             <dest-node>ROADMC01-DEG1</dest-node>
@@ -221,6 +247,8 @@
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <link-id>ROADMC01-DEG2-DEG2-CTP-TXRXtoROADMC01-SRG1-SRG1-CP-TXRX</link-id>
         <opposite-link xmlns="http://org/openroadm/common/network">ROADMC01-SRG1-SRG1-CP-TXRXtoROADMC01-DEG2-DEG2-CTP-TXRX</opposite-link>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <destination>
             <dest-tp>SRG1-CP-TXRX</dest-tp>
             <dest-node>ROADMC01-SRG1</dest-node>
@@ -234,6 +262,8 @@
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <link-id>ROADMC01-SRG1-SRG1-PP1-TXRXtoXPDRC01-XPDR1-XPDR1-NETWORK1</link-id>
         <opposite-link xmlns="http://org/openroadm/common/network">XPDRC01-XPDR1-XPDR1-NETWORK1toROADMC01-SRG1-SRG1-PP1-TXRX</opposite-link>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <destination>
             <dest-tp>XPDR1-NETWORK1</dest-tp>
             <dest-node>XPDRC01-XPDR1</dest-node>
@@ -247,6 +277,8 @@
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <link-id>ROADMA01-SRG1-SRG1-CP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX</link-id>
         <opposite-link xmlns="http://org/openroadm/common/network">ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-SRG1-SRG1-CP-TXRX</opposite-link>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <destination>
             <dest-tp>DEG2-CTP-TXRX</dest-tp>
             <dest-node>ROADMA01-DEG2</dest-node>
@@ -260,6 +292,8 @@
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <link-id>XPDRC01-XPDR1-XPDR1-NETWORK1toROADMC01-SRG1-SRG1-PP1-TXRX</link-id>
         <opposite-link xmlns="http://org/openroadm/common/network">ROADMC01-SRG1-SRG1-PP1-TXRXtoXPDRC01-XPDR1-XPDR1-NETWORK1</opposite-link>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <destination>
             <dest-tp>SRG1-PP1-TXRX</dest-tp>
             <dest-node>ROADMC01-SRG1</dest-node>
@@ -275,73 +309,109 @@
     </network-types>
     <node>
         <node-id>ROADMC01-SRG1</node-id>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP12-TXRX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP15-TXRX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP1-TXRX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP2-TXRX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-CP-TXRX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-CP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP5-TXRX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP8-TXRX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP6-TXRX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP9-TXRX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP3-TXRX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP10-TXRX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP14-TXRX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP16-TXRX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP7-TXRX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP11-TXRX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP13-TXRX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP4-TXRX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <supporting-node>
             <network-ref>openroadm-network</network-ref>
@@ -352,306 +422,32 @@
             <node-ref>NodeC</node-ref>
         </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
-            <available-wavelengths>
-                <index>93</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>94</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>95</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>96</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>29</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>30</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>31</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>32</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>33</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>34</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>35</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>36</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>37</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>38</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>39</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>40</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>41</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>42</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>43</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>44</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>45</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>46</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>47</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>48</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>49</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>50</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>51</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>52</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>53</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>54</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>55</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>56</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>57</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>58</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>59</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>60</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>61</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>62</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>63</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>64</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>65</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>66</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>67</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>68</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>69</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>70</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>71</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>72</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>73</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>74</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>75</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>76</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>77</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>78</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>79</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>80</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>81</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>82</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>83</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>84</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>85</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>86</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>87</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>88</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>89</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>90</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>91</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>92</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>1</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>2</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>3</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>4</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>5</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>6</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>7</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>8</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>9</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>10</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>11</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>12</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>13</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>14</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>15</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>16</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>17</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>18</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>19</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>20</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>21</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>22</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>23</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>24</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>25</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>26</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>27</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>28</index>
-            </available-wavelengths>
+            <avail-freq-maps>
+                <map-name>cband</map-name>
+                <start-edge-freq>191.325</start-edge-freq>
+                <freq-map-granularity>6.25</freq-map-granularity>
+                <effective-bits>768</effective-bits>
+                <freq-map>////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+                </freq-map>
+            </avail-freq-maps>s>
         </srg-attributes>
         <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
     </node>
     <node>
         <node-id>ROADMC01-DEG1</node-id>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>DEG1-CTP-TXRX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TXRX-CTP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>DEG1-TTP-TXRX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TXRX-TTP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
         <supporting-node>
@@ -664,305 +460,31 @@
         </supporting-node>
         <degree-attributes xmlns="http://org/openroadm/network/topology">
             <degree-number>1</degree-number>
-            <available-wavelengths>
-                <index>93</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>94</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>95</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>96</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>29</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>30</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>31</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>32</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>33</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>34</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>35</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>36</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>37</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>38</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>39</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>40</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>41</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>42</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>43</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>44</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>45</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>46</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>47</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>48</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>49</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>50</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>51</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>52</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>53</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>54</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>55</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>56</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>57</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>58</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>59</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>60</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>61</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>62</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>63</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>64</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>65</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>66</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>67</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>68</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>69</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>70</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>71</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>72</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>73</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>74</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>75</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>76</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>77</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>78</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>79</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>80</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>81</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>82</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>83</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>84</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>85</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>86</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>87</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>88</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>89</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>90</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>91</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>92</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>1</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>2</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>3</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>4</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>5</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>6</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>7</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>8</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>9</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>10</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>11</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>12</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>13</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>14</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>15</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>16</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>17</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>18</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>19</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>20</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>21</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>22</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>23</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>24</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>25</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>26</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>27</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>28</index>
-            </available-wavelengths>
+           <avail-freq-maps>
+                <map-name>cband</map-name>
+                <start-edge-freq>191.325</start-edge-freq>
+                <freq-map-granularity>6.25</freq-map-granularity>
+                <effective-bits>768</effective-bits>
+                <freq-map>////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+                </freq-map>
+            </avail-freq-maps>s>
         </degree-attributes>
     </node>
     <node>
         <node-id>ROADMC01-DEG2</node-id>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>DEG2-TTP-TXRX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TXRX-TTP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>DEG2-CTP-TXRX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TXRX-CTP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
         <supporting-node>
@@ -975,365 +497,121 @@
         </supporting-node>
         <degree-attributes xmlns="http://org/openroadm/network/topology">
             <degree-number>2</degree-number>
-            <available-wavelengths>
-                <index>93</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>94</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>95</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>96</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>29</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>30</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>31</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>32</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>33</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>34</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>35</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>36</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>37</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>38</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>39</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>40</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>41</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>42</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>43</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>44</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>45</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>46</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>47</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>48</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>49</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>50</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>51</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>52</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>53</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>54</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>55</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>56</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>57</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>58</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>59</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>60</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>61</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>62</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>63</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>64</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>65</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>66</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>67</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>68</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>69</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>70</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>71</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>72</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>73</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>74</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>75</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>76</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>77</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>78</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>79</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>80</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>81</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>82</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>83</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>84</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>85</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>86</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>87</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>88</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>89</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>90</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>91</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>92</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>1</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>2</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>3</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>4</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>5</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>6</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>7</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>8</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>9</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>10</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>11</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>12</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>13</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>14</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>15</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>16</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>17</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>18</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>19</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>20</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>21</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>22</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>23</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>24</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>25</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>26</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>27</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>28</index>
-            </available-wavelengths>
+        <avail-freq-maps>
+                <map-name>cband</map-name>
+                <start-edge-freq>191.325</start-edge-freq>
+                <freq-map-granularity>6.25</freq-map-granularity>
+                <effective-bits>768</effective-bits>
+                <freq-map>////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+                </freq-map>
+            </avail-freq-maps>s>
         </degree-attributes>
     </node>
     <node>
         <node-id>ROADMA01-SRG1</node-id>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP12-TXRX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP15-TXRX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP1-TXRX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP2-TXRX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-CP-TXRX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-CP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP5-TXRX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP8-TXRX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP6-TXRX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP9-TXRX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP3-TXRX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP10-TXRX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP14-TXRX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP16-TXRX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP7-TXRX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP11-TXRX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP13-TXRX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP4-TXRX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <supporting-node>
             <network-ref>openroadm-network</network-ref>
@@ -1344,318 +622,48 @@
             <node-ref>NodeA</node-ref>
         </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
-            <available-wavelengths>
-                <index>93</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>94</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>95</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>96</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>29</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>30</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>31</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>32</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>33</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>34</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>35</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>36</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>37</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>38</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>39</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>40</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>41</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>42</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>43</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>44</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>45</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>46</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>47</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>48</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>49</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>50</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>51</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>52</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>53</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>54</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>55</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>56</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>57</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>58</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>59</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>60</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>61</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>62</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>63</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>64</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>65</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>66</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>67</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>68</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>69</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>70</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>71</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>72</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>73</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>74</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>75</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>76</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>77</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>78</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>79</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>80</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>81</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>82</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>83</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>84</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>85</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>86</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>87</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>88</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>89</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>90</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>91</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>92</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>1</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>2</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>3</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>4</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>5</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>6</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>7</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>8</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>9</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>10</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>11</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>12</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>13</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>14</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>15</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>16</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>17</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>18</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>19</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>20</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>21</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>22</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>23</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>24</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>25</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>26</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>27</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>28</index>
-            </available-wavelengths>
+        <avail-freq-maps>
+                <map-name>cband</map-name>
+                <start-edge-freq>191.325</start-edge-freq>
+                <freq-map-granularity>6.25</freq-map-granularity>
+                <effective-bits>768</effective-bits>
+                <freq-map>////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+                </freq-map>
+            </avail-freq-maps>s>
         </srg-attributes>
         <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
     </node>
     <node>
         <node-id>XPDRA01-XPDR1</node-id>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>XPDR1-NETWORK2</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
             <associated-connection-map-port xmlns="http://transportpce/topology">XPDR1-CLIENT2</associated-connection-map-port>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>XPDR1-CLIENT2</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
             <associated-connection-map-port xmlns="http://transportpce/topology">XPDR1-NETWORK2</associated-connection-map-port>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>XPDR1-CLIENT1</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
             <associated-connection-map-port xmlns="http://transportpce/topology">XPDR1-NETWORK1</associated-connection-map-port>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>XPDR1-NETWORK1</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
             <associated-connection-map-port xmlns="http://transportpce/topology">XPDR1-CLIENT1</associated-connection-map-port>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
         <supporting-node>
@@ -1669,13 +677,19 @@
     </node>
     <node>
         <node-id>ROADMA01-DEG2</node-id>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>DEG2-TTP-TXRX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TXRX-TTP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>DEG2-CTP-TXRX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TXRX-CTP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
         <supporting-node>
@@ -1688,317 +702,47 @@
         </supporting-node>
         <degree-attributes xmlns="http://org/openroadm/network/topology">
             <degree-number>2</degree-number>
-            <available-wavelengths>
-                <index>93</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>94</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>95</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>96</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>29</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>30</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>31</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>32</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>33</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>34</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>35</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>36</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>37</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>38</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>39</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>40</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>41</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>42</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>43</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>44</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>45</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>46</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>47</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>48</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>49</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>50</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>51</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>52</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>53</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>54</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>55</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>56</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>57</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>58</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>59</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>60</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>61</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>62</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>63</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>64</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>65</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>66</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>67</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>68</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>69</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>70</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>71</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>72</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>73</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>74</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>75</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>76</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>77</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>78</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>79</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>80</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>81</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>82</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>83</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>84</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>85</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>86</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>87</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>88</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>89</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>90</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>91</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>92</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>1</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>2</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>3</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>4</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>5</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>6</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>7</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>8</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>9</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>10</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>11</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>12</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>13</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>14</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>15</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>16</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>17</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>18</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>19</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>20</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>21</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>22</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>23</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>24</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>25</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>26</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>27</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>28</index>
-            </available-wavelengths>
+         <avail-freq-maps>
+                <map-name>cband</map-name>
+                <start-edge-freq>191.325</start-edge-freq>
+                <freq-map-granularity>6.25</freq-map-granularity>
+                <effective-bits>768</effective-bits>
+                <freq-map>////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+                </freq-map>
+            </avail-freq-maps>s>
         </degree-attributes>
     </node>
     <node>
         <node-id>XPDRC01-XPDR1</node-id>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>XPDR1-NETWORK2</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
             <associated-connection-map-port xmlns="http://transportpce/topology">XPDR1-CLIENT2</associated-connection-map-port>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>XPDR1-CLIENT2</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
             <associated-connection-map-port xmlns="http://transportpce/topology">XPDR1-NETWORK2</associated-connection-map-port>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>XPDR1-CLIENT1</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
             <associated-connection-map-port xmlns="http://transportpce/topology">XPDR1-NETWORK1</associated-connection-map-port>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>XPDR1-NETWORK1</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
             <associated-connection-map-port xmlns="http://transportpce/topology">XPDR1-CLIENT1</associated-connection-map-port>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
         <supporting-node>
@@ -2012,13 +756,19 @@
     </node>
     <node>
         <node-id>ROADMA01-DEG1</node-id>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>DEG1-CTP-TXRX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TXRX-CTP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>DEG1-TTP-TXRX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TXRX-TTP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
         <supporting-node>
@@ -2031,294 +781,14 @@
         </supporting-node>
         <degree-attributes xmlns="http://org/openroadm/network/topology">
             <degree-number>1</degree-number>
-            <available-wavelengths>
-                <index>93</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>94</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>95</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>96</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>29</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>30</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>31</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>32</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>33</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>34</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>35</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>36</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>37</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>38</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>39</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>40</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>41</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>42</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>43</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>44</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>45</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>46</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>47</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>48</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>49</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>50</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>51</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>52</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>53</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>54</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>55</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>56</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>57</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>58</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>59</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>60</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>61</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>62</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>63</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>64</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>65</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>66</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>67</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>68</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>69</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>70</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>71</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>72</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>73</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>74</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>75</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>76</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>77</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>78</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>79</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>80</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>81</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>82</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>83</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>84</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>85</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>86</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>87</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>88</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>89</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>90</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>91</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>92</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>1</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>2</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>3</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>4</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>5</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>6</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>7</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>8</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>9</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>10</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>11</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>12</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>13</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>14</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>15</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>16</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>17</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>18</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>19</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>20</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>21</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>22</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>23</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>24</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>25</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>26</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>27</index>
-            </available-wavelengths>
-            <available-wavelengths>
-                <index>28</index>
-            </available-wavelengths>
+            <avail-freq-maps>
+                <map-name>cband</map-name>
+                <start-edge-freq>191.325</start-edge-freq>
+                <freq-map-granularity>6.25</freq-map-granularity>
+                <effective-bits>768</effective-bits>
+                <freq-map>////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+                </freq-map>
+            </avail-freq-maps>s>
         </degree-attributes>
     </node>
 </network>