X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=transportpce.git;a=blobdiff_plain;f=tests%2Fsample_configs%2FNW-for-test-5-4.xml;h=20d05c964eb3b93698b06094b601d7fb0c075cb9;hp=e79275c45dc3efd5bc01975182910dc28107bf4f;hb=ed10af1226bcc1c0e05e0a4cbf0c7a75f88a52e7;hpb=e5480799d2f666999f2ae5cd7a874aa78d648a60

diff --git a/tests/sample_configs/NW-for-test-5-4.xml b/tests/sample_configs/NW-for-test-5-4.xml
index e79275c45..20d05c964 100644
--- a/tests/sample_configs/NW-for-test-5-4.xml
+++ b/tests/sample_configs/NW-for-test-5-4.xml
@@ -1,2717 +1,4798 @@
 <network xmlns="urn:ietf:params:xml:ns:yang:ietf-network">
  <network-id>openroadm-topology</network-id>
 <node>    <node-id>OpenROADM-1-1-DEG1</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>1</index> </available-wavelengths>
-        <available-wavelengths> <index>2</index> </available-wavelengths>
-        <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>
+            <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>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////
+                </freq-map>
+            </avail-freq-maps>s>
         </degree-attributes>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-1-1</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli11</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-1-1-DEG2</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>1</index> </available-wavelengths>
-        <available-wavelengths> <index>2</index> </available-wavelengths>
-        <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>
+            <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>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////
+                </freq-map>
+            </avail-freq-maps>
         </degree-attributes>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-1-1</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli11</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-1-1-DEG3</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>1</index> </available-wavelengths>
-        <available-wavelengths> <index>2</index> </available-wavelengths>
-        <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>
-        </degree-attributes>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <degree-attributes xmlns="http://org/openroadm/network/topology">
+      <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>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////
+        </freq-map>
+      </avail-freq-maps>
+    </degree-attributes>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-1-1</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli11</node-ref>    </supporting-node></node>
 <node>   <node-id>OpenROADM-1-1-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-1-1</node-ref>    </supporting-node>
         <supporting-node><network-ref>clli-network</network-ref><node-ref>clli11</node-ref>    </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>1</index> </available-wavelengths>
-        <available-wavelengths> <index>2</index> </available-wavelengths>
-        <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>
+            <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>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////
+                </freq-map>
+            </avail-freq-maps>
         </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>               </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>               </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-CP-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>
+            <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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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-PP1-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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>
 </node>
 <node>        <node-id>XPONDER-1-1</node-id>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-1-1</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE1</node-ref>    </supporting-node>
     <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+    <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>XPDR-NW1-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <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>XPDR-NW1-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <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>XPDR-NW2-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <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>XPDR-NW2-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <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>XPDR-NW3-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <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>XPDR-NW3-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <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>XPDR-NW4-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <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>XPDR-NW4-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <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>
 <node>    <node-id>OpenROADM-1-2-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>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>1</index> </available-wavelengths>
-        <available-wavelengths> <index>2</index> </available-wavelengths>
-        <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>
+            <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>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////
+                </freq-map>
+            </avail-freq-maps>
         </degree-attributes>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-1-2</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli12</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-1-2-DEG2</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>1</index> </available-wavelengths>
-        <available-wavelengths> <index>2</index> </available-wavelengths>
-        <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>
+            <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>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////
+                </freq-map>
+            </avail-freq-maps>
         </degree-attributes>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-1-2</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli12</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-1-2-DEG3</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>1</index> </available-wavelengths>
-        <available-wavelengths> <index>2</index> </available-wavelengths>
-        <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>
+            <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>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////
+                </freq-map>
+            </avail-freq-maps>
         </degree-attributes>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-1-2</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli12</node-ref>    </supporting-node></node>
 <node>   <node-id>OpenROADM-1-2-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-1-2</node-ref>    </supporting-node>
         <supporting-node><network-ref>clli-network</network-ref><node-ref>clli12</node-ref>    </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>1</index> </available-wavelengths>
-        <available-wavelengths> <index>2</index> </available-wavelengths>
-        <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>
+            <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>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////
+                </freq-map>
+            </avail-freq-maps>
         </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>               </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>               </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-CP-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>
+            <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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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-PP1-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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>
 </node>
 <node>        <node-id>XPONDER-1-2</node-id>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-1-2</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE1</node-ref>    </supporting-node>
     <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+    <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>XPDR-NW1-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <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>XPDR-NW1-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <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>XPDR-NW2-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <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>XPDR-NW2-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <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>XPDR-NW3-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <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>XPDR-NW3-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <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>XPDR-NW4-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <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>XPDR-NW4-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <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>
 <node>    <node-id>OpenROADM-1-3-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>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>1</index> </available-wavelengths>
-        <available-wavelengths> <index>2</index> </available-wavelengths>
-        <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>
+            <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>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////
+                </freq-map>
+            </avail-freq-maps>
         </degree-attributes>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-1-3</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli13</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-1-3-DEG2</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>1</index> </available-wavelengths>
-        <available-wavelengths> <index>2</index> </available-wavelengths>
-        <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>
+            <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>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////
+                </freq-map>
+            </avail-freq-maps>
         </degree-attributes>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-1-3</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli13</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-1-3-DEG3</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>1</index> </available-wavelengths>
-        <available-wavelengths> <index>2</index> </available-wavelengths>
-        <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>
+            <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>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////
+                </freq-map>
+            </avail-freq-maps>
         </degree-attributes>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-1-3</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli13</node-ref>    </supporting-node></node>
 <node>   <node-id>OpenROADM-1-3-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-1-3</node-ref>    </supporting-node>
         <supporting-node><network-ref>clli-network</network-ref><node-ref>clli13</node-ref>    </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>1</index> </available-wavelengths>
-        <available-wavelengths> <index>2</index> </available-wavelengths>
-        <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>
+            <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>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////
+                </freq-map>
+            </avail-freq-maps>
         </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>               </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>               </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-CP-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>
+            <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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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-PP1-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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>
 </node>
 <node>        <node-id>XPONDER-1-3</node-id>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-1-3</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE1</node-ref>    </supporting-node>
     <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+    <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>XPDR-NW1-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <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>XPDR-NW1-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <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>XPDR-NW2-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <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>XPDR-NW2-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <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>XPDR-NW3-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <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>XPDR-NW3-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <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>XPDR-NW4-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <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>XPDR-NW4-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <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>
 <node>    <node-id>OpenROADM-1-4-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>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>1</index> </available-wavelengths>
-        <available-wavelengths> <index>2</index> </available-wavelengths>
-        <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>
+            <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>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////
+                </freq-map>
+            </avail-freq-maps>
         </degree-attributes>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-1-4</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli14</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-1-4-DEG2</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>1</index> </available-wavelengths>
-        <available-wavelengths> <index>2</index> </available-wavelengths>
-        <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>
+            <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>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////
+                </freq-map>
+            </avail-freq-maps>
         </degree-attributes>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-1-4</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli14</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-1-4-DEG3</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>1</index> </available-wavelengths>
-        <available-wavelengths> <index>2</index> </available-wavelengths>
-        <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>
+            <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>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////
+                </freq-map>
+            </avail-freq-maps>
         </degree-attributes>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-1-4</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli14</node-ref>    </supporting-node></node>
 <node>   <node-id>OpenROADM-1-4-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-1-4</node-ref>    </supporting-node>
         <supporting-node><network-ref>clli-network</network-ref><node-ref>clli14</node-ref>    </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>1</index> </available-wavelengths>
-        <available-wavelengths> <index>2</index> </available-wavelengths>
-        <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>
+            <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>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////
+                </freq-map>
+            </avail-freq-maps>
         </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>               </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>               </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-CP-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>
+            <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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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-PP1-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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>
 </node>
 <node>        <node-id>XPONDER-1-4</node-id>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-1-4</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE1</node-ref>    </supporting-node>
     <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+    <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>XPDR-NW1-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <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>XPDR-NW1-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <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>XPDR-NW2-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <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>XPDR-NW2-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <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>XPDR-NW3-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <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>XPDR-NW3-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <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>XPDR-NW4-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <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>XPDR-NW4-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <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>
 <node>    <node-id>OpenROADM-2-1-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>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>2</index> </available-wavelengths>
-        <available-wavelengths> <index>3</index> </available-wavelengths>
-        <available-wavelengths> <index>4</index> </available-wavelengths>
-        <available-wavelengths> <index>5</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>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////8A
+                </freq-map>
+            </avail-freq-maps>
          </degree-attributes>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-2-1</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli21</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-2-1-DEG2</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>2</index> </available-wavelengths>
-        <available-wavelengths> <index>3</index> </available-wavelengths>
-        <available-wavelengths> <index>4</index> </available-wavelengths>
-        <available-wavelengths> <index>5</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>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////8A
+                </freq-map>
+            </avail-freq-maps>
         </degree-attributes>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-2-1</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli21</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-2-1-DEG3</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>2</index> </available-wavelengths>
-        <available-wavelengths> <index>3</index> </available-wavelengths>
-        <available-wavelengths> <index>4</index> </available-wavelengths>
-        <available-wavelengths> <index>5</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>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////8A
+                </freq-map>
+            </avail-freq-maps>
         </degree-attributes>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-2-1</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli21</node-ref>    </supporting-node></node>
 <node>   <node-id>OpenROADM-2-1-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-2-1</node-ref>    </supporting-node>
         <supporting-node><network-ref>clli-network</network-ref><node-ref>clli21</node-ref>    </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>2</index> </available-wavelengths>
-        <available-wavelengths> <index>3</index> </available-wavelengths>
-        <available-wavelengths> <index>4</index> </available-wavelengths>
-        <available-wavelengths> <index>5</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>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////8A
+                </freq-map>
+            </avail-freq-maps>
         </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>               </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>               </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-CP-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>
+            <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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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-PP1-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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>
 </node>
 <node>        <node-id>XPONDER-2-1</node-id>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-2-1</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE2</node-ref>    </supporting-node>
     <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+    <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>XPDR-NW1-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <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>XPDR-NW1-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <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>XPDR-NW2-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <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>XPDR-NW2-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <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>XPDR-NW3-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <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>XPDR-NW3-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <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>XPDR-NW4-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <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>XPDR-NW4-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <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>
 <node>    <node-id>OpenROADM-2-2-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>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>2</index> </available-wavelengths>
-        <available-wavelengths> <index>3</index> </available-wavelengths>
-        <available-wavelengths> <index>4</index> </available-wavelengths>
-        <available-wavelengths> <index>5</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>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////8A
+                </freq-map>
+            </avail-freq-maps>
         </degree-attributes>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-2-2</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli22</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-2-2-DEG2</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>2</index> </available-wavelengths>
-        <available-wavelengths> <index>3</index> </available-wavelengths>
-        <available-wavelengths> <index>4</index> </available-wavelengths>
-        <available-wavelengths> <index>5</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>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////8A
+                </freq-map>
+            </avail-freq-maps>
         </degree-attributes>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-2-2</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli22</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-2-2-DEG3</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>2</index> </available-wavelengths>
-        <available-wavelengths> <index>3</index> </available-wavelengths>
-        <available-wavelengths> <index>4</index> </available-wavelengths>
-        <available-wavelengths> <index>5</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>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////8A
+                </freq-map>
+            </avail-freq-maps>
         </degree-attributes>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-2-2</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli22</node-ref>    </supporting-node></node>
 <node>   <node-id>OpenROADM-2-2-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-2-2</node-ref>    </supporting-node>
         <supporting-node><network-ref>clli-network</network-ref><node-ref>clli22</node-ref>    </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>2</index> </available-wavelengths>
-        <available-wavelengths> <index>3</index> </available-wavelengths>
-        <available-wavelengths> <index>4</index> </available-wavelengths>
-        <available-wavelengths> <index>5</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>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////8A
+                </freq-map>
+            </avail-freq-maps>
         </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>               </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>               </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-CP-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>
+            <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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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-PP1-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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>
 </node>
 <node>        <node-id>XPONDER-2-2</node-id>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-2-2</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE2</node-ref>    </supporting-node>
     <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+    <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>XPDR-NW1-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <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>XPDR-NW1-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <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>XPDR-NW2-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <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>XPDR-NW2-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <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>XPDR-NW3-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <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>XPDR-NW3-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <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>XPDR-NW4-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <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>XPDR-NW4-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <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>
 <node>    <node-id>OpenROADM-2-3-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>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>2</index> </available-wavelengths>
-        <available-wavelengths> <index>3</index> </available-wavelengths>
-        <available-wavelengths> <index>4</index> </available-wavelengths>
-        <available-wavelengths> <index>5</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>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////8A
+                </freq-map>
+            </avail-freq-maps>
         </degree-attributes>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-2-3</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli23</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-2-3-DEG2</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>2</index> </available-wavelengths>
-        <available-wavelengths> <index>3</index> </available-wavelengths>
-        <available-wavelengths> <index>4</index> </available-wavelengths>
-        <available-wavelengths> <index>5</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>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////8A
+                </freq-map>
+            </avail-freq-maps>
         </degree-attributes>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-2-3</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli23</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-2-3-DEG3</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>2</index> </available-wavelengths>
-        <available-wavelengths> <index>3</index> </available-wavelengths>
-        <available-wavelengths> <index>4</index> </available-wavelengths>
-        <available-wavelengths> <index>5</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>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////8A
+                </freq-map>
+            </avail-freq-maps>>
         </degree-attributes>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-2-3</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli23</node-ref>    </supporting-node></node>
 <node>   <node-id>OpenROADM-2-3-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-2-3</node-ref>    </supporting-node>
         <supporting-node><network-ref>clli-network</network-ref><node-ref>clli23</node-ref>    </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>2</index> </available-wavelengths>
-        <available-wavelengths> <index>3</index> </available-wavelengths>
-        <available-wavelengths> <index>4</index> </available-wavelengths>
-        <available-wavelengths> <index>5</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>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////8A
+                </freq-map>
+            </avail-freq-maps>>
         </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>               </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>               </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-CP-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>
+            <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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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-PP1-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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>
 </node>
 <node>        <node-id>XPONDER-2-3</node-id>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-2-3</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE2</node-ref>    </supporting-node>
     <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+    <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>XPDR-NW1-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <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>XPDR-NW1-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <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>XPDR-NW2-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <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>XPDR-NW2-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <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>XPDR-NW3-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <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>XPDR-NW3-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <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>XPDR-NW4-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <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>XPDR-NW4-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <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>
 <node>    <node-id>OpenROADM-2-4-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>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>2</index> </available-wavelengths>
-        <available-wavelengths> <index>3</index> </available-wavelengths>
-        <available-wavelengths> <index>4</index> </available-wavelengths>
-        <available-wavelengths> <index>5</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>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////8A
+                </freq-map>
+            </avail-freq-maps>
         </degree-attributes>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-2-4</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli24</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-2-4-DEG2</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>2</index> </available-wavelengths>
-        <available-wavelengths> <index>3</index> </available-wavelengths>
-        <available-wavelengths> <index>4</index> </available-wavelengths>
-        <available-wavelengths> <index>5</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>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////8A
+                </freq-map>
+            </avail-freq-maps>
         </degree-attributes>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-2-4</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli24</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-2-4-DEG3</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>2</index> </available-wavelengths>
-        <available-wavelengths> <index>3</index> </available-wavelengths>
-        <available-wavelengths> <index>4</index> </available-wavelengths>
-        <available-wavelengths> <index>5</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>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////8A
+                </freq-map>
+            </avail-freq-maps>
         </degree-attributes>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-2-4</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli24</node-ref>    </supporting-node></node>
 <node>   <node-id>OpenROADM-2-4-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-2-4</node-ref>    </supporting-node>
         <supporting-node><network-ref>clli-network</network-ref><node-ref>clli24</node-ref>    </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>2</index> </available-wavelengths>
-        <available-wavelengths> <index>3</index> </available-wavelengths>
-        <available-wavelengths> <index>4</index> </available-wavelengths>
-        <available-wavelengths> <index>5</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>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////8A
+                </freq-map>
+            </avail-freq-maps>
         </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>               </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>               </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-CP-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>
+            <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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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-PP1-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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>
 </node>
 <node>        <node-id>XPONDER-2-4</node-id>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-2-4</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE2</node-ref>    </supporting-node>
     <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+    <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>XPDR-NW1-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <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>XPDR-NW1-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <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>XPDR-NW2-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <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>XPDR-NW2-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <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>XPDR-NW3-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <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>XPDR-NW3-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <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>XPDR-NW4-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <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>XPDR-NW4-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <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>
 <node>    <node-id>OpenROADM-3-1-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>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>5</index> </available-wavelengths>
-        <available-wavelengths> <index>6</index> </available-wavelengths>
-        <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>
+            <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>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////8AAAAA
+                </freq-map>
+            </avail-freq-maps>
         </degree-attributes>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-3-1</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli31</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-3-1-DEG2</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
-         <available-wavelengths> <index>5</index> </available-wavelengths>
-        <available-wavelengths> <index>6</index> </available-wavelengths>
-        <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>
+            <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>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////8AAAAA
+                </freq-map>
+            </avail-freq-maps>
         </degree-attributes>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-3-1</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli31</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-3-1-DEG3</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>5</index> </available-wavelengths>
-        <available-wavelengths> <index>6</index> </available-wavelengths>
-        <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>
+            <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>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////8AAAAA
+                </freq-map>
+            </avail-freq-maps>
         </degree-attributes>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-3-1</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli31</node-ref>    </supporting-node></node>
 <node>   <node-id>OpenROADM-3-1-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-3-1</node-ref>    </supporting-node>
         <supporting-node><network-ref>clli-network</network-ref><node-ref>clli31</node-ref>    </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>5</index> </available-wavelengths>
-        <available-wavelengths> <index>6</index> </available-wavelengths>
-        <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>
+            <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>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////8AAAAA
+                </freq-map>
+            </avail-freq-maps>
         </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>               </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>               </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-CP-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>
+            <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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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-PP1-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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>
 </node>
 <node>        <node-id>XPONDER-3-1</node-id>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-3-1</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE3</node-ref>    </supporting-node>
     <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+    <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>XPDR-NW1-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <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>XPDR-NW1-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <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>XPDR-NW2-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <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>XPDR-NW2-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <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>XPDR-NW3-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <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>XPDR-NW3-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <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>XPDR-NW4-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <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>XPDR-NW4-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <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>
 <node>    <node-id>OpenROADM-3-2-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>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>5</index> </available-wavelengths>
-        <available-wavelengths> <index>6</index> </available-wavelengths>
-        <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>
+            <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>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////8AAAAA
+                </freq-map>
+            </avail-freq-maps>
         </degree-attributes>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-3-2</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli32</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-3-2-DEG2</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>5</index> </available-wavelengths>
-        <available-wavelengths> <index>6</index> </available-wavelengths>
-        <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>
+            <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>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////8AAAAA
+                </freq-map>
+            </avail-freq-maps>
         </degree-attributes>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-3-2</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli32</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-3-2-DEG3</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>5</index> </available-wavelengths>
-        <available-wavelengths> <index>6</index> </available-wavelengths>
-        <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>
+            <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>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////8AAAAA
+                </freq-map>
+            </avail-freq-maps>
         </degree-attributes>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-3-2</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli32</node-ref>    </supporting-node></node>
 <node>   <node-id>OpenROADM-3-2-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-3-2</node-ref>    </supporting-node>
         <supporting-node><network-ref>clli-network</network-ref><node-ref>clli32</node-ref>    </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>5</index> </available-wavelengths>
-        <available-wavelengths> <index>6</index> </available-wavelengths>
-        <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>
+            <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>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////8AAAAA
+                </freq-map>
+            </avail-freq-maps>>
         </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>               </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>               </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-CP-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>
+            <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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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-PP1-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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>
 </node>
 <node>        <node-id>XPONDER-3-2</node-id>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-3-2</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE3</node-ref>    </supporting-node>
     <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+    <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>XPDR-NW1-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <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>XPDR-NW1-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <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>XPDR-NW2-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <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>XPDR-NW2-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <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>XPDR-NW3-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <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>XPDR-NW3-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <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>XPDR-NW4-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <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>XPDR-NW4-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <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>
 <node>    <node-id>OpenROADM-3-3-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>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>5</index> </available-wavelengths>
-        <available-wavelengths> <index>6</index> </available-wavelengths>
-        <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>
+            <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>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////8AAAAA
+                </freq-map>
+            </avail-freq-maps>
         </degree-attributes>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-3-3</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli33</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-3-3-DEG2</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>5</index> </available-wavelengths>
-        <available-wavelengths> <index>6</index> </available-wavelengths>
-        <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>
+            <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>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////8AAAAA
+                </freq-map>
+            </avail-freq-maps>
         </degree-attributes>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-3-3</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli33</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-3-3-DEG3</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>5</index> </available-wavelengths>
-        <available-wavelengths> <index>6</index> </available-wavelengths>
-        <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>
+            <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>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////8AAAAA
+                </freq-map>
+            </avail-freq-maps>
         </degree-attributes>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-3-3</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli33</node-ref>    </supporting-node></node>
 <node>   <node-id>OpenROADM-3-3-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-3-3</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli33</node-ref>    </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>5</index> </available-wavelengths>
-        <available-wavelengths> <index>6</index> </available-wavelengths>
-        <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>
+            <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>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////8AAAAA
+                </freq-map>
+            </avail-freq-maps>
         </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>               </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>               </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-CP-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>
+            <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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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-PP1-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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>
 </node>
 <node>        <node-id>XPONDER-3-3</node-id>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-3-3</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE3</node-ref>    </supporting-node>
     <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+    <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>XPDR-NW1-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <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>XPDR-NW1-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <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>XPDR-NW2-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <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>XPDR-NW2-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <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>XPDR-NW3-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <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>XPDR-NW3-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <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>XPDR-NW4-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <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>XPDR-NW4-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <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>
 <node>    <node-id>OpenROADM-3-4-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>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>5</index> </available-wavelengths>
-        <available-wavelengths> <index>6</index> </available-wavelengths>
-        <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>
+            <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>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////8AAAAA
+                </freq-map>
+            </avail-freq-maps>
         </degree-attributes>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-3-4</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli34</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-3-4-DEG2</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>5</index> </available-wavelengths>
-        <available-wavelengths> <index>6</index> </available-wavelengths>
-        <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>
+            <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>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////8AAAAA
+                </freq-map>
+            </avail-freq-maps>
         </degree-attributes>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-3-4</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli34</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-3-4-DEG3</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>5</index> </available-wavelengths>
-        <available-wavelengths> <index>6</index> </available-wavelengths>
-        <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>
+            <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>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////8AAAAA
+                </freq-map>
+            </avail-freq-maps>
         </degree-attributes>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-3-4</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli34</node-ref>    </supporting-node></node>
 <node>   <node-id>OpenROADM-3-4-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-3-4</node-ref>    </supporting-node>
         <supporting-node><network-ref>clli-network</network-ref><node-ref>clli34</node-ref>    </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>5</index> </available-wavelengths>
-        <available-wavelengths> <index>6</index> </available-wavelengths>
-        <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>
+            <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>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////8AAAAA
+                </freq-map>
+            </avail-freq-maps>
         </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>               </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>               </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-CP-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>
+            <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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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-PP1-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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>
 </node>
 <node>        <node-id>XPONDER-3-4</node-id>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-3-4</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE3</node-ref>    </supporting-node>
     <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+    <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>XPDR-NW1-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <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>XPDR-NW1-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <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>XPDR-NW2-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <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>XPDR-NW2-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <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>XPDR-NW3-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <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>XPDR-NW3-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <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>XPDR-NW4-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <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>XPDR-NW4-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <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>
 <node>    <node-id>OpenROADM-4-1-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>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <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>
+            <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>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////AAAAAAAA
+                </freq-map>
+            </avail-freq-maps>
         </degree-attributes>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-4-1</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli41</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-4-1-DEG2</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <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>
+            <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>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////AAAAAAAA
+                </freq-map>
+            </avail-freq-maps>
         </degree-attributes>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-4-1</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli41</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-4-1-DEG3</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <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>
+            <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>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////AAAAAAAA
+                </freq-map>
+            </avail-freq-maps>
         </degree-attributes>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-4-1</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli41</node-ref>    </supporting-node></node>
 <node>   <node-id>OpenROADM-4-1-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-4-1</node-ref>    </supporting-node>
         <supporting-node><network-ref>clli-network</network-ref><node-ref>clli41</node-ref>    </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <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>
+            <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>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////AAAAAAAA
+                </freq-map>
+            </avail-freq-maps>>
         </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>               </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>               </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-CP-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>
+            <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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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-PP1-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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>
 </node>
 <node>        <node-id>XPONDER-4-1</node-id>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-4-1</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE4</node-ref>    </supporting-node>
     <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+    <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>XPDR-NW1-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <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>XPDR-NW1-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <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>XPDR-NW2-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <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>XPDR-NW2-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <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>XPDR-NW3-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <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>XPDR-NW3-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <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>XPDR-NW4-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <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>XPDR-NW4-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <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>
 <node>    <node-id>OpenROADM-4-2-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>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <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>
+            <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>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////AAAAAAAA
+                </freq-map>
+            </avail-freq-maps>
         </degree-attributes>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-4-2</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli42</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-4-2-DEG2</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <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>
+            <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>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////AAAAAAAA
+                </freq-map>
+            </avail-freq-maps>
         </degree-attributes>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-4-2</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli42</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-4-2-DEG3</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <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>
+            <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>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////AAAAAAAA
+                </freq-map>
+            </avail-freq-maps>
         </degree-attributes>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-4-2</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli42</node-ref>    </supporting-node></node>
 <node>   <node-id>OpenROADM-4-2-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-4-2</node-ref>    </supporting-node>
         <supporting-node><network-ref>clli-network</network-ref><node-ref>clli42</node-ref>    </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <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>
+            <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>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////AAAAAAAA
+                </freq-map>
+            </avail-freq-maps>
         </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>               </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>               </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-CP-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>
+            <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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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-PP1-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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>
 </node>
 <node>        <node-id>XPONDER-4-2</node-id>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-4-2</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE4</node-ref>    </supporting-node>
     <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+    <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>XPDR-NW1-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <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>XPDR-NW1-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <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>XPDR-NW2-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <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>XPDR-NW2-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <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>XPDR-NW3-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <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>XPDR-NW3-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <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>XPDR-NW4-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <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>XPDR-NW4-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <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>
 <node>    <node-id>OpenROADM-4-3-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>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <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>
+            <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>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////AAAAAAAA
+                </freq-map>
+            </avail-freq-maps>
         </degree-attributes>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-4-3</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli43</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-4-3-DEG2</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <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>
+            <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>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////AAAAAAAA
+                </freq-map>
+            </avail-freq-maps>>
         </degree-attributes>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-4-3</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli43</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-4-3-DEG3</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <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>
+            <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>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////AAAAAAAA
+                </freq-map>
+            </avail-freq-maps>
         </degree-attributes>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-4-3</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli43</node-ref>    </supporting-node></node>
 <node>   <node-id>OpenROADM-4-3-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-4-3</node-ref>    </supporting-node>
         <supporting-node><network-ref>clli-network</network-ref><node-ref>clli43</node-ref>    </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <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>
+            <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>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////AAAAAAAA
+                </freq-map>
+            </avail-freq-maps>
         </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>               </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>               </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-CP-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>
+            <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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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-PP1-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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>
 </node>
 <node>        <node-id>XPONDER-4-3</node-id>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-4-3</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE4</node-ref>    </supporting-node>
     <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+    <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>XPDR-NW1-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <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>XPDR-NW1-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <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>XPDR-NW2-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <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>XPDR-NW2-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <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>XPDR-NW3-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <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>XPDR-NW3-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <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>XPDR-NW4-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <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>XPDR-NW4-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <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>
 <node>    <node-id>OpenROADM-4-4-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>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <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>
+            <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>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////AAAAAAAA
+                </freq-map>
+            </avail-freq-maps>
         </degree-attributes>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-4-4</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli44</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-4-4-DEG2</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <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>
+            <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>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////AAAAAAAA
+                </freq-map>
+            </avail-freq-maps>s>
         </degree-attributes>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-4-4</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli44</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-4-4-DEG3</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <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>
+            <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>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////AAAAAAAA
+                </freq-map>
+            </avail-freq-maps>
         </degree-attributes>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-4-4</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli44</node-ref>    </supporting-node></node>
 <node>   <node-id>OpenROADM-4-4-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-4-4</node-ref>    </supporting-node>
         <supporting-node><network-ref>clli-network</network-ref><node-ref>clli44</node-ref>    </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>7</index> </available-wavelengths>
-        <available-wavelengths> <index>8</index> </available-wavelengths>
-        <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>
+            <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>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////AAAAAAAA
+                </freq-map>
+            </avail-freq-maps>
         </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>               </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>               </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-CP-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>
+            <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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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-PP1-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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>
 </node>
 <node>        <node-id>XPONDER-4-4</node-id>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-4-4</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE4</node-ref>    </supporting-node>
     <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+    <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>XPDR-NW1-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <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>XPDR-NW1-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <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>XPDR-NW2-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <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>XPDR-NW2-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <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>XPDR-NW3-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <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>XPDR-NW3-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <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>XPDR-NW4-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <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>XPDR-NW4-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <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>
 <node>    <node-id>OpenROADM-5-1-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>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <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>
+            <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>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///////wAAAAAAAAAA
+                </freq-map>
+            </avail-freq-maps>
         </degree-attributes>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-5-1</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli51</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-5-1-DEG2</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <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>
+            <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>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///////wAAAAAAAAAA
+                </freq-map>
+            </avail-freq-maps>
         </degree-attributes>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-5-1</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli51</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-5-1-DEG3</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <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>
+            <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>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///////wAAAAAAAAAA
+                </freq-map>
+            </avail-freq-maps>
         </degree-attributes>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-5-1</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli51</node-ref>    </supporting-node></node>
 <node>   <node-id>OpenROADM-5-1-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-5-1</node-ref>    </supporting-node>
         <supporting-node><network-ref>clli-network</network-ref><node-ref>clli51</node-ref>    </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <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>
+            <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>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///////wAAAAAAAAAA
+                </freq-map>
+            </avail-freq-maps>
         </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>               </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>               </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-CP-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>
+            <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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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-PP1-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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>
 </node>
 <node>        <node-id>XPONDER-5-1</node-id>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-5-1</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE5</node-ref>    </supporting-node>
     <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+    <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>XPDR-NW1-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <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>XPDR-NW1-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <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>XPDR-NW2-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <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>XPDR-NW2-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <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>XPDR-NW3-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <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>XPDR-NW3-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <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>XPDR-NW4-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <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>XPDR-NW4-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <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>
 <node>    <node-id>OpenROADM-5-2-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>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <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>
+            <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>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///////wAAAAAAAAAA
+                </freq-map>
+            </avail-freq-maps>
         </degree-attributes>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-5-2</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli52</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-5-2-DEG2</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <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>
+            <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>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///////wAAAAAAAAAA
+                </freq-map>
+            </avail-freq-maps>
         </degree-attributes>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-5-2</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli52</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-5-2-DEG3</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <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>
+            <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>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///////wAAAAAAAAAA
+                </freq-map>
+            </avail-freq-maps>
         </degree-attributes>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-5-2</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli52</node-ref>    </supporting-node></node>
 <node>   <node-id>OpenROADM-5-2-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-5-2</node-ref>    </supporting-node>
         <supporting-node><network-ref>clli-network</network-ref><node-ref>clli52</node-ref>    </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <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>
+            <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>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///////wAAAAAAAAAA
+                </freq-map>
+            </avail-freq-maps>
         </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>               </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>               </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-CP-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>
+            <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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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-PP1-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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>
 </node>
 <node>        <node-id>XPONDER-5-2</node-id>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-5-2</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE5</node-ref>    </supporting-node>
     <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+    <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>XPDR-NW1-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <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>XPDR-NW1-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <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>XPDR-NW2-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <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>XPDR-NW2-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <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>XPDR-NW3-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <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>XPDR-NW3-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <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>XPDR-NW4-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <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>XPDR-NW4-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <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>
 <node>    <node-id>OpenROADM-5-3-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>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <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>
+            <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>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///////wAAAAAAAAAA
+                </freq-map>
+            </avail-freq-maps>
         </degree-attributes>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-5-3</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli53</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-5-3-DEG2</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <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>
+            <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>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///////wAAAAAAAAAA
+                </freq-map>
+            </avail-freq-maps>
         </degree-attributes>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-5-3</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli53</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-5-3-DEG3</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <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>
+            <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>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///////wAAAAAAAAAA
+                </freq-map>
+            </avail-freq-maps>
         </degree-attributes>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-5-3</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli53</node-ref>    </supporting-node></node>
 <node>   <node-id>OpenROADM-5-3-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-5-3</node-ref>    </supporting-node>
         <supporting-node><network-ref>clli-network</network-ref><node-ref>clli53</node-ref>    </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <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>
+            <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>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///////wAAAAAAAAAA
+                </freq-map>
+            </avail-freq-maps>
         </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>               </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>               </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-CP-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>
+            <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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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-PP1-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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>
 </node>
 <node>        <node-id>XPONDER-5-3</node-id>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-5-3</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE5</node-ref>    </supporting-node>
     <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+    <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>XPDR-NW1-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <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>XPDR-NW1-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <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>XPDR-NW2-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <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>XPDR-NW2-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <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>XPDR-NW3-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <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>XPDR-NW3-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <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>XPDR-NW4-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <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>XPDR-NW4-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <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>
 <node>    <node-id>OpenROADM-5-4-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>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <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>
+            <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>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///////wAAAAAAAAAA
+                </freq-map>
+            </avail-freq-maps>
         </degree-attributes>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-5-4</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli54</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-5-4-DEG2</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <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>
+            <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>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///////wAAAAAAAAAA
+                </freq-map>
+            </avail-freq-maps>
         </degree-attributes>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-5-4</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli54</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-5-4-DEG3</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <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>
+            <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>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///////wAAAAAAAAAA
+                </freq-map>
+            </avail-freq-maps>
         </degree-attributes>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-5-4</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli54</node-ref>    </supporting-node></node>
 <node>   <node-id>OpenROADM-5-4-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-5-4</node-ref>    </supporting-node>
         <supporting-node><network-ref>clli-network</network-ref><node-ref>clli54</node-ref>    </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
-        <available-wavelengths> <index>9</index> </available-wavelengths>
-        <available-wavelengths> <index>10</index> </available-wavelengths>
-        <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>
+            <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>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///////wAAAAAAAAAA
+                </freq-map>
+            </avail-freq-maps>
         </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>               </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>               </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>               </termination-point>
+        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
+            <tp-id>SRG1-CP-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>
+            <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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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-PP1-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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-RX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-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-TX</tp-id>
+            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-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>
 </node>
 <node>        <node-id>XPONDER-5-4</node-id>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-5-4</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE5</node-ref>    </supporting-node>
     <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+    <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>XPDR-NW1-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <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>XPDR-NW1-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <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>XPDR-NW2-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <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>XPDR-NW2-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <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>XPDR-NW3-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <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>XPDR-NW3-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <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>XPDR-NW4-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <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>XPDR-NW4-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <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>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-1-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-1-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-1-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-1-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-1-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-DEG3-DEG3-CTP-TXtoOpenROADM-1-1-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-1-SRG1-SRG1-CP-TXtoOpenROADM-1-1-DEG1-DEG1-CTP-RX</link-id>
             <source><source-node>OpenROADM-1-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-1-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-1-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-1-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-SRG1-SRG1-CP-TXtoOpenROADM-1-1-DEG1-DEG1-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-1-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-1-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-1-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-1-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-1-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-DEG3-DEG3-CTP-TXtoOpenROADM-1-1-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-1-SRG1-SRG1-CP-TXtoOpenROADM-1-1-DEG2-DEG2-CTP-RX</link-id>
             <source><source-node>OpenROADM-1-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-1-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-1-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-1-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-SRG1-SRG1-CP-TXtoOpenROADM-1-1-DEG2-DEG2-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-DEG3-DEG3-CTP-TXtoOpenROADM-1-1-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-1-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-1-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-DEG3-DEG3-CTP-TXtoOpenROADM-1-1-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-1-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-1-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-1-SRG1-SRG1-CP-TXtoOpenROADM-1-1-DEG3-DEG3-CTP-RX</link-id>
             <source><source-node>OpenROADM-1-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-DEG3-DEG3-CTP-TXtoOpenROADM-1-1-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-1-DEG3-DEG3-CTP-TXtoOpenROADM-1-1-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-1-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-SRG1-SRG1-CP-TXtoOpenROADM-1-1-DEG3-DEG3-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-1XPDR-NW1-TX-toOpenROADM-1-1-SRG1-SRG1-PP1-RX</link-id>
         <source><source-node>XPONDER-1-1</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-SRG1-SRG1-PP1-TX-to-XPONDER-1-1XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-SRG1-SRG1-PP1-TX-to-XPONDER-1-1XPDR-NW1-RX</link-id>
         <source><source-node>OpenROADM-1-1-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-1-1</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-1XPDR-NW1-TX-toOpenROADM-1-1-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-1XPDR-NW2-TX-toOpenROADM-1-1-SRG1-SRG1-PP2-RX</link-id>
         <source><source-node>XPONDER-1-1</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-SRG1-SRG1-PP2-TX-to-XPONDER-1-1XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-SRG1-SRG1-PP2-TX-to-XPONDER-1-1XPDR-NW2-RX</link-id>
         <source><source-node>OpenROADM-1-1-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-1-1</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-1XPDR-NW2-TX-toOpenROADM-1-1-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-1XPDR-NW3-TX-toOpenROADM-1-1-SRG1-SRG1-PP3-RX</link-id>
         <source><source-node>XPONDER-1-1</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-SRG1-SRG1-PP3-TX-to-XPONDER-1-1XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-SRG1-SRG1-PP3-TX-to-XPONDER-1-1XPDR-NW3-RX</link-id>
         <source><source-node>OpenROADM-1-1-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-1-1</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-1XPDR-NW3-TX-toOpenROADM-1-1-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-1XPDR-NW4-TX-toOpenROADM-1-1-SRG1-SRG1-PP4-RX</link-id>
         <source><source-node>XPONDER-1-1</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-SRG1-SRG1-PP4-TX-to-XPONDER-1-1XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-SRG1-SRG1-PP4-TX-to-XPONDER-1-1XPDR-NW4-RX</link-id>
         <source><source-node>OpenROADM-1-1-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-1-1</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-1XPDR-NW4-TX-toOpenROADM-1-1-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-DEG1-DEG1-CTP-TXtoOpenROADM-1-2-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-1-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-DEG2-DEG2-CTP-TXtoOpenROADM-1-2-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-DEG1-DEG1-CTP-TXtoOpenROADM-1-2-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-1-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-DEG3-DEG3-CTP-TXtoOpenROADM-1-2-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-2-SRG1-SRG1-CP-TXtoOpenROADM-1-2-DEG1-DEG1-CTP-RX</link-id>
             <source><source-node>OpenROADM-1-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-DEG1-DEG1-CTP-TXtoOpenROADM-1-2-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-2-DEG1-DEG1-CTP-TXtoOpenROADM-1-2-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-1-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-SRG1-SRG1-CP-TXtoOpenROADM-1-2-DEG1-DEG1-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-DEG2-DEG2-CTP-TXtoOpenROADM-1-2-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-1-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-DEG1-DEG1-CTP-TXtoOpenROADM-1-2-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-DEG2-DEG2-CTP-TXtoOpenROADM-1-2-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-1-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-DEG3-DEG3-CTP-TXtoOpenROADM-1-2-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-2-SRG1-SRG1-CP-TXtoOpenROADM-1-2-DEG2-DEG2-CTP-RX</link-id>
             <source><source-node>OpenROADM-1-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-DEG2-DEG2-CTP-TXtoOpenROADM-1-2-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-2-DEG2-DEG2-CTP-TXtoOpenROADM-1-2-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-1-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-SRG1-SRG1-CP-TXtoOpenROADM-1-2-DEG2-DEG2-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-DEG3-DEG3-CTP-TXtoOpenROADM-1-2-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-1-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-DEG1-DEG1-CTP-TXtoOpenROADM-1-2-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-DEG3-DEG3-CTP-TXtoOpenROADM-1-2-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-1-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-DEG2-DEG2-CTP-TXtoOpenROADM-1-2-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-2-SRG1-SRG1-CP-TXtoOpenROADM-1-2-DEG3-DEG3-CTP-RX</link-id>
             <source><source-node>OpenROADM-1-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-DEG3-DEG3-CTP-TXtoOpenROADM-1-2-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-2-DEG3-DEG3-CTP-TXtoOpenROADM-1-2-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-1-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-SRG1-SRG1-CP-TXtoOpenROADM-1-2-DEG3-DEG3-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-2XPDR-NW1-TX-toOpenROADM-1-2-SRG1-SRG1-PP1-RX</link-id>
         <source><source-node>XPONDER-1-2</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-SRG1-SRG1-PP1-TX-to-XPONDER-1-2XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-SRG1-SRG1-PP1-TX-to-XPONDER-1-2XPDR-NW1-RX</link-id>
         <source><source-node>OpenROADM-1-2-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-1-2</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-2XPDR-NW1-TX-toOpenROADM-1-2-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-2XPDR-NW2-TX-toOpenROADM-1-2-SRG1-SRG1-PP2-RX</link-id>
         <source><source-node>XPONDER-1-2</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-SRG1-SRG1-PP2-TX-to-XPONDER-1-2XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-SRG1-SRG1-PP2-TX-to-XPONDER-1-2XPDR-NW2-RX</link-id>
         <source><source-node>OpenROADM-1-2-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-1-2</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-2XPDR-NW2-TX-toOpenROADM-1-2-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-2XPDR-NW3-TX-toOpenROADM-1-2-SRG1-SRG1-PP3-RX</link-id>
         <source><source-node>XPONDER-1-2</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-SRG1-SRG1-PP3-TX-to-XPONDER-1-2XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-SRG1-SRG1-PP3-TX-to-XPONDER-1-2XPDR-NW3-RX</link-id>
         <source><source-node>OpenROADM-1-2-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-1-2</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-2XPDR-NW3-TX-toOpenROADM-1-2-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-2XPDR-NW4-TX-toOpenROADM-1-2-SRG1-SRG1-PP4-RX</link-id>
         <source><source-node>XPONDER-1-2</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-SRG1-SRG1-PP4-TX-to-XPONDER-1-2XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-SRG1-SRG1-PP4-TX-to-XPONDER-1-2XPDR-NW4-RX</link-id>
         <source><source-node>OpenROADM-1-2-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-1-2</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-2XPDR-NW4-TX-toOpenROADM-1-2-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-3-DEG1-DEG1-CTP-TXtoOpenROADM-1-3-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-1-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-DEG2-DEG2-CTP-TXtoOpenROADM-1-3-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-3-DEG1-DEG1-CTP-TXtoOpenROADM-1-3-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-1-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-DEG3-DEG3-CTP-TXtoOpenROADM-1-3-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-3-SRG1-SRG1-CP-TXtoOpenROADM-1-3-DEG1-DEG1-CTP-RX</link-id>
             <source><source-node>OpenROADM-1-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-DEG1-DEG1-CTP-TXtoOpenROADM-1-3-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-3-DEG1-DEG1-CTP-TXtoOpenROADM-1-3-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-1-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-SRG1-SRG1-CP-TXtoOpenROADM-1-3-DEG1-DEG1-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-3-DEG2-DEG2-CTP-TXtoOpenROADM-1-3-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-1-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-DEG1-DEG1-CTP-TXtoOpenROADM-1-3-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-3-DEG2-DEG2-CTP-TXtoOpenROADM-1-3-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-1-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-DEG3-DEG3-CTP-TXtoOpenROADM-1-3-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-3-SRG1-SRG1-CP-TXtoOpenROADM-1-3-DEG2-DEG2-CTP-RX</link-id>
             <source><source-node>OpenROADM-1-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-DEG2-DEG2-CTP-TXtoOpenROADM-1-3-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-3-DEG2-DEG2-CTP-TXtoOpenROADM-1-3-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-1-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-SRG1-SRG1-CP-TXtoOpenROADM-1-3-DEG2-DEG2-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-3-DEG3-DEG3-CTP-TXtoOpenROADM-1-3-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-1-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-DEG1-DEG1-CTP-TXtoOpenROADM-1-3-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-3-DEG3-DEG3-CTP-TXtoOpenROADM-1-3-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-1-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-DEG2-DEG2-CTP-TXtoOpenROADM-1-3-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-3-SRG1-SRG1-CP-TXtoOpenROADM-1-3-DEG3-DEG3-CTP-RX</link-id>
             <source><source-node>OpenROADM-1-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-DEG3-DEG3-CTP-TXtoOpenROADM-1-3-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-3-DEG3-DEG3-CTP-TXtoOpenROADM-1-3-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-1-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-SRG1-SRG1-CP-TXtoOpenROADM-1-3-DEG3-DEG3-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-3XPDR-NW1-TX-toOpenROADM-1-3-SRG1-SRG1-PP1-RX</link-id>
         <source><source-node>XPONDER-1-3</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-3-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-SRG1-SRG1-PP1-TX-to-XPONDER-1-3XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-3-SRG1-SRG1-PP1-TX-to-XPONDER-1-3XPDR-NW1-RX</link-id>
         <source><source-node>OpenROADM-1-3-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-1-3</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-3XPDR-NW1-TX-toOpenROADM-1-3-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-3XPDR-NW2-TX-toOpenROADM-1-3-SRG1-SRG1-PP2-RX</link-id>
         <source><source-node>XPONDER-1-3</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-3-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-SRG1-SRG1-PP2-TX-to-XPONDER-1-3XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-3-SRG1-SRG1-PP2-TX-to-XPONDER-1-3XPDR-NW2-RX</link-id>
         <source><source-node>OpenROADM-1-3-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-1-3</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-3XPDR-NW2-TX-toOpenROADM-1-3-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-3XPDR-NW3-TX-toOpenROADM-1-3-SRG1-SRG1-PP3-RX</link-id>
         <source><source-node>XPONDER-1-3</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-3-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-SRG1-SRG1-PP3-TX-to-XPONDER-1-3XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-3-SRG1-SRG1-PP3-TX-to-XPONDER-1-3XPDR-NW3-RX</link-id>
         <source><source-node>OpenROADM-1-3-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-1-3</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-3XPDR-NW3-TX-toOpenROADM-1-3-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-3XPDR-NW4-TX-toOpenROADM-1-3-SRG1-SRG1-PP4-RX</link-id>
         <source><source-node>XPONDER-1-3</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-3-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-SRG1-SRG1-PP4-TX-to-XPONDER-1-3XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-3-SRG1-SRG1-PP4-TX-to-XPONDER-1-3XPDR-NW4-RX</link-id>
         <source><source-node>OpenROADM-1-3-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-1-3</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-3XPDR-NW4-TX-toOpenROADM-1-3-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-4-DEG1-DEG1-CTP-TXtoOpenROADM-1-4-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-1-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-DEG2-DEG2-CTP-TXtoOpenROADM-1-4-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-4-DEG1-DEG1-CTP-TXtoOpenROADM-1-4-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-1-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-DEG3-DEG3-CTP-TXtoOpenROADM-1-4-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-4-SRG1-SRG1-CP-TXtoOpenROADM-1-4-DEG1-DEG1-CTP-RX</link-id>
             <source><source-node>OpenROADM-1-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-DEG1-DEG1-CTP-TXtoOpenROADM-1-4-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-4-DEG1-DEG1-CTP-TXtoOpenROADM-1-4-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-1-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-SRG1-SRG1-CP-TXtoOpenROADM-1-4-DEG1-DEG1-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-4-DEG2-DEG2-CTP-TXtoOpenROADM-1-4-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-1-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-DEG1-DEG1-CTP-TXtoOpenROADM-1-4-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-4-DEG2-DEG2-CTP-TXtoOpenROADM-1-4-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-1-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-DEG3-DEG3-CTP-TXtoOpenROADM-1-4-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-4-SRG1-SRG1-CP-TXtoOpenROADM-1-4-DEG2-DEG2-CTP-RX</link-id>
             <source><source-node>OpenROADM-1-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-DEG2-DEG2-CTP-TXtoOpenROADM-1-4-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-4-DEG2-DEG2-CTP-TXtoOpenROADM-1-4-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-1-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-SRG1-SRG1-CP-TXtoOpenROADM-1-4-DEG2-DEG2-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-4-DEG3-DEG3-CTP-TXtoOpenROADM-1-4-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-1-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-DEG1-DEG1-CTP-TXtoOpenROADM-1-4-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-4-DEG3-DEG3-CTP-TXtoOpenROADM-1-4-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-1-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-DEG2-DEG2-CTP-TXtoOpenROADM-1-4-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-4-SRG1-SRG1-CP-TXtoOpenROADM-1-4-DEG3-DEG3-CTP-RX</link-id>
             <source><source-node>OpenROADM-1-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-DEG3-DEG3-CTP-TXtoOpenROADM-1-4-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-4-DEG3-DEG3-CTP-TXtoOpenROADM-1-4-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-1-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-SRG1-SRG1-CP-TXtoOpenROADM-1-4-DEG3-DEG3-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-4XPDR-NW1-TX-toOpenROADM-1-4-SRG1-SRG1-PP1-RX</link-id>
         <source><source-node>XPONDER-1-4</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-4-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-SRG1-SRG1-PP1-TX-to-XPONDER-1-4XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-4-SRG1-SRG1-PP1-TX-to-XPONDER-1-4XPDR-NW1-RX</link-id>
         <source><source-node>OpenROADM-1-4-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-1-4</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-4XPDR-NW1-TX-toOpenROADM-1-4-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-4XPDR-NW2-TX-toOpenROADM-1-4-SRG1-SRG1-PP2-RX</link-id>
         <source><source-node>XPONDER-1-4</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-4-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-SRG1-SRG1-PP2-TX-to-XPONDER-1-4XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-4-SRG1-SRG1-PP2-TX-to-XPONDER-1-4XPDR-NW2-RX</link-id>
         <source><source-node>OpenROADM-1-4-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-1-4</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-4XPDR-NW2-TX-toOpenROADM-1-4-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-4XPDR-NW3-TX-toOpenROADM-1-4-SRG1-SRG1-PP3-RX</link-id>
         <source><source-node>XPONDER-1-4</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-4-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-SRG1-SRG1-PP3-TX-to-XPONDER-1-4XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-4-SRG1-SRG1-PP3-TX-to-XPONDER-1-4XPDR-NW3-RX</link-id>
         <source><source-node>OpenROADM-1-4-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-1-4</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-4XPDR-NW3-TX-toOpenROADM-1-4-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-4XPDR-NW4-TX-toOpenROADM-1-4-SRG1-SRG1-PP4-RX</link-id>
         <source><source-node>XPONDER-1-4</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-4-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-SRG1-SRG1-PP4-TX-to-XPONDER-1-4XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-4-SRG1-SRG1-PP4-TX-to-XPONDER-1-4XPDR-NW4-RX</link-id>
         <source><source-node>OpenROADM-1-4-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-1-4</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-4XPDR-NW4-TX-toOpenROADM-1-4-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
 <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
     <link-id>OpenROADM-1-1-DEG1-to-OpenROADM-1-2-DEG1</link-id>
     <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-DEG1-to-OpenROADM-1-1-DEG1</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
+    <clfi xmlns="http://org/openroadm/common/network">fiber1112</clfi>
+    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
+
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-1-1-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-1-2-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <opposite-link>OpenROADM-1-2-DEG1-to-OpenROADM-1-1-DEG1</opposite-link>
-        <TE-metric>10</TE-metric>
         <span>
-            <clfi>fiber1</clfi>
             <auto-spanloss>true</auto-spanloss>
             <spanloss-base>11.4</spanloss-base>
             <spanloss-current>12</spanloss-current>
@@ -2728,15 +4809,16 @@
 <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
     <link-id>OpenROADM-1-2-DEG1-to-OpenROADM-1-1-DEG1</link-id>
     <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-DEG1-to-OpenROADM-1-2-DEG1</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
+    <clfi xmlns="http://org/openroadm/common/network">fiber1211</clfi>
+    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
+
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-1-2-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-1-1-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <opposite-link>OpenROADM-1-1-DEG1-to-OpenROADM-1-2-DEG1</opposite-link>
-        <TE-metric>10</TE-metric>
         <span>
-            <clfi>fiber2</clfi>
             <auto-spanloss>true</auto-spanloss>
             <spanloss-base>11.4</spanloss-base>
             <spanloss-current>12</spanloss-current>
@@ -2753,15 +4835,16 @@
 <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
     <link-id>OpenROADM-1-2-DEG2-to-OpenROADM-1-3-DEG2</link-id>
     <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-DEG2-to-OpenROADM-1-2-DEG2</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
+    <clfi xmlns="http://org/openroadm/common/network">fiber1213</clfi>
+    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
+
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-1-2-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-1-3-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <opposite-link>OpenROADM-1-3-DEG2-to-OpenROADM-1-2-DEG2</opposite-link>
-        <TE-metric>10</TE-metric>
         <span>
-            <clfi>fiber56</clfi>
             <auto-spanloss>true</auto-spanloss>
             <spanloss-base>11.4</spanloss-base>
             <spanloss-current>12</spanloss-current>
@@ -2778,15 +4861,16 @@
 <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
     <link-id>OpenROADM-1-3-DEG2-to-OpenROADM-1-2-DEG2</link-id>
     <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-DEG2-to-OpenROADM-1-3-DEG2</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
+
+    <clfi xmlns="http://org/openroadm/common/network">fiber1312</clfi>
+    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-1-3-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-1-2-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <opposite-link>OpenROADM-1-2-DEG2-to-OpenROADM-1-3-DEG2</opposite-link>
-        <TE-metric>10</TE-metric>
         <span>
-            <clfi>fiber3</clfi>
             <auto-spanloss>true</auto-spanloss>
             <spanloss-base>11.4</spanloss-base>
             <spanloss-current>12</spanloss-current>
@@ -2803,15 +4887,16 @@
 <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
     <link-id>OpenROADM-1-3-DEG1-to-OpenROADM-1-4-DEG1</link-id>
     <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-DEG1-to-OpenROADM-1-3-DEG1</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
+    <clfi xmlns="http://org/openroadm/common/network">fiber1314</clfi>
+    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
+
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-1-3-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-1-4-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <opposite-link>OpenROADM-1-4-DEG1-to-OpenROADM-1-3-DEG1</opposite-link>
-        <TE-metric>10</TE-metric>
         <span>
-            <clfi>fiber</clfi>
             <auto-spanloss>true</auto-spanloss>
             <spanloss-base>11.4</spanloss-base>
             <spanloss-current>12</spanloss-current>
@@ -2828,15 +4913,16 @@
 <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
     <link-id>OpenROADM-1-4-DEG1-to-OpenROADM-1-3-DEG1</link-id>
     <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-DEG1-to-OpenROADM-1-4-DEG1</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
+    <clfi xmlns="http://org/openroadm/common/network">fiber1413</clfi>
+    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
+
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-1-4-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-1-3-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <opposite-link>OpenROADM-1-3-DEG1-to-OpenROADM-1-4-DEG1</opposite-link>
-        <TE-metric>10</TE-metric>
         <span>
-            <clfi>fiber4</clfi>
             <auto-spanloss>true</auto-spanloss>
             <spanloss-base>11.4</spanloss-base>
             <spanloss-current>12</spanloss-current>
@@ -2853,15 +4939,16 @@
 <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
     <link-id>OpenROADM-1-4-DEG2-to-OpenROADM-1-1-DEG2</link-id>
     <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-DEG2-to-OpenROADM-1-4-DEG2</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
+    <clfi xmlns="http://org/openroadm/common/network">fiber1411</clfi>
+    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
+
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-1-4-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-1-1-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <opposite-link>OpenROADM-1-1-DEG2-to-OpenROADM-1-4-DEG2</opposite-link>
-        <TE-metric>10</TE-metric>
         <span>
-            <clfi>fiber57</clfi>
             <auto-spanloss>true</auto-spanloss>
             <spanloss-base>11.4</spanloss-base>
             <spanloss-current>12</spanloss-current>
@@ -2878,15 +4965,16 @@
 <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
     <link-id>OpenROADM-1-1-DEG2-to-OpenROADM-1-4-DEG2</link-id>
     <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-DEG2-to-OpenROADM-1-1-DEG2</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
+    <clfi xmlns="http://org/openroadm/common/network">fiber1114</clfi>
+    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
+
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-1-1-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-1-4-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <opposite-link>OpenROADM-1-4-DEG2-to-OpenROADM-1-1-DEG2</opposite-link>
-        <TE-metric>10</TE-metric>
         <span>
-            <clfi>fiber5</clfi>
             <auto-spanloss>true</auto-spanloss>
             <spanloss-base>11.4</spanloss-base>
             <spanloss-current>12</spanloss-current>
@@ -2903,335 +4991,576 @@
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-DEG1-DEG1-CTP-TXtoOpenROADM-2-1-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-2-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-DEG2-DEG2-CTP-TXtoOpenROADM-2-1-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-DEG1-DEG1-CTP-TXtoOpenROADM-2-1-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-2-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-DEG3-DEG3-CTP-TXtoOpenROADM-2-1-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-1-SRG1-SRG1-CP-TXtoOpenROADM-2-1-DEG1-DEG1-CTP-RX</link-id>
             <source><source-node>OpenROADM-2-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-DEG1-DEG1-CTP-TXtoOpenROADM-2-1-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-1-DEG1-DEG1-CTP-TXtoOpenROADM-2-1-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-2-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-SRG1-SRG1-CP-TXtoOpenROADM-2-1-DEG1-DEG1-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-DEG2-DEG2-CTP-TXtoOpenROADM-2-1-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-2-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-DEG1-DEG1-CTP-TXtoOpenROADM-2-1-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-DEG2-DEG2-CTP-TXtoOpenROADM-2-1-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-2-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-DEG3-DEG3-CTP-TXtoOpenROADM-2-1-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-1-SRG1-SRG1-CP-TXtoOpenROADM-2-1-DEG2-DEG2-CTP-RX</link-id>
             <source><source-node>OpenROADM-2-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-DEG2-DEG2-CTP-TXtoOpenROADM-2-1-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-1-DEG2-DEG2-CTP-TXtoOpenROADM-2-1-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-2-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-SRG1-SRG1-CP-TXtoOpenROADM-2-1-DEG2-DEG2-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-DEG3-DEG3-CTP-TXtoOpenROADM-2-1-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-2-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-DEG1-DEG1-CTP-TXtoOpenROADM-2-1-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-DEG3-DEG3-CTP-TXtoOpenROADM-2-1-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-2-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-DEG2-DEG2-CTP-TXtoOpenROADM-2-1-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-1-SRG1-SRG1-CP-TXtoOpenROADM-2-1-DEG3-DEG3-CTP-RX</link-id>
             <source><source-node>OpenROADM-2-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-DEG3-DEG3-CTP-TXtoOpenROADM-2-1-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-1-DEG3-DEG3-CTP-TXtoOpenROADM-2-1-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-2-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-SRG1-SRG1-CP-TXtoOpenROADM-2-1-DEG3-DEG3-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-1XPDR-NW1-TX-toOpenROADM-2-1-SRG1-SRG1-PP1-RX</link-id>
         <source><source-node>XPONDER-2-1</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-SRG1-SRG1-PP1-TX-to-XPONDER-2-1XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-SRG1-SRG1-PP1-TX-to-XPONDER-2-1XPDR-NW1-RX</link-id>
         <source><source-node>OpenROADM-2-1-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-2-1</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-1XPDR-NW1-TX-toOpenROADM-2-1-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-1XPDR-NW2-TX-toOpenROADM-2-1-SRG1-SRG1-PP2-RX</link-id>
         <source><source-node>XPONDER-2-1</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-SRG1-SRG1-PP2-TX-to-XPONDER-2-1XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-SRG1-SRG1-PP2-TX-to-XPONDER-2-1XPDR-NW2-RX</link-id>
         <source><source-node>OpenROADM-2-1-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-2-1</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-1XPDR-NW2-TX-toOpenROADM-2-1-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-1XPDR-NW3-TX-toOpenROADM-2-1-SRG1-SRG1-PP3-RX</link-id>
         <source><source-node>XPONDER-2-1</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-SRG1-SRG1-PP3-TX-to-XPONDER-2-1XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-SRG1-SRG1-PP3-TX-to-XPONDER-2-1XPDR-NW3-RX</link-id>
         <source><source-node>OpenROADM-2-1-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-2-1</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-1XPDR-NW3-TX-toOpenROADM-2-1-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-1XPDR-NW4-TX-toOpenROADM-2-1-SRG1-SRG1-PP4-RX</link-id>
         <source><source-node>XPONDER-2-1</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-SRG1-SRG1-PP4-TX-to-XPONDER-2-1XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-SRG1-SRG1-PP4-TX-to-XPONDER-2-1XPDR-NW4-RX</link-id>
         <source><source-node>OpenROADM-2-1-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-2-1</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-1XPDR-NW4-TX-toOpenROADM-2-1-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-2-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-2-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-2-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-2-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-2-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-2-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-2-SRG1-SRG1-CP-TXtoOpenROADM-2-2-DEG1-DEG1-CTP-RX</link-id>
             <source><source-node>OpenROADM-2-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-2-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-2-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-2-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-SRG1-SRG1-CP-TXtoOpenROADM-2-2-DEG1-DEG1-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-2-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-2-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-2-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-2-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-2-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-2-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-2-SRG1-SRG1-CP-TXtoOpenROADM-2-2-DEG2-DEG2-CTP-RX</link-id>
             <source><source-node>OpenROADM-2-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-2-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-2-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-2-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-SRG1-SRG1-CP-TXtoOpenROADM-2-2-DEG2-DEG2-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-2-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-2-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-2-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-2-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-2-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-2-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-2-SRG1-SRG1-CP-TXtoOpenROADM-2-2-DEG3-DEG3-CTP-RX</link-id>
             <source><source-node>OpenROADM-2-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-2-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-2-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-2-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-SRG1-SRG1-CP-TXtoOpenROADM-2-2-DEG3-DEG3-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-2XPDR-NW1-TX-toOpenROADM-2-2-SRG1-SRG1-PP1-RX</link-id>
         <source><source-node>XPONDER-2-2</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-SRG1-SRG1-PP1-TX-to-XPONDER-2-2XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-SRG1-SRG1-PP1-TX-to-XPONDER-2-2XPDR-NW1-RX</link-id>
         <source><source-node>OpenROADM-2-2-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-2-2</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-2XPDR-NW1-TX-toOpenROADM-2-2-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-2XPDR-NW2-TX-toOpenROADM-2-2-SRG1-SRG1-PP2-RX</link-id>
         <source><source-node>XPONDER-2-2</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-SRG1-SRG1-PP2-TX-to-XPONDER-2-2XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-SRG1-SRG1-PP2-TX-to-XPONDER-2-2XPDR-NW2-RX</link-id>
         <source><source-node>OpenROADM-2-2-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-2-2</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-2XPDR-NW2-TX-toOpenROADM-2-2-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-2XPDR-NW3-TX-toOpenROADM-2-2-SRG1-SRG1-PP3-RX</link-id>
         <source><source-node>XPONDER-2-2</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-SRG1-SRG1-PP3-TX-to-XPONDER-2-2XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-SRG1-SRG1-PP3-TX-to-XPONDER-2-2XPDR-NW3-RX</link-id>
         <source><source-node>OpenROADM-2-2-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-2-2</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-2XPDR-NW3-TX-toOpenROADM-2-2-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-2XPDR-NW4-TX-toOpenROADM-2-2-SRG1-SRG1-PP4-RX</link-id>
         <source><source-node>XPONDER-2-2</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-SRG1-SRG1-PP4-TX-to-XPONDER-2-2XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-SRG1-SRG1-PP4-TX-to-XPONDER-2-2XPDR-NW4-RX</link-id>
         <source><source-node>OpenROADM-2-2-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-2-2</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-2XPDR-NW4-TX-toOpenROADM-2-2-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-3-DEG1-DEG1-CTP-TXtoOpenROADM-2-3-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-2-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-DEG2-DEG2-CTP-TXtoOpenROADM-2-3-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-3-DEG1-DEG1-CTP-TXtoOpenROADM-2-3-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-2-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-DEG3-DEG3-CTP-TXtoOpenROADM-2-3-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-3-SRG1-SRG1-CP-TXtoOpenROADM-2-3-DEG1-DEG1-CTP-RX</link-id>
             <source><source-node>OpenROADM-2-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-DEG1-DEG1-CTP-TXtoOpenROADM-2-3-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-3-DEG1-DEG1-CTP-TXtoOpenROADM-2-3-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-2-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-SRG1-SRG1-CP-TXtoOpenROADM-2-3-DEG1-DEG1-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-3-DEG2-DEG2-CTP-TXtoOpenROADM-2-3-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-2-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-DEG1-DEG1-CTP-TXtoOpenROADM-2-3-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-3-DEG2-DEG2-CTP-TXtoOpenROADM-2-3-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-2-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-DEG3-DEG3-CTP-TXtoOpenROADM-2-3-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-3-SRG1-SRG1-CP-TXtoOpenROADM-2-3-DEG2-DEG2-CTP-RX</link-id>
             <source><source-node>OpenROADM-2-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-DEG2-DEG2-CTP-TXtoOpenROADM-2-3-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-3-DEG2-DEG2-CTP-TXtoOpenROADM-2-3-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-2-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-SRG1-SRG1-CP-TXtoOpenROADM-2-3-DEG2-DEG2-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-3-DEG3-DEG3-CTP-TXtoOpenROADM-2-3-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-2-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-DEG1-DEG1-CTP-TXtoOpenROADM-2-3-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-3-DEG3-DEG3-CTP-TXtoOpenROADM-2-3-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-2-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-DEG2-DEG2-CTP-TXtoOpenROADM-2-3-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-3-SRG1-SRG1-CP-TXtoOpenROADM-2-3-DEG3-DEG3-CTP-RX</link-id>
             <source><source-node>OpenROADM-2-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-DEG3-DEG3-CTP-TXtoOpenROADM-2-3-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-3-DEG3-DEG3-CTP-TXtoOpenROADM-2-3-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-2-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-SRG1-SRG1-CP-TXtoOpenROADM-2-3-DEG3-DEG3-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-3XPDR-NW1-TX-toOpenROADM-2-3-SRG1-SRG1-PP1-RX</link-id>
         <source><source-node>XPONDER-2-3</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-3-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-SRG1-SRG1-PP1-TX-to-XPONDER-2-3XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-3-SRG1-SRG1-PP1-TX-to-XPONDER-2-3XPDR-NW1-RX</link-id>
         <source><source-node>OpenROADM-2-3-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-2-3</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-3XPDR-NW1-TX-toOpenROADM-2-3-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-3XPDR-NW2-TX-toOpenROADM-2-3-SRG1-SRG1-PP2-RX</link-id>
         <source><source-node>XPONDER-2-3</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-3-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-SRG1-SRG1-PP2-TX-to-XPONDER-2-3XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-3-SRG1-SRG1-PP2-TX-to-XPONDER-2-3XPDR-NW2-RX</link-id>
         <source><source-node>OpenROADM-2-3-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-2-3</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-3XPDR-NW2-TX-toOpenROADM-2-3-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-3XPDR-NW3-TX-toOpenROADM-2-3-SRG1-SRG1-PP3-RX</link-id>
         <source><source-node>XPONDER-2-3</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-3-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-SRG1-SRG1-PP3-TX-to-XPONDER-2-3XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-3-SRG1-SRG1-PP3-TX-to-XPONDER-2-3XPDR-NW3-RX</link-id>
         <source><source-node>OpenROADM-2-3-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-2-3</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-3XPDR-NW3-TX-toOpenROADM-2-3-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-3XPDR-NW4-TX-toOpenROADM-2-3-SRG1-SRG1-PP4-RX</link-id>
         <source><source-node>XPONDER-2-3</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-3-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-SRG1-SRG1-PP4-TX-to-XPONDER-2-3XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-3-SRG1-SRG1-PP4-TX-to-XPONDER-2-3XPDR-NW4-RX</link-id>
         <source><source-node>OpenROADM-2-3-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-2-3</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-3XPDR-NW4-TX-toOpenROADM-2-3-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-4-DEG1-DEG1-CTP-TXtoOpenROADM-2-4-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-2-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-DEG2-DEG2-CTP-TXtoOpenROADM-2-4-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-4-DEG1-DEG1-CTP-TXtoOpenROADM-2-4-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-2-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-DEG3-DEG3-CTP-TXtoOpenROADM-2-4-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-4-SRG1-SRG1-CP-TXtoOpenROADM-2-4-DEG1-DEG1-CTP-RX</link-id>
             <source><source-node>OpenROADM-2-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-DEG1-DEG1-CTP-TXtoOpenROADM-2-4-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-4-DEG1-DEG1-CTP-TXtoOpenROADM-2-4-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-2-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-SRG1-SRG1-CP-TXtoOpenROADM-2-4-DEG1-DEG1-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-4-DEG2-DEG2-CTP-TXtoOpenROADM-2-4-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-2-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-DEG1-DEG1-CTP-TXtoOpenROADM-2-4-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-4-DEG2-DEG2-CTP-TXtoOpenROADM-2-4-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-2-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-DEG3-DEG3-CTP-TXtoOpenROADM-2-4-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-4-SRG1-SRG1-CP-TXtoOpenROADM-2-4-DEG2-DEG2-CTP-RX</link-id>
             <source><source-node>OpenROADM-2-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-DEG2-DEG2-CTP-TXtoOpenROADM-2-4-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-4-DEG2-DEG2-CTP-TXtoOpenROADM-2-4-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-2-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-SRG1-SRG1-CP-TXtoOpenROADM-2-4-DEG2-DEG2-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-4-DEG3-DEG3-CTP-TXtoOpenROADM-2-4-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-2-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-DEG1-DEG1-CTP-TXtoOpenROADM-2-4-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-4-DEG3-DEG3-CTP-TXtoOpenROADM-2-4-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-2-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-DEG2-DEG2-CTP-TXtoOpenROADM-2-4-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-4-SRG1-SRG1-CP-TXtoOpenROADM-2-4-DEG3-DEG3-CTP-RX</link-id>
             <source><source-node>OpenROADM-2-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-DEG3-DEG3-CTP-TXtoOpenROADM-2-4-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-4-DEG3-DEG3-CTP-TXtoOpenROADM-2-4-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-2-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-SRG1-SRG1-CP-TXtoOpenROADM-2-4-DEG3-DEG3-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-4XPDR-NW1-TX-toOpenROADM-2-4-SRG1-SRG1-PP1-RX</link-id>
         <source><source-node>XPONDER-2-4</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-4-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-SRG1-SRG1-PP1-TX-to-XPONDER-2-4XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-4-SRG1-SRG1-PP1-TX-to-XPONDER-2-4XPDR-NW1-RX</link-id>
         <source><source-node>OpenROADM-2-4-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-2-4</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-4XPDR-NW1-TX-toOpenROADM-2-4-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-4XPDR-NW2-TX-toOpenROADM-2-4-SRG1-SRG1-PP2-RX</link-id>
         <source><source-node>XPONDER-2-4</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-4-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-SRG1-SRG1-PP2-TX-to-XPONDER-2-4XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-4-SRG1-SRG1-PP2-TX-to-XPONDER-2-4XPDR-NW2-RX</link-id>
         <source><source-node>OpenROADM-2-4-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-2-4</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-4XPDR-NW2-TX-toOpenROADM-2-4-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-4XPDR-NW3-TX-toOpenROADM-2-4-SRG1-SRG1-PP3-RX</link-id>
         <source><source-node>XPONDER-2-4</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-4-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-SRG1-SRG1-PP3-TX-to-XPONDER-2-4XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-4-SRG1-SRG1-PP3-TX-to-XPONDER-2-4XPDR-NW3-RX</link-id>
         <source><source-node>OpenROADM-2-4-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-2-4</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-4XPDR-NW3-TX-toOpenROADM-2-4-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-4XPDR-NW4-TX-toOpenROADM-2-4-SRG1-SRG1-PP4-RX</link-id>
         <source><source-node>XPONDER-2-4</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-4-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-SRG1-SRG1-PP4-TX-to-XPONDER-2-4XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-4-SRG1-SRG1-PP4-TX-to-XPONDER-2-4XPDR-NW4-RX</link-id>
         <source><source-node>OpenROADM-2-4-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-2-4</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-4XPDR-NW4-TX-toOpenROADM-2-4-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
 <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
     <link-id>OpenROADM-2-1-DEG1-to-OpenROADM-2-2-DEG1</link-id>
     <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-DEG1-to-OpenROADM-2-1-DEG1</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
+    <clfi xmlns="http://org/openroadm/common/network">fiber2122</clfi>
+    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
+
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-2-1-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-2-2-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <opposite-link>OpenROADM-2-2-DEG1-to-OpenROADM-2-1-DEG1</opposite-link>
-        <TE-metric>10</TE-metric>
         <span>
-            <clfi>fiber6</clfi>
             <auto-spanloss>true</auto-spanloss>
             <spanloss-base>11.4</spanloss-base>
             <spanloss-current>12</spanloss-current>
@@ -3248,15 +5577,16 @@
 <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
     <link-id>OpenROADM-2-2-DEG1-to-OpenROADM-2-1-DEG1</link-id>
     <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-DEG1-to-OpenROADM-2-2-DEG1</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
+    <clfi xmlns="http://org/openroadm/common/network">fiber2221</clfi>
+    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
+
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-2-2-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-2-1-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <opposite-link>OpenROADM-2-1-DEG1-to-OpenROADM-2-2-DEG1</opposite-link>
-        <TE-metric>10</TE-metric>
         <span>
-            <clfi>fiber7</clfi>
             <auto-spanloss>true</auto-spanloss>
             <spanloss-base>11.4</spanloss-base>
             <spanloss-current>12</spanloss-current>
@@ -3273,15 +5603,16 @@
 <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
     <link-id>OpenROADM-2-2-DEG2-to-OpenROADM-2-3-DEG2</link-id>
     <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-DEG2-to-OpenROADM-2-2-DEG2</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
+    <clfi xmlns="http://org/openroadm/common/network">fiber2223</clfi>
+    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
+
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-2-2-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-2-3-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <opposite-link>OpenROADM-2-3-DEG2-to-OpenROADM-2-2-DEG2</opposite-link>
-        <TE-metric>10</TE-metric>
         <span>
-            <clfi>fiber8</clfi>
             <auto-spanloss>true</auto-spanloss>
             <spanloss-base>11.4</spanloss-base>
             <spanloss-current>12</spanloss-current>
@@ -3298,15 +5629,16 @@
 <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
     <link-id>OpenROADM-2-3-DEG2-to-OpenROADM-2-2-DEG2</link-id>
     <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-DEG2-to-OpenROADM-2-3-DEG2</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
+    <clfi xmlns="http://org/openroadm/common/network">fiber2322</clfi>
+    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
+
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-2-3-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-2-2-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <opposite-link>OpenROADM-2-2-DEG2-to-OpenROADM-2-3-DEG2</opposite-link>
-        <TE-metric>10</TE-metric>
         <span>
-            <clfi>fiber9</clfi>
             <auto-spanloss>true</auto-spanloss>
             <spanloss-base>11.4</spanloss-base>
             <spanloss-current>12</spanloss-current>
@@ -3323,15 +5655,16 @@
 <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
     <link-id>OpenROADM-2-3-DEG1-to-OpenROADM-2-4-DEG1</link-id>
     <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-DEG1-to-OpenROADM-2-3-DEG1</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
+    <clfi xmlns="http://org/openroadm/common/network">fiber2324</clfi>
+    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
+
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-2-3-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-2-4-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <opposite-link>OpenROADM-2-4-DEG1-to-OpenROADM-2-3-DEG1</opposite-link>
-        <TE-metric>10</TE-metric>
         <span>
-            <clfi>fiber10</clfi>
             <auto-spanloss>true</auto-spanloss>
             <spanloss-base>11.4</spanloss-base>
             <spanloss-current>12</spanloss-current>
@@ -3348,15 +5681,16 @@
 <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
     <link-id>OpenROADM-2-4-DEG1-to-OpenROADM-2-3-DEG1</link-id>
     <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-DEG1-to-OpenROADM-2-4-DEG1</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
+    <clfi xmlns="http://org/openroadm/common/network">fiber2423</clfi>
+    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
+
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-2-4-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-2-3-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <opposite-link>OpenROADM-2-3-DEG1-to-OpenROADM-2-4-DEG1</opposite-link>
-        <TE-metric>10</TE-metric>
         <span>
-            <clfi>fiber11</clfi>
             <auto-spanloss>true</auto-spanloss>
             <spanloss-base>11.4</spanloss-base>
             <spanloss-current>12</spanloss-current>
@@ -3373,15 +5707,16 @@
 <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
     <link-id>OpenROADM-2-4-DEG2-to-OpenROADM-2-1-DEG2</link-id>
     <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-DEG2-to-OpenROADM-2-4-DEG2</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
+    <clfi xmlns="http://org/openroadm/common/network">fiber2421</clfi>
+    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
+
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-2-4-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-2-1-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <opposite-link>OpenROADM-2-1-DEG2-to-OpenROADM-2-4-DEG2</opposite-link>
-        <TE-metric>10</TE-metric>
         <span>
-            <clfi>fiber58</clfi>
             <auto-spanloss>true</auto-spanloss>
             <spanloss-base>11.4</spanloss-base>
             <spanloss-current>12</spanloss-current>
@@ -3398,15 +5733,16 @@
 <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
     <link-id>OpenROADM-2-1-DEG2-to-OpenROADM-2-4-DEG2</link-id>
     <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-DEG2-to-OpenROADM-2-1-DEG2</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
+    <clfi xmlns="http://org/openroadm/common/network">fiber2124</clfi>
+    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
+
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-2-1-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-2-4-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <opposite-link>OpenROADM-2-4-DEG2-to-OpenROADM-2-1-DEG2</opposite-link>
-        <TE-metric>10</TE-metric>
         <span>
-            <clfi>fiber12</clfi>
             <auto-spanloss>true</auto-spanloss>
             <spanloss-base>11.4</spanloss-base>
             <spanloss-current>12</spanloss-current>
@@ -3426,336 +5762,576 @@
         <destination><dest-node>OpenROADM-3-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-DEG2-DEG2-CTP-TXtoOpenROADM-3-1-DEG1-DEG1-CTP-RX</opposite-link>
         <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <link-id>OpenROADM-3-1-DEG1-DEG1-CTP-TXtoOpenROADM-3-1-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-3-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-DEG3-DEG3-CTP-TXtoOpenROADM-3-1-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-1-SRG1-SRG1-CP-TXtoOpenROADM-3-1-DEG1-DEG1-CTP-RX</link-id>
             <source><source-node>OpenROADM-3-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-DEG1-DEG1-CTP-TXtoOpenROADM-3-1-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-1-DEG1-DEG1-CTP-TXtoOpenROADM-3-1-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-3-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-SRG1-SRG1-CP-TXtoOpenROADM-3-1-DEG1-DEG1-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-1-DEG2-DEG2-CTP-TXtoOpenROADM-3-1-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-3-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-DEG1-DEG1-CTP-TXtoOpenROADM-3-1-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-1-DEG2-DEG2-CTP-TXtoOpenROADM-3-1-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-3-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-DEG3-DEG3-CTP-TXtoOpenROADM-3-1-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-1-SRG1-SRG1-CP-TXtoOpenROADM-3-1-DEG2-DEG2-CTP-RX</link-id>
             <source><source-node>OpenROADM-3-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-DEG2-DEG2-CTP-TXtoOpenROADM-3-1-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-1-DEG2-DEG2-CTP-TXtoOpenROADM-3-1-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-3-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-SRG1-SRG1-CP-TXtoOpenROADM-3-1-DEG2-DEG2-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-1-DEG3-DEG3-CTP-TXtoOpenROADM-3-1-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-3-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-DEG1-DEG1-CTP-TXtoOpenROADM-3-1-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-1-DEG3-DEG3-CTP-TXtoOpenROADM-3-1-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-3-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-DEG2-DEG2-CTP-TXtoOpenROADM-3-1-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-1-SRG1-SRG1-CP-TXtoOpenROADM-3-1-DEG3-DEG3-CTP-RX</link-id>
             <source><source-node>OpenROADM-3-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-DEG3-DEG3-CTP-TXtoOpenROADM-3-1-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-1-DEG3-DEG3-CTP-TXtoOpenROADM-3-1-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-3-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-SRG1-SRG1-CP-TXtoOpenROADM-3-1-DEG3-DEG3-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-1XPDR-NW1-TX-toOpenROADM-3-1-SRG1-SRG1-PP1-RX</link-id>
         <source><source-node>XPONDER-3-1</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-SRG1-SRG1-PP1-TX-to-XPONDER-3-1XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-1-SRG1-SRG1-PP1-TX-to-XPONDER-3-1XPDR-NW1-RX</link-id>
         <source><source-node>OpenROADM-3-1-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-3-1</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-1XPDR-NW1-TX-toOpenROADM-3-1-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-1XPDR-NW2-TX-toOpenROADM-3-1-SRG1-SRG1-PP2-RX</link-id>
         <source><source-node>XPONDER-3-1</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-SRG1-SRG1-PP2-TX-to-XPONDER-3-1XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-1-SRG1-SRG1-PP2-TX-to-XPONDER-3-1XPDR-NW2-RX</link-id>
         <source><source-node>OpenROADM-3-1-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-3-1</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-1XPDR-NW2-TX-toOpenROADM-3-1-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-1XPDR-NW3-TX-toOpenROADM-3-1-SRG1-SRG1-PP3-RX</link-id>
         <source><source-node>XPONDER-3-1</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-SRG1-SRG1-PP3-TX-to-XPONDER-3-1XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-1-SRG1-SRG1-PP3-TX-to-XPONDER-3-1XPDR-NW3-RX</link-id>
         <source><source-node>OpenROADM-3-1-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-3-1</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-1XPDR-NW3-TX-toOpenROADM-3-1-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-1XPDR-NW4-TX-toOpenROADM-3-1-SRG1-SRG1-PP4-RX</link-id>
         <source><source-node>XPONDER-3-1</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-SRG1-SRG1-PP4-TX-to-XPONDER-3-1XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-1-SRG1-SRG1-PP4-TX-to-XPONDER-3-1XPDR-NW4-RX</link-id>
         <source><source-node>OpenROADM-3-1-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-3-1</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-1XPDR-NW4-TX-toOpenROADM-3-1-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-DEG1-DEG1-CTP-TXtoOpenROADM-3-2-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-3-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-DEG2-DEG2-CTP-TXtoOpenROADM-3-2-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-DEG1-DEG1-CTP-TXtoOpenROADM-3-2-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-3-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-DEG3-DEG3-CTP-TXtoOpenROADM-3-2-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-2-SRG1-SRG1-CP-TXtoOpenROADM-3-2-DEG1-DEG1-CTP-RX</link-id>
             <source><source-node>OpenROADM-3-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-DEG1-DEG1-CTP-TXtoOpenROADM-3-2-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-2-DEG1-DEG1-CTP-TXtoOpenROADM-3-2-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-3-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-SRG1-SRG1-CP-TXtoOpenROADM-3-2-DEG1-DEG1-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-DEG2-DEG2-CTP-TXtoOpenROADM-3-2-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-3-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-DEG1-DEG1-CTP-TXtoOpenROADM-3-2-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-DEG2-DEG2-CTP-TXtoOpenROADM-3-2-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-3-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-DEG3-DEG3-CTP-TXtoOpenROADM-3-2-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-2-SRG1-SRG1-CP-TXtoOpenROADM-3-2-DEG2-DEG2-CTP-RX</link-id>
             <source><source-node>OpenROADM-3-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-DEG2-DEG2-CTP-TXtoOpenROADM-3-2-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-2-DEG2-DEG2-CTP-TXtoOpenROADM-3-2-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-3-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-SRG1-SRG1-CP-TXtoOpenROADM-3-2-DEG2-DEG2-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-DEG3-DEG3-CTP-TXtoOpenROADM-3-2-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-3-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-DEG1-DEG1-CTP-TXtoOpenROADM-3-2-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-DEG3-DEG3-CTP-TXtoOpenROADM-3-2-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-3-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-DEG2-DEG2-CTP-TXtoOpenROADM-3-2-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-2-SRG1-SRG1-CP-TXtoOpenROADM-3-2-DEG3-DEG3-CTP-RX</link-id>
             <source><source-node>OpenROADM-3-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-DEG3-DEG3-CTP-TXtoOpenROADM-3-2-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-2-DEG3-DEG3-CTP-TXtoOpenROADM-3-2-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-3-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-SRG1-SRG1-CP-TXtoOpenROADM-3-2-DEG3-DEG3-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-2XPDR-NW1-TX-toOpenROADM-3-2-SRG1-SRG1-PP1-RX</link-id>
         <source><source-node>XPONDER-3-2</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-SRG1-SRG1-PP1-TX-to-XPONDER-3-2XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-SRG1-SRG1-PP1-TX-to-XPONDER-3-2XPDR-NW1-RX</link-id>
         <source><source-node>OpenROADM-3-2-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-3-2</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-2XPDR-NW1-TX-toOpenROADM-3-2-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-2XPDR-NW2-TX-toOpenROADM-3-2-SRG1-SRG1-PP2-RX</link-id>
         <source><source-node>XPONDER-3-2</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-SRG1-SRG1-PP2-TX-to-XPONDER-3-2XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-SRG1-SRG1-PP2-TX-to-XPONDER-3-2XPDR-NW2-RX</link-id>
         <source><source-node>OpenROADM-3-2-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-3-2</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-2XPDR-NW2-TX-toOpenROADM-3-2-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-2XPDR-NW3-TX-toOpenROADM-3-2-SRG1-SRG1-PP3-RX</link-id>
         <source><source-node>XPONDER-3-2</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-SRG1-SRG1-PP3-TX-to-XPONDER-3-2XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-SRG1-SRG1-PP3-TX-to-XPONDER-3-2XPDR-NW3-RX</link-id>
         <source><source-node>OpenROADM-3-2-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-3-2</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-2XPDR-NW3-TX-toOpenROADM-3-2-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-2XPDR-NW4-TX-toOpenROADM-3-2-SRG1-SRG1-PP4-RX</link-id>
         <source><source-node>XPONDER-3-2</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-SRG1-SRG1-PP4-TX-to-XPONDER-3-2XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-SRG1-SRG1-PP4-TX-to-XPONDER-3-2XPDR-NW4-RX</link-id>
         <source><source-node>OpenROADM-3-2-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-3-2</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-2XPDR-NW4-TX-toOpenROADM-3-2-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-3-DEG1-DEG1-CTP-TXtoOpenROADM-3-3-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-3-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-DEG2-DEG2-CTP-TXtoOpenROADM-3-3-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-3-DEG1-DEG1-CTP-TXtoOpenROADM-3-3-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-3-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-DEG3-DEG3-CTP-TXtoOpenROADM-3-3-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-3-SRG1-SRG1-CP-TXtoOpenROADM-3-3-DEG1-DEG1-CTP-RX</link-id>
             <source><source-node>OpenROADM-3-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-DEG1-DEG1-CTP-TXtoOpenROADM-3-3-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-3-DEG1-DEG1-CTP-TXtoOpenROADM-3-3-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-3-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-SRG1-SRG1-CP-TXtoOpenROADM-3-3-DEG1-DEG1-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-3-DEG2-DEG2-CTP-TXtoOpenROADM-3-3-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-3-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-DEG1-DEG1-CTP-TXtoOpenROADM-3-3-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-3-DEG2-DEG2-CTP-TXtoOpenROADM-3-3-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-3-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-DEG3-DEG3-CTP-TXtoOpenROADM-3-3-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-3-SRG1-SRG1-CP-TXtoOpenROADM-3-3-DEG2-DEG2-CTP-RX</link-id>
             <source><source-node>OpenROADM-3-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-DEG2-DEG2-CTP-TXtoOpenROADM-3-3-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-3-DEG2-DEG2-CTP-TXtoOpenROADM-3-3-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-3-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-SRG1-SRG1-CP-TXtoOpenROADM-3-3-DEG2-DEG2-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-3-DEG3-DEG3-CTP-TXtoOpenROADM-3-3-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-3-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-DEG1-DEG1-CTP-TXtoOpenROADM-3-3-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-3-DEG3-DEG3-CTP-TXtoOpenROADM-3-3-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-3-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-DEG2-DEG2-CTP-TXtoOpenROADM-3-3-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-3-SRG1-SRG1-CP-TXtoOpenROADM-3-3-DEG3-DEG3-CTP-RX</link-id>
             <source><source-node>OpenROADM-3-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-DEG3-DEG3-CTP-TXtoOpenROADM-3-3-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-3-DEG3-DEG3-CTP-TXtoOpenROADM-3-3-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-3-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-SRG1-SRG1-CP-TXtoOpenROADM-3-3-DEG3-DEG3-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-3XPDR-NW1-TX-toOpenROADM-3-3-SRG1-SRG1-PP1-RX</link-id>
         <source><source-node>XPONDER-3-3</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-3-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-SRG1-SRG1-PP1-TX-to-XPONDER-3-3XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-3-SRG1-SRG1-PP1-TX-to-XPONDER-3-3XPDR-NW1-RX</link-id>
         <source><source-node>OpenROADM-3-3-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-3-3</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-3XPDR-NW1-TX-toOpenROADM-3-3-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-3XPDR-NW2-TX-toOpenROADM-3-3-SRG1-SRG1-PP2-RX</link-id>
         <source><source-node>XPONDER-3-3</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-3-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-SRG1-SRG1-PP2-TX-to-XPONDER-3-3XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-3-SRG1-SRG1-PP2-TX-to-XPONDER-3-3XPDR-NW2-RX</link-id>
         <source><source-node>OpenROADM-3-3-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-3-3</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-3XPDR-NW2-TX-toOpenROADM-3-3-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-3XPDR-NW3-TX-toOpenROADM-3-3-SRG1-SRG1-PP3-RX</link-id>
         <source><source-node>XPONDER-3-3</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-3-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-SRG1-SRG1-PP3-TX-to-XPONDER-3-3XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-3-SRG1-SRG1-PP3-TX-to-XPONDER-3-3XPDR-NW3-RX</link-id>
         <source><source-node>OpenROADM-3-3-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-3-3</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-3XPDR-NW3-TX-toOpenROADM-3-3-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-3XPDR-NW4-TX-toOpenROADM-3-3-SRG1-SRG1-PP4-RX</link-id>
         <source><source-node>XPONDER-3-3</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-3-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-SRG1-SRG1-PP4-TX-to-XPONDER-3-3XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-3-SRG1-SRG1-PP4-TX-to-XPONDER-3-3XPDR-NW4-RX</link-id>
         <source><source-node>OpenROADM-3-3-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-3-3</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-3XPDR-NW4-TX-toOpenROADM-3-3-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-4-DEG1-DEG1-CTP-TXtoOpenROADM-3-4-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-3-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-DEG2-DEG2-CTP-TXtoOpenROADM-3-4-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-4-DEG1-DEG1-CTP-TXtoOpenROADM-3-4-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-3-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-DEG3-DEG3-CTP-TXtoOpenROADM-3-4-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-4-SRG1-SRG1-CP-TXtoOpenROADM-3-4-DEG1-DEG1-CTP-RX</link-id>
             <source><source-node>OpenROADM-3-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-DEG1-DEG1-CTP-TXtoOpenROADM-3-4-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-4-DEG1-DEG1-CTP-TXtoOpenROADM-3-4-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-3-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-SRG1-SRG1-CP-TXtoOpenROADM-3-4-DEG1-DEG1-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-4-DEG2-DEG2-CTP-TXtoOpenROADM-3-4-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-3-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-DEG1-DEG1-CTP-TXtoOpenROADM-3-4-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-4-DEG2-DEG2-CTP-TXtoOpenROADM-3-4-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-3-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-DEG3-DEG3-CTP-TXtoOpenROADM-3-4-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-4-SRG1-SRG1-CP-TXtoOpenROADM-3-4-DEG2-DEG2-CTP-RX</link-id>
             <source><source-node>OpenROADM-3-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-DEG2-DEG2-CTP-TXtoOpenROADM-3-4-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-4-DEG2-DEG2-CTP-TXtoOpenROADM-3-4-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-3-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-SRG1-SRG1-CP-TXtoOpenROADM-3-4-DEG2-DEG2-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-4-DEG3-DEG3-CTP-TXtoOpenROADM-3-4-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-3-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-DEG1-DEG1-CTP-TXtoOpenROADM-3-4-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-4-DEG3-DEG3-CTP-TXtoOpenROADM-3-4-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-3-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-DEG2-DEG2-CTP-TXtoOpenROADM-3-4-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-4-SRG1-SRG1-CP-TXtoOpenROADM-3-4-DEG3-DEG3-CTP-RX</link-id>
             <source><source-node>OpenROADM-3-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-DEG3-DEG3-CTP-TXtoOpenROADM-3-4-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-4-DEG3-DEG3-CTP-TXtoOpenROADM-3-4-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-3-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-SRG1-SRG1-CP-TXtoOpenROADM-3-4-DEG3-DEG3-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-4XPDR-NW1-TX-toOpenROADM-3-4-SRG1-SRG1-PP1-RX</link-id>
         <source><source-node>XPONDER-3-4</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-4-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-SRG1-SRG1-PP1-TX-to-XPONDER-3-4XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-4-SRG1-SRG1-PP1-TX-to-XPONDER-3-4XPDR-NW1-RX</link-id>
         <source><source-node>OpenROADM-3-4-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-3-4</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-4XPDR-NW1-TX-toOpenROADM-3-4-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-4XPDR-NW2-TX-toOpenROADM-3-4-SRG1-SRG1-PP2-RX</link-id>
         <source><source-node>XPONDER-3-4</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-4-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-SRG1-SRG1-PP2-TX-to-XPONDER-3-4XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-4-SRG1-SRG1-PP2-TX-to-XPONDER-3-4XPDR-NW2-RX</link-id>
         <source><source-node>OpenROADM-3-4-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-3-4</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-4XPDR-NW2-TX-toOpenROADM-3-4-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-4XPDR-NW3-TX-toOpenROADM-3-4-SRG1-SRG1-PP3-RX</link-id>
         <source><source-node>XPONDER-3-4</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-4-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-SRG1-SRG1-PP3-TX-to-XPONDER-3-4XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-4-SRG1-SRG1-PP3-TX-to-XPONDER-3-4XPDR-NW3-RX</link-id>
         <source><source-node>OpenROADM-3-4-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-3-4</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-4XPDR-NW3-TX-toOpenROADM-3-4-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-4XPDR-NW4-TX-toOpenROADM-3-4-SRG1-SRG1-PP4-RX</link-id>
         <source><source-node>XPONDER-3-4</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-4-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-SRG1-SRG1-PP4-TX-to-XPONDER-3-4XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-4-SRG1-SRG1-PP4-TX-to-XPONDER-3-4XPDR-NW4-RX</link-id>
         <source><source-node>OpenROADM-3-4-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-3-4</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-4XPDR-NW4-TX-toOpenROADM-3-4-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
 <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
     <link-id>OpenROADM-3-1-DEG1-to-OpenROADM-3-2-DEG1</link-id>
     <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-DEG1-to-OpenROADM-3-1-DEG1</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
+    <clfi xmlns="http://org/openroadm/common/network">fiber3132</clfi>
+    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
+
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-3-1-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-3-2-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <opposite-link>OpenROADM-3-2-DEG1-to-OpenROADM-3-1-DEG1</opposite-link>
-        <TE-metric>10</TE-metric>
         <span>
-            <clfi>fiber13</clfi>
             <auto-spanloss>true</auto-spanloss>
             <spanloss-base>11.4</spanloss-base>
             <spanloss-current>12</spanloss-current>
@@ -3772,15 +6348,16 @@
 <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
     <link-id>OpenROADM-3-2-DEG1-to-OpenROADM-3-1-DEG1</link-id>
     <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-DEG1-to-OpenROADM-3-2-DEG1</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
+    <clfi xmlns="http://org/openroadm/common/network">fiber3231</clfi>
+    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
+
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-3-2-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-3-1-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <opposite-link>OpenROADM-3-1-DEG1-to-OpenROADM-3-2-DEG1</opposite-link>
-        <TE-metric>10</TE-metric>
         <span>
-            <clfi>fiber14</clfi>
             <auto-spanloss>true</auto-spanloss>
             <spanloss-base>11.4</spanloss-base>
             <spanloss-current>12</spanloss-current>
@@ -3797,15 +6374,16 @@
 <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
     <link-id>OpenROADM-3-2-DEG2-to-OpenROADM-3-3-DEG2</link-id>
     <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-DEG2-to-OpenROADM-3-2-DEG2</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
+    <clfi xmlns="http://org/openroadm/common/network">fiber3233</clfi>
+    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
+
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-3-2-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-3-3-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <opposite-link>OpenROADM-3-3-DEG2-to-OpenROADM-3-2-DEG2</opposite-link>
-        <TE-metric>10</TE-metric>
         <span>
-            <clfi>fiber15</clfi>
             <auto-spanloss>true</auto-spanloss>
             <spanloss-base>11.4</spanloss-base>
             <spanloss-current>12</spanloss-current>
@@ -3822,15 +6400,16 @@
 <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
     <link-id>OpenROADM-3-3-DEG2-to-OpenROADM-3-2-DEG2</link-id>
     <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-DEG2-to-OpenROADM-3-3-DEG2</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
+    <clfi xmlns="http://org/openroadm/common/network">fiber3332</clfi>
+    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
+
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-3-3-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-3-2-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <opposite-link>OpenROADM-3-2-DEG2-to-OpenROADM-3-3-DEG2</opposite-link>
-        <TE-metric>10</TE-metric>
         <span>
-            <clfi>fiber16</clfi>
             <auto-spanloss>true</auto-spanloss>
             <spanloss-base>11.4</spanloss-base>
             <spanloss-current>12</spanloss-current>
@@ -3847,15 +6426,16 @@
 <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
     <link-id>OpenROADM-3-3-DEG1-to-OpenROADM-3-4-DEG1</link-id>
     <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-DEG1-to-OpenROADM-3-3-DEG1</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
+    <clfi xmlns="http://org/openroadm/common/network">fiber3334</clfi>
+    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
+
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-3-3-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-3-4-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <opposite-link>OpenROADM-3-4-DEG1-to-OpenROADM-3-3-DEG1</opposite-link>
-        <TE-metric>10</TE-metric>
         <span>
-            <clfi>fiber17</clfi>
             <auto-spanloss>true</auto-spanloss>
             <spanloss-base>11.4</spanloss-base>
             <spanloss-current>12</spanloss-current>
@@ -3872,15 +6452,16 @@
 <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
     <link-id>OpenROADM-3-4-DEG1-to-OpenROADM-3-3-DEG1</link-id>
     <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-DEG1-to-OpenROADM-3-4-DEG1</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
+    <clfi xmlns="http://org/openroadm/common/network">fiber3433</clfi>
+    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
+
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-3-4-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-3-3-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <opposite-link>OpenROADM-3-3-DEG1-to-OpenROADM-3-4-DEG1</opposite-link>
-        <TE-metric>10</TE-metric>
         <span>
-            <clfi>fiber18</clfi>
             <auto-spanloss>true</auto-spanloss>
             <spanloss-base>11.4</spanloss-base>
             <spanloss-current>12</spanloss-current>
@@ -3897,15 +6478,16 @@
 <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
     <link-id>OpenROADM-3-4-DEG2-to-OpenROADM-3-1-DEG2</link-id>
     <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-DEG2-to-OpenROADM-3-4-DEG2</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
+    <clfi xmlns="http://org/openroadm/common/network">fiber3431</clfi>
+    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
+
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-3-4-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-3-1-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <opposite-link>OpenROADM-3-1-DEG2-to-OpenROADM-3-4-DEG2</opposite-link>
-        <TE-metric>10</TE-metric>
         <span>
-            <clfi>fiber19</clfi>
             <auto-spanloss>true</auto-spanloss>
             <spanloss-base>11.4</spanloss-base>
             <spanloss-current>12</spanloss-current>
@@ -3922,15 +6504,16 @@
 <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
     <link-id>OpenROADM-3-1-DEG2-to-OpenROADM-3-4-DEG2</link-id>
     <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-DEG2-to-OpenROADM-3-1-DEG2</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
+    <clfi xmlns="http://org/openroadm/common/network">fiber3431</clfi>
+    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
+
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-3-1-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-3-4-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <opposite-link>OpenROADM-3-4-DEG2-to-OpenROADM-3-1-DEG2</opposite-link>
-        <TE-metric>10</TE-metric>
         <span>
-            <clfi>fiber20</clfi>
             <auto-spanloss>true</auto-spanloss>
             <spanloss-base>11.4</spanloss-base>
             <spanloss-current>12</spanloss-current>
@@ -3947,335 +6530,576 @@
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-DEG1-DEG1-CTP-TXtoOpenROADM-4-1-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-4-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-DEG2-DEG2-CTP-TXtoOpenROADM-4-1-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-DEG1-DEG1-CTP-TXtoOpenROADM-4-1-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-4-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-DEG3-DEG3-CTP-TXtoOpenROADM-4-1-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-1-SRG1-SRG1-CP-TXtoOpenROADM-4-1-DEG1-DEG1-CTP-RX</link-id>
             <source><source-node>OpenROADM-4-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-DEG1-DEG1-CTP-TXtoOpenROADM-4-1-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-1-DEG1-DEG1-CTP-TXtoOpenROADM-4-1-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-4-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-SRG1-SRG1-CP-TXtoOpenROADM-4-1-DEG1-DEG1-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-DEG2-DEG2-CTP-TXtoOpenROADM-4-1-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-4-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-DEG1-DEG1-CTP-TXtoOpenROADM-4-1-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-DEG2-DEG2-CTP-TXtoOpenROADM-4-1-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-4-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-DEG3-DEG3-CTP-TXtoOpenROADM-4-1-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-1-SRG1-SRG1-CP-TXtoOpenROADM-4-1-DEG2-DEG2-CTP-RX</link-id>
             <source><source-node>OpenROADM-4-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-DEG2-DEG2-CTP-TXtoOpenROADM-4-1-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-1-DEG2-DEG2-CTP-TXtoOpenROADM-4-1-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-4-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-SRG1-SRG1-CP-TXtoOpenROADM-4-1-DEG2-DEG2-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-DEG3-DEG3-CTP-TXtoOpenROADM-4-1-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-4-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-DEG1-DEG1-CTP-TXtoOpenROADM-4-1-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-DEG3-DEG3-CTP-TXtoOpenROADM-4-1-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-4-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-DEG2-DEG2-CTP-TXtoOpenROADM-4-1-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-1-SRG1-SRG1-CP-TXtoOpenROADM-4-1-DEG3-DEG3-CTP-RX</link-id>
             <source><source-node>OpenROADM-4-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-DEG3-DEG3-CTP-TXtoOpenROADM-4-1-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-1-DEG3-DEG3-CTP-TXtoOpenROADM-4-1-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-4-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-SRG1-SRG1-CP-TXtoOpenROADM-4-1-DEG3-DEG3-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-1XPDR-NW1-TX-toOpenROADM-4-1-SRG1-SRG1-PP1-RX</link-id>
         <source><source-node>XPONDER-4-1</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-SRG1-SRG1-PP1-TX-to-XPONDER-4-1XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-SRG1-SRG1-PP1-TX-to-XPONDER-4-1XPDR-NW1-RX</link-id>
         <source><source-node>OpenROADM-4-1-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-4-1</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-1XPDR-NW1-TX-toOpenROADM-4-1-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-1XPDR-NW2-TX-toOpenROADM-4-1-SRG1-SRG1-PP2-RX</link-id>
         <source><source-node>XPONDER-4-1</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-SRG1-SRG1-PP2-TX-to-XPONDER-4-1XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-SRG1-SRG1-PP2-TX-to-XPONDER-4-1XPDR-NW2-RX</link-id>
         <source><source-node>OpenROADM-4-1-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-4-1</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-1XPDR-NW2-TX-toOpenROADM-4-1-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-1XPDR-NW3-TX-toOpenROADM-4-1-SRG1-SRG1-PP3-RX</link-id>
         <source><source-node>XPONDER-4-1</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-SRG1-SRG1-PP3-TX-to-XPONDER-4-1XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-SRG1-SRG1-PP3-TX-to-XPONDER-4-1XPDR-NW3-RX</link-id>
         <source><source-node>OpenROADM-4-1-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-4-1</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-1XPDR-NW3-TX-toOpenROADM-4-1-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-1XPDR-NW4-TX-toOpenROADM-4-1-SRG1-SRG1-PP4-RX</link-id>
         <source><source-node>XPONDER-4-1</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-SRG1-SRG1-PP4-TX-to-XPONDER-4-1XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-SRG1-SRG1-PP4-TX-to-XPONDER-4-1XPDR-NW4-RX</link-id>
         <source><source-node>OpenROADM-4-1-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-4-1</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-1XPDR-NW4-TX-toOpenROADM-4-1-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-DEG1-DEG1-CTP-TXtoOpenROADM-4-2-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-4-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-DEG2-DEG2-CTP-TXtoOpenROADM-4-2-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-DEG1-DEG1-CTP-TXtoOpenROADM-4-2-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-4-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-DEG3-DEG3-CTP-TXtoOpenROADM-4-2-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-2-SRG1-SRG1-CP-TXtoOpenROADM-4-2-DEG1-DEG1-CTP-RX</link-id>
             <source><source-node>OpenROADM-4-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-DEG1-DEG1-CTP-TXtoOpenROADM-4-2-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-2-DEG1-DEG1-CTP-TXtoOpenROADM-4-2-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-4-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-SRG1-SRG1-CP-TXtoOpenROADM-4-2-DEG1-DEG1-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-DEG2-DEG2-CTP-TXtoOpenROADM-4-2-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-4-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-DEG1-DEG1-CTP-TXtoOpenROADM-4-2-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-DEG2-DEG2-CTP-TXtoOpenROADM-4-2-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-4-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-DEG3-DEG3-CTP-TXtoOpenROADM-4-2-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-2-SRG1-SRG1-CP-TXtoOpenROADM-4-2-DEG2-DEG2-CTP-RX</link-id>
             <source><source-node>OpenROADM-4-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-DEG2-DEG2-CTP-TXtoOpenROADM-4-2-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-2-DEG2-DEG2-CTP-TXtoOpenROADM-4-2-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-4-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-SRG1-SRG1-CP-TXtoOpenROADM-4-2-DEG2-DEG2-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-DEG3-DEG3-CTP-TXtoOpenROADM-4-2-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-4-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-DEG1-DEG1-CTP-TXtoOpenROADM-4-2-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-DEG3-DEG3-CTP-TXtoOpenROADM-4-2-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-4-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-DEG2-DEG2-CTP-TXtoOpenROADM-4-2-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-2-SRG1-SRG1-CP-TXtoOpenROADM-4-2-DEG3-DEG3-CTP-RX</link-id>
             <source><source-node>OpenROADM-4-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-DEG3-DEG3-CTP-TXtoOpenROADM-4-2-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-2-DEG3-DEG3-CTP-TXtoOpenROADM-4-2-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-4-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-SRG1-SRG1-CP-TXtoOpenROADM-4-2-DEG3-DEG3-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-2XPDR-NW1-TX-toOpenROADM-4-2-SRG1-SRG1-PP1-RX</link-id>
         <source><source-node>XPONDER-4-2</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-SRG1-SRG1-PP1-TX-to-XPONDER-4-2XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-SRG1-SRG1-PP1-TX-to-XPONDER-4-2XPDR-NW1-RX</link-id>
         <source><source-node>OpenROADM-4-2-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-4-2</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-2XPDR-NW1-TX-toOpenROADM-4-2-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-2XPDR-NW2-TX-toOpenROADM-4-2-SRG1-SRG1-PP2-RX</link-id>
         <source><source-node>XPONDER-4-2</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-SRG1-SRG1-PP2-TX-to-XPONDER-4-2XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-SRG1-SRG1-PP2-TX-to-XPONDER-4-2XPDR-NW2-RX</link-id>
         <source><source-node>OpenROADM-4-2-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-4-2</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-2XPDR-NW2-TX-toOpenROADM-4-2-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-2XPDR-NW3-TX-toOpenROADM-4-2-SRG1-SRG1-PP3-RX</link-id>
         <source><source-node>XPONDER-4-2</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-SRG1-SRG1-PP3-TX-to-XPONDER-4-2XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-SRG1-SRG1-PP3-TX-to-XPONDER-4-2XPDR-NW3-RX</link-id>
         <source><source-node>OpenROADM-4-2-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-4-2</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-2XPDR-NW3-TX-toOpenROADM-4-2-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-2XPDR-NW4-TX-toOpenROADM-4-2-SRG1-SRG1-PP4-RX</link-id>
         <source><source-node>XPONDER-4-2</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-SRG1-SRG1-PP4-TX-to-XPONDER-4-2XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-SRG1-SRG1-PP4-TX-to-XPONDER-4-2XPDR-NW4-RX</link-id>
         <source><source-node>OpenROADM-4-2-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-4-2</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-2XPDR-NW4-TX-toOpenROADM-4-2-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-3-DEG1-DEG1-CTP-TXtoOpenROADM-4-3-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-4-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-DEG2-DEG2-CTP-TXtoOpenROADM-4-3-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-3-DEG1-DEG1-CTP-TXtoOpenROADM-4-3-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-4-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-DEG3-DEG3-CTP-TXtoOpenROADM-4-3-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-3-SRG1-SRG1-CP-TXtoOpenROADM-4-3-DEG1-DEG1-CTP-RX</link-id>
             <source><source-node>OpenROADM-4-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-DEG1-DEG1-CTP-TXtoOpenROADM-4-3-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-3-DEG1-DEG1-CTP-TXtoOpenROADM-4-3-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-4-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-SRG1-SRG1-CP-TXtoOpenROADM-4-3-DEG1-DEG1-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-3-DEG2-DEG2-CTP-TXtoOpenROADM-4-3-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-4-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-DEG1-DEG1-CTP-TXtoOpenROADM-4-3-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-3-DEG2-DEG2-CTP-TXtoOpenROADM-4-3-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-4-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-DEG3-DEG3-CTP-TXtoOpenROADM-4-3-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-3-SRG1-SRG1-CP-TXtoOpenROADM-4-3-DEG2-DEG2-CTP-RX</link-id>
             <source><source-node>OpenROADM-4-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-DEG2-DEG2-CTP-TXtoOpenROADM-4-3-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-3-DEG2-DEG2-CTP-TXtoOpenROADM-4-3-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-4-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-SRG1-SRG1-CP-TXtoOpenROADM-4-3-DEG2-DEG2-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-3-DEG3-DEG3-CTP-TXtoOpenROADM-4-3-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-4-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-DEG1-DEG1-CTP-TXtoOpenROADM-4-3-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-3-DEG3-DEG3-CTP-TXtoOpenROADM-4-3-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-4-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-DEG2-DEG2-CTP-TXtoOpenROADM-4-3-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-3-SRG1-SRG1-CP-TXtoOpenROADM-4-3-DEG3-DEG3-CTP-RX</link-id>
             <source><source-node>OpenROADM-4-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-DEG3-DEG3-CTP-TXtoOpenROADM-4-3-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-3-DEG3-DEG3-CTP-TXtoOpenROADM-4-3-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-4-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-SRG1-SRG1-CP-TXtoOpenROADM-4-3-DEG3-DEG3-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-3XPDR-NW1-TX-toOpenROADM-4-3-SRG1-SRG1-PP1-RX</link-id>
         <source><source-node>XPONDER-4-3</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-3-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-SRG1-SRG1-PP1-TX-to-XPONDER-4-3XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-3-SRG1-SRG1-PP1-TX-to-XPONDER-4-3XPDR-NW1-RX</link-id>
         <source><source-node>OpenROADM-4-3-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-4-3</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-3XPDR-NW1-TX-toOpenROADM-4-3-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-3XPDR-NW2-TX-toOpenROADM-4-3-SRG1-SRG1-PP2-RX</link-id>
         <source><source-node>XPONDER-4-3</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-3-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-SRG1-SRG1-PP2-TX-to-XPONDER-4-3XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-3-SRG1-SRG1-PP2-TX-to-XPONDER-4-3XPDR-NW2-RX</link-id>
         <source><source-node>OpenROADM-4-3-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-4-3</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-3XPDR-NW2-TX-toOpenROADM-4-3-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-3XPDR-NW3-TX-toOpenROADM-4-3-SRG1-SRG1-PP3-RX</link-id>
         <source><source-node>XPONDER-4-3</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-3-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-SRG1-SRG1-PP3-TX-to-XPONDER-4-3XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-3-SRG1-SRG1-PP3-TX-to-XPONDER-4-3XPDR-NW3-RX</link-id>
         <source><source-node>OpenROADM-4-3-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-4-3</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-3XPDR-NW3-TX-toOpenROADM-4-3-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-3XPDR-NW4-TX-toOpenROADM-4-3-SRG1-SRG1-PP4-RX</link-id>
         <source><source-node>XPONDER-4-3</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-3-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-SRG1-SRG1-PP4-TX-to-XPONDER-4-3XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-3-SRG1-SRG1-PP4-TX-to-XPONDER-4-3XPDR-NW4-RX</link-id>
         <source><source-node>OpenROADM-4-3-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-4-3</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-3XPDR-NW4-TX-toOpenROADM-4-3-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-4-DEG1-DEG1-CTP-TXtoOpenROADM-4-4-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-4-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-DEG2-DEG2-CTP-TXtoOpenROADM-4-4-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-4-DEG1-DEG1-CTP-TXtoOpenROADM-4-4-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-4-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-DEG3-DEG3-CTP-TXtoOpenROADM-4-4-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-4-SRG1-SRG1-CP-TXtoOpenROADM-4-4-DEG1-DEG1-CTP-RX</link-id>
             <source><source-node>OpenROADM-4-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-DEG1-DEG1-CTP-TXtoOpenROADM-4-4-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-4-DEG1-DEG1-CTP-TXtoOpenROADM-4-4-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-4-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-SRG1-SRG1-CP-TXtoOpenROADM-4-4-DEG1-DEG1-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-4-DEG2-DEG2-CTP-TXtoOpenROADM-4-4-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-4-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-DEG1-DEG1-CTP-TXtoOpenROADM-4-4-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-4-DEG2-DEG2-CTP-TXtoOpenROADM-4-4-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-4-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-DEG3-DEG3-CTP-TXtoOpenROADM-4-4-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-4-SRG1-SRG1-CP-TXtoOpenROADM-4-4-DEG2-DEG2-CTP-RX</link-id>
             <source><source-node>OpenROADM-4-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-DEG2-DEG2-CTP-TXtoOpenROADM-4-4-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-4-DEG2-DEG2-CTP-TXtoOpenROADM-4-4-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-4-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-SRG1-SRG1-CP-TXtoOpenROADM-4-4-DEG2-DEG2-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-4-DEG3-DEG3-CTP-TXtoOpenROADM-4-4-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-4-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-DEG1-DEG1-CTP-TXtoOpenROADM-4-4-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-4-DEG3-DEG3-CTP-TXtoOpenROADM-4-4-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-4-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-DEG2-DEG2-CTP-TXtoOpenROADM-4-4-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-4-SRG1-SRG1-CP-TXtoOpenROADM-4-4-DEG3-DEG3-CTP-RX</link-id>
             <source><source-node>OpenROADM-4-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-DEG3-DEG3-CTP-TXtoOpenROADM-4-4-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-4-DEG3-DEG3-CTP-TXtoOpenROADM-4-4-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-4-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-SRG1-SRG1-CP-TXtoOpenROADM-4-4-DEG3-DEG3-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-4XPDR-NW1-TX-toOpenROADM-4-4-SRG1-SRG1-PP1-RX</link-id>
         <source><source-node>XPONDER-4-4</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-4-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-SRG1-SRG1-PP1-TX-to-XPONDER-4-4XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-4-SRG1-SRG1-PP1-TX-to-XPONDER-4-4XPDR-NW1-RX</link-id>
         <source><source-node>OpenROADM-4-4-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-4-4</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-4XPDR-NW1-TX-toOpenROADM-4-4-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-4XPDR-NW2-TX-toOpenROADM-4-4-SRG1-SRG1-PP2-RX</link-id>
         <source><source-node>XPONDER-4-4</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-4-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-SRG1-SRG1-PP2-TX-to-XPONDER-4-4XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-4-SRG1-SRG1-PP2-TX-to-XPONDER-4-4XPDR-NW2-RX</link-id>
         <source><source-node>OpenROADM-4-4-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-4-4</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-4XPDR-NW2-TX-toOpenROADM-4-4-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-4XPDR-NW3-TX-toOpenROADM-4-4-SRG1-SRG1-PP3-RX</link-id>
         <source><source-node>XPONDER-4-4</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-4-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-SRG1-SRG1-PP3-TX-to-XPONDER-4-4XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-4-SRG1-SRG1-PP3-TX-to-XPONDER-4-4XPDR-NW3-RX</link-id>
         <source><source-node>OpenROADM-4-4-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-4-4</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-4XPDR-NW3-TX-toOpenROADM-4-4-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-4XPDR-NW4-TX-toOpenROADM-4-4-SRG1-SRG1-PP4-RX</link-id>
         <source><source-node>XPONDER-4-4</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-4-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-SRG1-SRG1-PP4-TX-to-XPONDER-4-4XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-4-SRG1-SRG1-PP4-TX-to-XPONDER-4-4XPDR-NW4-RX</link-id>
         <source><source-node>OpenROADM-4-4-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-4-4</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-4XPDR-NW4-TX-toOpenROADM-4-4-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
 <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
     <link-id>OpenROADM-4-1-DEG1-to-OpenROADM-4-2-DEG1</link-id>
     <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-DEG1-to-OpenROADM-4-1-DEG1</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
+    <clfi xmlns="http://org/openroadm/common/network">fiber4142</clfi>
+    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
+
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-4-1-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-4-2-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <opposite-link>OpenROADM-4-2-DEG1-to-OpenROADM-4-1-DEG1</opposite-link>
-        <TE-metric>10</TE-metric>
         <span>
-            <clfi>fiber21</clfi>
             <auto-spanloss>true</auto-spanloss>
             <spanloss-base>11.4</spanloss-base>
             <spanloss-current>12</spanloss-current>
@@ -4292,15 +7116,16 @@
 <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
     <link-id>OpenROADM-4-2-DEG1-to-OpenROADM-4-1-DEG1</link-id>
     <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-DEG1-to-OpenROADM-4-2-DEG1</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
+    <clfi xmlns="http://org/openroadm/common/network">fiber4241</clfi>
+    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
+
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-4-2-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-4-1-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <opposite-link>OpenROADM-4-1-DEG1-to-OpenROADM-4-2-DEG1</opposite-link>
-        <TE-metric>10</TE-metric>
         <span>
-            <clfi>fiber22</clfi>
             <auto-spanloss>true</auto-spanloss>
             <spanloss-base>11.4</spanloss-base>
             <spanloss-current>12</spanloss-current>
@@ -4317,15 +7142,16 @@
 <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
     <link-id>OpenROADM-4-2-DEG2-to-OpenROADM-4-3-DEG2</link-id>
     <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-DEG2-to-OpenROADM-4-2-DEG2</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
+    <clfi xmlns="http://org/openroadm/common/network">fiber4243</clfi>
+    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
+
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-4-2-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-4-3-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <opposite-link>OpenROADM-4-3-DEG2-to-OpenROADM-4-2-DEG2</opposite-link>
-        <TE-metric>10</TE-metric>
         <span>
-            <clfi>fiber23</clfi>
             <auto-spanloss>true</auto-spanloss>
             <spanloss-base>11.4</spanloss-base>
             <spanloss-current>12</spanloss-current>
@@ -4342,15 +7168,16 @@
 <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
     <link-id>OpenROADM-4-3-DEG2-to-OpenROADM-4-2-DEG2</link-id>
     <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-DEG2-to-OpenROADM-4-3-DEG2</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
+    <clfi xmlns="http://org/openroadm/common/network">fiber4342</clfi>
+    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
+
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-4-3-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-4-2-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <opposite-link>OpenROADM-4-2-DEG2-to-OpenROADM-4-3-DEG2</opposite-link>
-        <TE-metric>10</TE-metric>
         <span>
-            <clfi>fiber24</clfi>
             <auto-spanloss>true</auto-spanloss>
             <spanloss-base>11.4</spanloss-base>
             <spanloss-current>12</spanloss-current>
@@ -4367,15 +7194,16 @@
 <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
     <link-id>OpenROADM-4-3-DEG1-to-OpenROADM-4-4-DEG1</link-id>
     <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-DEG1-to-OpenROADM-4-3-DEG1</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
+    <clfi xmlns="http://org/openroadm/common/network">fiber4344</clfi>
+    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
+
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-4-3-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-4-4-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <opposite-link>OpenROADM-4-4-DEG1-to-OpenROADM-4-3-DEG1</opposite-link>
-        <TE-metric>10</TE-metric>
         <span>
-            <clfi>fiber25</clfi>
             <auto-spanloss>true</auto-spanloss>
             <spanloss-base>11.4</spanloss-base>
             <spanloss-current>12</spanloss-current>
@@ -4392,15 +7220,16 @@
 <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
     <link-id>OpenROADM-4-4-DEG1-to-OpenROADM-4-3-DEG1</link-id>
     <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-DEG1-to-OpenROADM-4-4-DEG1</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
+    <clfi xmlns="http://org/openroadm/common/network">fiber4443</clfi>
+    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
+
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-4-4-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-4-3-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <opposite-link>OpenROADM-4-3-DEG1-to-OpenROADM-4-4-DEG1</opposite-link>
-        <TE-metric>10</TE-metric>
         <span>
-            <clfi>fiber26</clfi>
             <auto-spanloss>true</auto-spanloss>
             <spanloss-base>11.4</spanloss-base>
             <spanloss-current>12</spanloss-current>
@@ -4417,15 +7246,16 @@
 <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
     <link-id>OpenROADM-4-4-DEG2-to-OpenROADM-4-1-DEG2</link-id>
     <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-DEG2-to-OpenROADM-4-4-DEG2</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
+    <clfi xmlns="http://org/openroadm/common/network">fiber4441</clfi>
+    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
+
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-4-4-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-4-1-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <opposite-link>OpenROADM-4-1-DEG2-to-OpenROADM-4-4-DEG2</opposite-link>
-        <TE-metric>10</TE-metric>
         <span>
-            <clfi>fiber27</clfi>
             <auto-spanloss>true</auto-spanloss>
             <spanloss-base>11.4</spanloss-base>
             <spanloss-current>12</spanloss-current>
@@ -4442,15 +7272,16 @@
 <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
     <link-id>OpenROADM-4-1-DEG2-to-OpenROADM-4-4-DEG2</link-id>
     <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-DEG2-to-OpenROADM-4-1-DEG2</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
+    <clfi xmlns="http://org/openroadm/common/network">fiber4144</clfi>
+    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
+
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-4-1-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-4-4-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <opposite-link>OpenROADM-4-4-DEG2-to-OpenROADM-4-1-DEG2</opposite-link>
-        <TE-metric>10</TE-metric>
         <span>
-            <clfi>fiber28</clfi>
             <auto-spanloss>true</auto-spanloss>
             <spanloss-base>11.4</spanloss-base>
             <spanloss-current>12</spanloss-current>
@@ -4467,335 +7298,576 @@
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-DEG1-DEG1-CTP-TXtoOpenROADM-5-1-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-5-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-DEG2-DEG2-CTP-TXtoOpenROADM-5-1-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-DEG1-DEG1-CTP-TXtoOpenROADM-5-1-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-5-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-DEG3-DEG3-CTP-TXtoOpenROADM-5-1-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-1-SRG1-SRG1-CP-TXtoOpenROADM-5-1-DEG1-DEG1-CTP-RX</link-id>
             <source><source-node>OpenROADM-5-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-DEG1-DEG1-CTP-TXtoOpenROADM-5-1-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-1-DEG1-DEG1-CTP-TXtoOpenROADM-5-1-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-5-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-SRG1-SRG1-CP-TXtoOpenROADM-5-1-DEG1-DEG1-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-DEG2-DEG2-CTP-TXtoOpenROADM-5-1-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-5-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-DEG1-DEG1-CTP-TXtoOpenROADM-5-1-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-DEG2-DEG2-CTP-TXtoOpenROADM-5-1-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-5-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-DEG3-DEG3-CTP-TXtoOpenROADM-5-1-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-1-SRG1-SRG1-CP-TXtoOpenROADM-5-1-DEG2-DEG2-CTP-RX</link-id>
             <source><source-node>OpenROADM-5-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-DEG2-DEG2-CTP-TXtoOpenROADM-5-1-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-1-DEG2-DEG2-CTP-TXtoOpenROADM-5-1-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-5-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-SRG1-SRG1-CP-TXtoOpenROADM-5-1-DEG2-DEG2-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-DEG3-DEG3-CTP-TXtoOpenROADM-5-1-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-5-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-DEG1-DEG1-CTP-TXtoOpenROADM-5-1-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-DEG3-DEG3-CTP-TXtoOpenROADM-5-1-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-5-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-DEG2-DEG2-CTP-TXtoOpenROADM-5-1-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-1-SRG1-SRG1-CP-TXtoOpenROADM-5-1-DEG3-DEG3-CTP-RX</link-id>
             <source><source-node>OpenROADM-5-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-DEG3-DEG3-CTP-TXtoOpenROADM-5-1-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-1-DEG3-DEG3-CTP-TXtoOpenROADM-5-1-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-5-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-SRG1-SRG1-CP-TXtoOpenROADM-5-1-DEG3-DEG3-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-1XPDR-NW1-TX-toOpenROADM-5-1-SRG1-SRG1-PP1-RX</link-id>
         <source><source-node>XPONDER-5-1</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-SRG1-SRG1-PP1-TX-to-XPONDER-5-1XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-SRG1-SRG1-PP1-TX-to-XPONDER-5-1XPDR-NW1-RX</link-id>
         <source><source-node>OpenROADM-5-1-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-5-1</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-1XPDR-NW1-TX-toOpenROADM-5-1-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-1XPDR-NW2-TX-toOpenROADM-5-1-SRG1-SRG1-PP2-RX</link-id>
         <source><source-node>XPONDER-5-1</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-SRG1-SRG1-PP2-TX-to-XPONDER-5-1XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-SRG1-SRG1-PP2-TX-to-XPONDER-5-1XPDR-NW2-RX</link-id>
         <source><source-node>OpenROADM-5-1-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-5-1</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-1XPDR-NW2-TX-toOpenROADM-5-1-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-1XPDR-NW3-TX-toOpenROADM-5-1-SRG1-SRG1-PP3-RX</link-id>
         <source><source-node>XPONDER-5-1</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-SRG1-SRG1-PP3-TX-to-XPONDER-5-1XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-SRG1-SRG1-PP3-TX-to-XPONDER-5-1XPDR-NW3-RX</link-id>
         <source><source-node>OpenROADM-5-1-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-5-1</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-1XPDR-NW3-TX-toOpenROADM-5-1-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-1XPDR-NW4-TX-toOpenROADM-5-1-SRG1-SRG1-PP4-RX</link-id>
         <source><source-node>XPONDER-5-1</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-SRG1-SRG1-PP4-TX-to-XPONDER-5-1XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-SRG1-SRG1-PP4-TX-to-XPONDER-5-1XPDR-NW4-RX</link-id>
         <source><source-node>OpenROADM-5-1-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-5-1</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-1XPDR-NW4-TX-toOpenROADM-5-1-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-DEG1-DEG1-CTP-TXtoOpenROADM-5-2-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-5-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-DEG2-DEG2-CTP-TXtoOpenROADM-5-2-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-DEG1-DEG1-CTP-TXtoOpenROADM-5-2-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-5-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-DEG3-DEG3-CTP-TXtoOpenROADM-5-2-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-2-SRG1-SRG1-CP-TXtoOpenROADM-5-2-DEG1-DEG1-CTP-RX</link-id>
             <source><source-node>OpenROADM-5-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-DEG1-DEG1-CTP-TXtoOpenROADM-5-2-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-2-DEG1-DEG1-CTP-TXtoOpenROADM-5-2-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-5-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-SRG1-SRG1-CP-TXtoOpenROADM-5-2-DEG1-DEG1-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-DEG2-DEG2-CTP-TXtoOpenROADM-5-2-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-5-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-DEG1-DEG1-CTP-TXtoOpenROADM-5-2-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-DEG2-DEG2-CTP-TXtoOpenROADM-5-2-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-5-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-DEG3-DEG3-CTP-TXtoOpenROADM-5-2-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-2-SRG1-SRG1-CP-TXtoOpenROADM-5-2-DEG2-DEG2-CTP-RX</link-id>
             <source><source-node>OpenROADM-5-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-DEG2-DEG2-CTP-TXtoOpenROADM-5-2-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-2-DEG2-DEG2-CTP-TXtoOpenROADM-5-2-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-5-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-SRG1-SRG1-CP-TXtoOpenROADM-5-2-DEG2-DEG2-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-DEG3-DEG3-CTP-TXtoOpenROADM-5-2-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-5-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-DEG1-DEG1-CTP-TXtoOpenROADM-5-2-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-DEG3-DEG3-CTP-TXtoOpenROADM-5-2-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-5-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-DEG2-DEG2-CTP-TXtoOpenROADM-5-2-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-2-SRG1-SRG1-CP-TXtoOpenROADM-5-2-DEG3-DEG3-CTP-RX</link-id>
             <source><source-node>OpenROADM-5-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-DEG3-DEG3-CTP-TXtoOpenROADM-5-2-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-2-DEG3-DEG3-CTP-TXtoOpenROADM-5-2-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-5-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-SRG1-SRG1-CP-TXtoOpenROADM-5-2-DEG3-DEG3-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-2XPDR-NW1-TX-toOpenROADM-5-2-SRG1-SRG1-PP1-RX</link-id>
         <source><source-node>XPONDER-5-2</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-SRG1-SRG1-PP1-TX-to-XPONDER-5-2XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-SRG1-SRG1-PP1-TX-to-XPONDER-5-2XPDR-NW1-RX</link-id>
         <source><source-node>OpenROADM-5-2-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-5-2</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-2XPDR-NW1-TX-toOpenROADM-5-2-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-2XPDR-NW2-TX-toOpenROADM-5-2-SRG1-SRG1-PP2-RX</link-id>
         <source><source-node>XPONDER-5-2</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-SRG1-SRG1-PP2-TX-to-XPONDER-5-2XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-SRG1-SRG1-PP2-TX-to-XPONDER-5-2XPDR-NW2-RX</link-id>
         <source><source-node>OpenROADM-5-2-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-5-2</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-2XPDR-NW2-TX-toOpenROADM-5-2-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-2XPDR-NW3-TX-toOpenROADM-5-2-SRG1-SRG1-PP3-RX</link-id>
         <source><source-node>XPONDER-5-2</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-SRG1-SRG1-PP3-TX-to-XPONDER-5-2XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-SRG1-SRG1-PP3-TX-to-XPONDER-5-2XPDR-NW3-RX</link-id>
         <source><source-node>OpenROADM-5-2-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-5-2</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-2XPDR-NW3-TX-toOpenROADM-5-2-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-2XPDR-NW4-TX-toOpenROADM-5-2-SRG1-SRG1-PP4-RX</link-id>
         <source><source-node>XPONDER-5-2</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-SRG1-SRG1-PP4-TX-to-XPONDER-5-2XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-SRG1-SRG1-PP4-TX-to-XPONDER-5-2XPDR-NW4-RX</link-id>
         <source><source-node>OpenROADM-5-2-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-5-2</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-2XPDR-NW4-TX-toOpenROADM-5-2-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-3-DEG1-DEG1-CTP-TXtoOpenROADM-5-3-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-5-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-DEG2-DEG2-CTP-TXtoOpenROADM-5-3-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-3-DEG1-DEG1-CTP-TXtoOpenROADM-5-3-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-5-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-DEG3-DEG3-CTP-TXtoOpenROADM-5-3-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-3-SRG1-SRG1-CP-TXtoOpenROADM-5-3-DEG1-DEG1-CTP-RX</link-id>
             <source><source-node>OpenROADM-5-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-DEG1-DEG1-CTP-TXtoOpenROADM-5-3-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-3-DEG1-DEG1-CTP-TXtoOpenROADM-5-3-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-5-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-SRG1-SRG1-CP-TXtoOpenROADM-5-3-DEG1-DEG1-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-3-DEG2-DEG2-CTP-TXtoOpenROADM-5-3-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-5-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-DEG1-DEG1-CTP-TXtoOpenROADM-5-3-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-3-DEG2-DEG2-CTP-TXtoOpenROADM-5-3-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-5-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-DEG3-DEG3-CTP-TXtoOpenROADM-5-3-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-3-SRG1-SRG1-CP-TXtoOpenROADM-5-3-DEG2-DEG2-CTP-RX</link-id>
             <source><source-node>OpenROADM-5-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-DEG2-DEG2-CTP-TXtoOpenROADM-5-3-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-3-DEG2-DEG2-CTP-TXtoOpenROADM-5-3-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-5-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-SRG1-SRG1-CP-TXtoOpenROADM-5-3-DEG2-DEG2-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-3-DEG3-DEG3-CTP-TXtoOpenROADM-5-3-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-5-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-DEG1-DEG1-CTP-TXtoOpenROADM-5-3-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-3-DEG3-DEG3-CTP-TXtoOpenROADM-5-3-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-5-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-DEG2-DEG2-CTP-TXtoOpenROADM-5-3-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-3-SRG1-SRG1-CP-TXtoOpenROADM-5-3-DEG3-DEG3-CTP-RX</link-id>
             <source><source-node>OpenROADM-5-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-DEG3-DEG3-CTP-TXtoOpenROADM-5-3-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-3-DEG3-DEG3-CTP-TXtoOpenROADM-5-3-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-5-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-SRG1-SRG1-CP-TXtoOpenROADM-5-3-DEG3-DEG3-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-3XPDR-NW1-TX-toOpenROADM-5-3-SRG1-SRG1-PP1-RX</link-id>
         <source><source-node>XPONDER-5-3</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-3-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-SRG1-SRG1-PP1-TX-to-XPONDER-5-3XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-3-SRG1-SRG1-PP1-TX-to-XPONDER-5-3XPDR-NW1-RX</link-id>
         <source><source-node>OpenROADM-5-3-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-5-3</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-3XPDR-NW1-TX-toOpenROADM-5-3-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-3XPDR-NW2-TX-toOpenROADM-5-3-SRG1-SRG1-PP2-RX</link-id>
         <source><source-node>XPONDER-5-3</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-3-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-SRG1-SRG1-PP2-TX-to-XPONDER-5-3XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-3-SRG1-SRG1-PP2-TX-to-XPONDER-5-3XPDR-NW2-RX</link-id>
         <source><source-node>OpenROADM-5-3-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-5-3</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-3XPDR-NW2-TX-toOpenROADM-5-3-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-3XPDR-NW3-TX-toOpenROADM-5-3-SRG1-SRG1-PP3-RX</link-id>
         <source><source-node>XPONDER-5-3</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-3-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-SRG1-SRG1-PP3-TX-to-XPONDER-5-3XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-3-SRG1-SRG1-PP3-TX-to-XPONDER-5-3XPDR-NW3-RX</link-id>
         <source><source-node>OpenROADM-5-3-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-5-3</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-3XPDR-NW3-TX-toOpenROADM-5-3-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-3XPDR-NW4-TX-toOpenROADM-5-3-SRG1-SRG1-PP4-RX</link-id>
         <source><source-node>XPONDER-5-3</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-3-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-SRG1-SRG1-PP4-TX-to-XPONDER-5-3XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-3-SRG1-SRG1-PP4-TX-to-XPONDER-5-3XPDR-NW4-RX</link-id>
         <source><source-node>OpenROADM-5-3-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-5-3</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-3XPDR-NW4-TX-toOpenROADM-5-3-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-4-DEG1-DEG1-CTP-TXtoOpenROADM-5-4-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-5-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-DEG2-DEG2-CTP-TXtoOpenROADM-5-4-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-4-DEG1-DEG1-CTP-TXtoOpenROADM-5-4-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-5-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-DEG3-DEG3-CTP-TXtoOpenROADM-5-4-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-4-SRG1-SRG1-CP-TXtoOpenROADM-5-4-DEG1-DEG1-CTP-RX</link-id>
             <source><source-node>OpenROADM-5-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-DEG1-DEG1-CTP-TXtoOpenROADM-5-4-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-4-DEG1-DEG1-CTP-TXtoOpenROADM-5-4-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-5-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-SRG1-SRG1-CP-TXtoOpenROADM-5-4-DEG1-DEG1-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-4-DEG2-DEG2-CTP-TXtoOpenROADM-5-4-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-5-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-DEG1-DEG1-CTP-TXtoOpenROADM-5-4-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-4-DEG2-DEG2-CTP-TXtoOpenROADM-5-4-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-5-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-DEG3-DEG3-CTP-TXtoOpenROADM-5-4-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-4-SRG1-SRG1-CP-TXtoOpenROADM-5-4-DEG2-DEG2-CTP-RX</link-id>
             <source><source-node>OpenROADM-5-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-DEG2-DEG2-CTP-TXtoOpenROADM-5-4-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-4-DEG2-DEG2-CTP-TXtoOpenROADM-5-4-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-5-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-SRG1-SRG1-CP-TXtoOpenROADM-5-4-DEG2-DEG2-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-4-DEG3-DEG3-CTP-TXtoOpenROADM-5-4-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-5-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-DEG1-DEG1-CTP-TXtoOpenROADM-5-4-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-4-DEG3-DEG3-CTP-TXtoOpenROADM-5-4-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-5-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-DEG2-DEG2-CTP-TXtoOpenROADM-5-4-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-4-SRG1-SRG1-CP-TXtoOpenROADM-5-4-DEG3-DEG3-CTP-RX</link-id>
             <source><source-node>OpenROADM-5-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-DEG3-DEG3-CTP-TXtoOpenROADM-5-4-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-4-DEG3-DEG3-CTP-TXtoOpenROADM-5-4-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-5-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-SRG1-SRG1-CP-TXtoOpenROADM-5-4-DEG3-DEG3-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-4XPDR-NW1-TX-toOpenROADM-5-4-SRG1-SRG1-PP1-RX</link-id>
         <source><source-node>XPONDER-5-4</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-4-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-SRG1-SRG1-PP1-TX-to-XPONDER-5-4XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-4-SRG1-SRG1-PP1-TX-to-XPONDER-5-4XPDR-NW1-RX</link-id>
         <source><source-node>OpenROADM-5-4-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-5-4</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-4XPDR-NW1-TX-toOpenROADM-5-4-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-4XPDR-NW2-TX-toOpenROADM-5-4-SRG1-SRG1-PP2-RX</link-id>
         <source><source-node>XPONDER-5-4</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-4-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-SRG1-SRG1-PP2-TX-to-XPONDER-5-4XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-4-SRG1-SRG1-PP2-TX-to-XPONDER-5-4XPDR-NW2-RX</link-id>
         <source><source-node>OpenROADM-5-4-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-5-4</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-4XPDR-NW2-TX-toOpenROADM-5-4-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-4XPDR-NW3-TX-toOpenROADM-5-4-SRG1-SRG1-PP3-RX</link-id>
         <source><source-node>XPONDER-5-4</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-4-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-SRG1-SRG1-PP3-TX-to-XPONDER-5-4XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-4-SRG1-SRG1-PP3-TX-to-XPONDER-5-4XPDR-NW3-RX</link-id>
         <source><source-node>OpenROADM-5-4-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-5-4</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-4XPDR-NW3-TX-toOpenROADM-5-4-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-4XPDR-NW4-TX-toOpenROADM-5-4-SRG1-SRG1-PP4-RX</link-id>
         <source><source-node>XPONDER-5-4</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-4-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-SRG1-SRG1-PP4-TX-to-XPONDER-5-4XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-4-SRG1-SRG1-PP4-TX-to-XPONDER-5-4XPDR-NW4-RX</link-id>
         <source><source-node>OpenROADM-5-4-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-5-4</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-4XPDR-NW4-TX-toOpenROADM-5-4-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
 <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
     <link-id>OpenROADM-5-1-DEG1-to-OpenROADM-5-2-DEG1</link-id>
     <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-DEG1-to-OpenROADM-5-1-DEG1</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
+    <clfi xmlns="http://org/openroadm/common/network">fiber5152</clfi>
+    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
+
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-5-1-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-5-2-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <opposite-link>OpenROADM-5-2-DEG1-to-OpenROADM-5-1-DEG1</opposite-link>
-        <TE-metric>10</TE-metric>
         <span>
-            <clfi>fiber29</clfi>
             <auto-spanloss>true</auto-spanloss>
             <spanloss-base>11.4</spanloss-base>
             <spanloss-current>12</spanloss-current>
@@ -4812,15 +7884,16 @@
 <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
     <link-id>OpenROADM-5-2-DEG1-to-OpenROADM-5-1-DEG1</link-id>
     <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-DEG1-to-OpenROADM-5-2-DEG1</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
+    <clfi xmlns="http://org/openroadm/common/network">fiber5251</clfi>
+    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
+
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-5-2-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-5-1-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <opposite-link>OpenROADM-5-1-DEG1-to-OpenROADM-5-2-DEG1</opposite-link>
-        <TE-metric>10</TE-metric>
         <span>
-            <clfi>fiber30</clfi>
             <auto-spanloss>true</auto-spanloss>
             <spanloss-base>11.4</spanloss-base>
             <spanloss-current>12</spanloss-current>
@@ -4837,15 +7910,16 @@
 <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
     <link-id>OpenROADM-5-2-DEG2-to-OpenROADM-5-3-DEG2</link-id>
     <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-DEG2-to-OpenROADM-5-2-DEG2</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
+    <clfi xmlns="http://org/openroadm/common/network">fiber5253</clfi>
+    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
+
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-5-2-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-5-3-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <opposite-link>OpenROADM-5-3-DEG2-to-OpenROADM-5-2-DEG2</opposite-link>
-        <TE-metric>10</TE-metric>
         <span>
-            <clfi>fiber31</clfi>
             <auto-spanloss>true</auto-spanloss>
             <spanloss-base>11.4</spanloss-base>
             <spanloss-current>12</spanloss-current>
@@ -4862,15 +7936,16 @@
 <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
     <link-id>OpenROADM-5-3-DEG2-to-OpenROADM-5-2-DEG2</link-id>
     <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-DEG2-to-OpenROADM-5-3-DEG2</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
+    <clfi xmlns="http://org/openroadm/common/network">fiber5352</clfi>
+    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
+
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-5-3-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-5-2-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <opposite-link>OpenROADM-5-2-DEG2-to-OpenROADM-5-3-DEG2</opposite-link>
-        <TE-metric>10</TE-metric>
         <span>
-            <clfi>fiber32</clfi>
             <auto-spanloss>true</auto-spanloss>
             <spanloss-base>11.4</spanloss-base>
             <spanloss-current>12</spanloss-current>
@@ -4887,15 +7962,16 @@
 <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
     <link-id>OpenROADM-5-3-DEG1-to-OpenROADM-5-4-DEG1</link-id>
     <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-DEG1-to-OpenROADM-5-3-DEG1</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
+    <clfi xmlns="http://org/openroadm/common/network">fiber5354</clfi>
+    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
+
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-5-3-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-5-4-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <opposite-link>OpenROADM-5-4-DEG1-to-OpenROADM-5-3-DEG1</opposite-link>
-        <TE-metric>10</TE-metric>
         <span>
-            <clfi>fiber33</clfi>
             <auto-spanloss>true</auto-spanloss>
             <spanloss-base>11.4</spanloss-base>
             <spanloss-current>12</spanloss-current>
@@ -4912,15 +7988,16 @@
 <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
     <link-id>OpenROADM-5-4-DEG1-to-OpenROADM-5-3-DEG1</link-id>
     <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-DEG1-to-OpenROADM-5-4-DEG1</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
+    <clfi xmlns="http://org/openroadm/common/network">fiber5453</clfi>
+    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
+
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-5-4-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-5-3-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <opposite-link>OpenROADM-5-3-DEG1-to-OpenROADM-5-4-DEG1</opposite-link>
-        <TE-metric>10</TE-metric>
         <span>
-            <clfi>fiber34</clfi>
             <auto-spanloss>true</auto-spanloss>
             <spanloss-base>11.4</spanloss-base>
             <spanloss-current>12</spanloss-current>
@@ -4937,15 +8014,16 @@
 <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
     <link-id>OpenROADM-5-4-DEG2-to-OpenROADM-5-1-DEG2</link-id>
     <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-DEG2-to-OpenROADM-5-4-DEG2</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
+    <clfi xmlns="http://org/openroadm/common/network">fiber5451</clfi>
+    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
+
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-5-4-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-5-1-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <opposite-link>OpenROADM-5-1-DEG2-to-OpenROADM-5-4-DEG2</opposite-link>
-        <TE-metric>10</TE-metric>
         <span>
-            <clfi>fiber35</clfi>
             <auto-spanloss>true</auto-spanloss>
             <spanloss-base>11.4</spanloss-base>
             <spanloss-current>12</spanloss-current>
@@ -4962,15 +8040,16 @@
 <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
     <link-id>OpenROADM-5-1-DEG2-to-OpenROADM-5-4-DEG2</link-id>
     <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-DEG2-to-OpenROADM-5-1-DEG2</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
+    <clfi xmlns="http://org/openroadm/common/network">fiber5154</clfi>
+    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
+
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-5-1-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-5-4-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <opposite-link>OpenROADM-5-4-DEG2-to-OpenROADM-5-1-DEG2</opposite-link>
-        <TE-metric>10</TE-metric>
         <span>
-            <clfi>fiber36</clfi>
             <auto-spanloss>true</auto-spanloss>
             <spanloss-base>11.4</spanloss-base>
             <spanloss-current>12</spanloss-current>
@@ -4987,15 +8066,16 @@
 <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
     <link-id>OpenROADM-1-4-DEG3-to-OpenROADM-2-1-DEG3</link-id>
     <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-DEG3-to-OpenROADM-1-4-DEG3</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
+    <clfi xmlns="http://org/openroadm/common/network">fiber1421</clfi>
+    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
+
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-1-4-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-2-1-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <opposite-link>OpenROADM-2-1-DEG3-to-OpenROADM-1-4-DEG3</opposite-link>
-        <TE-metric>10</TE-metric>
         <span>
-            <clfi>fiber37</clfi>
             <auto-spanloss>true</auto-spanloss>
             <spanloss-base>11.4</spanloss-base>
             <spanloss-current>12</spanloss-current>
@@ -5012,15 +8092,16 @@
 <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
     <link-id>OpenROADM-2-1-DEG3-to-OpenROADM-1-4-DEG3</link-id>
     <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-DEG3-to-OpenROADM-2-1-DEG3</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
+    <clfi xmlns="http://org/openroadm/common/network">fiber2114</clfi>
+    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
+
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-2-1-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-1-4-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <opposite-link>OpenROADM-1-4-DEG3-to-OpenROADM-2-1-DEG3</opposite-link>
-        <TE-metric>10</TE-metric>
         <span>
-            <clfi>fiber38</clfi>
             <auto-spanloss>true</auto-spanloss>
             <spanloss-base>11.4</spanloss-base>
             <spanloss-current>12</spanloss-current>
@@ -5037,15 +8118,16 @@
 <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
     <link-id>OpenROADM-1-3-DEG3-to-OpenROADM-2-2-DEG3</link-id>
     <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-DEG3-to-OpenROADM-1-3-DEG3</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
+    <clfi xmlns="http://org/openroadm/common/network">fiber1322</clfi>
+    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
+
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-1-3-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-2-2-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <opposite-link>OpenROADM-2-2-DEG3-to-OpenROADM-1-3-DEG3</opposite-link>
-        <TE-metric>10</TE-metric>
         <span>
-            <clfi>fiber39</clfi>
             <auto-spanloss>true</auto-spanloss>
             <spanloss-base>11.4</spanloss-base>
             <spanloss-current>12</spanloss-current>
@@ -5062,15 +8144,16 @@
 <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
     <link-id>OpenROADM-2-2-DEG3-to-OpenROADM-1-3-DEG3</link-id>
     <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-DEG3-to-OpenROADM-2-2-DEG3</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
+    <clfi xmlns="http://org/openroadm/common/network">fiber2213</clfi>
+    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
+
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-2-2-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-1-3-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <opposite-link>OpenROADM-1-3-DEG3-to-OpenROADM-2-2-DEG3</opposite-link>
-        <TE-metric>10</TE-metric>
         <span>
-            <clfi>fiber40</clfi>
             <auto-spanloss>true</auto-spanloss>
             <spanloss-base>11.4</spanloss-base>
             <spanloss-current>12</spanloss-current>
@@ -5087,15 +8170,16 @@
 <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
     <link-id>OpenROADM-2-4-DEG3-to-OpenROADM-3-1-DEG3</link-id>
     <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-DEG3-to-OpenROADM-2-4-DEG3</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
+    <clfi xmlns="http://org/openroadm/common/network">fiber2431</clfi>
+    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
+
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-2-4-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-3-1-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <opposite-link>OpenROADM-3-1-DEG3-to-OpenROADM-2-4-DEG3</opposite-link>
-        <TE-metric>10</TE-metric>
         <span>
-            <clfi>fiber41</clfi>
             <auto-spanloss>true</auto-spanloss>
             <spanloss-base>11.4</spanloss-base>
             <spanloss-current>12</spanloss-current>
@@ -5112,15 +8196,16 @@
 <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
     <link-id>OpenROADM-3-1-DEG3-to-OpenROADM-2-4-DEG3</link-id>
     <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-DEG3-to-OpenROADM-3-1-DEG3</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
+    <clfi xmlns="http://org/openroadm/common/network">fiber3124</clfi>
+    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
+
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-3-1-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-2-4-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <opposite-link>OpenROADM-2-4-DEG3-to-OpenROADM-3-1-DEG3</opposite-link>
-        <TE-metric>10</TE-metric>
         <span>
-            <clfi>fiber42</clfi>
             <auto-spanloss>true</auto-spanloss>
             <spanloss-base>11.4</spanloss-base>
             <spanloss-current>12</spanloss-current>
@@ -5137,15 +8222,16 @@
 <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
     <link-id>OpenROADM-2-3-DEG3-to-OpenROADM-3-2-DEG3</link-id>
     <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-DEG3-to-OpenROADM-2-3-DEG3</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
+    <clfi xmlns="http://org/openroadm/common/network">fiber2332</clfi>
+    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
+
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-2-3-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-3-2-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <opposite-link>OpenROADM-3-2-DEG3-to-OpenROADM-2-3-DEG3</opposite-link>
-        <TE-metric>10</TE-metric>
         <span>
-            <clfi>fiber43</clfi>
             <auto-spanloss>true</auto-spanloss>
             <spanloss-base>11.4</spanloss-base>
             <spanloss-current>12</spanloss-current>
@@ -5159,18 +8245,19 @@
         </span>
     </OMS-attributes>
 </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> 
+<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
    <link-id>OpenROADM-3-2-DEG3-to-OpenROADM-2-3-DEG3</link-id>
     <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-DEG3-to-OpenROADM-3-2-DEG3</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
+    <clfi xmlns="http://org/openroadm/common/network">fiber3223</clfi>
+    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
+
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-3-2-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-2-3-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <opposite-link>OpenROADM-2-3-DEG3-to-OpenROADM-3-2-DEG3</opposite-link>
-        <TE-metric>10</TE-metric>
         <span>
-            <clfi>fiber44</clfi>
             <auto-spanloss>true</auto-spanloss>
             <spanloss-base>11.4</spanloss-base>
             <spanloss-current>12</spanloss-current>
@@ -5187,15 +8274,16 @@
 <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
     <link-id>OpenROADM-3-4-DEG3-to-OpenROADM-4-1-DEG3</link-id>
     <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-DEG3-to-OpenROADM-3-4-DEG3</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
+    <clfi xmlns="http://org/openroadm/common/network">fiber3441</clfi>
+    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
+
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-3-4-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-4-1-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <opposite-link>OpenROADM-4-1-DEG3-to-OpenROADM-3-4-DEG3</opposite-link>
-        <TE-metric>10</TE-metric>
         <span>
-            <clfi>fiber45</clfi>
             <auto-spanloss>true</auto-spanloss>
             <spanloss-base>11.4</spanloss-base>
             <spanloss-current>12</spanloss-current>
@@ -5212,15 +8300,16 @@
 <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
     <link-id>OpenROADM-4-1-DEG3-to-OpenROADM-3-4-DEG3</link-id>
     <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-DEG3-to-OpenROADM-4-1-DEG3</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
+    <clfi xmlns="http://org/openroadm/common/network">fiber4134</clfi>
+    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
+
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-4-1-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-3-4-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <opposite-link>OpenROADM-3-4-DEG3-to-OpenROADM-4-1-DEG3</opposite-link>
-        <TE-metric>10</TE-metric>
         <span>
-            <clfi>fiber46</clfi>
             <auto-spanloss>true</auto-spanloss>
             <spanloss-base>11.4</spanloss-base>
             <spanloss-current>12</spanloss-current>
@@ -5237,15 +8326,16 @@
 <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
     <link-id>OpenROADM-3-3-DEG3-to-OpenROADM-4-2-DEG3</link-id>
     <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-DEG3-to-OpenROADM-3-3-DEG3</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
+    <clfi xmlns="http://org/openroadm/common/network">fiber3342</clfi>
+    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
+
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-3-3-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-4-2-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <opposite-link>OpenROADM-4-2-DEG3-to-OpenROADM-3-3-DEG3</opposite-link>
-        <TE-metric>10</TE-metric>
         <span>
-            <clfi>fiber47</clfi>
             <auto-spanloss>true</auto-spanloss>
             <spanloss-base>11.4</spanloss-base>
             <spanloss-current>12</spanloss-current>
@@ -5262,15 +8352,16 @@
 <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
     <link-id>OpenROADM-4-2-DEG3-to-OpenROADM-3-3-DEG3</link-id>
     <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-DEG3-to-OpenROADM-4-2-DEG3</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
+    <clfi xmlns="http://org/openroadm/common/network">fiber4233</clfi>
+    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
+
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-4-2-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-3-3-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <opposite-link>OpenROADM-3-3-DEG3-to-OpenROADM-4-2-DEG3</opposite-link>
-        <TE-metric>10</TE-metric>
         <span>
-            <clfi>fiber48</clfi>
             <auto-spanloss>true</auto-spanloss>
             <spanloss-base>11.4</spanloss-base>
             <spanloss-current>12</spanloss-current>
@@ -5287,15 +8378,16 @@
 <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
     <link-id>OpenROADM-4-4-DEG3-to-OpenROADM-5-1-DEG3</link-id>
     <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-DEG3-to-OpenROADM-4-4-DEG3</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
+    <clfi xmlns="http://org/openroadm/common/network">fiber4451</clfi>
+    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
+
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-4-4-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-5-1-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <opposite-link>OpenROADM-5-1-DEG3-to-OpenROADM-4-4-DEG3</opposite-link>
-        <TE-metric>10</TE-metric>
         <span>
-            <clfi>fiber49</clfi>
             <auto-spanloss>true</auto-spanloss>
             <spanloss-base>11.4</spanloss-base>
             <spanloss-current>12</spanloss-current>
@@ -5312,15 +8404,16 @@
 <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
     <link-id>OpenROADM-5-1-DEG3-to-OpenROADM-4-4-DEG3</link-id>
     <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-DEG3-to-OpenROADM-5-1-DEG3</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
+    <clfi xmlns="http://org/openroadm/common/network">fiber5144</clfi>
+    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
+
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-5-1-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-4-4-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <opposite-link>OpenROADM-4-4-DEG3-to-OpenROADM-5-1-DEG3</opposite-link>
-        <TE-metric>10</TE-metric>
         <span>
-            <clfi>fiber50</clfi>
             <auto-spanloss>true</auto-spanloss>
             <spanloss-base>11.4</spanloss-base>
             <spanloss-current>12</spanloss-current>
@@ -5337,15 +8430,15 @@
 <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
     <link-id>OpenROADM-4-3-DEG3-to-OpenROADM-5-2-DEG3</link-id>
     <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-DEG3-to-OpenROADM-4-3-DEG3</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">10</link-latency>
+    <clfi xmlns="http://org/openroadm/common/network">fiber4352</clfi>
+    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-4-3-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-5-2-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <opposite-link>OpenROADM-5-2-DEG3-to-OpenROADM-4-3-DEG3</opposite-link>
-        <TE-metric>10</TE-metric>
         <span>
-            <clfi>fiber51</clfi>
             <auto-spanloss>true</auto-spanloss>
             <spanloss-base>11.4</spanloss-base>
             <spanloss-current>12</spanloss-current>
@@ -5362,15 +8455,15 @@
 <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
     <link-id>OpenROADM-5-2-DEG3-to-OpenROADM-4-3-DEG3</link-id>
     <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-DEG3-to-OpenROADM-5-2-DEG3</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">10</link-latency>
+    <clfi xmlns="http://org/openroadm/common/network">fiber5243</clfi>
+    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-5-2-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-4-3-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <opposite-link>OpenROADM-4-3-DEG3-to-OpenROADM-5-2-DEG3</opposite-link>
-        <TE-metric>10</TE-metric>
         <span>
-            <clfi>fiber52</clfi>
             <auto-spanloss>true</auto-spanloss>
             <spanloss-base>11.4</spanloss-base>
             <spanloss-current>12</spanloss-current>
@@ -5387,15 +8480,15 @@
 <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
     <link-id>OpenROADM-5-4-DEG3-to-OpenROADM-1-1-DEG3</link-id>
     <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-DEG3-to-OpenROADM-5-4-DEG3</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
+    <clfi xmlns="http://org/openroadm/common/network">fiber5411</clfi>
+    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-5-4-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-1-1-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <opposite-link>OpenROADM-1-1-DEG3-to-OpenROADM-5-4-DEG3</opposite-link>
-        <TE-metric>10</TE-metric>
         <span>
-            <clfi>fiber53</clfi>
             <auto-spanloss>true</auto-spanloss>
             <spanloss-base>11.4</spanloss-base>
             <spanloss-current>12</spanloss-current>
@@ -5412,15 +8505,15 @@
 <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
     <link-id>OpenROADM-1-1-DEG3-to-OpenROADM-5-4-DEG3</link-id>
     <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-DEG3-to-OpenROADM-1-1-DEG3</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
+    <clfi xmlns="http://org/openroadm/common/network">fiber1154</clfi>
+    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-1-1-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-5-4-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <opposite-link>OpenROADM-5-4-DEG3-to-OpenROADM-1-1-DEG3</opposite-link>
-        <TE-metric>10</TE-metric>
         <span>
-            <clfi>fiber54</clfi>
             <auto-spanloss>true</auto-spanloss>
             <spanloss-base>11.4</spanloss-base>
             <spanloss-current>12</spanloss-current>
@@ -5437,15 +8530,15 @@
 <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
     <link-id>OpenROADM-5-3-DEG3-to-OpenROADM-1-2-DEG3</link-id>
     <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-DEG3-to-OpenROADM-5-3-DEG3</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">10</link-latency>
+    <clfi xmlns="http://org/openroadm/common/network">fiber5312</clfi>
+    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-5-3-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-1-2-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <opposite-link>OpenROADM-1-2-DEG3-to-OpenROADM-5-3-DEG3</opposite-link>
-        <TE-metric>10</TE-metric>
         <span>
-            <clfi>fiber55</clfi>
             <auto-spanloss>true</auto-spanloss>
             <spanloss-base>11.4</spanloss-base>
             <spanloss-current>12</spanloss-current>
@@ -5462,15 +8555,15 @@
 <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
     <link-id>OpenROADM-1-2-DEG3-to-OpenROADM-5-3-DEG3</link-id>
     <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-DEG3-to-OpenROADM-1-2-DEG3</opposite-link>
-    <link-latency xmlns="http://org/openroadm/network/topology">10</link-latency>
+    <clfi xmlns="http://org/openroadm/common/network">fiber1253</clfi>
+    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-1-2-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-5-3-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <opposite-link>OpenROADM-5-3-DEG3-to-OpenROADM-1-2-DEG3</opposite-link>
-        <TE-metric>10</TE-metric>
         <span>
-            <clfi>fiber56</clfi>
             <auto-spanloss>true</auto-spanloss>
             <spanloss-base>11.4</spanloss-base>
             <spanloss-current>12</spanloss-current>