Replace tpce-topology yang by existing ordmodels

[transportpce.git] / tests / sample_configs / gnpy / openroadmTopology.json

diff --git a/tests/sample_configs/gnpy/openroadmTopology.json b/tests/sample_configs/gnpy/openroadmTopology.json
index 14035e6e0080ae243bb473ea1a7f3c5ff567d98a..283c4c6b9fa5fc74db5bfe9e1f16a18342fd7ffc 100644 (file)
--- a/tests/sample_configs/gnpy/openroadmTopology.json
+++ b/tests/sample_configs/gnpy/openroadmTopology.json
@@ -14,7 +14,9 @@
                         "dest-node": "OpenROADM-1-SRG1",
                         "dest-tp": "SRG1-PP1-RX"
                     },
-                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-SRG1-SRG1-PP1-TX-to-XPONDER-1XPDR-NW1-RX"
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-SRG1-SRG1-PP1-TX-to-XPONDER-1XPDR-NW1-RX",
+                    "administrative-state": "inService",
+                    "operational-state": "inService"
                 },
                 {
                     "link-id": "XPONDER-2XPDR-NW1-TX-toOpenROADM-2-SRG1-SRG1-PP1-RX",
@@ -27,7 +29,9 @@
                         "dest-node": "OpenROADM-2-SRG1",
                         "dest-tp": "SRG1-PP1-RX"
                     },
-                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-SRG1-SRG1-PP1-TX-to-XPONDER-2XPDR-NW1-RX"
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-SRG1-SRG1-PP1-TX-to-XPONDER-2XPDR-NW1-RX",
+                    "administrative-state": "inService",
+                    "operational-state": "inService"
                 },
                 {
                     "link-id": "XPONDER-3XPDR-NW1-TX-toOpenROADM-3-SRG1-SRG1-PP1-RX",
@@ -40,7 +44,9 @@
                         "dest-node": "OpenROADM-3-SRG1",
                         "dest-tp": "SRG1-PP1-RX"
                     },
-                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-SRG1-SRG1-PP1-TX-to-XPONDER-3XPDR-NW1-RX"
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-SRG1-SRG1-PP1-TX-to-XPONDER-3XPDR-NW1-RX",
+                    "administrative-state": "inService",
+                    "operational-state": "inService"
                 },
                 {
                     "link-id": "XPONDER-4XPDR-NW1-TX-toOpenROADM-4-SRG1-SRG1-PP1-RX",
@@ -53,7 +59,9 @@
                         "dest-node": "OpenROADM-4-SRG1",
                         "dest-tp": "SRG1-PP1-RX"
                     },
-                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-SRG1-SRG1-PP1-TX-to-XPONDER-4XPDR-NW1-RX"
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-SRG1-SRG1-PP1-TX-to-XPONDER-4XPDR-NW1-RX",
+                    "administrative-state": "inService",
+                    "operational-state": "inService"
                 },
                 {
                     "link-id": "XPONDER-5XPDR-NW1-TX-toOpenROADM-5-SRG1-SRG1-PP1-RX",
@@ -66,7 +74,9 @@
                         "dest-node": "OpenROADM-5-SRG1",
                         "dest-tp": "SRG1-PP1-RX"
                     },
-                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-SRG1-SRG1-PP1-TX-to-XPONDER-5XPDR-NW1-RX"
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-SRG1-SRG1-PP1-TX-to-XPONDER-5XPDR-NW1-RX",
+                    "administrative-state": "inService",
+                    "operational-state": "inService"
                 },
                 {
                     "link-id": "OpenROADM-1-SRG1-SRG1-PP1-TX-to-XPONDER-1XPDR-NW1-RX",
@@ -79,7 +89,9 @@
                         "dest-node": "XPONDER-1",
                         "dest-tp": "XPDR-NW1-RX"
                     },
-                    "org-openroadm-common-network:opposite-link": "XPONDER-1XPDR-NW1-TX-toOpenROADM-1-SRG1-SRG1-PP1-RX"
+                    "org-openroadm-common-network:opposite-link": "XPONDER-1XPDR-NW1-TX-toOpenROADM-1-SRG1-SRG1-PP1-RX",
+                    "administrative-state": "inService",
+                    "operational-state": "inService"
                 },
                 {
                     "link-id": "OpenROADM-2-SRG1-SRG1-PP1-TX-to-XPONDER-2XPDR-NW1-RX",
@@ -92,7 +104,9 @@
                         "dest-node": "XPONDER-2",
                         "dest-tp": "XPDR-NW1-RX"
                     },
-                    "org-openroadm-common-network:opposite-link": "XPONDER-2XPDR-NW1-TX-toOpenROADM-2-SRG1-SRG1-PP1-RX"
+                    "org-openroadm-common-network:opposite-link": "XPONDER-2XPDR-NW1-TX-toOpenROADM-2-SRG1-SRG1-PP1-RX",
+                    "administrative-state": "inService",
+                    "operational-state": "inService"
                 },
                 {
                     "link-id": "OpenROADM-3-SRG1-SRG1-PP1-TX-to-XPONDER-3XPDR-NW1-RX",
@@ -105,7 +119,9 @@
                         "dest-node": "XPONDER-3",
                         "dest-tp": "XPDR-NW1-RX"
                     },
-                    "org-openroadm-common-network:opposite-link": "XPONDER-3XPDR-NW1-TX-toOpenROADM-3-SRG1-SRG1-PP1-RX"
+                    "org-openroadm-common-network:opposite-link": "XPONDER-3XPDR-NW1-TX-toOpenROADM-3-SRG1-SRG1-PP1-RX",
+                    "administrative-state": "inService",
+                    "operational-state": "inService"
                 },
                 {
                     "link-id": "OpenROADM-4-SRG1-SRG1-PP1-TX-to-XPONDER-4XPDR-NW1-RX",
@@ -118,7 +134,9 @@
                         "dest-node": "XPONDER-4",
                         "dest-tp": "XPDR-NW1-RX"
                     },
-                    "org-openroadm-common-network:opposite-link": "XPONDER-4XPDR-NW1-TX-toOpenROADM-4-SRG1-SRG1-PP1-RX"
+                    "org-openroadm-common-network:opposite-link": "XPONDER-4XPDR-NW1-TX-toOpenROADM-4-SRG1-SRG1-PP1-RX",
+                    "administrative-state": "inService",
+                    "operational-state": "inService"
                 },
                 {
                     "link-id": "OpenROADM-5-SRG1-SRG1-PP1-TX-to-XPONDER-5XPDR-NW1-RX",
@@ -131,7 +149,9 @@
                         "dest-node": "XPONDER-5",
                         "dest-tp": "XPDR-NW1-RX"
                     },
-                    "org-openroadm-common-network:opposite-link": "XPONDER-5XPDR-NW1-TX-toOpenROADM-5-SRG1-SRG1-PP1-RX"
+                    "org-openroadm-common-network:opposite-link": "XPONDER-5XPDR-NW1-TX-toOpenROADM-5-SRG1-SRG1-PP1-RX",
+                    "administrative-state": "inService",
+                    "operational-state": "inService"
                 },
                 {
                     "link-id": "OpenROADM-1-SRG1-SRG1-CP-TXtoOpenROADM-1-DEG1-DEG1-CTP-RX",
@@ -144,7 +164,9 @@
                         "dest-node": "OpenROADM-1-DEG1",
                         "dest-tp": "DEG1-CTP-RX"
                     },
-                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-SRG1-SRG1-CP-RX"
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-SRG1-SRG1-CP-RX",
+                    "administrative-state": "inService",
+                    "operational-state": "inService"
                 },
                 {
                     "link-id": "OpenROADM-1-SRG1-SRG1-CP-TXtoOpenROADM-1-DEG2-DEG2-CTP-RX",
@@ -157,7 +179,9 @@
                         "dest-node": "OpenROADM-1-DEG2",
                         "dest-tp": "DEG2-CTP-RX"
                     },
-                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-SRG1-SRG1-CP-RX"
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-SRG1-SRG1-CP-RX",
+                    "administrative-state": "inService",
+                    "operational-state": "inService"
                 },
                 {
                     "link-id": "OpenROADM-2-SRG1-SRG1-CP-TXtoOpenROADM-2-DEG1-DEG1-CTP-RX",
@@ -170,7 +194,9 @@
                         "dest-node": "OpenROADM-2-DEG1",
                         "dest-tp": "DEG1-CTP-RX"
                     },
-                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-SRG1-SRG1-CP-RX"
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-SRG1-SRG1-CP-RX",
+                    "administrative-state": "inService",
+                    "operational-state": "inService"
                 },
                 {
                     "link-id": "OpenROADM-2-SRG1-SRG1-CP-TXtoOpenROADM-2-DEG2-DEG2-CTP-RX",
@@ -183,7 +209,9 @@
                         "dest-node": "OpenROADM-2-DEG2",
                         "dest-tp": "DEG2-CTP-RX"
                     },
-                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-SRG1-SRG1-CP-RX"
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-SRG1-SRG1-CP-RX",
+                    "administrative-state": "inService",
+                    "operational-state": "inService"
                 },
                 {
                     "link-id": "OpenROADM-2-SRG1-SRG1-CP-TXtoOpenROADM-2-DEG3-DEG3-CTP-RX",
@@ -196,7 +224,9 @@
                         "dest-node": "OpenROADM-2-DEG3",
                         "dest-tp": "DEG3-CTP-RX"
                     },
-                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-SRG1-SRG1-CP-RX"
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-SRG1-SRG1-CP-RX",
+                    "administrative-state": "inService",
+                    "operational-state": "inService"
                 },
                 {
                     "link-id": "OpenROADM-3-SRG1-SRG1-CP-TXtoOpenROADM-3-DEG1-DEG1-CTP-RX",
@@ -209,7 +239,9 @@
                         "dest-node": "OpenROADM-3-DEG1",
                         "dest-tp": "DEG1-CTP-RX"
                     },
-                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-DEG1-DEG1-CTP-TXtoOpenROADM-3-SRG1-SRG1-CP-RX"
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-DEG1-DEG1-CTP-TXtoOpenROADM-3-SRG1-SRG1-CP-RX",
+                    "administrative-state": "inService",
+                    "operational-state": "inService"
                 },
                 {
                     "link-id": "OpenROADM-3-SRG1-SRG1-CP-TXtoOpenROADM-3-DEG2-DEG2-CTP-RX",
@@ -222,7 +254,9 @@
                         "dest-node": "OpenROADM-3-DEG2",
                         "dest-tp": "DEG2-CTP-RX"
                     },
-                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-DEG2-DEG2-CTP-TXtoOpenROADM-3-SRG1-SRG1-CP-RX"
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-DEG2-DEG2-CTP-TXtoOpenROADM-3-SRG1-SRG1-CP-RX",
+                    "administrative-state": "inService",
+                    "operational-state": "inService"
                 },
                 {
                     "link-id": "OpenROADM-3-SRG1-SRG1-CP-TXtoOpenROADM-3-DEG3-DEG3-CTP-RX",
@@ -235,7 +269,9 @@
                         "dest-node": "OpenROADM-3-DEG3",
                         "dest-tp": "DEG3-CTP-RX"
                     },
-                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-DEG3-DEG3-CTP-TXtoOpenROADM-3-SRG1-SRG1-CP-RX"
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-DEG3-DEG3-CTP-TXtoOpenROADM-3-SRG1-SRG1-CP-RX",
+                    "administrative-state": "inService",
+                    "operational-state": "inService"
                 },
                 {
                     "link-id": "OpenROADM-3-SRG1-SRG1-CP-TXtoOpenROADM-3-DEG4-DEG4-CTP-RX",
@@ -248,7 +284,9 @@
                         "dest-node": "OpenROADM-3-DEG4",
                         "dest-tp": "DEG4-CTP-RX"
                     },
-                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-DEG4-DEG4-CTP-TXtoOpenROADM-3-SRG1-SRG1-CP-RX"
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-DEG4-DEG4-CTP-TXtoOpenROADM-3-SRG1-SRG1-CP-RX",
+                    "administrative-state": "inService",
+                    "operational-state": "inService"
                 },
                 {
                     "link-id": "OpenROADM-4-SRG1-SRG1-CP-TXtoOpenROADM-4-DEG1-DEG1-CTP-RX",
@@ -261,7 +299,9 @@
                         "dest-node": "OpenROADM-4-DEG1",
                         "dest-tp": "DEG1-CTP-RX"
                     },
-                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-DEG1-DEG1-CTP-TXtoOpenROADM-4-SRG1-SRG1-CP-RX"
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-DEG1-DEG1-CTP-TXtoOpenROADM-4-SRG1-SRG1-CP-RX",
+                    "administrative-state": "inService",
+                    "operational-state": "inService"
                 },
                 {
                     "link-id": "OpenROADM-4-SRG1-SRG1-CP-TXtoOpenROADM-4-DEG2-DEG2-CTP-RX",
@@ -274,7 +314,9 @@
                         "dest-node": "OpenROADM-4-DEG2",
                         "dest-tp": "DEG2-CTP-RX"
                     },
-                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-DEG2-DEG2-CTP-TXtoOpenROADM-4-SRG1-SRG1-CP-RX"
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-DEG2-DEG2-CTP-TXtoOpenROADM-4-SRG1-SRG1-CP-RX",
+                    "administrative-state": "inService",
+                    "operational-state": "inService"
                 },
                 {
                     "link-id": "OpenROADM-5-SRG1-SRG1-CP-TXtoOpenROADM-5-DEG1-DEG1-CTP-RX",
@@ -287,7 +329,9 @@
                         "dest-node": "OpenROADM-5-DEG1",
                         "dest-tp": "DEG1-CTP-RX"
                     },
-                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-DEG1-DEG1-CTP-TXtoOpenROADM-5-SRG1-SRG1-CP-RX"
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-DEG1-DEG1-CTP-TXtoOpenROADM-5-SRG1-SRG1-CP-RX",
+                    "administrative-state": "inService",
+                    "operational-state": "inService"
                 },
                 {
                     "link-id": "OpenROADM-5-SRG1-SRG1-CP-TXtoOpenROADM-5-DEG2-DEG2-CTP-RX",
@@ -300,7 +344,9 @@
                         "dest-node": "OpenROADM-5-DEG2",
                         "dest-tp": "DEG2-CTP-RX"
                     },
-                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-DEG2-DEG2-CTP-TXtoOpenROADM-5-SRG1-SRG1-CP-RX"
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-DEG2-DEG2-CTP-TXtoOpenROADM-5-SRG1-SRG1-CP-RX",
+                    "administrative-state": "inService",
+                    "operational-state": "inService"
                 },
                 {
                     "link-id": "OpenROADM-5-SRG1-SRG1-CP-TXtoOpenROADM-5-DEG3-DEG3-CTP-RX",
@@ -313,7 +359,9 @@
                         "dest-node": "OpenROADM-5-DEG3",
                         "dest-tp": "DEG3-CTP-RX"
                     },
-                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-DEG3-DEG3-CTP-TXtoOpenROADM-5-SRG1-SRG1-CP-RX"
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-DEG3-DEG3-CTP-TXtoOpenROADM-5-SRG1-SRG1-CP-RX",
+                    "administrative-state": "inService",
+                    "operational-state": "inService"
                 },
                 {
                     "link-id": "OpenROADM-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-SRG1-SRG1-CP-RX",
@@ -326,7 +374,9 @@
                         "dest-node": "OpenROADM-1-SRG1",
                         "dest-tp": "SRG1-CP-RX"
                     },
-                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-SRG1-SRG1-CP-TXtoOpenROADM-1-DEG1-DEG1-CTP-RX"
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-SRG1-SRG1-CP-TXtoOpenROADM-1-DEG1-DEG1-CTP-RX",
+                    "administrative-state": "inService",
+                    "operational-state": "inService"
                 },
                 {
                     "link-id": "OpenROADM-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-SRG1-SRG1-CP-RX",
@@ -339,7 +389,9 @@
                         "dest-node": "OpenROADM-1-SRG1",
                         "dest-tp": "SRG1-CP-RX"
                     },
-                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-SRG1-SRG1-CP-TXtoOpenROADM-1-DEG2-DEG2-CTP-RX"
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-SRG1-SRG1-CP-TXtoOpenROADM-1-DEG2-DEG2-CTP-RX",
+                    "administrative-state": "inService",
+                    "operational-state": "inService"
                 },
                 {
                     "link-id": "OpenROADM-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-SRG1-SRG1-CP-RX",
@@ -352,7 +404,9 @@
                         "dest-node": "OpenROADM-2-SRG1",
                         "dest-tp": "SRG1-CP-RX"
                     },
-                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-SRG1-SRG1-CP-TXtoOpenROADM-2-DEG1-DEG1-CTP-RX"
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-SRG1-SRG1-CP-TXtoOpenROADM-2-DEG1-DEG1-CTP-RX",
+                    "administrative-state": "inService",
+                    "operational-state": "inService"
                 },
                 {
                     "link-id": "OpenROADM-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-SRG1-SRG1-CP-RX",
@@ -365,7 +419,9 @@
                         "dest-node": "OpenROADM-2-SRG1",
                         "dest-tp": "SRG1-CP-RX"
                     },
-                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-SRG1-SRG1-CP-TXtoOpenROADM-2-DEG2-DEG2-CTP-RX"
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-SRG1-SRG1-CP-TXtoOpenROADM-2-DEG2-DEG2-CTP-RX",
+                    "administrative-state": "inService",
+                    "operational-state": "inService"
                 },
                 {
                     "link-id": "OpenROADM-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-SRG1-SRG1-CP-RX",
@@ -378,7 +434,9 @@
                         "dest-node": "OpenROADM-2-SRG1",
                         "dest-tp": "SRG1-CP-RX"
                     },
-                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-SRG1-SRG1-CP-TXtoOpenROADM-2-DEG3-DEG3-CTP-RX"
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-SRG1-SRG1-CP-TXtoOpenROADM-2-DEG3-DEG3-CTP-RX",
+                    "administrative-state": "inService",
+                    "operational-state": "inService"
                 },
                 {
                     "link-id": "OpenROADM-3-DEG1-DEG1-CTP-TXtoOpenROADM-3-SRG1-SRG1-CP-RX",
@@ -391,7 +449,9 @@
                         "dest-node": "OpenROADM-3-SRG1",
                         "dest-tp": "SRG1-CP-RX"
                     },
-                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-SRG1-SRG1-CP-TXtoOpenROADM-3-DEG1-DEG1-CTP-RX"
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-SRG1-SRG1-CP-TXtoOpenROADM-3-DEG1-DEG1-CTP-RX",
+                    "administrative-state": "inService",
+                    "operational-state": "inService"
                 },
                 {
                     "link-id": "OpenROADM-3-DEG2-DEG2-CTP-TXtoOpenROADM-3-SRG1-SRG1-CP-RX",
@@ -404,7 +464,9 @@
                         "dest-node": "OpenROADM-3-SRG1",
                         "dest-tp": "SRG1-CP-RX"
                     },
-                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-SRG1-SRG1-CP-TXtoOpenROADM-3-DEG2-DEG2-CTP-RX"
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-SRG1-SRG1-CP-TXtoOpenROADM-3-DEG2-DEG2-CTP-RX",
+                    "administrative-state": "inService",
+                    "operational-state": "inService"
                 },
                 {
                     "link-id": "OpenROADM-3-DEG3-DEG3-CTP-TXtoOpenROADM-3-SRG1-SRG1-CP-RX",
@@ -417,7 +479,9 @@
                         "dest-node": "OpenROADM-3-SRG1",
                         "dest-tp": "SRG1-CP-RX"
                     },
-                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-SRG1-SRG1-CP-TXtoOpenROADM-3-DEG3-DEG3-CTP-RX"
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-SRG1-SRG1-CP-TXtoOpenROADM-3-DEG3-DEG3-CTP-RX",
+                    "administrative-state": "inService",
+                    "operational-state": "inService"
                 },
                 {
                     "link-id": "OpenROADM-3-DEG4-DEG4-CTP-TXtoOpenROADM-3-SRG1-SRG1-CP-RX",
@@ -430,7 +494,9 @@
                         "dest-node": "OpenROADM-3-SRG1",
                         "dest-tp": "SRG1-CP-RX"
                     },
-                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-SRG1-SRG1-CP-TXtoOpenROADM-3-DEG4-DEG4-CTP-RX"
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-SRG1-SRG1-CP-TXtoOpenROADM-3-DEG4-DEG4-CTP-RX",
+                    "administrative-state": "inService",
+                    "operational-state": "inService"
                 },
                 {
                     "link-id": "OpenROADM-4-DEG1-DEG1-CTP-TXtoOpenROADM-4-SRG1-SRG1-CP-RX",
@@ -443,7 +509,9 @@
                         "dest-node": "OpenROADM-4-SRG1",
                         "dest-tp": "SRG1-CP-RX"
                     },
-                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-SRG1-SRG1-CP-TXtoOpenROADM-4-DEG1-DEG1-CTP-RX"
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-SRG1-SRG1-CP-TXtoOpenROADM-4-DEG1-DEG1-CTP-RX",
+                    "administrative-state": "inService",
+                    "operational-state": "inService"
                 },
                 {
                     "link-id": "OpenROADM-4-DEG2-DEG2-CTP-TXtoOpenROADM-4-SRG1-SRG1-CP-RX",
@@ -456,7 +524,9 @@
                         "dest-node": "OpenROADM-4-SRG1",
                         "dest-tp": "SRG1-CP-RX"
                     },
-                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-SRG1-SRG1-CP-TXtoOpenROADM-4-DEG2-DEG2-CTP-RX"
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-SRG1-SRG1-CP-TXtoOpenROADM-4-DEG2-DEG2-CTP-RX",
+                    "administrative-state": "inService",
+                    "operational-state": "inService"
                 },
                 {
                     "link-id": "OpenROADM-5-DEG1-DEG1-CTP-TXtoOpenROADM-5-SRG1-SRG1-CP-RX",
@@ -469,7 +539,9 @@
                         "dest-node": "OpenROADM-5-SRG1",
                         "dest-tp": "SRG1-CP-RX"
                     },
-                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-SRG1-SRG1-CP-TXtoOpenROADM-5-DEG1-DEG1-CTP-RX"
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-SRG1-SRG1-CP-TXtoOpenROADM-5-DEG1-DEG1-CTP-RX",
+                    "administrative-state": "inService",
+                    "operational-state": "inService"
                 },
                 {
                     "link-id": "OpenROADM-5-DEG2-DEG2-CTP-TXtoOpenROADM-5-SRG1-SRG1-CP-RX",
@@ -482,7 +554,9 @@
                         "dest-node": "OpenROADM-5-SRG1",
                         "dest-tp": "SRG1-CP-RX"
                     },
-                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-SRG1-SRG1-CP-TXtoOpenROADM-5-DEG2-DEG2-CTP-RX"
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-SRG1-SRG1-CP-TXtoOpenROADM-5-DEG2-DEG2-CTP-RX",
+                    "administrative-state": "inService",
+                    "operational-state": "inService"
                 },
                 {
                     "link-id": "OpenROADM-5-DEG3-DEG3-CTP-TXtoOpenROADM-5-SRG1-SRG1-CP-RX",
@@ -495,7 +569,9 @@
                         "dest-node": "OpenROADM-5-SRG1",
                         "dest-tp": "SRG1-CP-RX"
                     },
-                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-SRG1-SRG1-CP-TXtoOpenROADM-5-DEG3-DEG3-CTP-RX"
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-SRG1-SRG1-CP-TXtoOpenROADM-5-DEG3-DEG3-CTP-RX",
+                    "administrative-state": "inService",
+                    "operational-state": "inService"
                 },
                 {
                     "link-id": "OpenROADM-1-DEG1-to-OpenROADM-2-DEG1",
@@ -504,31 +580,29 @@
                         "source-tp": "DEG1-TTP-TX"
                     },
                     "org-openroadm-network-topology:OMS-attributes": {
-                        "opposite-link": "OpenROADM-2-DEG1-to-OpenROADM-1-DEG1",
                         "span": {
-                            "spanloss-base": 11.4,
+                            "spanloss-base": 28.4,
                             "link-concatenation": [
                                 {
                                     "SRLG-Id": 0,
-                                    "SRLG-length": 70000,
+                                    "SRLG-length": 100000,
                                     "pmd": 0.5,
                                     "fiber-type": "smf"
                                 }
                             ],
-                            "spanloss-current": 12,
-                            "engineered-spanloss": 12.2,
-                            "clfi": "fiber12",
+                            "spanloss-current": 20,
+                            "engineered-spanloss": 20.2,
                             "auto-spanloss": true
-                        },
-                        "TE-metric": 10
+                        }
                     },
                     "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
-                    "org-openroadm-network-topology:link-latency": 1,
                     "destination": {
                         "dest-node": "OpenROADM-2-DEG1",
                         "dest-tp": "DEG1-TTP-RX"
                     },
-                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-DEG1-to-OpenROADM-1-DEG1"
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-DEG1-to-OpenROADM-1-DEG1",
+                    "administrative-state": "inService",
+                    "operational-state": "inService"
                 },
                 {
                     "link-id": "OpenROADM-1-DEG2-to-OpenROADM-3-DEG1",
@@ -537,31 +611,29 @@
                         "source-tp": "DEG2-TTP-TX"
                     },
                     "org-openroadm-network-topology:OMS-attributes": {
-                        "opposite-link": "OpenROADM-3-DEG1-to-OpenROADM-1-DEG2",
                         "span": {
                             "spanloss-base": 11.4,
                             "link-concatenation": [
                                 {
                                     "SRLG-Id": 0,
-                                    "SRLG-length": 70000,
+                                    "SRLG-length": 100000,
                                     "pmd": 0.5,
                                     "fiber-type": "smf"
                                 }
                             ],
                             "spanloss-current": 12,
                             "engineered-spanloss": 12.2,
-                            "clfi": "fiber13",
                             "auto-spanloss": true
-                        },
-                        "TE-metric": 10
+                        }
                     },
                     "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
-                    "org-openroadm-network-topology:link-latency": 1,
                     "destination": {
                         "dest-node": "OpenROADM-3-DEG1",
                         "dest-tp": "DEG1-TTP-RX"
                     },
-                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-DEG1-to-OpenROADM-1-DEG2"
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-DEG1-to-OpenROADM-1-DEG2",
+                    "administrative-state": "inService",
+                    "operational-state": "inService"
                 },
                 {
                     "link-id": "OpenROADM-2-DEG1-to-OpenROADM-1-DEG1",
@@ -570,31 +642,29 @@
                         "source-tp": "DEG1-TTP-TX"
                     },
                     "org-openroadm-network-topology:OMS-attributes": {
-                        "opposite-link": "OpenROADM-1-DEG1-to-OpenROADM-2-DEG1",
                         "span": {
-                            "spanloss-base": 11.4,
+                            "spanloss-base": 28.4,
                             "link-concatenation": [
                                 {
                                     "SRLG-Id": 0,
-                                    "SRLG-length": 70000,
+                                    "SRLG-length": 100000,
                                     "pmd": 0.5,
                                     "fiber-type": "smf"
                                 }
                             ],
-                            "spanloss-current": 12,
-                            "engineered-spanloss": 12.2,
-                            "clfi": "fiber21",
+                            "spanloss-current": 20,
+                            "engineered-spanloss": 20.2,
                             "auto-spanloss": true
-                        },
-                        "TE-metric": 10
+                        }
                     },
                     "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
-                    "org-openroadm-network-topology:link-latency": 1,
                     "destination": {
                         "dest-node": "OpenROADM-1-DEG1",
                         "dest-tp": "DEG1-TTP-RX"
                     },
-                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-DEG1-to-OpenROADM-2-DEG1"
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-DEG1-to-OpenROADM-2-DEG1",
+                    "administrative-state": "inService",
+                    "operational-state": "inService"
                 },
                 {
                     "link-id": "OpenROADM-2-DEG2-to-OpenROADM-3-DEG2",
@@ -603,31 +673,29 @@
                         "source-tp": "DEG2-TTP-TX"
                     },
                     "org-openroadm-network-topology:OMS-attributes": {
-                        "opposite-link": "OpenROADM-3-DEG2-to-OpenROADM-2-DEG2",
                         "span": {
-                            "spanloss-base": 11.4,
+                            "spanloss-base": 28.4,
                             "link-concatenation": [
                                 {
                                     "SRLG-Id": 0,
-                                    "SRLG-length": 70000,
+                                    "SRLG-length": 133000,
                                     "pmd": 0.5,
                                     "fiber-type": "smf"
                                 }
                             ],
-                            "spanloss-current": 12,
-                            "engineered-spanloss": 12.2,
-                            "clfi": "fiber23",
+                            "spanloss-current": 27.93,
+                            "engineered-spanloss": 30.2,
                             "auto-spanloss": true
-                        },
-                        "TE-metric": 10
+                        }
                     },
                     "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
-                    "org-openroadm-network-topology:link-latency": 1,
                     "destination": {
                         "dest-node": "OpenROADM-3-DEG2",
                         "dest-tp": "DEG2-TTP-RX"
                     },
-                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-DEG2-to-OpenROADM-2-DEG2"
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-DEG2-to-OpenROADM-2-DEG2",
+                    "administrative-state": "inService",
+                    "operational-state": "inService"
                 },
                 {
                     "link-id": "OpenROADM-2-DEG3-to-OpenROADM-5-DEG3",
@@ -636,31 +704,29 @@
                         "source-tp": "DEG3-TTP-TX"
                     },
                     "org-openroadm-network-topology:OMS-attributes": {
-                        "opposite-link": "OpenROADM-5-DEG3-to-OpenROADM-2-DEG3",
                         "span": {
-                            "spanloss-base": 11.4,
+                            "spanloss-base": 7.1,
                             "link-concatenation": [
                                 {
                                     "SRLG-Id": 0,
-                                    "SRLG-length": 149000,
+                                    "SRLG-length": 60000,
                                     "pmd": 0.5,
                                     "fiber-type": "smf"
                                 }
                             ],
-                            "spanloss-current": 38,
-                            "engineered-spanloss": 12.2,
-                            "clfi": "fiber25",
+                            "spanloss-current": 7.2,
+                            "engineered-spanloss": 7.5,
                             "auto-spanloss": true
-                        },
-                        "TE-metric": 10
+                        }
                     },
                     "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
-                    "org-openroadm-network-topology:link-latency": 1,
                     "destination": {
                         "dest-node": "OpenROADM-5-DEG3",
                         "dest-tp": "DEG3-TTP-RX"
                     },
-                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-DEG3-to-OpenROADM-2-DEG3"
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-DEG3-to-OpenROADM-2-DEG3",
+                    "administrative-state": "inService",
+                    "operational-state": "inService"
                 },
                 {
                     "link-id": "OpenROADM-3-DEG1-to-OpenROADM-1-DEG2",
@@ -669,31 +735,29 @@
                         "source-tp": "DEG1-TTP-TX"
                     },
                     "org-openroadm-network-topology:OMS-attributes": {
-                        "opposite-link": "OpenROADM-1-DEG2-to-OpenROADM-3-DEG1",
                         "span": {
                             "spanloss-base": 11.4,
                             "link-concatenation": [
                                 {
                                     "SRLG-Id": 0,
-                                    "SRLG-length": 70000,
+                                    "SRLG-length": 100000,
                                     "pmd": 0.5,
                                     "fiber-type": "smf"
                                 }
                             ],
                             "spanloss-current": 12,
                             "engineered-spanloss": 12.2,
-                            "clfi": "fiber31",
                             "auto-spanloss": true
-                        },
-                        "TE-metric": 10
+                        }
                     },
                     "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
-                    "org-openroadm-network-topology:link-latency": 1,
                     "destination": {
                         "dest-node": "OpenROADM-1-DEG2",
                         "dest-tp": "DEG2-TTP-RX"
                     },
-                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-DEG2-to-OpenROADM-3-DEG1"
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-DEG2-to-OpenROADM-3-DEG1",
+                    "administrative-state": "inService",
+                    "operational-state": "inService"
                 },
                 {
                     "link-id": "OpenROADM-3-DEG2-to-OpenROADM-2-DEG2",
@@ -702,31 +766,29 @@
                         "source-tp": "DEG2-TTP-TX"
                     },
                     "org-openroadm-network-topology:OMS-attributes": {
-                        "opposite-link": "OpenROADM-2-DEG2-to-OpenROADM-3-DEG2",
                         "span": {
-                            "spanloss-base": 11.4,
+                            "spanloss-base": 28.4,
                             "link-concatenation": [
                                 {
                                     "SRLG-Id": 0,
-                                    "SRLG-length": 70000,
+                                    "SRLG-length": 133000,
                                     "pmd": 0.5,
                                     "fiber-type": "smf"
                                 }
                             ],
-                            "spanloss-current": 12,
-                            "engineered-spanloss": 12.2,
-                            "clfi": "fiber32",
+                            "spanloss-current": 27.93,
+                            "engineered-spanloss": 30.2,
                             "auto-spanloss": true
-                        },
-                        "TE-metric": 10
+                        }
                     },
                     "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
-                    "org-openroadm-network-topology:link-latency": 1,
                     "destination": {
                         "dest-node": "OpenROADM-2-DEG2",
                         "dest-tp": "DEG2-TTP-RX"
                     },
-                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-DEG2-to-OpenROADM-3-DEG2"
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-DEG2-to-OpenROADM-3-DEG2",
+                    "administrative-state": "inService",
+                    "operational-state": "inService"
                 },
                 {
                     "link-id": "OpenROADM-3-DEG3-to-OpenROADM-5-DEG2",
@@ -735,31 +797,29 @@
                         "source-tp": "DEG3-TTP-TX"
                     },
                     "org-openroadm-network-topology:OMS-attributes": {
-                        "opposite-link": "OpenROADM-5-DEG2-to-OpenROADM-3-DEG3",
                         "span": {
-                            "spanloss-base": 11.4,
+                            "spanloss-base": 7.1,
                             "link-concatenation": [
                                 {
                                     "SRLG-Id": 0,
-                                    "SRLG-length": 149000,
+                                    "SRLG-length": 60000,
                                     "pmd": 0.5,
                                     "fiber-type": "smf"
                                 }
                             ],
-                            "spanloss-current": 38,
-                            "engineered-spanloss": 12.2,
-                            "clfi": "fiber35",
+                            "spanloss-current": 7.2,
+                            "engineered-spanloss": 7.5,
                             "auto-spanloss": true
-                        },
-                        "TE-metric": 10
+                        }
                     },
                     "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
-                    "org-openroadm-network-topology:link-latency": 1,
                     "destination": {
                         "dest-node": "OpenROADM-5-DEG2",
                         "dest-tp": "DEG2-TTP-RX"
                     },
-                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-DEG2-to-OpenROADM-3-DEG3"
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-DEG2-to-OpenROADM-3-DEG3",
+                    "administrative-state": "inService",
+                    "operational-state": "inService"
                 },
                 {
                     "link-id": "OpenROADM-3-DEG4-to-OpenROADM-4-DEG2",
@@ -768,31 +828,29 @@
                         "source-tp": "DEG2-TTP-TX"
                     },
                     "org-openroadm-network-topology:OMS-attributes": {
-                        "opposite-link": "OpenROADM-4-DEG2-to-OpenROADM-3-DEG4",
                         "span": {
-                            "spanloss-base": 11.4,
+                            "spanloss-base": 28.4,
                             "link-concatenation": [
                                 {
                                     "SRLG-Id": 0,
-                                    "SRLG-length": 70000,
+                                    "SRLG-length": 100000,
                                     "pmd": 0.5,
                                     "fiber-type": "smf"
                                 }
                             ],
-                            "spanloss-current": 12,
-                            "engineered-spanloss": 12.2,
-                            "clfi": "fiber34",
+                            "spanloss-current": 20,
+                            "engineered-spanloss": 20.2,
                             "auto-spanloss": true
-                        },
-                        "TE-metric": 10
+                        }
                     },
                     "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
-                    "org-openroadm-network-topology:link-latency": 1,
                     "destination": {
                         "dest-node": "OpenROADM-4-DEG2",
                         "dest-tp": "DEG2-TTP-RX"
                     },
-                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-DEG2-to-OpenROADM-3-DEG4"
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-DEG2-to-OpenROADM-3-DEG4",
+                    "administrative-state": "inService",
+                    "operational-state": "inService"
                 },
                 {
                     "link-id": "OpenROADM-4-DEG1-to-OpenROADM-5-DEG1",
@@ -801,31 +859,29 @@
                         "source-tp": "DEG1-TTP-TX"
                     },
                     "org-openroadm-network-topology:OMS-attributes": {
-                        "opposite-link": "OpenROADM-4-DEG1-to-OpenROADM-5-DEG1",
                         "span": {
-                            "spanloss-base": 11.4,
+                            "spanloss-base": 28.4,
                             "link-concatenation": [
                                 {
                                     "SRLG-Id": 0,
-                                    "SRLG-length": 70000,
+                                    "SRLG-length": 100000,
                                     "pmd": 0.5,
                                     "fiber-type": "smf"
                                 }
                             ],
-                            "spanloss-current": 12,
-                            "engineered-spanloss": 12.2,
-                            "clfi": "fiber45",
+                            "spanloss-current": 20,
+                            "engineered-spanloss": 20.2,
                             "auto-spanloss": true
-                        },
-                        "TE-metric": 10
+                        }
                     },
                     "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
-                    "org-openroadm-network-topology:link-latency": 1,
                     "destination": {
                         "dest-node": "OpenROADM-5-DEG1",
                         "dest-tp": "DEG1-TTP-RX"
                     },
-                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-DEG1-to-OpenROADM-4-DEG1"
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-DEG1-to-OpenROADM-4-DEG1",
+                    "administrative-state": "inService",
+                    "operational-state": "inService"
                 },
                 {
                     "link-id": "OpenROADM-4-DEG2-to-OpenROADM-3-DEG4",
@@ -834,31 +890,29 @@
                         "source-tp": "DEG2-TTP-TX"
                     },
                     "org-openroadm-network-topology:OMS-attributes": {
-                        "opposite-link": "OpenROADM-3-DEG4-to-OpenROADM-4-DEG2",
                         "span": {
-                            "spanloss-base": 11.4,
+                            "spanloss-base": 28.4,
                             "link-concatenation": [
                                 {
                                     "SRLG-Id": 0,
-                                    "SRLG-length": 70000,
+                                    "SRLG-length": 100000,
                                     "pmd": 0.5,
                                     "fiber-type": "smf"
                                 }
                             ],
-                            "spanloss-current": 12,
-                            "engineered-spanloss": 12.2,
-                            "clfi": "fiber43",
+                            "spanloss-current": 20,
+                            "engineered-spanloss": 20.2,
                             "auto-spanloss": true
-                        },
-                        "TE-metric": 10
+                        }
                     },
                     "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
-                    "org-openroadm-network-topology:link-latency": 1,
                     "destination": {
                         "dest-node": "OpenROADM-3-DEG4",
                         "dest-tp": "DEG4-TTP-RX"
                     },
-                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-DEG4-to-OpenROADM-4-DEG2"
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-DEG4-to-OpenROADM-4-DEG2",
+                    "administrative-state": "inService",
+                    "operational-state": "inService"
                 },
                 {
                     "link-id": "OpenROADM-5-DEG1-to-OpenROADM-4-DEG1",
@@ -867,31 +921,29 @@
                         "source-tp": "DEG1-TTP-TX"
                     },
                     "org-openroadm-network-topology:OMS-attributes": {
-                        "opposite-link": "OpenROADM-4-DEG1-to-OpenROADM-5-DEG1",
                         "span": {
-                            "spanloss-base": 11.4,
+                            "spanloss-base": 28.4,
                             "link-concatenation": [
                                 {
                                     "SRLG-Id": 0,
-                                    "SRLG-length": 70000,
+                                    "SRLG-length": 100000,
                                     "pmd": 0.5,
                                     "fiber-type": "smf"
                                 }
                             ],
-                            "spanloss-current": 12,
-                            "engineered-spanloss": 12.2,
-                            "clfi": "fiber54",
+                            "spanloss-current": 20,
+                            "engineered-spanloss": 20.2,
                             "auto-spanloss": true
-                        },
-                        "TE-metric": 10
+                        }
                     },
                     "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
-                    "org-openroadm-network-topology:link-latency": 1,
                     "destination": {
                         "dest-node": "OpenROADM-4-DEG1",
                         "dest-tp": "DEG1-TTP-RX"
                     },
-                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-DEG1-to-OpenROADM-5-DEG1"
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-DEG1-to-OpenROADM-5-DEG1",
+                    "administrative-state": "inService",
+                    "operational-state": "inService"
                 },
                 {
                     "link-id": "OpenROADM-5-DEG2-to-OpenROADM-3-DEG3",
@@ -900,31 +952,29 @@
                         "source-tp": "DEG2-TTP-TX"
                     },
                     "org-openroadm-network-topology:OMS-attributes": {
-                        "opposite-link": "OpenROADM-3-DEG3-to-OpenROADM-5-DEG2",
                         "span": {
-                            "spanloss-base": 11.4,
+                            "spanloss-base": 7.1,
                             "link-concatenation": [
                                 {
                                     "SRLG-Id": 0,
-                                    "SRLG-length": 149000,
+                                    "SRLG-length": 60000,
                                     "pmd": 0.5,
                                     "fiber-type": "smf"
                                 }
                             ],
-                            "spanloss-current": 38,
-                            "engineered-spanloss": 12.2,
-                            "clfi": "fiber53",
+                            "spanloss-current": 7.2,
+                            "engineered-spanloss": 7.5,
                             "auto-spanloss": true
-                        },
-                        "TE-metric": 10
+                        }
                     },
                     "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
-                    "org-openroadm-network-topology:link-latency": 1,
                     "destination": {
                         "dest-node": "OpenROADM-3-DEG3",
                         "dest-tp": "DEG3-TTP-RX"
                     },
-                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-DEG3-to-OpenROADM-5-DEG2"
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-DEG3-to-OpenROADM-5-DEG2",
+                    "administrative-state": "inService",
+                    "operational-state": "inService"
                 },
                 {
                     "link-id": "OpenROADM-5-DEG3-to-OpenROADM-2-DEG3",
@@ -933,31 +983,29 @@
                         "source-tp": "DEG3-TTP-TX"
                     },
                     "org-openroadm-network-topology:OMS-attributes": {
-                        "opposite-link": "OpenROADM-2-DEG3-to-OpenROADM-5-DEG3",
                         "span": {
-                            "spanloss-base": 11.4,
+                            "spanloss-base": 7.1,
                             "link-concatenation": [
                                 {
                                     "SRLG-Id": 0,
-                                    "SRLG-length": 149000,
+                                    "SRLG-length": 60000,
                                     "pmd": 0.5,
                                     "fiber-type": "smf"
                                 }
                             ],
-                            "spanloss-current": 38,
-                            "engineered-spanloss": 12.2,
-                            "clfi": "fiber52",
+                            "spanloss-current": 7.2,
+                            "engineered-spanloss": 7.5,
                             "auto-spanloss": true
-                        },
-                        "TE-metric": 10
+                        }
                     },
                     "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
-                    "org-openroadm-network-topology:link-latency": 1,
                     "destination": {
                         "dest-node": "OpenROADM-2-DEG3",
                         "dest-tp": "DEG3-TTP-RX"
                     },
-                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-DEG3-to-OpenROADM-5-DEG3"
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-DEG3-to-OpenROADM-5-DEG3",
+                    "administrative-state": "inService",
+                    "operational-state": "inService"
                 },
                 {
                     "link-id": "OpenROADM-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-DEG2-DEG2-CTP-RX",
@@ -970,7 +1018,9 @@
                         "dest-node": "OpenROADM-1-DEG2",
                         "dest-tp": "DEG2-CTP-RX"
                     },
-                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-DEG1-DEG1-CTP-RX"
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-DEG1-DEG1-CTP-RX",
+                    "administrative-state": "inService",
+                    "operational-state": "inService"
                 },
                 {
                     "link-id": "OpenROADM-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-DEG1-DEG1-CTP-RX",
@@ -983,7 +1033,9 @@
                         "dest-node": "OpenROADM-1-DEG1",
                         "dest-tp": "DEG1-CTP-RX"
                     },
-                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-DEG2-DEG2-CTP-RX"
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-DEG2-DEG2-CTP-RX",
+                    "administrative-state": "inService",
+                    "operational-state": "inService"
                 },
                 {
                     "link-id": "OpenROADM-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-DEG2-DEG2-CTP-RX",
@@ -996,7 +1048,9 @@
                         "dest-node": "OpenROADM-2-DEG2",
                         "dest-tp": "DEG2-CTP-RX"
                     },
-                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-DEG1-DEG1-CTP-RX"
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-DEG1-DEG1-CTP-RX",
+                    "administrative-state": "inService",
+                    "operational-state": "inService"
                 },
                 {
                     "link-id": "OpenROADM-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-DEG3-DEG3-CTP-RX",
@@ -1009,7 +1063,9 @@
                         "dest-node": "OpenROADM-2-DEG3",
                         "dest-tp": "DEG3-CTP-RX"
                     },
-                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-DEG1-DEG1-CTP-RX"
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-DEG1-DEG1-CTP-RX",
+                    "administrative-state": "inService",
+                    "operational-state": "inService"
                 },
                 {
                     "link-id": "OpenROADM-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-DEG1-DEG1-CTP-RX",
@@ -1022,7 +1078,9 @@
                         "dest-node": "OpenROADM-2-DEG1",
                         "dest-tp": "DEG1-CTP-RX"
                     },
-                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-DEG2-DEG2-CTP-RX"
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-DEG2-DEG2-CTP-RX",
+                    "administrative-state": "inService",
+                    "operational-state": "inService"
                 },
                 {
                     "link-id": "OpenROADM-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-DEG3-DEG3-CTP-RX",
@@ -1035,7 +1093,9 @@
                         "dest-node": "OpenROADM-2-DEG3",
                         "dest-tp": "DEG3-CTP-RX"
                     },
-                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-DEG2-DEG2-CTP-RX"
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-DEG2-DEG2-CTP-RX",
+                    "administrative-state": "inService",
+                    "operational-state": "inService"
                 },
                 {
                     "link-id": "OpenROADM-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-DEG1-DEG1-CTP-RX",
@@ -1048,7 +1108,9 @@
                         "dest-node": "OpenROADM-2-DEG1",
                         "dest-tp": "DEG1-CTP-RX"
                     },
-                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-DEG3-DEG3-CTP-RX"
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-DEG3-DEG3-CTP-RX",
+                    "administrative-state": "inService",
+                    "operational-state": "inService"
                 },
                 {
                     "link-id": "OpenROADM-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-DEG2-DEG2-CTP-RX",
@@ -1061,7 +1123,9 @@
                         "dest-node": "OpenROADM-2-DEG2",
                         "dest-tp": "DEG2-CTP-RX"
                     },
-                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-DEG3-DEG3-CTP-RX"
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-DEG3-DEG3-CTP-RX",
+                    "administrative-state": "inService",
+                    "operational-state": "inService"
                 },
                 {
                     "link-id": "OpenROADM-3-DEG1-DEG1-CTP-TXtoOpenROADM-3-DEG2-DEG2-CTP-RX",
@@ -1074,7 +1138,9 @@
                         "dest-node": "OpenROADM-3-DEG2",
                         "dest-tp": "DEG2-CTP-RX"
                     },
-                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-DEG2-DEG2-CTP-TXtoOpenROADM-3-DEG1-DEG1-CTP-RX"
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-DEG2-DEG2-CTP-TXtoOpenROADM-3-DEG1-DEG1-CTP-RX",
+                    "administrative-state": "inService",
+                    "operational-state": "inService"
                 },
                 {
                     "link-id": "OpenROADM-3-DEG1-DEG1-CTP-TXtoOpenROADM-3-DEG3-DEG3-CTP-RX",
@@ -1087,7 +1153,9 @@
                         "dest-node": "OpenROADM-3-DEG3",
                         "dest-tp": "DEG3-CTP-RX"
                     },
-                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-DEG3-DEG3-CTP-TXtoOpenROADM-3-DEG1-DEG1-CTP-RX"
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-DEG3-DEG3-CTP-TXtoOpenROADM-3-DEG1-DEG1-CTP-RX",
+                    "administrative-state": "inService",
+                    "operational-state": "inService"
                 },
                 {
                     "link-id": "OpenROADM-3-DEG1-DEG1-CTP-TXtoOpenROADM-3-DEG4-DEG4-CTP-RX",
@@ -1100,7 +1168,9 @@
                         "dest-node": "OpenROADM-3-DEG4",
                         "dest-tp": "DEG4-CTP-RX"
                     },
-                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-DEG4-DEG4-CTP-TXtoOpenROADM-3-DEG1-DEG1-CTP-RX"
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-DEG4-DEG4-CTP-TXtoOpenROADM-3-DEG1-DEG1-CTP-RX",
+                    "administrative-state": "inService",
+                    "operational-state": "inService"
                 },
                 {
                     "link-id": "OpenROADM-3-DEG2-DEG2-CTP-TXtoOpenROADM-3-DEG1-DEG1-CTP-RX",
@@ -1113,7 +1183,9 @@
                         "dest-node": "OpenROADM-3-DEG1",
                         "dest-tp": "DEG1-CTP-RX"
                     },
-                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-DEG1-DEG1-CTP-TXtoOpenROADM-3-DEG2-DEG2-CTP-RX"
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-DEG1-DEG1-CTP-TXtoOpenROADM-3-DEG2-DEG2-CTP-RX",
+                    "administrative-state": "inService",
+                    "operational-state": "inService"
                 },
                 {
                     "link-id": "OpenROADM-3-DEG2-DEG2-CTP-TXtoOpenROADM-3-DEG3-DEG3-CTP-RX",
@@ -1126,7 +1198,9 @@
                         "dest-node": "OpenROADM-3-DEG3",
                         "dest-tp": "DEG3-CTP-RX"
                     },
-                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-DEG3-DEG3-CTP-TXtoOpenROADM-3-DEG2-DEG2-CTP-RX"
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-DEG3-DEG3-CTP-TXtoOpenROADM-3-DEG2-DEG2-CTP-RX",
+                    "administrative-state": "inService",
+                    "operational-state": "inService"
                 },
                 {
                     "link-id": "OpenROADM-3-DEG2-DEG2-CTP-TXtoOpenROADM-3-DEG4-DEG4-CTP-RX",
@@ -1139,7 +1213,9 @@
                         "dest-node": "OpenROADM-3-DEG4",
                         "dest-tp": "DEG4-CTP-RX"
                     },
-                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-DEG4-DEG4-CTP-TXtoOpenROADM-3-DEG2-DEG2-CTP-RX"
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-DEG4-DEG4-CTP-TXtoOpenROADM-3-DEG2-DEG2-CTP-RX",
+                    "administrative-state": "inService",
+                    "operational-state": "inService"
                 },
                 {
                     "link-id": "OpenROADM-3-DEG3-DEG3-CTP-TXtoOpenROADM-3-DEG1-DEG1-CTP-RX",
@@ -1152,7 +1228,9 @@
                         "dest-node": "OpenROADM-3-DEG1",
                         "dest-tp": "DEG1-CTP-RX"
                     },
-                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-DEG1-DEG1-CTP-TXtoOpenROADM-3-DEG3-DEG3-CTP-RX"
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-DEG1-DEG1-CTP-TXtoOpenROADM-3-DEG3-DEG3-CTP-RX",
+                    "administrative-state": "inService",
+                    "operational-state": "inService"
                 },
                 {
                     "link-id": "OpenROADM-3-DEG3-DEG3-CTP-TXtoOpenROADM-3-DEG2-DEG2-CTP-RX",
@@ -1165,7 +1243,9 @@
                         "dest-node": "OpenROADM-3-DEG2",
                         "dest-tp": "DEG2-CTP-RX"
                     },
-                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-DEG2-DEG2-CTP-TXtoOpenROADM-3-DEG3-DEG3-CTP-RX"
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-DEG2-DEG2-CTP-TXtoOpenROADM-3-DEG3-DEG3-CTP-RX",
+                    "administrative-state": "inService",
+                    "operational-state": "inService"
                 },
                 {
                     "link-id": "OpenROADM-3-DEG3-DEG3-CTP-TXtoOpenROADM-3-DEG4-DEG4-CTP-RX",
@@ -1178,7 +1258,9 @@
                         "dest-node": "OpenROADM-3-DEG4",
                         "dest-tp": "DEG4-CTP-RX"
                     },
-                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-DEG4-DEG4-CTP-TXtoOpenROADM-3-DEG3-DEG3-CTP-RX"
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-DEG4-DEG4-CTP-TXtoOpenROADM-3-DEG3-DEG3-CTP-RX",
+                    "administrative-state": "inService",
+                    "operational-state": "inService"
                 },
                 {
                     "link-id": "OpenROADM-3-DEG4-DEG4-CTP-TXtoOpenROADM-3-DEG1-DEG1-CTP-RX",
@@ -1191,7 +1273,9 @@
                         "dest-node": "OpenROADM-3-DEG1",
                         "dest-tp": "DEG1-CTP-RX"
                     },
-                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-DEG1-DEG1-CTP-TXtoOpenROADM-3-DEG4-DEG4-CTP-RX"
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-DEG1-DEG1-CTP-TXtoOpenROADM-3-DEG4-DEG4-CTP-RX",
+                    "administrative-state": "inService",
+                    "operational-state": "inService"
                 },
                 {
                     "link-id": "OpenROADM-3-DEG4-DEG4-CTP-TXtoOpenROADM-3-DEG2-DEG2-CTP-RX",
@@ -1204,7 +1288,9 @@
                         "dest-node": "OpenROADM-3-DEG2",
                         "dest-tp": "DEG2-CTP-RX"
                     },
-                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-DEG2-DEG2-CTP-TXtoOpenROADM-3-DEG4-DEG4-CTP-RX"
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-DEG2-DEG2-CTP-TXtoOpenROADM-3-DEG4-DEG4-CTP-RX",
+                    "administrative-state": "inService",
+                    "operational-state": "inService"
                 },
                 {
                     "link-id": "OpenROADM-3-DEG4-DEG4-CTP-TXtoOpenROADM-3-DEG3-DEG3-CTP-RX",
@@ -1217,7 +1303,9 @@
                         "dest-node": "OpenROADM-3-DEG3",
                         "dest-tp": "DEG3-CTP-RX"
                     },
-                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-DEG3-DEG3-CTP-TXtoOpenROADM-3-DEG4-DEG4-CTP-RX"
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-DEG3-DEG3-CTP-TXtoOpenROADM-3-DEG4-DEG4-CTP-RX",
+                    "administrative-state": "inService",
+                    "operational-state": "inService"
                 },
                 {
                     "link-id": "OpenROADM-4-DEG1-DEG1-CTP-TXtoOpenROADM-4-DEG2-DEG2-CTP-RX",
@@ -1230,7 +1318,9 @@
                         "dest-node": "OpenROADM-4-DEG2",
                         "dest-tp": "DEG2-CTP-RX"
                     },
-                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-DEG2-DEG2-CTP-TXtoOpenROADM-4-DEG1-DEG1-CTP-RX"
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-DEG2-DEG2-CTP-TXtoOpenROADM-4-DEG1-DEG1-CTP-RX",
+                    "administrative-state": "inService",
+                    "operational-state": "inService"
                 },
                 {
                     "link-id": "OpenROADM-4-DEG2-DEG2-CTP-TXtoOpenROADM-4-DEG1-DEG1-CTP-RX",
@@ -1243,7 +1333,9 @@
                         "dest-node": "OpenROADM-4-DEG1",
                         "dest-tp": "DEG1-CTP-RX"
                     },
-                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-DEG1-DEG1-CTP-TXtoOpenROADM-4-DEG2-DEG2-CTP-RX"
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-DEG1-DEG1-CTP-TXtoOpenROADM-4-DEG2-DEG2-CTP-RX",
+                    "administrative-state": "inService",
+                    "operational-state": "inService"
                 },
                 {
                     "link-id": "OpenROADM-5-DEG1-DEG1-CTP-TXtoOpenROADM-5-DEG2-DEG2-CTP-RX",
@@ -1256,7 +1348,9 @@
                         "dest-node": "OpenROADM-5-DEG2",
                         "dest-tp": "DEG2-CTP-RX"
                     },
-                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-DEG2-DEG2-CTP-TXtoOpenROADM-5-DEG1-DEG1-CTP-RX"
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-DEG2-DEG2-CTP-TXtoOpenROADM-5-DEG1-DEG1-CTP-RX",
+                    "administrative-state": "inService",
+                    "operational-state": "inService"
                 },
                 {
                     "link-id": "OpenROADM-5-DEG1-DEG1-CTP-TXtoOpenROADM-5-DEG3-DEG3-CTP-RX",
@@ -1269,7 +1363,9 @@
                         "dest-node": "OpenROADM-5-DEG3",
                         "dest-tp": "DEG3-CTP-RX"
                     },
-                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-DEG3-DEG3-CTP-TXtoOpenROADM-5-DEG1-DEG1-CTP-RX"
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-DEG3-DEG3-CTP-TXtoOpenROADM-5-DEG1-DEG1-CTP-RX",
+                    "administrative-state": "inService",
+                    "operational-state": "inService"
                 },
                 {
                     "link-id": "OpenROADM-5-DEG2-DEG2-CTP-TXtoOpenROADM-5-DEG1-DEG1-CTP-RX",
@@ -1282,7 +1378,9 @@
                         "dest-node": "OpenROADM-5-DEG1",
                         "dest-tp": "DEG1-CTP-RX"
                     },
-                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-DEG1-DEG1-CTP-TXtoOpenROADM-5-DEG2-DEG2-CTP-RX"
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-DEG1-DEG1-CTP-TXtoOpenROADM-5-DEG2-DEG2-CTP-RX",
+                    "administrative-state": "inService",
+                    "operational-state": "inService"
                 },
                 {
                     "link-id": "OpenROADM-5-DEG2-DEG2-CTP-TXtoOpenROADM-5-DEG3-DEG3-CTP-RX",
@@ -1295,7 +1393,9 @@
                         "dest-node": "OpenROADM-5-DEG3",
                         "dest-tp": "DEG3-CTP-RX"
                     },
-                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-DEG3-DEG3-CTP-TXtoOpenROADM-5-DEG2-DEG2-CTP-RX"
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-DEG3-DEG3-CTP-TXtoOpenROADM-5-DEG2-DEG2-CTP-RX",
+                    "administrative-state": "inService",
+                    "operational-state": "inService"
                 },
                 {
                     "link-id": "OpenROADM-5-DEG3-DEG3-CTP-TXtoOpenROADM-5-DEG1-DEG1-CTP-RX",
@@ -1308,7 +1408,9 @@
                         "dest-node": "OpenROADM-5-DEG1",
                         "dest-tp": "DEG1-CTP-RX"
                     },
-                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-DEG1-DEG1-CTP-TXtoOpenROADM-5-DEG3-DEG3-CTP-RX"
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-DEG1-DEG1-CTP-TXtoOpenROADM-5-DEG3-DEG3-CTP-RX",
+                    "administrative-state": "inService",
+                    "operational-state": "inService"
                 },
                 {
                     "link-id": "OpenROADM-5-DEG3-DEG3-CTP-TXtoOpenROADM-5-DEG2-DEG2-CTP-RX",
@@ -1321,1774 +1423,1958 @@
                         "dest-node": "OpenROADM-5-DEG2",
                         "dest-tp": "DEG2-CTP-RX"
                     },
-                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-DEG2-DEG2-CTP-TXtoOpenROADM-5-DEG3-DEG3-CTP-RX"
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-DEG2-DEG2-CTP-TXtoOpenROADM-5-DEG3-DEG3-CTP-RX",
+                    "administrative-state": "inService",
+                    "operational-state": "inService"
                 }
             ],
             "node": [
                 {
                     "node-id": "OpenROADM-1-SRG1",
+                    "administrative-state": "inService",
+                    "operational-state": "inService",
                     "ietf-network-topology:termination-point": [
                         {
                             "tp-id": "SRG1-CP-RX",
-                            "org-openroadm-common-network:tp-type": "SRG-RX-CP"
+                            "org-openroadm-common-network:tp-type": "SRG-RX-CP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "SRG1-PP4-TX",
-                            "org-openroadm-common-network:tp-type": "SRG-TX-PP"
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "SRG1-PP5-TX",
-                            "org-openroadm-common-network:tp-type": "SRG-TX-PP"
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "SRG1-PP1-RX",
-                            "org-openroadm-common-network:tp-type": "SRG-RX-PP"
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "SRG1-PP3-TX",
-                            "org-openroadm-common-network:tp-type": "SRG-TX-PP"
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "SRG1-PP4-RX",
-                            "org-openroadm-common-network:tp-type": "SRG-RX-PP"
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "SRG1-PP2-TX",
-                            "org-openroadm-common-network:tp-type": "SRG-TX-PP"
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "SRG1-PP5-RX",
-                            "org-openroadm-common-network:tp-type": "SRG-RX-PP"
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "SRG1-CP-TX",
-                            "org-openroadm-common-network:tp-type": "SRG-TX-CP"
+                            "org-openroadm-common-network:tp-type": "SRG-TX-CP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "SRG1-PP1-TX",
-                            "org-openroadm-common-network:tp-type": "SRG-TX-PP"
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "SRG1-PP3-RX",
-                            "org-openroadm-common-network:tp-type": "SRG-RX-PP"
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "SRG1-PP2-RX",
-                            "org-openroadm-common-network:tp-type": "SRG-RX-PP"
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         }
                     ],
                     "org-openroadm-network-topology:srg-attributes": {
-                        "available-wavelengths": [
-                            {
-                                "index": 10
-                            },
-                            {
-                                "index": 9
-                            },
-                            {
-                                "index": 6
-                            },
-                            {
-                                "index": 5
-                            },
-                            {
-                                "index": 8
-                            },
-                            {
-                                "index": 7
-                            },
+                        "avail-freq-maps": [
                             {
-                                "index": 2
-                            },
-                            {
-                                "index": 1
-                            },
-                            {
-                                "index": 4
-                            },
-                            {
-                                "index": 3
+                                "map-name": "cband",
+                                "start-edge-freq": 191.325,
+                                "freq-map-granularity": 6.25,
+                                "effective-bits": 768,
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////"
                             }
                         ]
                     },
                     "org-openroadm-common-network:node-type": "SRG",
                     "supporting-node": [
                         {
-                            "network-ref":"openroadm-network",
+                            "network-ref": "openroadm-network",
                             "node-ref": "OpenROADM-1"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "Node1"
                         }
                     ]
                 },
                 {
                     "node-id": "OpenROADM-1-DEG1",
+                    "administrative-state": "inService",
+                    "operational-state": "inService",
                     "ietf-network-topology:termination-point": [
                         {
                             "tp-id": "DEG1-CTP-TX",
-                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP"
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "DEG1-TTP-TX",
-                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP"
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "DEG1-CTP-RX",
-                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP"
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "DEG1-TTP-RX",
-                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP"
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         }
                     ],
                     "org-openroadm-network-topology:degree-attributes": {
-                        "degree-number":1,
-                        "available-wavelengths": [
-                            {
-                                "index": 10
-                            },
-                            {
-                                "index": 9
-                            },
-                            {
-                                "index": 6
-                            },
-                            {
-                                "index": 5
-                            },
-                            {
-                                "index": 8
-                            },
-                            {
-                                "index": 7
-                            },
-                            {
-                                "index": 2
-                            },
-                            {
-                                "index": 1
-                            },
-                            {
-                                "index": 4
-                            },
-                            {
-                                "index": 3
+                        "degree-number": 1,
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": 191.325,
+                                "freq-map-granularity": 6.25,
+                                "effective-bits": 768,
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////"
                             }
                         ]
                     },
                     "org-openroadm-common-network:node-type": "DEGREE",
                     "supporting-node": [
                         {
-                            "network-ref":"openroadm-network",
+                            "network-ref": "openroadm-network",
                             "node-ref": "OpenROADM-1"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "Node1"
                         }
                     ]
                 },
                 {
                     "node-id": "OpenROADM-1-DEG2",
+                    "administrative-state": "inService",
+                    "operational-state": "inService",
                     "ietf-network-topology:termination-point": [
                         {
                             "tp-id": "DEG2-CTP-RX",
-                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP"
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "DEG2-CTP-TX",
-                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP"
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "DEG2-TTP-TX",
-                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP"
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "DEG2-TTP-RX",
-                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP"
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         }
                     ],
                     "org-openroadm-network-topology:degree-attributes": {
-                        "degree-number":2,
-                        "available-wavelengths": [
-                            {
-                                "index": 10
-                            },
-                            {
-                                "index": 9
-                            },
-                            {
-                                "index": 6
-                            },
-                            {
-                                "index": 5
-                            },
-                            {
-                                "index": 8
-                            },
-                            {
-                                "index": 7
-                            },
-                            {
-                                "index": 2
-                            },
-                            {
-                                "index": 1
-                            },
-                            {
-                                "index": 4
-                            },
-                            {
-                                "index": 3
+                        "degree-number": 2,
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": 191.325,
+                                "freq-map-granularity": 6.25,
+                                "effective-bits": 768,
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////"
                             }
                         ]
                     },
                     "org-openroadm-common-network:node-type": "DEGREE",
                     "supporting-node": [
                         {
-                            "network-ref":"openroadm-network",
+                            "network-ref": "openroadm-network",
                             "node-ref": "OpenROADM-1"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "Node1"
                         }
                     ]
                 },
                 {
                     "node-id": "OpenROADM-2-SRG1",
+                    "administrative-state": "inService",
+                    "operational-state": "inService",
                     "ietf-network-topology:termination-point": [
                         {
                             "tp-id": "SRG1-CP-RX",
-                            "org-openroadm-common-network:tp-type": "SRG-RX-CP"
+                            "org-openroadm-common-network:tp-type": "SRG-RX-CP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "SRG1-PP4-TX",
-                            "org-openroadm-common-network:tp-type": "SRG-TX-PP"
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "SRG1-PP5-TX",
-                            "org-openroadm-common-network:tp-type": "SRG-TX-PP"
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "SRG1-PP1-RX",
-                            "org-openroadm-common-network:tp-type": "SRG-RX-PP"
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "SRG1-PP3-TX",
-                            "org-openroadm-common-network:tp-type": "SRG-TX-PP"
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "SRG1-PP4-RX",
-                            "org-openroadm-common-network:tp-type": "SRG-RX-PP"
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "SRG1-PP2-TX",
-                            "org-openroadm-common-network:tp-type": "SRG-TX-PP"
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "SRG1-PP5-RX",
-                            "org-openroadm-common-network:tp-type": "SRG-RX-PP"
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "SRG1-CP-TX",
-                            "org-openroadm-common-network:tp-type": "SRG-TX-CP"
+                            "org-openroadm-common-network:tp-type": "SRG-TX-CP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "SRG1-PP1-TX",
-                            "org-openroadm-common-network:tp-type": "SRG-TX-PP"
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "SRG1-PP3-RX",
-                            "org-openroadm-common-network:tp-type": "SRG-RX-PP"
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "SRG1-PP2-RX",
-                            "org-openroadm-common-network:tp-type": "SRG-RX-PP"
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         }
                     ],
                     "org-openroadm-network-topology:srg-attributes": {
-                        "available-wavelengths": [
-                            {
-                                "index": 10
-                            },
-                            {
-                                "index": 9
-                            },
-                            {
-                                "index": 6
-                            },
+                        "avail-freq-maps": [
                             {
-                                "index": 5
-                            },
-                            {
-                                "index": 8
-                            },
-                            {
-                                "index": 7
-                            },
-                            {
-                                "index": 2
-                            },
-                            {
-                                "index": 1
-                            },
-                            {
-                                "index": 4
-                            },
-                            {
-                                "index": 3
+                                "map-name": "cband",
+                                "start-edge-freq": 191.325,
+                                "freq-map-granularity": 6.25,
+                                "effective-bits": 768,
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////"
                             }
                         ]
                     },
                     "org-openroadm-common-network:node-type": "SRG",
                     "supporting-node": [
                         {
-                            "network-ref":"openroadm-network",
+                            "network-ref": "openroadm-network",
                             "node-ref": "OpenROADM-2"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "Node2"
                         }
                     ]
                 },
                 {
                     "node-id": "OpenROADM-2-DEG1",
+                    "administrative-state": "inService",
+                    "operational-state": "inService",
                     "ietf-network-topology:termination-point": [
                         {
                             "tp-id": "DEG1-CTP-TX",
-                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP"
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "DEG1-TTP-TX",
-                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP"
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "DEG1-CTP-RX",
-                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP"
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "DEG1-TTP-RX",
-                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP"
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         }
                     ],
                     "org-openroadm-network-topology:degree-attributes": {
-                        "degree-number":1,
-                        "available-wavelengths": [
-                            {
-                                "index": 10
-                            },
-                            {
-                                "index": 9
-                            },
-                            {
-                                "index": 6
-                            },
-                            {
-                                "index": 5
-                            },
-                            {
-                                "index": 8
-                            },
-                            {
-                                "index": 7
-                            },
-                            {
-                                "index": 2
-                            },
-                            {
-                                "index": 1
-                            },
-                            {
-                                "index": 4
-                            },
-                            {
-                                "index": 3
+                        "degree-number": 1,
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": 191.325,
+                                "freq-map-granularity": 6.25,
+                                "effective-bits": 768,
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////"
                             }
                         ]
                     },
                     "org-openroadm-common-network:node-type": "DEGREE",
                     "supporting-node": [
                         {
-                            "network-ref":"openroadm-network",
+                            "network-ref": "openroadm-network",
                             "node-ref": "OpenROADM-2"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "Node2"
                         }
                     ]
                 },
                 {
                     "node-id": "OpenROADM-2-DEG2",
+                    "administrative-state": "inService",
+                    "operational-state": "inService",
                     "ietf-network-topology:termination-point": [
                         {
                             "tp-id": "DEG2-CTP-RX",
-                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP"
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "DEG2-CTP-TX",
-                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP"
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "DEG2-TTP-TX",
-                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP"
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "DEG2-TTP-RX",
-                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP"
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         }
                     ],
                     "org-openroadm-network-topology:degree-attributes": {
-                        "degree-number":2,
-                        "available-wavelengths": [
-                            {
-                                "index": 10
-                            },
-                            {
-                                "index": 9
-                            },
-                            {
-                                "index": 6
-                            },
-                            {
-                                "index": 5
-                            },
-                            {
-                                "index": 8
-                            },
-                            {
-                                "index": 7
-                            },
-                            {
-                                "index": 2
-                            },
-                            {
-                                "index": 1
-                            },
-                            {
-                                "index": 4
-                            },
-                            {
-                                "index": 3
+                        "degree-number": 2,
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": 191.325,
+                                "freq-map-granularity": 6.25,
+                                "effective-bits": 768,
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////"
                             }
                         ]
                     },
                     "org-openroadm-common-network:node-type": "DEGREE",
                     "supporting-node": [
                         {
-                            "network-ref":"openroadm-network",
+                            "network-ref": "openroadm-network",
                             "node-ref": "OpenROADM-2"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "Node2"
                         }
                     ]
                 },
                 {
                     "node-id": "OpenROADM-2-DEG3",
+                    "administrative-state": "inService",
+                    "operational-state": "inService",
                     "ietf-network-topology:termination-point": [
                         {
                             "tp-id": "DEG3-TTP-TX",
-                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP"
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "DEG3-CTP-TX",
-                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP"
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "DEG3-CTP-RX",
-                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP"
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "DEG3-TTP-RX",
-                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP"
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         }
                     ],
                     "org-openroadm-network-topology:degree-attributes": {
-                        "degree-number":3,
-                        "available-wavelengths": [
-                            {
-                                "index": 10
-                            },
-                            {
-                                "index": 9
-                            },
-                            {
-                                "index": 6
-                            },
-                            {
-                                "index": 5
-                            },
-                            {
-                                "index": 8
-                            },
-                            {
-                                "index": 7
-                            },
-                            {
-                                "index": 2
-                            },
-                            {
-                                "index": 1
-                            },
-                            {
-                                "index": 4
-                            },
-                            {
-                                "index": 3
+                        "degree-number": 3,
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": 191.325,
+                                "freq-map-granularity": 6.25,
+                                "effective-bits": 768,
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////"
                             }
                         ]
                     },
                     "org-openroadm-common-network:node-type": "DEGREE",
                     "supporting-node": [
                         {
-                            "network-ref":"openroadm-network",
+                            "network-ref": "openroadm-network",
                             "node-ref": "OpenROADM-2"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "Node2"
                         }
                     ]
                 },
                 {
                     "node-id": "OpenROADM-3-SRG1",
+                    "administrative-state": "inService",
+                    "operational-state": "inService",
                     "ietf-network-topology:termination-point": [
                         {
                             "tp-id": "SRG1-CP-RX",
-                            "org-openroadm-common-network:tp-type": "SRG-RX-CP"
+                            "org-openroadm-common-network:tp-type": "SRG-RX-CP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "SRG1-PP4-TX",
-                            "org-openroadm-common-network:tp-type": "SRG-TX-PP"
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "SRG1-PP5-TX",
-                            "org-openroadm-common-network:tp-type": "SRG-TX-PP"
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "SRG1-PP1-RX",
-                            "org-openroadm-common-network:tp-type": "SRG-RX-PP"
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "SRG1-PP3-TX",
-                            "org-openroadm-common-network:tp-type": "SRG-TX-PP"
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "SRG1-PP4-RX",
-                            "org-openroadm-common-network:tp-type": "SRG-RX-PP"
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "SRG1-PP2-TX",
-                            "org-openroadm-common-network:tp-type": "SRG-TX-PP"
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "SRG1-PP5-RX",
-                            "org-openroadm-common-network:tp-type": "SRG-RX-PP"
-                        },
-                        {
-                            "tp-id": "SRG1-CP-TX",
-                            "org-openroadm-common-network:tp-type": "SRG-TX-CP"
-                        },
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
+                        },{"tp-id":"SRG1-CP-TX","org-openroadm-common-network:tp-type":"SRG-TX-CP","administrative-state":"inService","operational-state":"inService"},
                         {
                             "tp-id": "SRG1-PP1-TX",
-                            "org-openroadm-common-network:tp-type": "SRG-TX-PP"
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "SRG1-PP3-RX",
-                            "org-openroadm-common-network:tp-type": "SRG-RX-PP"
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "SRG1-PP2-RX",
-                            "org-openroadm-common-network:tp-type": "SRG-RX-PP"
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         }
                     ],
                     "org-openroadm-network-topology:srg-attributes": {
-                        "available-wavelengths": [
-                            {
-                                "index": 10
-                            },
-                            {
-                                "index": 9
-                            },
-                            {
-                                "index": 6
-                            },
-                            {
-                                "index": 5
-                            },
-                            {
-                                "index": 8
-                            },
-                            {
-                                "index": 7
-                            },
-                            {
-                                "index": 2
-                            },
+                        "avail-freq-maps": [
                             {
-                                "index": 1
-                            },
-                            {
-                                "index": 4
-                            },
-                            {
-                                "index": 3
+                                "map-name": "cband",
+                                "start-edge-freq": 191.325,
+                                "freq-map-granularity": 6.25,
+                                "effective-bits": 768,
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////"
                             }
                         ]
                     },
                     "org-openroadm-common-network:node-type": "SRG",
                     "supporting-node": [
                         {
-                            "network-ref":"openroadm-network",
+                            "network-ref": "openroadm-network",
                             "node-ref": "OpenROADM-3"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "Node3"
                         }
                     ]
                 },
                 {
                     "node-id": "OpenROADM-3-DEG1",
+                    "administrative-state": "inService",
+                    "operational-state": "inService",
                     "ietf-network-topology:termination-point": [
                         {
                             "tp-id": "DEG1-CTP-TX",
-                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP"
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "DEG1-TTP-TX",
-                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP"
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "DEG1-CTP-RX",
-                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP"
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "DEG1-TTP-RX",
-                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP"
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         }
                     ],
                     "org-openroadm-network-topology:degree-attributes": {
-                        "degree-number":1,
-                        "available-wavelengths": [
-                            {
-                                "index": 10
-                            },
-                            {
-                                "index": 9
-                            },
-                            {
-                                "index": 6
-                            },
-                            {
-                                "index": 5
-                            },
-                            {
-                                "index": 8
-                            },
-                            {
-                                "index": 7
-                            },
-                            {
-                                "index": 2
-                            },
-                            {
-                                "index": 1
-                            },
-                            {
-                                "index": 4
-                            },
-                            {
-                                "index": 3
+                        "degree-number": 1,
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": 191.325,
+                                "freq-map-granularity": 6.25,
+                                "effective-bits": 768,
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////"
                             }
                         ]
                     },
                     "org-openroadm-common-network:node-type": "DEGREE",
                     "supporting-node": [
                         {
-                            "network-ref":"openroadm-network",
+                            "network-ref": "openroadm-network",
                             "node-ref": "OpenROADM-3"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "Node3"
                         }
                     ]
                 },
                 {
                     "node-id": "OpenROADM-3-DEG2",
+                    "administrative-state": "inService",
+                    "operational-state": "inService",
                     "ietf-network-topology:termination-point": [
                         {
                             "tp-id": "DEG2-CTP-RX",
-                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP"
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "DEG2-CTP-TX",
-                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP"
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "DEG2-TTP-TX",
-                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP"
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "DEG2-TTP-RX",
-                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP"
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         }
                     ],
                     "org-openroadm-network-topology:degree-attributes": {
-                        "degree-number":2,
-                        "available-wavelengths": [
-                            {
-                                "index": 10
-                            },
-                            {
-                                "index": 9
-                            },
-                            {
-                                "index": 6
-                            },
-                            {
-                                "index": 5
-                            },
-                            {
-                                "index": 8
-                            },
-                            {
-                                "index": 7
-                            },
-                            {
-                                "index": 2
-                            },
-                            {
-                                "index": 1
-                            },
-                            {
-                                "index": 4
-                            },
-                            {
-                                "index": 3
+                        "degree-number": 2,
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": 191.325,
+                                "freq-map-granularity": 6.25,
+                                "effective-bits": 768,
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////"
                             }
                         ]
                     },
                     "org-openroadm-common-network:node-type": "DEGREE",
                     "supporting-node": [
                         {
-                            "network-ref":"openroadm-network",
+                            "network-ref": "openroadm-network",
                             "node-ref": "OpenROADM-3"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "Node3"
                         }
                     ]
                 },
                 {
                     "node-id": "OpenROADM-3-DEG3",
+                    "administrative-state": "inService",
+                    "operational-state": "inService",
                     "ietf-network-topology:termination-point": [
                         {
                             "tp-id": "DEG3-TTP-TX",
-                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP"
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "DEG3-CTP-TX",
-                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP"
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "DEG3-CTP-RX",
-                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP"
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "DEG3-TTP-RX",
-                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP"
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         }
                     ],
                     "org-openroadm-network-topology:degree-attributes": {
-                        "degree-number":3,
-                        "available-wavelengths": [
-                            {
-                                "index": 10
-                            },
-                            {
-                                "index": 9
-                            },
-                            {
-                                "index": 6
-                            },
-                            {
-                                "index": 5
-                            },
-                            {
-                                "index": 8
-                            },
-                            {
-                                "index": 7
-                            },
-                            {
-                                "index": 2
-                            },
-                            {
-                                "index": 1
-                            },
-                            {
-                                "index": 4
-                            },
-                            {
-                                "index": 3
+                        "degree-number": 3,
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": 191.325,
+                                "freq-map-granularity": 6.25,
+                                "effective-bits": 768,
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////"
                             }
                         ]
                     },
                     "org-openroadm-common-network:node-type": "DEGREE",
                     "supporting-node": [
                         {
-                            "network-ref":"openroadm-network",
+                            "network-ref": "openroadm-network",
                             "node-ref": "OpenROADM-3"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "Node3"
                         }
                     ]
                 },
                 {
                     "node-id": "OpenROADM-3-DEG4",
+                    "administrative-state": "inService",
+                    "operational-state": "inService",
                     "ietf-network-topology:termination-point": [
                         {
                             "tp-id": "DEG4-TTP-RX",
-                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP"
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "DEG4-CTP-TX",
-                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP"
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "DEG4-CTP-RX",
-                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP"
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "DEG4-TTP-TX",
-                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP"
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         }
                     ],
                     "org-openroadm-network-topology:degree-attributes": {
-                        "degree-number":4,
-                        "available-wavelengths": [
-                            {
-                                "index": 10
-                            },
-                            {
-                                "index": 9
-                            },
-                            {
-                                "index": 6
-                            },
-                            {
-                                "index": 5
-                            },
-                            {
-                                "index": 8
-                            },
-                            {
-                                "index": 7
-                            },
-                            {
-                                "index": 2
-                            },
-                            {
-                                "index": 1
-                            },
-                            {
-                                "index": 4
-                            },
-                            {
-                                "index": 3
+                        "degree-number": 4,
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": 191.325,
+                                "freq-map-granularity": 6.25,
+                                "effective-bits": 768,
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////"
                             }
                         ]
                     },
                     "org-openroadm-common-network:node-type": "DEGREE",
                     "supporting-node": [
                         {
-                            "network-ref":"openroadm-network",
+                            "network-ref": "openroadm-network",
                             "node-ref": "OpenROADM-3"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "Node3"
                         }
                     ]
                 },
                 {
                     "node-id": "OpenROADM-4-SRG1",
+                    "administrative-state": "inService",
+                    "operational-state": "inService",
                     "ietf-network-topology:termination-point": [
                         {
                             "tp-id": "SRG1-CP-RX",
-                            "org-openroadm-common-network:tp-type": "SRG-RX-CP"
+                            "org-openroadm-common-network:tp-type": "SRG-RX-CP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "SRG1-PP4-TX",
-                            "org-openroadm-common-network:tp-type": "SRG-TX-PP"
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "SRG1-PP5-TX",
-                            "org-openroadm-common-network:tp-type": "SRG-TX-PP"
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "SRG1-PP1-RX",
-                            "org-openroadm-common-network:tp-type": "SRG-RX-PP"
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "SRG1-PP3-TX",
-                            "org-openroadm-common-network:tp-type": "SRG-TX-PP"
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "SRG1-PP4-RX",
-                            "org-openroadm-common-network:tp-type": "SRG-RX-PP"
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "SRG1-PP2-TX",
-                            "org-openroadm-common-network:tp-type": "SRG-TX-PP"
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "SRG1-PP5-RX",
-                            "org-openroadm-common-network:tp-type": "SRG-RX-PP"
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "SRG1-CP-TX",
-                            "org-openroadm-common-network:tp-type": "SRG-TX-CP"
+                            "org-openroadm-common-network:tp-type": "SRG-TX-CP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "SRG1-PP1-TX",
-                            "org-openroadm-common-network:tp-type": "SRG-TX-PP"
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "SRG1-PP3-RX",
-                            "org-openroadm-common-network:tp-type": "SRG-RX-PP"
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "SRG1-PP2-RX",
-                            "org-openroadm-common-network:tp-type": "SRG-RX-PP"
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         }
                     ],
                     "org-openroadm-network-topology:srg-attributes": {
-                        "available-wavelengths": [
-                            {
-                                "index": 10
-                            },
-                            {
-                                "index": 9
-                            },
+                        "avail-freq-maps": [
                             {
-                                "index": 6
-                            },
-                            {
-                                "index": 5
-                            },
-                            {
-                                "index": 8
-                            },
-                            {
-                                "index": 7
-                            },
-                            {
-                                "index": 2
-                            },
-                            {
-                                "index": 1
-                            },
-                            {
-                                "index": 4
-                            },
-                            {
-                                "index": 3
+                                "map-name": "cband",
+                                "start-edge-freq": 191.325,
+                                "freq-map-granularity": 6.25,
+                                "effective-bits": 768,
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////"
                             }
                         ]
                     },
                     "org-openroadm-common-network:node-type": "SRG",
                     "supporting-node": [
                         {
-                            "network-ref":"openroadm-network",
+                            "network-ref": "openroadm-network",
                             "node-ref": "OpenROADM-4"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "Node4"
                         }
                     ]
                 },
                 {
                     "node-id": "OpenROADM-4-DEG1",
+                    "administrative-state": "inService",
+                    "operational-state": "inService",
                     "ietf-network-topology:termination-point": [
                         {
                             "tp-id": "DEG1-CTP-TX",
-                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP"
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "DEG1-TTP-TX",
-                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP"
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "DEG1-CTP-RX",
-                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP"
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "DEG1-TTP-RX",
-                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP"
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         }
                     ],
                     "org-openroadm-network-topology:degree-attributes": {
-                        "degree-number":1,
-                        "available-wavelengths": [
-                            {
-                                "index": 10
-                            },
-                            {
-                                "index": 9
-                            },
-                            {
-                                "index": 6
-                            },
-                            {
-                                "index": 5
-                            },
-                            {
-                                "index": 8
-                            },
-                            {
-                                "index": 7
-                            },
-                            {
-                                "index": 2
-                            },
-                            {
-                                "index": 1
-                            },
-                            {
-                                "index": 4
-                            },
-                            {
-                                "index": 3
+                        "degree-number": 1,
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": 191.325,
+                                "freq-map-granularity": 6.25,
+                                "effective-bits": 768,
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////"
                             }
                         ]
                     },
                     "org-openroadm-common-network:node-type": "DEGREE",
                     "supporting-node": [
                         {
-                            "network-ref":"openroadm-network",
+                            "network-ref": "openroadm-network",
                             "node-ref": "OpenROADM-4"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "Node4"
                         }
                     ]
                 },
                 {
                     "node-id": "OpenROADM-4-DEG2",
+                    "administrative-state": "inService",
+                    "operational-state": "inService",
                     "ietf-network-topology:termination-point": [
                         {
                             "tp-id": "DEG2-CTP-RX",
-                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP"
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "DEG2-CTP-TX",
-                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP"
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "DEG2-TTP-TX",
-                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP"
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "DEG2-TTP-RX",
-                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP"
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         }
                     ],
                     "org-openroadm-network-topology:degree-attributes": {
-                        "degree-number":2,
-                        "available-wavelengths": [
-                            {
-                                "index": 10
-                            },
-                            {
-                                "index": 9
-                            },
-                            {
-                                "index": 6
-                            },
-                            {
-                                "index": 5
-                            },
-                            {
-                                "index": 8
-                            },
-                            {
-                                "index": 7
-                            },
-                            {
-                                "index": 2
-                            },
-                            {
-                                "index": 1
-                            },
-                            {
-                                "index": 4
-                            },
-                            {
-                                "index": 3
+                        "degree-number": 2,
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": 191.325,
+                                "freq-map-granularity": 6.25,
+                                "effective-bits": 768,
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////"
                             }
                         ]
                     },
                     "org-openroadm-common-network:node-type": "DEGREE",
                     "supporting-node": [
                         {
-                            "network-ref":"openroadm-network",
+                            "network-ref": "openroadm-network",
                             "node-ref": "OpenROADM-4"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "Node4"
                         }
                     ]
                 },
                 {
                     "node-id": "OpenROADM-5-SRG1",
+                    "administrative-state": "inService",
+                    "operational-state": "inService",
                     "ietf-network-topology:termination-point": [
                         {
                             "tp-id": "SRG1-CP-RX",
-                            "org-openroadm-common-network:tp-type": "SRG-RX-CP"
+                            "org-openroadm-common-network:tp-type": "SRG-RX-CP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "SRG1-PP4-TX",
-                            "org-openroadm-common-network:tp-type": "SRG-TX-PP"
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "SRG1-PP5-TX",
-                            "org-openroadm-common-network:tp-type": "SRG-TX-PP"
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "SRG1-PP1-RX",
-                            "org-openroadm-common-network:tp-type": "SRG-RX-PP"
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "SRG1-PP3-TX",
-                            "org-openroadm-common-network:tp-type": "SRG-TX-PP"
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "SRG1-PP4-RX",
-                            "org-openroadm-common-network:tp-type": "SRG-RX-PP"
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "SRG1-PP2-TX",
-                            "org-openroadm-common-network:tp-type": "SRG-TX-PP"
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "SRG1-PP5-RX",
-                            "org-openroadm-common-network:tp-type": "SRG-RX-PP"
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "SRG1-CP-TX",
-                            "org-openroadm-common-network:tp-type": "SRG-TX-CP"
+                            "org-openroadm-common-network:tp-type": "SRG-TX-CP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "SRG1-PP1-TX",
-                            "org-openroadm-common-network:tp-type": "SRG-TX-PP"
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "SRG1-PP3-RX",
-                            "org-openroadm-common-network:tp-type": "SRG-RX-PP"
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "SRG1-PP2-RX",
-                            "org-openroadm-common-network:tp-type": "SRG-RX-PP"
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         }
                     ],
                     "org-openroadm-network-topology:srg-attributes": {
-                        "available-wavelengths": [
+                        "avail-freq-maps": [
                             {
-                                "index": 10
-                            },
-                            {
-                                "index": 9
-                            },
-                            {
-                                "index": 6
-                            },
-                            {
-                                "index": 5
-                            },
-                            {
-                                "index": 8
-                            },
-                            {
-                                "index": 7
-                            },
-                            {
-                                "index": 2
-                            },
-                            {
-                                "index": 1
-                            },
-                            {
-                                "index": 4
-                            },
-                            {
-                                "index": 3
+                                "map-name": "cband",
+                                "start-edge-freq": 191.325,
+                                "freq-map-granularity": 6.25,
+                                "effective-bits": 768,
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////"
                             }
                         ]
                     },
                     "org-openroadm-common-network:node-type": "SRG",
                     "supporting-node": [
                         {
-                            "network-ref":"openroadm-network",
+                            "network-ref": "openroadm-network",
                             "node-ref": "OpenROADM-5"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "Node5"
                         }
                     ]
                 },
                 {
                     "node-id": "OpenROADM-5-DEG1",
+                    "administrative-state": "inService",
+                    "operational-state": "inService",
                     "ietf-network-topology:termination-point": [
                         {
                             "tp-id": "DEG1-CTP-TX",
-                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP"
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "DEG1-TTP-TX",
-                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP"
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "DEG1-CTP-RX",
-                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP"
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "DEG1-TTP-RX",
-                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP"
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         }
                     ],
                     "org-openroadm-network-topology:degree-attributes": {
-                        "degree-number":1,
-                        "available-wavelengths": [
-                            {
-                                "index": 10
-                            },
-                            {
-                                "index": 9
-                            },
-                            {
-                                "index": 6
-                            },
-                            {
-                                "index": 5
-                            },
-                            {
-                                "index": 8
-                            },
-                            {
-                                "index": 7
-                            },
-                            {
-                                "index": 2
-                            },
-                            {
-                                "index": 1
-                            },
-                            {
-                                "index": 4
-                            },
-                            {
-                                "index": 3
+                        "degree-number": 1,
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": 191.325,
+                                "freq-map-granularity": 6.25,
+                                "effective-bits": 768,
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////"
                             }
                         ]
                     },
                     "org-openroadm-common-network:node-type": "DEGREE",
                     "supporting-node": [
                         {
-                            "network-ref":"openroadm-network",
+                            "network-ref": "openroadm-network",
                             "node-ref": "OpenROADM-5"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "Node5"
                         }
                     ]
                 },
                 {
                     "node-id": "OpenROADM-5-DEG2",
+                    "administrative-state": "inService",
+                    "operational-state": "inService",
                     "ietf-network-topology:termination-point": [
                         {
                             "tp-id": "DEG2-CTP-RX",
-                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP"
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "DEG2-CTP-TX",
-                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP"
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "DEG2-TTP-TX",
-                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP"
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "DEG2-TTP-RX",
-                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP"
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         }
                     ],
                     "org-openroadm-network-topology:degree-attributes": {
-                        "degree-number":2,
-                        "available-wavelengths": [
-                            {
-                                "index": 10
-                            },
-                            {
-                                "index": 9
-                            },
-                            {
-                                "index": 6
-                            },
-                            {
-                                "index": 5
-                            },
-                            {
-                                "index": 8
-                            },
-                            {
-                                "index": 7
-                            },
-                            {
-                                "index": 2
-                            },
-                            {
-                                "index": 1
-                            },
-                            {
-                                "index": 4
-                            },
-                            {
-                                "index": 3
+                        "degree-number": 2,
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": 191.325,
+                                "freq-map-granularity": 6.25,
+                                "effective-bits": 768,
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////"
                             }
                         ]
                     },
                     "org-openroadm-common-network:node-type": "DEGREE",
                     "supporting-node": [
                         {
-                            "network-ref":"openroadm-network",
+                            "network-ref": "openroadm-network",
                             "node-ref": "OpenROADM-5"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "Node5"
                         }
                     ]
                 },
                 {
                     "node-id": "OpenROADM-5-DEG3",
+                    "administrative-state": "inService",
+                    "operational-state": "inService",
                     "ietf-network-topology:termination-point": [
                         {
                             "tp-id": "DEG3-TTP-TX",
-                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP"
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "DEG3-CTP-TX",
-                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP"
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "DEG3-CTP-RX",
-                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP"
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "DEG3-TTP-RX",
-                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP"
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         }
                     ],
                     "org-openroadm-network-topology:degree-attributes": {
-                        "degree-number":3,
-                        "available-wavelengths": [
-                            {
-                                "index": 10
-                            },
-                            {
-                                "index": 9
-                            },
-                            {
-                                "index": 6
-                            },
-                            {
-                                "index": 5
-                            },
-                            {
-                                "index": 8
-                            },
-                            {
-                                "index": 7
-                            },
-                            {
-                                "index": 2
-                            },
-                            {
-                                "index": 1
-                            },
-                            {
-                                "index": 4
-                            },
-                            {
-                                "index": 3
+                        "degree-number": 3,
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": 191.325,
+                                "freq-map-granularity": 6.25,
+                                "effective-bits": 768,
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////"
                             }
                         ]
                     },
                     "org-openroadm-common-network:node-type": "DEGREE",
                     "supporting-node": [
                         {
-                            "network-ref":"openroadm-network",
+                            "network-ref": "openroadm-network",
                             "node-ref": "OpenROADM-5"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "Node5"
                         }
                     ]
                 },
                 {
                     "node-id": "XPONDER-1",
+                    "administrative-state": "inService",
+                    "operational-state": "inService",
                     "ietf-network-topology:termination-point": [
                         {
                             "tp-id": "XPDR-NW1-RX",
-                            "transportpce-topology:associated-connection-map-port": "Client-1",
-                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK"
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-1"
+                            ],
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "XPDR-NW5-RX",
-                            "transportpce-topology:associated-connection-map-port": "Client-5",
-                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK"
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-5"
+                            ],
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "XPDR-NW4-RX",
-                            "transportpce-topology:associated-connection-map-port": "Client-4",
-                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK"
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-4"
+                            ],
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "XPDR-NW2-RX",
-                            "transportpce-topology:associated-connection-map-port": "Client-2",
-                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK"
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-2"
+                            ],
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "XPDR-NW1-TX",
-                            "transportpce-topology:associated-connection-map-port": "Client-1",
-                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK"
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-1"
+                            ],
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "XPDR-NW3-RX",
-                            "transportpce-topology:associated-connection-map-port": "Client-3",
-                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK"
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-3"
+                            ],
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "XPDR-NW2-TX",
-                            "transportpce-topology:associated-connection-map-port": "Client-2",
-                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK"
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-2"
+                            ],
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "XPDR-NW5-TX",
-                            "transportpce-topology:associated-connection-map-port": "Client-5",
-                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK"
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-5"
+                            ],
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "XPDR-NW3-TX",
-                            "transportpce-topology:associated-connection-map-port": "Client-3",
-                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK"
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-3"
+                            ],
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "XPDR-NW4-TX",
-                            "transportpce-topology:associated-connection-map-port": "Client-4",
-                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK"
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-4"
+                            ],
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "Client-4",
-                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT"
+                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "Client-5",
-                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT"
+                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "Client-1",
-                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT"
+                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "Client-2",
-                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT"
+                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "Client-3",
-                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT"
+                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         }
                     ],
                     "org-openroadm-common-network:node-type": "XPONDER",
                     "supporting-node": [
                         {
-                            "network-ref":"openroadm-network",
+                            "network-ref": "openroadm-network",
                             "node-ref": "XPONDER-1"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "Node1"
                         }
                     ]
                 },
                 {
                     "node-id": "XPONDER-2",
+                    "administrative-state": "inService",
+                    "operational-state": "inService",
                     "ietf-network-topology:termination-point": [
                         {
                             "tp-id": "XPDR-NW1-RX",
-                            "transportpce-topology:associated-connection-map-port": "Client-1",
-                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK"
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-1"
+                            ],
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "XPDR-NW5-RX",
-                            "transportpce-topology:associated-connection-map-port": "Client-5",
-                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK"
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-5"
+                            ],
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "XPDR-NW4-RX",
-                            "transportpce-topology:associated-connection-map-port": "Client-4",
-                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK"
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-4"
+                            ],
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "XPDR-NW2-RX",
-                            "transportpce-topology:associated-connection-map-port": "Client-2",
-                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK"
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-2"
+                            ],
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "XPDR-NW1-TX",
-                            "transportpce-topology:associated-connection-map-port": "Client-1",
-                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK"
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-1"
+                            ],
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "XPDR-NW3-RX",
-                            "transportpce-topology:associated-connection-map-port": "Client-3",
-                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK"
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-3"
+                            ],
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "XPDR-NW2-TX",
-                            "transportpce-topology:associated-connection-map-port": "Client-2",
-                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK"
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-2"
+                            ],
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "XPDR-NW5-TX",
-                            "transportpce-topology:associated-connection-map-port": "Client-5",
-                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK"
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-5"
+                            ],
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "XPDR-NW3-TX",
-                            "transportpce-topology:associated-connection-map-port": "Client-3",
-                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK"
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-3"
+                            ],
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "XPDR-NW4-TX",
-                            "transportpce-topology:associated-connection-map-port": "Client-4",
-                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK"
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-4"
+                            ],
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "Client-4",
-                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT"
+                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "Client-5",
-                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT"
+                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "Client-1",
-                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT"
+                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "Client-2",
-                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT"
+                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "Client-3",
-                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT"
+                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         }
                     ],
                     "org-openroadm-common-network:node-type": "XPONDER",
                     "supporting-node": [
                         {
-                            "network-ref":"openroadm-network",
+                            "network-ref": "openroadm-network",
                             "node-ref": "XPONDER-2"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "Node2"
                         }
                     ]
                 },
                 {
                     "node-id": "XPONDER-3",
+                    "administrative-state": "inService",
+                    "operational-state": "inService",
                     "ietf-network-topology:termination-point": [
                         {
                             "tp-id": "XPDR-NW1-RX",
-                            "transportpce-topology:associated-connection-map-port": "Client-1",
-                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK"
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-1"
+                            ],
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "XPDR-NW5-RX",
-                            "transportpce-topology:associated-connection-map-port": "Client-5",
-                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK"
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-5"
+                            ],
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "XPDR-NW4-RX",
-                            "transportpce-topology:associated-connection-map-port": "Client-4",
-                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK"
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-4"
+                            ],
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "XPDR-NW2-RX",
-                            "transportpce-topology:associated-connection-map-port": "Client-2",
-                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK"
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-2"
+                            ],
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "XPDR-NW1-TX",
-                            "transportpce-topology:associated-connection-map-port": "Client-1",
-                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK"
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-1"
+                            ],
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "XPDR-NW3-RX",
-                            "transportpce-topology:associated-connection-map-port": "Client-3",
-                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK"
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-3"
+                            ],
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "XPDR-NW2-TX",
-                            "transportpce-topology:associated-connection-map-port": "Client-2",
-                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK"
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-2"
+                            ],
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "XPDR-NW5-TX",
-                            "transportpce-topology:associated-connection-map-port": "Client-5",
-                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK"
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-5"
+                            ],
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "XPDR-NW3-TX",
-                            "transportpce-topology:associated-connection-map-port": "Client-3",
-                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK"
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-3"
+                            ],
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "XPDR-NW4-TX",
-                            "transportpce-topology:associated-connection-map-port": "Client-4",
-                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK"
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-4"
+                            ],
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "Client-4",
-                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT"
+                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "Client-5",
-                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT"
+                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "Client-1",
-                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT"
+                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "Client-2",
-                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT"
+                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "Client-3",
-                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT"
+                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         }
                     ],
                     "org-openroadm-common-network:node-type": "XPONDER",
                     "supporting-node": [
                         {
-                            "network-ref":"openroadm-network",
+                            "network-ref": "openroadm-network",
                             "node-ref": "XPONDER-3"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "Node3"
                         }
                     ]
                 },
                 {
                     "node-id": "XPONDER-4",
+                    "administrative-state": "inService",
+                    "operational-state": "inService",
                     "ietf-network-topology:termination-point": [
                         {
                             "tp-id": "XPDR-NW1-RX",
-                            "transportpce-topology:associated-connection-map-port": "Client-1",
-                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK"
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-1"
+                            ],
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "XPDR-NW5-RX",
-                            "transportpce-topology:associated-connection-map-port": "Client-5",
-                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK"
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-5"
+                            ],
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "XPDR-NW4-RX",
-                            "transportpce-topology:associated-connection-map-port": "Client-4",
-                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK"
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-4"
+                            ],
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "XPDR-NW2-RX",
-                            "transportpce-topology:associated-connection-map-port": "Client-2",
-                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK"
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-2"
+                            ],
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "XPDR-NW1-TX",
-                            "transportpce-topology:associated-connection-map-port": "Client-1",
-                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK"
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-1"
+                            ],
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "XPDR-NW3-RX",
-                            "transportpce-topology:associated-connection-map-port": "Client-3",
-                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK"
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-3"
+                            ],
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "XPDR-NW2-TX",
-                            "transportpce-topology:associated-connection-map-port": "Client-2",
-                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK"
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-2"
+                            ],
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "XPDR-NW5-TX",
-                            "transportpce-topology:associated-connection-map-port": "Client-5",
-                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK"
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-5"
+                            ],
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "XPDR-NW3-TX",
-                            "transportpce-topology:associated-connection-map-port": "Client-3",
-                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK"
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-3"
+                            ],
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "XPDR-NW4-TX",
-                            "transportpce-topology:associated-connection-map-port": "Client-4",
-                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK"
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-4"
+                            ],
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "Client-4",
-                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT"
+                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "Client-5",
-                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT"
+                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "Client-1",
-                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT"
+                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "Client-2",
-                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT"
+                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "Client-3",
-                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT"
+                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         }
                     ],
                     "org-openroadm-common-network:node-type": "XPONDER",
                     "supporting-node": [
                         {
-                            "network-ref":"openroadm-network",
+                            "network-ref": "openroadm-network",
                             "node-ref": "XPONDER-4"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "Node4"
                         }
                     ]
                 },
                 {
                     "node-id": "XPONDER-5",
+                    "administrative-state": "inService",
+                    "operational-state": "inService",
                     "ietf-network-topology:termination-point": [
                         {
                             "tp-id": "XPDR-NW1-RX",
-                            "transportpce-topology:associated-connection-map-port": "Client-1",
-                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK"
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-1"
+                            ],
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "XPDR-NW5-RX",
-                            "transportpce-topology:associated-connection-map-port": "Client-5",
-                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK"
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-5"
+                            ],
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "XPDR-NW4-RX",
-                            "transportpce-topology:associated-connection-map-port": "Client-4",
-                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK"
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-4"
+                            ],
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "XPDR-NW2-RX",
-                            "transportpce-topology:associated-connection-map-port": "Client-2",
-                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK"
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-2"
+                            ],
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "XPDR-NW1-TX",
-                            "transportpce-topology:associated-connection-map-port": "Client-1",
-                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK"
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-1"
+                            ],
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "XPDR-NW3-RX",
-                            "transportpce-topology:associated-connection-map-port": "Client-3",
-                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK"
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-3"
+                            ],
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "XPDR-NW2-TX",
-                            "transportpce-topology:associated-connection-map-port": "Client-2",
-                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK"
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-2"
+                            ],
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "XPDR-NW5-TX",
-                            "transportpce-topology:associated-connection-map-port": "Client-5",
-                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK"
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-5"
+                            ],
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "XPDR-NW3-TX",
-                            "transportpce-topology:associated-connection-map-port": "Client-3",
-                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK"
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-3"
+                            ],
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "XPDR-NW4-TX",
-                            "transportpce-topology:associated-connection-map-port": "Client-4",
-                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK"
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-4"
+                            ],
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "Client-4",
-                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT"
+                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "Client-5",
-                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT"
+                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "Client-1",
-                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT"
+                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "Client-2",
-                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT"
+                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         },
                         {
                             "tp-id": "Client-3",
-                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT"
+                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT",
+                            "administrative-state": "inService",
+                            "operational-state": "inService"
                         }
                     ],
                     "org-openroadm-common-network:node-type": "XPONDER",
                     "supporting-node": [
                         {
-                            "network-ref":"openroadm-network",
+                            "network-ref": "openroadm-network",
                             "node-ref": "XPONDER-5"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "Node5"
                         }
                     ]
                 }
-
             ]
         }
     ]
-}
\ No newline at end of file
+}